Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
ec87b2b6
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,发现更多精彩内容 >>
提交
ec87b2b6
编写于
12月 11, 2017
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add unit-test for #39893
上级
3155771c
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
56 addition
and
4 deletion
+56
-4
src/vs/editor/contrib/suggest/suggestController.ts
src/vs/editor/contrib/suggest/suggestController.ts
+1
-1
src/vs/editor/contrib/suggest/test/suggestModel.test.ts
src/vs/editor/contrib/suggest/test/suggestModel.test.ts
+55
-3
未找到文件。
src/vs/editor/contrib/suggest/suggestController.ts
浏览文件 @
ec87b2b6
...
@@ -193,7 +193,7 @@ export class SuggestController implements IEditorContribution {
...
@@ -193,7 +193,7 @@ export class SuggestController implements IEditorContribution {
}
}
}
}
pr
ivate
_onDidSelectItem
(
item
:
ICompletionItem
):
void
{
pr
otected
_onDidSelectItem
(
item
:
ICompletionItem
):
void
{
if
(
!
item
)
{
if
(
!
item
)
{
this
.
_model
.
cancel
();
this
.
_model
.
cancel
();
return
;
return
;
...
...
src/vs/editor/contrib/suggest/test/suggestModel.test.ts
浏览文件 @
ec87b2b6
...
@@ -22,15 +22,18 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
...
@@ -22,15 +22,18 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
import
{
NullTelemetryService
}
from
'
vs/platform/telemetry/common/telemetryUtils
'
;
import
{
NullTelemetryService
}
from
'
vs/platform/telemetry/common/telemetryUtils
'
;
import
{
EditOperation
}
from
'
vs/editor/common/core/editOperation
'
;
import
{
EditOperation
}
from
'
vs/editor/common/core/editOperation
'
;
import
{
Range
}
from
'
vs/editor/common/core/range
'
;
import
{
Range
}
from
'
vs/editor/common/core/range
'
;
import
{
ICodeEditor
}
from
'
vs/editor/browser/editorBrowser
'
;
import
{
CoreEditingCommands
}
from
'
vs/editor/browser/controller/coreCommands
'
;
import
{
CoreEditingCommands
}
from
'
vs/editor/browser/controller/coreCommands
'
;
import
{
SuggestController
}
from
'
vs/editor/contrib/suggest/suggestController
'
;
import
{
IStorageService
,
NullStorageService
}
from
'
vs/platform/storage/common/storage
'
;
import
{
SnippetController2
}
from
'
vs/editor/contrib/snippet/snippetController2
'
;
function
createMockEditor
(
model
:
Model
):
TestCodeEditor
{
function
createMockEditor
(
model
:
Model
):
TestCodeEditor
{
const
contextKeyService
=
new
MockContextKeyService
();
const
contextKeyService
=
new
MockContextKeyService
();
const
telemetryService
=
NullTelemetryService
;
const
telemetryService
=
NullTelemetryService
;
const
instantiationService
=
new
InstantiationService
(
new
ServiceCollection
(
const
instantiationService
=
new
InstantiationService
(
new
ServiceCollection
(
[
IContextKeyService
,
contextKeyService
],
[
IContextKeyService
,
contextKeyService
],
[
ITelemetryService
,
telemetryService
]
[
ITelemetryService
,
telemetryService
],
[
IStorageService
,
NullStorageService
]
));
));
const
editor
=
new
TestCodeEditor
(
new
MockScopeLocation
(),
{},
instantiationService
,
contextKeyService
);
const
editor
=
new
TestCodeEditor
(
new
MockScopeLocation
(),
{},
instantiationService
,
contextKeyService
);
...
@@ -102,7 +105,7 @@ suite('SuggestModel - TriggerAndCancelOracle', function () {
...
@@ -102,7 +105,7 @@ suite('SuggestModel - TriggerAndCancelOracle', function () {
disposables
.
push
(
model
);
disposables
.
push
(
model
);
});
});
function
withOracle
(
callback
:
(
model
:
SuggestModel
,
editor
:
I
CodeEditor
)
=>
any
):
TPromise
<
any
>
{
function
withOracle
(
callback
:
(
model
:
SuggestModel
,
editor
:
Test
CodeEditor
)
=>
any
):
TPromise
<
any
>
{
return
new
TPromise
((
resolve
,
reject
)
=>
{
return
new
TPromise
((
resolve
,
reject
)
=>
{
const
editor
=
createMockEditor
(
model
);
const
editor
=
createMockEditor
(
model
);
...
@@ -564,4 +567,53 @@ suite('SuggestModel - TriggerAndCancelOracle', function () {
...
@@ -564,4 +567,53 @@ suite('SuggestModel - TriggerAndCancelOracle', function () {
});
});
});
});
});
});
test
(
'
Text changes for completion CodeAction are affected by the completion #39893
'
,
function
()
{
disposables
.
push
(
SuggestRegistry
.
register
({
scheme
:
'
test
'
},
{
provideCompletionItems
(
doc
,
pos
):
ISuggestResult
{
return
{
incomplete
:
true
,
suggestions
:
[{
label
:
'
bar
'
,
type
:
'
property
'
,
insertText
:
'
bar
'
,
overwriteBefore
:
2
,
additionalTextEdits
:
[{
text
:
'
, bar
'
,
range
:
{
startLineNumber
:
1
,
endLineNumber
:
1
,
startColumn
:
17
,
endColumn
:
17
}
}]
}]
};
}
}));
model
.
setValue
(
'
ba; import { foo } from "./b"
'
);
return
withOracle
(
async
(
sugget
,
editor
)
=>
{
class
TestCtrl
extends
SuggestController
{
_onDidSelectItem
(
item
)
{
super
.
_onDidSelectItem
(
item
);
}
}
const
ctrl
=
<
TestCtrl
>
editor
.
registerAndInstantiateContribution
(
TestCtrl
);
editor
.
registerAndInstantiateContribution
(
SnippetController2
);
await
assertEvent
(
sugget
.
onDidSuggest
,
()
=>
{
editor
.
setPosition
({
lineNumber
:
1
,
column
:
3
});
sugget
.
trigger
({
auto
:
false
});
},
event
=>
{
assert
.
equal
(
event
.
completionModel
.
items
.
length
,
1
);
const
[
first
]
=
event
.
completionModel
.
items
;
assert
.
equal
(
first
.
suggestion
.
label
,
'
bar
'
);
ctrl
.
_onDidSelectItem
(
first
);
});
assert
.
equal
(
model
.
getValue
(),
'
bar; import { foo, bar } from "./b"
'
);
});
});
});
});
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录