Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
cc1e59bd
V
vscode
项目概览
xxadev
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
cc1e59bd
编写于
4月 29, 2020
作者:
M
Matt Bierner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Make sure we pass through backupId in custom editors
Fixes #96484
上级
ff1b513f
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
22 addition
and
4 deletion
+22
-4
src/vs/workbench/api/browser/mainThreadWebview.ts
src/vs/workbench/api/browser/mainThreadWebview.ts
+7
-1
src/vs/workbench/contrib/customEditor/browser/customEditorInput.ts
...rkbench/contrib/customEditor/browser/customEditorInput.ts
+10
-3
src/vs/workbench/contrib/customEditor/common/customEditor.ts
src/vs/workbench/contrib/customEditor/common/customEditor.ts
+1
-0
src/vs/workbench/contrib/customEditor/common/customTextEditorModel.ts
...ench/contrib/customEditor/common/customTextEditorModel.ts
+4
-0
未找到文件。
src/vs/workbench/api/browser/mainThreadWebview.ts
浏览文件 @
cc1e59bd
...
...
@@ -610,8 +610,9 @@ namespace HotExitState {
class
MainThreadCustomEditorModel
extends
Disposable
implements
ICustomEditorModel
,
IWorkingCopy
{
private
_hotExitState
:
HotExitState
.
State
=
HotExitState
.
Allowed
;
private
readonly
_fromBackup
:
boolean
=
false
;
private
_hotExitState
:
HotExitState
.
State
=
HotExitState
.
Allowed
;
private
_backupId
:
string
|
undefined
;
private
_currentEditIndex
:
number
=
-
1
;
private
_savePoint
:
number
=
-
1
;
...
...
@@ -716,6 +717,10 @@ class MainThreadCustomEditorModel extends Disposable implements ICustomEditorMod
return
this
.
_viewType
;
}
public
get
backupId
()
{
return
this
.
_backupId
;
}
public
pushEdit
(
editId
:
number
,
label
:
string
|
undefined
)
{
if
(
!
this
.
_editable
)
{
throw
new
Error
(
'
Document is not editable
'
);
...
...
@@ -902,6 +907,7 @@ class MainThreadCustomEditorModel extends Disposable implements ICustomEditorMod
if
(
this
.
_hotExitState
===
pendingState
)
{
this
.
_hotExitState
=
HotExitState
.
Allowed
;
backupData
.
meta
!
.
backupId
=
backupId
;
this
.
_backupId
=
backupId
;
}
}
catch
(
e
)
{
// Make sure state has not changed in the meantime
...
...
src/vs/workbench/contrib/customEditor/browser/customEditorInput.ts
浏览文件 @
cc1e59bd
...
...
@@ -29,7 +29,7 @@ export class CustomEditorInput extends LazilyResolvedWebviewEditorInput {
private
readonly
_editorResource
:
URI
;
private
_defaultDirtyState
:
boolean
|
undefined
;
p
ublic
readonly
backupId
:
string
|
undefined
;
p
rivate
readonly
_
backupId
:
string
|
undefined
;
get
resource
()
{
return
this
.
_editorResource
;
}
...
...
@@ -54,7 +54,7 @@ export class CustomEditorInput extends LazilyResolvedWebviewEditorInput {
super
(
id
,
viewType
,
''
,
webview
,
webviewService
,
webviewWorkbenchService
);
this
.
_editorResource
=
resource
;
this
.
_defaultDirtyState
=
options
.
startsDirty
;
this
.
backupId
=
options
.
backupId
;
this
.
_
backupId
=
options
.
backupId
;
}
public
getTypeId
():
string
{
...
...
@@ -213,7 +213,7 @@ export class CustomEditorInput extends LazilyResolvedWebviewEditorInput {
this
.
viewType
,
this
.
id
,
new
Lazy
(()
=>
undefined
!
),
{
startsDirty
:
this
.
_defaultDirtyState
,
backupId
:
this
.
backupId
});
// this webview is replaced in the transfer call
{
startsDirty
:
this
.
_defaultDirtyState
,
backupId
:
this
.
_
backupId
});
// this webview is replaced in the transfer call
this
.
transfer
(
newEditor
);
newEditor
.
updateGroup
(
group
);
return
newEditor
;
...
...
@@ -245,4 +245,11 @@ export class CustomEditorInput extends LazilyResolvedWebviewEditorInput {
this
.
_moveHandler
=
undefined
;
return
other
;
}
get
backupId
():
string
|
undefined
{
if
(
this
.
_modelRef
)
{
return
this
.
_modelRef
.
object
.
backupId
;
}
return
this
.
_backupId
;
}
}
src/vs/workbench/contrib/customEditor/common/customEditor.ts
浏览文件 @
cc1e59bd
...
...
@@ -56,6 +56,7 @@ export interface ICustomEditorModelManager {
export
interface
ICustomEditorModel
extends
IDisposable
{
readonly
viewType
:
string
;
readonly
resource
:
URI
;
readonly
backupId
:
string
|
undefined
;
isReadonly
():
boolean
;
...
...
src/vs/workbench/contrib/customEditor/common/customTextEditorModel.ts
浏览文件 @
cc1e59bd
...
...
@@ -54,6 +54,10 @@ export class CustomTextEditorModel extends Disposable implements ICustomEditorMo
return
this
.
_model
.
object
.
isReadonly
();
}
public
get
backupId
()
{
return
undefined
;
}
public
isDirty
():
boolean
{
return
this
.
textFileService
.
isDirty
(
this
.
resource
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录