Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
235c1b32
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,发现更多精彩内容 >>
提交
235c1b32
编写于
1月 08, 2019
作者:
M
Matt Bierner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use const enums for state and move state into namespace
上级
6ac9ea2a
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
30 addition
and
23 deletion
+30
-23
src/vs/editor/contrib/parameterHints/parameterHintsModel.ts
src/vs/editor/contrib/parameterHints/parameterHintsModel.ts
+30
-23
未找到文件。
src/vs/editor/contrib/parameterHints/parameterHintsModel.ts
浏览文件 @
235c1b32
...
...
@@ -18,18 +18,25 @@ export interface TriggerContext {
readonly
triggerCharacter
?:
string
;
}
const
DefaultState
=
new
class
{
readonly
type
=
'
default
'
;
};
const
PendingState
=
new
class
{
readonly
type
=
'
pending
'
;
};
namespace
ParameterHintState
{
export
const
enum
Type
{
Default
,
Active
,
Pending
,
}
export
const
Default
=
new
class
{
readonly
type
=
Type
.
Default
;
};
export
const
Pending
=
new
class
{
readonly
type
=
Type
.
Pending
;
};
class
ActiveState
{
static
readonly
type
=
'
active
'
;
readonly
type
=
ActiveState
.
type
;
export
class
Active
{
readonly
type
=
Type
.
Active
;
constructor
(
readonly
hints
:
modes
.
SignatureHelp
)
{
}
}
}
type
ParameterHintState
=
typeof
DefaultState
|
typeof
PendingState
|
ActiveState
;
export
type
State
=
typeof
Default
|
typeof
Pending
|
Active
;
}
export
class
ParameterHintsModel
extends
Disposable
{
...
...
@@ -40,7 +47,7 @@ export class ParameterHintsModel extends Disposable {
private
editor
:
ICodeEditor
;
private
enabled
:
boolean
;
private
state
:
ParameterHintState
=
DefaultState
;
private
state
:
ParameterHintState
.
State
=
ParameterHintState
.
Default
;
private
triggerChars
=
new
CharacterSet
();
private
retriggerChars
=
new
CharacterSet
();
...
...
@@ -72,7 +79,7 @@ export class ParameterHintsModel extends Disposable {
}
cancel
(
silent
:
boolean
=
false
):
void
{
this
.
state
=
DefaultState
;
this
.
state
=
ParameterHintState
.
Default
;
this
.
throttledDelayer
.
cancel
();
...
...
@@ -97,13 +104,13 @@ export class ParameterHintsModel extends Disposable {
()
=>
this
.
doTrigger
({
triggerKind
:
context
.
triggerKind
,
triggerCharacter
:
context
.
triggerCharacter
,
isRetrigger
:
this
.
state
.
type
===
ActiveState
.
type
||
this
.
state
.
type
===
PendingState
.
type
,
activeSignatureHelp
:
this
.
state
.
type
===
ActiveState
.
typ
e
?
this
.
state
.
hints
:
undefined
isRetrigger
:
this
.
state
.
type
===
ParameterHintState
.
Type
.
Active
||
this
.
state
.
type
===
ParameterHintState
.
Type
.
Pending
,
activeSignatureHelp
:
this
.
state
.
type
===
ParameterHintState
.
Type
.
Activ
e
?
this
.
state
.
hints
:
undefined
},
triggerId
),
delay
).
then
(
undefined
,
onUnexpectedError
);
}
public
next
():
void
{
if
(
this
.
state
.
type
!==
ActiveState
.
typ
e
)
{
if
(
this
.
state
.
type
!==
ParameterHintState
.
Type
.
Activ
e
)
{
return
;
}
...
...
@@ -122,7 +129,7 @@ export class ParameterHintsModel extends Disposable {
}
public
previous
():
void
{
if
(
this
.
state
.
type
!==
ActiveState
.
typ
e
)
{
if
(
this
.
state
.
type
!==
ParameterHintState
.
Type
.
Activ
e
)
{
return
;
}
...
...
@@ -141,11 +148,11 @@ export class ParameterHintsModel extends Disposable {
}
private
updateActiveSignature
(
activeSignature
:
number
)
{
if
(
this
.
state
.
type
!==
ActiveState
.
typ
e
)
{
if
(
this
.
state
.
type
!==
ParameterHintState
.
Type
.
Activ
e
)
{
return
;
}
this
.
state
=
new
ActiveStat
e
({
...
this
.
state
.
hints
,
activeSignature
});
this
.
state
=
new
ParameterHintState
.
Activ
e
({
...
this
.
state
.
hints
,
activeSignature
});
this
.
_onChangedHints
.
fire
(
this
.
state
.
hints
);
}
...
...
@@ -159,7 +166,7 @@ export class ParameterHintsModel extends Disposable {
const
model
=
this
.
editor
.
getModel
();
const
position
=
this
.
editor
.
getPosition
();
this
.
state
=
P
endingState
;
this
.
state
=
P
arameterHintState
.
Pending
;
this
.
provideSignatureHelpRequest
=
createCancelablePromise
(
token
=>
provideSignatureHelp
(
model
,
position
,
triggerContext
,
token
));
...
...
@@ -174,20 +181,20 @@ export class ParameterHintsModel extends Disposable {
this
.
cancel
();
return
false
;
}
else
{
this
.
state
=
new
ActiveStat
e
(
result
);
this
.
state
=
new
ParameterHintState
.
Activ
e
(
result
);
this
.
_onChangedHints
.
fire
(
this
.
state
.
hints
);
return
true
;
}
}).
catch
(
error
=>
{
this
.
state
=
DefaultState
;
this
.
state
=
ParameterHintState
.
Default
;
onUnexpectedError
(
error
);
return
false
;
});
}
private
get
isTriggered
():
boolean
{
return
this
.
state
.
type
===
ActiveState
.
typ
e
||
this
.
state
.
type
===
P
endingState
.
type
return
this
.
state
.
type
===
ParameterHintState
.
Type
.
Activ
e
||
this
.
state
.
type
===
P
arameterHintState
.
Type
.
Pending
||
this
.
throttledDelayer
.
isTriggered
();
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录