Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
02b2629d
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,发现更多精彩内容 >>
提交
02b2629d
编写于
2月 19, 2021
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
cleanup, all notebooks must support backup
上级
fa6c46b7
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
16 addition
and
29 deletion
+16
-29
src/vs/workbench/contrib/notebook/browser/notebookServiceImpl.ts
...workbench/contrib/notebook/browser/notebookServiceImpl.ts
+1
-1
src/vs/workbench/contrib/notebook/common/model/notebookTextModel.ts
...kbench/contrib/notebook/common/model/notebookTextModel.ts
+0
-1
src/vs/workbench/contrib/notebook/common/notebookEditorModel.ts
.../workbench/contrib/notebook/common/notebookEditorModel.ts
+15
-27
未找到文件。
src/vs/workbench/contrib/notebook/browser/notebookServiceImpl.ts
浏览文件 @
02b2629d
...
...
@@ -739,7 +739,7 @@ export class NotebookService extends Disposable implements INotebookService, ICu
if
(
this
.
_models
.
has
(
uri
))
{
throw
new
Error
(
`notebook for
${
uri
}
already exists`
);
}
const
notebookModel
=
this
.
_instantiationService
.
createInstance
(
NotebookTextModel
,
viewType
,
true
,
uri
,
data
.
cells
,
data
.
metadata
,
transientOptions
);
const
notebookModel
=
this
.
_instantiationService
.
createInstance
(
NotebookTextModel
,
viewType
,
uri
,
data
.
cells
,
data
.
metadata
,
transientOptions
);
this
.
_models
.
set
(
uri
,
new
ModelData
(
notebookModel
,
this
.
_onWillDisposeDocument
.
bind
(
this
)));
this
.
_onDidAddNotebookDocument
.
fire
(
notebookModel
);
return
notebookModel
;
...
...
src/vs/workbench/contrib/notebook/common/model/notebookTextModel.ts
浏览文件 @
02b2629d
...
...
@@ -229,7 +229,6 @@ export class NotebookTextModel extends Disposable implements INotebookTextModel
constructor
(
readonly
viewType
:
string
,
readonly
supportBackup
:
boolean
,
//TODO@jrieken,@rebornix all support backup, right?
readonly
uri
:
URI
,
cells
:
ICellDto2
[],
metadata
:
NotebookDocumentMetadata
,
...
...
src/vs/workbench/contrib/notebook/common/notebookEditorModel.ts
浏览文件 @
02b2629d
...
...
@@ -11,7 +11,7 @@ import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/no
import
{
INotebookService
}
from
'
vs/workbench/contrib/notebook/common/notebookService
'
;
import
{
URI
}
from
'
vs/base/common/uri
'
;
import
{
IWorkingCopyService
,
IWorkingCopy
,
IWorkingCopyBackup
,
WorkingCopyCapabilities
}
from
'
vs/workbench/services/workingCopy/common/workingCopyService
'
;
import
{
CancellationToken
,
CancellationTokenSource
}
from
'
vs/base/common/cancellation
'
;
import
{
CancellationToken
}
from
'
vs/base/common/cancellation
'
;
import
{
IBackupFileService
}
from
'
vs/workbench/services/backup/common/backup
'
;
import
{
Schemas
}
from
'
vs/base/common/network
'
;
import
{
IFileStatWithMetadata
,
IFileService
,
FileChangeType
}
from
'
vs/platform/files/common/files
'
;
...
...
@@ -114,35 +114,23 @@ export class NotebookEditorModel extends EditorModel implements INotebookEditorM
async
backup
(
token
:
CancellationToken
):
Promise
<
IWorkingCopyBackup
<
NotebookDocumentBackupData
>>
{
if
(
!
this
.
isResolved
())
{
throw
new
Error
(
'
CANNOT call backup before notebook is resolved
'
)
;
return
{}
;
}
if
(
this
.
notebook
.
supportBackup
)
{
const
tokenSource
=
new
CancellationTokenSource
(
token
);
const
backupId
=
await
this
.
_notebookService
.
backup
(
this
.
viewType
,
this
.
resource
,
tokenSource
.
token
);
if
(
token
.
isCancellationRequested
)
{
return
{};
}
const
stats
=
await
this
.
_resolveStats
(
this
.
resource
);
return
{
meta
:
{
mtime
:
stats
?.
mtime
||
new
Date
().
getTime
(),
name
:
this
.
_name
,
viewType
:
this
.
notebook
.
viewType
,
backupId
:
backupId
}
};
}
else
{
return
{
meta
:
{
mtime
:
new
Date
().
getTime
(),
name
:
this
.
_name
,
viewType
:
this
.
notebook
.
viewType
},
content
:
this
.
notebook
.
createSnapshot
(
true
)
};
const
backupId
=
await
this
.
_notebookService
.
backup
(
this
.
viewType
,
this
.
resource
,
token
);
if
(
token
.
isCancellationRequested
)
{
return
{};
}
const
stats
=
await
this
.
_resolveStats
(
this
.
resource
);
return
{
meta
:
{
mtime
:
stats
?.
mtime
??
Date
.
now
(),
name
:
this
.
_name
,
viewType
:
this
.
notebook
.
viewType
,
backupId
:
backupId
}
};
}
async
revert
(
options
?:
IRevertOptions
|
undefined
):
Promise
<
void
>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录