Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
b2c8b2ac
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b2c8b2ac
编写于
7月 13, 2020
作者:
R
rebornix
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix #102411.
上级
139ccc4a
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
27 addition
and
9 deletion
+27
-9
extensions/vscode-notebook-tests/src/notebook.test.ts
extensions/vscode-notebook-tests/src/notebook.test.ts
+4
-0
src/vs/workbench/contrib/notebook/common/notebookEditorModel.ts
.../workbench/contrib/notebook/common/notebookEditorModel.ts
+23
-9
未找到文件。
extensions/vscode-notebook-tests/src/notebook.test.ts
浏览文件 @
b2c8b2ac
...
...
@@ -889,6 +889,10 @@ suite('regression', () => {
await
vscode
.
commands
.
executeCommand
(
'
workbench.action.closeAllEditors
'
);
});
test
(
'
untitled file
'
,
async
function
()
{
await
vscode
.
commands
.
executeCommand
(
'
workbench.action.files.newUntitledFile
'
,
{
viewType
:
"
notebookCoreTest
"
});
assert
.
notEqual
(
vscode
.
notebook
.
activeNotebookEditor
,
undefined
,
'
untitled notebook editor is not undefined
'
);
});
});
suite
(
'
webview
'
,
()
=>
{
...
...
src/vs/workbench/contrib/notebook/common/notebookEditorModel.ts
浏览文件 @
b2c8b2ac
...
...
@@ -91,11 +91,11 @@ export class NotebookEditorModel extends EditorModel implements IWorkingCopy, IN
if
(
this
.
_notebook
.
supportBackup
)
{
const
tokenSource
=
new
CancellationTokenSource
();
const
backupId
=
await
this
.
_notebookService
.
backup
(
this
.
viewType
,
this
.
resource
,
tokenSource
.
token
);
const
stats
=
await
this
.
_
fileService
.
resolve
(
this
.
resource
,
{
resolveMetadata
:
true
}
);
const
stats
=
await
this
.
_
resolveStats
(
this
.
resource
);
return
{
meta
:
{
mtime
:
stats
.
mtime
||
new
Date
().
getTime
(),
mtime
:
stats
?
.
mtime
||
new
Date
().
getTime
(),
name
:
this
.
_name
,
viewType
:
this
.
_notebook
.
viewType
,
backupId
:
backupId
...
...
@@ -120,7 +120,7 @@ export class NotebookEditorModel extends EditorModel implements IWorkingCopy, IN
}
await
this
.
load
({
forceReadFromDisk
:
true
});
const
newStats
=
await
this
.
_
fileService
.
resolve
(
this
.
resource
,
{
resolveMetadata
:
true
}
);
const
newStats
=
await
this
.
_
resolveStats
(
this
.
resource
);
this
.
_lastResolvedFileStat
=
newStats
;
this
.
_notebook
.
setDirty
(
false
);
...
...
@@ -159,7 +159,7 @@ export class NotebookEditorModel extends EditorModel implements IWorkingCopy, IN
const
notebook
=
await
this
.
_notebookService
.
createNotebookFromBackup
(
this
.
viewType
!
,
this
.
resource
,
data
.
metadata
,
data
.
languages
,
data
.
cells
,
editorId
);
this
.
_notebook
=
notebook
!
;
const
newStats
=
await
this
.
_
fileService
.
resolve
(
this
.
resource
,
{
resolveMetadata
:
true
}
);
const
newStats
=
await
this
.
_
resolveStats
(
this
.
resource
);
this
.
_lastResolvedFileStat
=
newStats
;
this
.
_register
(
this
.
_notebook
);
...
...
@@ -181,7 +181,7 @@ export class NotebookEditorModel extends EditorModel implements IWorkingCopy, IN
private
async
loadFromProvider
(
forceReloadFromDisk
:
boolean
,
editorId
:
string
|
undefined
,
backupId
:
string
|
undefined
)
{
const
notebook
=
await
this
.
_notebookService
.
resolveNotebook
(
this
.
viewType
!
,
this
.
resource
,
forceReloadFromDisk
,
editorId
,
backupId
);
this
.
_notebook
=
notebook
!
;
const
newStats
=
await
this
.
_
fileService
.
resolve
(
this
.
resource
,
{
resolveMetadata
:
true
}
);
const
newStats
=
await
this
.
_
resolveStats
(
this
.
resource
);
this
.
_lastResolvedFileStat
=
newStats
;
this
.
_register
(
this
.
_notebook
);
...
...
@@ -216,8 +216,8 @@ export class NotebookEditorModel extends EditorModel implements IWorkingCopy, IN
}
private
async
_assertStat
()
{
const
stats
=
await
this
.
_
fileService
.
resolve
(
this
.
resource
,
{
resolveMetadata
:
true
}
);
if
(
this
.
_lastResolvedFileStat
&&
stats
.
mtime
>
this
.
_lastResolvedFileStat
.
mtime
)
{
const
stats
=
await
this
.
_
resolveStats
(
this
.
resource
);
if
(
this
.
_lastResolvedFileStat
&&
stats
&&
stats
.
mtime
>
this
.
_lastResolvedFileStat
.
mtime
)
{
return
new
Promise
<
'
overwrite
'
|
'
revert
'
|
'
none
'
>
(
resolve
=>
{
const
handle
=
this
.
_notificationService
.
prompt
(
Severity
.
Info
,
...
...
@@ -258,7 +258,7 @@ export class NotebookEditorModel extends EditorModel implements IWorkingCopy, IN
const
tokenSource
=
new
CancellationTokenSource
();
await
this
.
_notebookService
.
save
(
this
.
notebook
.
viewType
,
this
.
notebook
.
uri
,
tokenSource
.
token
);
const
newStats
=
await
this
.
_
fileService
.
resolve
(
this
.
resource
,
{
resolveMetadata
:
true
}
);
const
newStats
=
await
this
.
_
resolveStats
(
this
.
resource
);
this
.
_lastResolvedFileStat
=
newStats
;
this
.
_notebook
.
setDirty
(
false
);
return
true
;
...
...
@@ -278,12 +278,26 @@ export class NotebookEditorModel extends EditorModel implements IWorkingCopy, IN
const
tokenSource
=
new
CancellationTokenSource
();
await
this
.
_notebookService
.
saveAs
(
this
.
notebook
.
viewType
,
this
.
notebook
.
uri
,
targetResource
,
tokenSource
.
token
);
const
newStats
=
await
this
.
_
fileService
.
resolve
(
this
.
resource
,
{
resolveMetadata
:
true
}
);
const
newStats
=
await
this
.
_
resolveStats
(
this
.
resource
);
this
.
_lastResolvedFileStat
=
newStats
;
this
.
_notebook
.
setDirty
(
false
);
return
true
;
}
private
async
_resolveStats
(
resource
:
URI
)
{
if
(
resource
.
scheme
===
Schemas
.
untitled
)
{
return
undefined
;
}
try
{
const
newStats
=
await
this
.
_fileService
.
resolve
(
this
.
resource
,
{
resolveMetadata
:
true
});
return
newStats
;
}
catch
(
e
)
{
return
undefined
;
}
}
dispose
()
{
super
.
dispose
();
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录