Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
49e08513
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,发现更多精彩内容 >>
提交
49e08513
编写于
5月 05, 2020
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
files - do not open dirty models that are being auto saved (#96920)
上级
5f8e9f3e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
45 addition
and
7 deletion
+45
-7
src/vs/workbench/contrib/files/browser/editors/textFileEditorTracker.ts
...ch/contrib/files/browser/editors/textFileEditorTracker.ts
+7
-1
src/vs/workbench/contrib/files/test/browser/textFileEditorTracker.test.ts
.../contrib/files/test/browser/textFileEditorTracker.test.ts
+38
-6
未找到文件。
src/vs/workbench/contrib/files/browser/editors/textFileEditorTracker.ts
浏览文件 @
49e08513
...
...
@@ -13,6 +13,7 @@ import { IHostService } from 'vs/workbench/services/host/browser/host';
import
{
IEditorService
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
RunOnceWorker
}
from
'
vs/base/common/async
'
;
import
{
ICodeEditorService
}
from
'
vs/editor/browser/services/codeEditorService
'
;
import
{
IFilesConfigurationService
,
AutoSaveMode
}
from
'
vs/workbench/services/filesConfiguration/common/filesConfigurationService
'
;
export
class
TextFileEditorTracker
extends
Disposable
implements
IWorkbenchContribution
{
...
...
@@ -21,7 +22,8 @@ export class TextFileEditorTracker extends Disposable implements IWorkbenchContr
@
ITextFileService
private
readonly
textFileService
:
ITextFileService
,
@
ILifecycleService
private
readonly
lifecycleService
:
ILifecycleService
,
@
IHostService
private
readonly
hostService
:
IHostService
,
@
ICodeEditorService
private
readonly
codeEditorService
:
ICodeEditorService
@
ICodeEditorService
private
readonly
codeEditorService
:
ICodeEditorService
,
@
IFilesConfigurationService
private
readonly
filesConfigurationService
:
IFilesConfigurationService
)
{
super
();
...
...
@@ -57,6 +59,10 @@ export class TextFileEditorTracker extends Disposable implements IWorkbenchContr
return
false
;
// resource must not be pending to save
}
if
(
this
.
filesConfigurationService
.
getAutoSaveMode
()
===
AutoSaveMode
.
AFTER_SHORT_DELAY
)
{
return
false
;
// resource must not be pending to be auto saved
}
if
(
this
.
editorService
.
isOpen
({
resource
}))
{
return
false
;
// model must not be opened already as file
}
...
...
src/vs/workbench/contrib/files/test/browser/textFileEditorTracker.test.ts
浏览文件 @
49e08513
...
...
@@ -8,7 +8,7 @@ import { Event } from 'vs/base/common/event';
import
{
TextFileEditorTracker
}
from
'
vs/workbench/contrib/files/browser/editors/textFileEditorTracker
'
;
import
{
toResource
}
from
'
vs/base/test/common/utils
'
;
import
{
IEditorService
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
workbenchInstantiationService
,
TestServiceAccessor
}
from
'
vs/workbench/test/browser/workbenchTestServices
'
;
import
{
workbenchInstantiationService
,
TestServiceAccessor
,
TestFilesConfigurationService
}
from
'
vs/workbench/test/browser/workbenchTestServices
'
;
import
{
IResolvedTextFileEditorModel
,
snapshotToString
,
ITextFileService
}
from
'
vs/workbench/services/textfile/common/textfiles
'
;
import
{
FileChangesEvent
,
FileChangeType
}
from
'
vs/platform/files/common/files
'
;
import
{
IEditorGroupsService
}
from
'
vs/workbench/services/editor/common/editorGroupsService
'
;
...
...
@@ -27,6 +27,11 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
import
{
UntitledTextEditorInput
}
from
'
vs/workbench/services/untitled/common/untitledTextEditorInput
'
;
import
{
isEqual
}
from
'
vs/base/common/resources
'
;
import
{
URI
}
from
'
vs/base/common/uri
'
;
import
{
TestConfigurationService
}
from
'
vs/platform/configuration/test/common/testConfigurationService
'
;
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
IFilesConfigurationService
}
from
'
vs/workbench/services/filesConfiguration/common/filesConfigurationService
'
;
import
{
MockContextKeyService
}
from
'
vs/platform/keybinding/test/common/mockKeybindingService
'
;
import
{
IContextKeyService
}
from
'
vs/platform/contextkey/common/contextkey
'
;
suite
(
'
Files - TextFileEditorTracker
'
,
()
=>
{
...
...
@@ -48,9 +53,21 @@ suite('Files - TextFileEditorTracker', () => {
disposables
=
[];
});
async
function
createTracker
():
Promise
<
[
EditorPart
,
TestServiceAccessor
,
TextFileEditorTracker
,
IInstantiationService
,
IEditorService
]
>
{
async
function
createTracker
(
autoSaveEnabled
=
false
):
Promise
<
[
EditorPart
,
TestServiceAccessor
,
TextFileEditorTracker
,
IInstantiationService
,
IEditorService
]
>
{
const
instantiationService
=
workbenchInstantiationService
();
if
(
autoSaveEnabled
)
{
const
configurationService
=
new
TestConfigurationService
();
configurationService
.
setUserConfiguration
(
'
files
'
,
{
autoSave
:
'
afterDelay
'
,
autoSaveDelay
:
1
});
instantiationService
.
stub
(
IConfigurationService
,
configurationService
);
instantiationService
.
stub
(
IFilesConfigurationService
,
new
TestFilesConfigurationService
(
<
IContextKeyService
>
instantiationService
.
createInstance
(
MockContextKeyService
),
configurationService
));
}
const
part
=
instantiationService
.
createInstance
(
EditorPart
);
part
.
create
(
document
.
createElement
(
'
div
'
));
part
.
layout
(
400
,
300
);
...
...
@@ -93,23 +110,38 @@ suite('Files - TextFileEditorTracker', () => {
});
test
(
'
dirty text file model opens as editor
'
,
async
function
()
{
const
[
part
,
accessor
,
tracker
]
=
await
createTracker
();
const
resource
=
toResource
.
call
(
this
,
'
/path/index.txt
'
);
await
testDirtyTextFileModelOpensEditorDependingOnAutoSaveSetting
(
resource
,
false
);
});
test
(
'
dirty text file model does not open as editor if autosave is ON
'
,
async
function
()
{
const
resource
=
toResource
.
call
(
this
,
'
/path/index.txt
'
);
await
testDirtyTextFileModelOpensEditorDependingOnAutoSaveSetting
(
resource
,
true
);
});
async
function
testDirtyTextFileModelOpensEditorDependingOnAutoSaveSetting
(
resource
:
URI
,
autoSave
:
boolean
):
Promise
<
void
>
{
const
[
part
,
accessor
,
tracker
]
=
await
createTracker
(
autoSave
);
assert
.
ok
(
!
accessor
.
editorService
.
isOpen
(
accessor
.
editorService
.
createEditorInput
({
resource
,
forceFile
:
true
})));
const
model
=
await
accessor
.
textFileService
.
files
.
resolve
(
resource
)
as
IResolvedTextFileEditorModel
;
model
.
textEditorModel
.
setValue
(
'
Super Good
'
);
await
awaitEditorOpening
(
accessor
.
editorService
);
assert
.
ok
(
accessor
.
editorService
.
isOpen
(
accessor
.
editorService
.
createEditorInput
({
resource
,
forceFile
:
true
})));
if
(
autoSave
)
{
await
timeout
(
100
);
assert
.
ok
(
!
accessor
.
editorService
.
isOpen
(
accessor
.
editorService
.
createEditorInput
({
resource
,
forceFile
:
true
})));
}
else
{
await
awaitEditorOpening
(
accessor
.
editorService
);
assert
.
ok
(
accessor
.
editorService
.
isOpen
(
accessor
.
editorService
.
createEditorInput
({
resource
,
forceFile
:
true
})));
}
part
.
dispose
();
tracker
.
dispose
();
(
<
TextFileEditorModelManager
>
accessor
.
textFileService
.
files
).
dispose
();
}
);
}
test
(
'
dirty untitled text file model opens as editor
'
,
async
function
()
{
const
[
part
,
accessor
,
tracker
,
,
editorService
]
=
await
createTracker
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录