Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
c9b48d56
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,发现更多精彩内容 >>
提交
c9b48d56
编写于
3月 25, 2020
作者:
M
Matt Bierner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixing save of untitled text based custom editors
上级
1264510b
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
30 addition
and
12 deletion
+30
-12
src/vs/workbench/api/browser/mainThreadWebview.ts
src/vs/workbench/api/browser/mainThreadWebview.ts
+9
-4
src/vs/workbench/contrib/customEditor/browser/customEditorInput.ts
...rkbench/contrib/customEditor/browser/customEditorInput.ts
+16
-3
src/vs/workbench/contrib/customEditor/common/customEditor.ts
src/vs/workbench/contrib/customEditor/common/customEditor.ts
+2
-2
src/vs/workbench/contrib/customEditor/common/customTextEditorModel.ts
...ench/contrib/customEditor/common/customTextEditorModel.ts
+3
-3
未找到文件。
src/vs/workbench/api/browser/mainThreadWebview.ts
浏览文件 @
c9b48d56
...
...
@@ -752,18 +752,23 @@ class MainThreadCustomEditorModel extends Disposable implements ICustomEditorMod
});
}
public
async
save
(
_options
?:
ISaveOptions
):
Promise
<
boolean
>
{
public
async
save
(
options
?:
ISaveOptions
):
Promise
<
boolean
>
{
return
!!
await
this
.
saveCustomEditor
(
options
);
}
public
async
saveCustomEditor
(
_options
?:
ISaveOptions
):
Promise
<
URI
|
undefined
>
{
if
(
!
this
.
_editable
)
{
return
false
;
return
undefined
;
}
// TODO: handle save untitled case
await
createCancelablePromise
(
token
=>
this
.
_proxy
.
$onSave
(
this
.
_editorResource
,
this
.
viewType
,
token
));
this
.
change
(()
=>
{
this
.
_savePoint
=
this
.
_currentEditIndex
;
});
return
t
ru
e
;
return
t
his
.
_editorResourc
e
;
}
public
async
saveAs
(
resource
:
URI
,
targetResource
:
URI
,
_options
?:
ISaveOptions
):
Promise
<
boolean
>
{
public
async
save
CustomEditor
As
(
resource
:
URI
,
targetResource
:
URI
,
_options
?:
ISaveOptions
):
Promise
<
boolean
>
{
if
(
this
.
_editable
)
{
await
this
.
_proxy
.
$onSaveAs
(
this
.
_editorResource
,
this
.
viewType
,
targetResource
);
this
.
change
(()
=>
{
...
...
src/vs/workbench/contrib/customEditor/browser/customEditorInput.ts
浏览文件 @
c9b48d56
...
...
@@ -6,6 +6,7 @@
import
{
memoize
}
from
'
vs/base/common/decorators
'
;
import
{
Lazy
}
from
'
vs/base/common/lazy
'
;
import
{
IReference
}
from
'
vs/base/common/lifecycle
'
;
import
{
Schemas
}
from
'
vs/base/common/network
'
;
import
{
basename
}
from
'
vs/base/common/path
'
;
import
{
isEqual
}
from
'
vs/base/common/resources
'
;
import
{
assertIsDefined
}
from
'
vs/base/common/types
'
;
...
...
@@ -99,6 +100,10 @@ export class CustomEditorInput extends LazilyResolvedWebviewEditorInput {
return
this
.
_modelRef
?
this
.
_modelRef
.
object
.
isReadonly
()
:
false
;
}
public
isUntitled
():
boolean
{
return
this
.
resource
.
scheme
===
Schemas
.
untitled
;
}
public
isDirty
():
boolean
{
if
(
!
this
.
_modelRef
)
{
return
false
;
...
...
@@ -120,8 +125,16 @@ export class CustomEditorInput extends LazilyResolvedWebviewEditorInput {
public
async
save
(
groupId
:
GroupIdentifier
,
options
?:
ISaveOptions
):
Promise
<
IEditorInput
|
undefined
>
{
const
modelRef
=
assertIsDefined
(
this
.
_modelRef
);
const
result
=
await
modelRef
.
object
.
save
(
options
);
return
result
?
this
:
undefined
;
const
target
=
await
modelRef
.
object
.
saveCustomEditor
(
options
);
if
(
!
target
)
{
return
undefined
;
// save cancelled
}
if
(
!
isEqual
(
target
,
this
.
resource
))
{
return
this
.
customEditorService
.
createInput
(
target
,
this
.
viewType
,
groupId
);
}
return
this
;
}
public
async
saveAs
(
groupId
:
GroupIdentifier
,
options
?:
ISaveOptions
):
Promise
<
IEditorInput
|
undefined
>
{
...
...
@@ -133,7 +146,7 @@ export class CustomEditorInput extends LazilyResolvedWebviewEditorInput {
return
undefined
;
// save cancelled
}
if
(
!
await
modelRef
.
object
.
saveAs
(
this
.
_editorResource
,
target
,
options
))
{
if
(
!
await
modelRef
.
object
.
save
CustomEditor
As
(
this
.
_editorResource
,
target
,
options
))
{
return
undefined
;
}
...
...
src/vs/workbench/contrib/customEditor/common/customEditor.ts
浏览文件 @
c9b48d56
...
...
@@ -57,8 +57,8 @@ export interface ICustomEditorModel extends IDisposable {
revert
(
options
?:
IRevertOptions
):
Promise
<
void
>
;
save
(
options
?:
ISaveOptions
):
Promise
<
boolean
>
;
saveAs
(
resource
:
URI
,
targetResource
:
URI
,
currentOptions
?:
ISaveOptions
):
Promise
<
boolean
>
;
save
CustomEditor
(
options
?:
ISaveOptions
):
Promise
<
URI
|
undefined
>
;
save
CustomEditor
As
(
resource
:
URI
,
targetResource
:
URI
,
currentOptions
?:
ISaveOptions
):
Promise
<
boolean
>
;
}
export
const
enum
CustomEditorPriority
{
...
...
src/vs/workbench/contrib/customEditor/common/customTextEditorModel.ts
浏览文件 @
c9b48d56
...
...
@@ -68,11 +68,11 @@ export class CustomTextEditorModel extends Disposable implements ICustomEditorMo
return
this
.
textFileService
.
revert
(
this
.
resource
,
options
);
}
public
async
save
(
options
?:
ISaveOptions
):
Promise
<
boolean
>
{
return
!!
await
this
.
textFileService
.
save
(
this
.
resource
,
options
);
public
saveCustomEditor
(
options
?:
ISaveOptions
):
Promise
<
URI
|
undefined
>
{
return
this
.
textFileService
.
save
(
this
.
resource
,
options
);
}
public
async
saveAs
(
resource
:
URI
,
targetResource
:
URI
,
options
?:
ISaveOptions
):
Promise
<
boolean
>
{
public
async
save
CustomEditor
As
(
resource
:
URI
,
targetResource
:
URI
,
options
?:
ISaveOptions
):
Promise
<
boolean
>
{
return
!!
await
this
.
textFileService
.
saveAs
(
resource
,
targetResource
,
options
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录