Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
7764b06f
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,发现更多精彩内容 >>
提交
7764b06f
编写于
3月 30, 2020
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
💄
上级
5b7aa982
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
7 addition
and
9 deletion
+7
-9
src/vs/platform/files/node/diskFileSystemProvider.ts
src/vs/platform/files/node/diskFileSystemProvider.ts
+1
-3
src/vs/workbench/browser/parts/editor/editorGroupView.ts
src/vs/workbench/browser/parts/editor/editorGroupView.ts
+2
-2
src/vs/workbench/common/editor/diffEditorModel.ts
src/vs/workbench/common/editor/diffEditorModel.ts
+2
-2
src/vs/workbench/contrib/backup/electron-browser/backupTracker.ts
...orkbench/contrib/backup/electron-browser/backupTracker.ts
+2
-2
未找到文件。
src/vs/platform/files/node/diskFileSystemProvider.ts
浏览文件 @
7764b06f
...
...
@@ -544,10 +544,8 @@ export class DiskFileSystemProvider extends Disposable implements
// Buffer requests for recursive watching to decide on right watcher
// that supports potentially watching more than one folder at once
this
.
recursiveWatchRequestDelayer
.
trigger
(()
=>
{
this
.
recursiveWatchRequestDelayer
.
trigger
(
async
()
=>
{
this
.
doRefreshRecursiveWatchers
();
return
Promise
.
resolve
();
});
}
...
...
src/vs/workbench/browser/parts/editor/editorGroupView.ts
浏览文件 @
7764b06f
...
...
@@ -894,7 +894,7 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
private
async
doShowEditor
(
editor
:
EditorInput
,
active
:
boolean
,
options
?:
EditorOptions
):
Promise
<
IEditorPane
|
undefined
>
{
// Show in editor control if the active editor changed
let
openEditorPromise
:
Promise
<
IEditorPane
|
undefined
>
;
let
openEditorPromise
:
Promise
<
IEditorPane
|
undefined
>
|
undefined
;
if
(
active
)
{
openEditorPromise
=
(
async
()
=>
{
try
{
...
...
@@ -915,7 +915,7 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
}
})();
}
else
{
openEditorPromise
=
Promise
.
resolve
(
undefined
)
;
// inactive: return undefined as result to signal this
openEditorPromise
=
undefined
;
// inactive: return undefined as result to signal this
}
// Show in title control after editor control because some actions depend on it
...
...
src/vs/workbench/common/editor/diffEditorModel.ts
浏览文件 @
7764b06f
...
...
@@ -32,8 +32,8 @@ export class DiffEditorModel extends EditorModel {
async
load
():
Promise
<
EditorModel
>
{
await
Promise
.
all
([
this
.
_originalModel
?
this
.
_originalModel
.
load
()
:
Promise
.
resolve
(
undefined
),
this
.
_modifiedModel
?
this
.
_modifiedModel
.
load
()
:
Promise
.
resolve
(
undefined
),
this
.
_originalModel
?.
load
(
),
this
.
_modifiedModel
?.
load
(
),
]);
return
this
;
...
...
src/vs/workbench/contrib/backup/electron-browser/backupTracker.ts
浏览文件 @
7764b06f
...
...
@@ -228,7 +228,7 @@ export class NativeBackupTracker extends BackupTracker implements IWorkbenchCont
// If we still have dirty working copies, save those directly
// unless the save was not successful (e.g. cancelled)
if
(
result
!==
false
)
{
await
Promise
.
all
(
workingCopies
.
map
(
workingCopy
=>
workingCopy
.
isDirty
()
?
workingCopy
.
save
(
saveOptions
)
:
Promise
.
resolve
(
true
)
));
await
Promise
.
all
(
workingCopies
.
map
(
workingCopy
=>
workingCopy
.
isDirty
()
?
workingCopy
.
save
(
saveOptions
)
:
true
));
}
}
...
...
@@ -244,7 +244,7 @@ export class NativeBackupTracker extends BackupTracker implements IWorkbenchCont
// If we still have dirty working copies, revert those directly
// unless the revert operation was not successful (e.g. cancelled)
await
Promise
.
all
(
workingCopies
.
map
(
workingCopy
=>
workingCopy
.
isDirty
()
?
workingCopy
.
revert
(
revertOptions
)
:
Promise
.
resolve
()
));
await
Promise
.
all
(
workingCopies
.
map
(
workingCopy
=>
workingCopy
.
isDirty
()
?
workingCopy
.
revert
(
revertOptions
)
:
undefined
));
}
private
noVeto
(
backupsToDiscard
:
IWorkingCopy
[]):
boolean
|
Promise
<
boolean
>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录