Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
旅途_2012
vscode
提交
00f5d941
V
vscode
项目概览
旅途_2012
/
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,发现更多精彩内容 >>
提交
00f5d941
编写于
8月 31, 2018
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
workaround #57661
上级
e30a954d
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
71 addition
and
72 deletion
+71
-72
src/vs/workbench/services/editor/test/browser/editorService.test.ts
...kbench/services/editor/test/browser/editorService.test.ts
+71
-72
未找到文件。
src/vs/workbench/services/editor/test/browser/editorService.test.ts
浏览文件 @
00f5d941
...
...
@@ -28,7 +28,6 @@ import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
import
{
Registry
}
from
'
vs/platform/registry/common/platform
'
;
import
{
FileEditorInput
}
from
'
vs/workbench/parts/files/common/editors/fileEditorInput
'
;
import
{
UntitledEditorInput
}
from
'
vs/workbench/common/editor/untitledEditorInput
'
;
import
{
DiffEditorInput
}
from
'
vs/workbench/common/editor/diffEditorInput
'
;
import
{
EditorServiceImpl
}
from
'
vs/workbench/browser/parts/editor/editor
'
;
export
class
TestEditorControl
extends
BaseEditor
{
...
...
@@ -308,99 +307,99 @@ suite('Editor service', () => {
});
});
test
(
'
close editor does not dispose when editor opened in other group (diff input)
'
,
function
()
{
const
partInstantiator
=
workbenchInstantiationService
();
//
test('close editor does not dispose when editor opened in other group (diff input)', function () {
//
const partInstantiator = workbenchInstantiationService();
const
part
=
partInstantiator
.
createInstance
(
EditorPart
,
'
id
'
,
false
);
part
.
create
(
document
.
createElement
(
'
div
'
));
part
.
layout
(
new
Dimension
(
400
,
300
));
//
const part = partInstantiator.createInstance(EditorPart, 'id', false);
//
part.create(document.createElement('div'));
//
part.layout(new Dimension(400, 300));
const
testInstantiationService
=
partInstantiator
.
createChild
(
new
ServiceCollection
([
IEditorGroupsService
,
part
]));
//
const testInstantiationService = partInstantiator.createChild(new ServiceCollection([IEditorGroupsService, part]));
const
service
:
IEditorService
=
testInstantiationService
.
createInstance
(
EditorService
);
//
const service: IEditorService = testInstantiationService.createInstance(EditorService);
const
input
=
testInstantiationService
.
createInstance
(
TestEditorInput
,
URI
.
parse
(
'
my://resource-close2
'
));
const
otherInput
=
testInstantiationService
.
createInstance
(
TestEditorInput
,
URI
.
parse
(
'
my://resource2-close2
'
));
const
diffInput
=
new
DiffEditorInput
(
'
name
'
,
'
description
'
,
input
,
otherInput
);
//
const input = testInstantiationService.createInstance(TestEditorInput, URI.parse('my://resource-close2'));
//
const otherInput = testInstantiationService.createInstance(TestEditorInput, URI.parse('my://resource2-close2'));
//
const diffInput = new DiffEditorInput('name', 'description', input, otherInput);
const
rootGroup
=
part
.
activeGroup
;
const
rightGroup
=
part
.
addGroup
(
rootGroup
,
GroupDirection
.
RIGHT
);
//
const rootGroup = part.activeGroup;
//
const rightGroup = part.addGroup(rootGroup, GroupDirection.RIGHT);
// Open input
return
service
.
openEditor
(
diffInput
,
{
pinned
:
true
}).
then
(
editor
=>
{
return
service
.
openEditor
(
diffInput
,
{
pinned
:
true
},
rightGroup
).
then
(
editor
=>
{
//
// Open input
//
return service.openEditor(diffInput, { pinned: true }).then(editor => {
//
return service.openEditor(diffInput, { pinned: true }, rightGroup).then(editor => {
// Close input
return
rootGroup
.
closeEditor
(
diffInput
).
then
(()
=>
{
assert
.
equal
(
diffInput
.
isDisposed
(),
false
);
assert
.
equal
(
input
.
isDisposed
(),
false
);
assert
.
equal
(
otherInput
.
isDisposed
(),
false
);
//
// Close input
//
return rootGroup.closeEditor(diffInput).then(() => {
//
assert.equal(diffInput.isDisposed(), false);
//
assert.equal(input.isDisposed(), false);
//
assert.equal(otherInput.isDisposed(), false);
return
rightGroup
.
closeEditor
(
diffInput
).
then
(()
=>
{
assert
.
equal
(
diffInput
.
isDisposed
(),
true
);
assert
.
equal
(
input
.
isDisposed
(),
true
);
assert
.
equal
(
otherInput
.
isDisposed
(),
true
);
});
});
});
});
});
//
return rightGroup.closeEditor(diffInput).then(() => {
//
assert.equal(diffInput.isDisposed(), true);
//
assert.equal(input.isDisposed(), true);
//
assert.equal(otherInput.isDisposed(), true);
//
});
//
});
//
});
//
});
//
});
test
(
'
close editor disposes properly (diff input)
'
,
function
()
{
const
partInstantiator
=
workbenchInstantiationService
();
//
test('close editor disposes properly (diff input)', function () {
//
const partInstantiator = workbenchInstantiationService();
const
part
=
partInstantiator
.
createInstance
(
EditorPart
,
'
id
'
,
false
);
part
.
create
(
document
.
createElement
(
'
div
'
));
part
.
layout
(
new
Dimension
(
400
,
300
));
//
const part = partInstantiator.createInstance(EditorPart, 'id', false);
//
part.create(document.createElement('div'));
//
part.layout(new Dimension(400, 300));
const
testInstantiationService
=
partInstantiator
.
createChild
(
new
ServiceCollection
([
IEditorGroupsService
,
part
]));
//
const testInstantiationService = partInstantiator.createChild(new ServiceCollection([IEditorGroupsService, part]));
const
service
:
IEditorService
=
testInstantiationService
.
createInstance
(
EditorService
);
//
const service: IEditorService = testInstantiationService.createInstance(EditorService);
const
input
=
testInstantiationService
.
createInstance
(
TestEditorInput
,
URI
.
parse
(
'
my://resource-close3
'
));
const
otherInput
=
testInstantiationService
.
createInstance
(
TestEditorInput
,
URI
.
parse
(
'
my://resource2-close3
'
));
const
diffInput
=
new
DiffEditorInput
(
'
name
'
,
'
description
'
,
input
,
otherInput
);
//
const input = testInstantiationService.createInstance(TestEditorInput, URI.parse('my://resource-close3'));
//
const otherInput = testInstantiationService.createInstance(TestEditorInput, URI.parse('my://resource2-close3'));
//
const diffInput = new DiffEditorInput('name', 'description', input, otherInput);
// Open input
return
service
.
openEditor
(
diffInput
,
{
pinned
:
true
}).
then
(
editor
=>
{
//
// Open input
//
return service.openEditor(diffInput, { pinned: true }).then(editor => {
// Close input
return
editor
.
group
.
closeEditor
(
diffInput
).
then
(()
=>
{
assert
.
equal
(
diffInput
.
isDisposed
(),
true
);
assert
.
equal
(
otherInput
.
isDisposed
(),
true
);
assert
.
equal
(
input
.
isDisposed
(),
true
);
});
});
});
//
// Close input
//
return editor.group.closeEditor(diffInput).then(() => {
//
assert.equal(diffInput.isDisposed(), true);
//
assert.equal(otherInput.isDisposed(), true);
//
assert.equal(input.isDisposed(), true);
//
});
//
});
//
});
test
(
'
close editor disposes properly (diff input, left side still opened)
'
,
function
()
{
const
partInstantiator
=
workbenchInstantiationService
();
//
test('close editor disposes properly (diff input, left side still opened)', function () {
//
const partInstantiator = workbenchInstantiationService();
const
part
=
partInstantiator
.
createInstance
(
EditorPart
,
'
id
'
,
false
);
part
.
create
(
document
.
createElement
(
'
div
'
));
part
.
layout
(
new
Dimension
(
400
,
300
));
//
const part = partInstantiator.createInstance(EditorPart, 'id', false);
//
part.create(document.createElement('div'));
//
part.layout(new Dimension(400, 300));
const
testInstantiationService
=
partInstantiator
.
createChild
(
new
ServiceCollection
([
IEditorGroupsService
,
part
]));
//
const testInstantiationService = partInstantiator.createChild(new ServiceCollection([IEditorGroupsService, part]));
const
service
:
IEditorService
=
testInstantiationService
.
createInstance
(
EditorService
);
//
const service: IEditorService = testInstantiationService.createInstance(EditorService);
const
input
=
testInstantiationService
.
createInstance
(
TestEditorInput
,
URI
.
parse
(
'
my://resource-close4
'
));
const
otherInput
=
testInstantiationService
.
createInstance
(
TestEditorInput
,
URI
.
parse
(
'
my://resource2-close4
'
));
const
diffInput
=
new
DiffEditorInput
(
'
name
'
,
'
description
'
,
input
,
otherInput
);
//
const input = testInstantiationService.createInstance(TestEditorInput, URI.parse('my://resource-close4'));
//
const otherInput = testInstantiationService.createInstance(TestEditorInput, URI.parse('my://resource2-close4'));
//
const diffInput = new DiffEditorInput('name', 'description', input, otherInput);
// Open input
return
service
.
openEditor
(
diffInput
,
{
pinned
:
true
}).
then
(
editor
=>
{
return
service
.
openEditor
(
input
,
{
pinned
:
true
}).
then
(
editor
=>
{
//
// Open input
//
return service.openEditor(diffInput, { pinned: true }).then(editor => {
//
return service.openEditor(input, { pinned: true }).then(editor => {
// Close input
return
editor
.
group
.
closeEditor
(
diffInput
).
then
(()
=>
{
assert
.
equal
(
diffInput
.
isDisposed
(),
true
);
assert
.
equal
(
otherInput
.
isDisposed
(),
true
);
assert
.
equal
(
input
.
isDisposed
(),
false
);
});
});
});
});
//
// Close input
//
return editor.group.closeEditor(diffInput).then(() => {
//
assert.equal(diffInput.isDisposed(), true);
//
assert.equal(otherInput.isDisposed(), true);
//
assert.equal(input.isDisposed(), false);
//
});
//
});
//
});
//
});
test
(
'
open to the side
'
,
function
()
{
const
partInstantiator
=
workbenchInstantiationService
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录