Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
5273e205
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,发现更多精彩内容 >>
提交
5273e205
编写于
1月 27, 2020
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
editors - save/revert through service
上级
3e777d8e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
3 addition
and
3 deletion
+3
-3
src/vs/workbench/browser/parts/editor/editorActions.ts
src/vs/workbench/browser/parts/editor/editorActions.ts
+2
-2
src/vs/workbench/contrib/preferences/browser/preferencesEditor.ts
...orkbench/contrib/preferences/browser/preferencesEditor.ts
+1
-1
未找到文件。
src/vs/workbench/browser/parts/editor/editorActions.ts
浏览文件 @
5273e205
...
...
@@ -543,13 +543,13 @@ export class RevertAndCloseEditorAction extends Action {
// first try a normal revert where the contents of the editor are restored
try
{
await
editor
.
revert
(
group
.
id
);
await
this
.
editorService
.
revert
({
editor
,
groupId
:
group
.
id
}
);
}
catch
(
error
)
{
// if that fails, since we are about to close the editor, we accept that
// the editor cannot be reverted and instead do a soft revert that just
// enables us to close the editor. With this, a user can always close a
// dirty editor even when reverting fails.
await
editor
.
revert
(
group
.
id
,
{
soft
:
true
});
await
this
.
editorService
.
revert
({
editor
,
groupId
:
group
.
id
}
,
{
soft
:
true
});
}
group
.
closeEditor
(
editor
);
...
...
src/vs/workbench/contrib/preferences/browser/preferencesEditor.ts
浏览文件 @
5273e205
...
...
@@ -252,7 +252,7 @@ export class PreferencesEditor extends BaseEditor {
if
(
this
.
editorService
.
activeControl
!==
this
)
{
this
.
focus
();
}
const
promise
:
Promise
<
boolean
>
=
this
.
input
&&
this
.
input
.
isDirty
()
?
this
.
input
.
save
(
this
.
group
!
.
id
).
then
(
editor
=>
!!
editor
)
:
Promise
.
resolve
(
true
);
const
promise
:
Promise
<
boolean
>
=
this
.
input
&&
this
.
input
.
isDirty
()
?
this
.
editorService
.
save
({
editor
:
this
.
input
,
groupId
:
this
.
group
!
.
id
}
)
:
Promise
.
resolve
(
true
);
promise
.
then
(()
=>
{
if
(
target
===
ConfigurationTarget
.
USER_LOCAL
)
{
this
.
preferencesService
.
switchSettings
(
ConfigurationTarget
.
USER_LOCAL
,
this
.
preferencesService
.
userSettingsResource
,
true
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录