Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
76182e63
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,发现更多精彩内容 >>
提交
76182e63
编写于
12月 19, 2018
作者:
M
Matt Bierner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix error where cancelled paramter hint request would still count as a retrigger
上级
cf9e62d3
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
16 addition
and
6 deletion
+16
-6
src/vs/editor/contrib/parameterHints/parameterHintsModel.ts
src/vs/editor/contrib/parameterHints/parameterHintsModel.ts
+11
-5
src/vs/editor/contrib/parameterHints/test/parameterHintsModel.test.ts
...r/contrib/parameterHints/test/parameterHintsModel.test.ts
+5
-1
未找到文件。
src/vs/editor/contrib/parameterHints/parameterHintsModel.ts
浏览文件 @
76182e63
...
@@ -44,7 +44,8 @@ export class ParameterHintsModel extends Disposable {
...
@@ -44,7 +44,8 @@ export class ParameterHintsModel extends Disposable {
private
retriggerChars
=
new
CharacterSet
();
private
retriggerChars
=
new
CharacterSet
();
private
throttledDelayer
:
Delayer
<
boolean
>
;
private
throttledDelayer
:
Delayer
<
boolean
>
;
private
provideSignatureHelpRequest
?:
CancelablePromise
<
modes
.
SignatureHelp
|
null
|
undefined
>
;
private
provideSignatureHelpRequest
?:
CancelablePromise
<
any
>
;
private
triggerId
=
0
;
constructor
(
constructor
(
editor
:
ICodeEditor
,
editor
:
ICodeEditor
,
...
@@ -85,18 +86,18 @@ export class ParameterHintsModel extends Disposable {
...
@@ -85,18 +86,18 @@ export class ParameterHintsModel extends Disposable {
}
}
trigger
(
context
:
TriggerContext
,
delay
?:
number
):
void
{
trigger
(
context
:
TriggerContext
,
delay
?:
number
):
void
{
const
model
=
this
.
editor
.
getModel
();
const
model
=
this
.
editor
.
getModel
();
if
(
model
===
null
||
!
modes
.
SignatureHelpProviderRegistry
.
has
(
model
))
{
if
(
model
===
null
||
!
modes
.
SignatureHelpProviderRegistry
.
has
(
model
))
{
return
;
return
;
}
}
const
triggerId
=
++
this
.
triggerId
;
this
.
throttledDelayer
.
trigger
(
this
.
throttledDelayer
.
trigger
(
()
=>
this
.
doTrigger
({
()
=>
this
.
doTrigger
({
triggerKind
:
context
.
triggerKind
,
triggerKind
:
context
.
triggerKind
,
triggerCharacter
:
context
.
triggerCharacter
,
triggerCharacter
:
context
.
triggerCharacter
,
isRetrigger
:
this
.
isTriggered
,
isRetrigger
:
this
.
state
.
state
===
'
active
'
||
this
.
state
.
state
===
'
pending
'
,
}),
delay
).
then
(
undefined
,
onUnexpectedError
);
}
,
triggerId
),
delay
).
then
(
undefined
,
onUnexpectedError
);
}
}
public
next
():
void
{
public
next
():
void
{
...
@@ -149,7 +150,7 @@ export class ParameterHintsModel extends Disposable {
...
@@ -149,7 +150,7 @@ export class ParameterHintsModel extends Disposable {
this
.
_onChangedHints
.
fire
(
this
.
state
.
hints
);
this
.
_onChangedHints
.
fire
(
this
.
state
.
hints
);
}
}
private
doTrigger
(
triggerContext
:
modes
.
SignatureHelpContext
):
Promise
<
boolean
>
{
private
doTrigger
(
triggerContext
:
modes
.
SignatureHelpContext
,
triggerId
:
number
):
Promise
<
boolean
>
{
this
.
cancel
(
true
);
this
.
cancel
(
true
);
if
(
!
this
.
editor
.
hasModel
())
{
if
(
!
this
.
editor
.
hasModel
())
{
...
@@ -165,6 +166,11 @@ export class ParameterHintsModel extends Disposable {
...
@@ -165,6 +166,11 @@ export class ParameterHintsModel extends Disposable {
provideSignatureHelp
(
model
,
position
,
triggerContext
,
token
));
provideSignatureHelp
(
model
,
position
,
triggerContext
,
token
));
return
this
.
provideSignatureHelpRequest
.
then
(
result
=>
{
return
this
.
provideSignatureHelpRequest
.
then
(
result
=>
{
// Check that we are still resolving the correct signature help
if
(
triggerId
!==
this
.
triggerId
)
{
return
false
;
}
if
(
!
result
||
!
result
.
signatures
||
result
.
signatures
.
length
===
0
)
{
if
(
!
result
||
!
result
.
signatures
||
result
.
signatures
.
length
===
0
)
{
this
.
cancel
();
this
.
cancel
();
return
false
;
return
false
;
...
...
src/vs/editor/contrib/parameterHints/test/parameterHintsModel.test.ts
浏览文件 @
76182e63
...
@@ -89,12 +89,13 @@ suite('ParameterHintsModel', () => {
...
@@ -89,12 +89,13 @@ suite('ParameterHintsModel', () => {
if
(
invokeCount
===
1
)
{
if
(
invokeCount
===
1
)
{
assert
.
strictEqual
(
context
.
triggerKind
,
modes
.
SignatureHelpTriggerKind
.
TriggerCharacter
);
assert
.
strictEqual
(
context
.
triggerKind
,
modes
.
SignatureHelpTriggerKind
.
TriggerCharacter
);
assert
.
strictEqual
(
context
.
triggerCharacter
,
triggerChar
);
assert
.
strictEqual
(
context
.
triggerCharacter
,
triggerChar
);
assert
.
strictEqual
(
context
.
isRetrigger
,
false
);
// Retrigger
// Retrigger
editor
.
trigger
(
'
keyboard
'
,
Handler
.
Type
,
{
text
:
triggerChar
});
editor
.
trigger
(
'
keyboard
'
,
Handler
.
Type
,
{
text
:
triggerChar
});
}
else
{
}
else
{
assert
.
strictEqual
(
invokeCount
,
2
);
assert
.
strictEqual
(
invokeCount
,
2
);
assert
.
strictEqual
(
context
.
triggerKind
,
modes
.
SignatureHelpTriggerKind
.
TriggerCharacter
);
assert
.
strictEqual
(
context
.
triggerKind
,
modes
.
SignatureHelpTriggerKind
.
TriggerCharacter
);
assert
.
ok
(
context
.
isRetrigger
);
assert
.
strictEqual
(
context
.
isRetrigger
,
true
);
assert
.
strictEqual
(
context
.
triggerCharacter
,
triggerChar
);
assert
.
strictEqual
(
context
.
triggerCharacter
,
triggerChar
);
done
();
done
();
}
}
...
@@ -122,6 +123,7 @@ suite('ParameterHintsModel', () => {
...
@@ -122,6 +123,7 @@ suite('ParameterHintsModel', () => {
if
(
invokeCount
===
1
)
{
if
(
invokeCount
===
1
)
{
assert
.
strictEqual
(
context
.
triggerKind
,
modes
.
SignatureHelpTriggerKind
.
TriggerCharacter
);
assert
.
strictEqual
(
context
.
triggerKind
,
modes
.
SignatureHelpTriggerKind
.
TriggerCharacter
);
assert
.
strictEqual
(
context
.
triggerCharacter
,
triggerChar
);
assert
.
strictEqual
(
context
.
triggerCharacter
,
triggerChar
);
assert
.
strictEqual
(
context
.
isRetrigger
,
false
);
// Cancel and retrigger
// Cancel and retrigger
hintModel
.
cancel
();
hintModel
.
cancel
();
...
@@ -130,6 +132,8 @@ suite('ParameterHintsModel', () => {
...
@@ -130,6 +132,8 @@ suite('ParameterHintsModel', () => {
assert
.
strictEqual
(
invokeCount
,
2
);
assert
.
strictEqual
(
invokeCount
,
2
);
assert
.
strictEqual
(
context
.
triggerKind
,
modes
.
SignatureHelpTriggerKind
.
TriggerCharacter
);
assert
.
strictEqual
(
context
.
triggerKind
,
modes
.
SignatureHelpTriggerKind
.
TriggerCharacter
);
assert
.
strictEqual
(
context
.
triggerCharacter
,
triggerChar
);
assert
.
strictEqual
(
context
.
triggerCharacter
,
triggerChar
);
assert
.
strictEqual
(
context
.
isRetrigger
,
false
);
done
();
done
();
}
}
return
emptySigHelpResult
;
return
emptySigHelpResult
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录