Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
549845ed
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,发现更多精彩内容 >>
提交
549845ed
编写于
1月 04, 2017
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
suggest - move shouldAutoTrigger into static and reduce Context properties
上级
8f88ee2a
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
26 addition
and
30 deletion
+26
-30
src/vs/editor/contrib/suggest/common/suggestModel.ts
src/vs/editor/contrib/suggest/common/suggestModel.ts
+21
-27
src/vs/editor/contrib/suggest/test/common/suggestModel.test.ts
...s/editor/contrib/suggest/test/common/suggestModel.test.ts
+5
-3
未找到文件。
src/vs/editor/contrib/suggest/common/suggestModel.ts
浏览文件 @
549845ed
...
...
@@ -32,14 +32,31 @@ export interface ISuggestEvent {
export
class
Context
{
static
shouldAutoTrigger
(
editor
:
ICommonCodeEditor
):
boolean
{
const
model
=
editor
.
getModel
();
if
(
!
model
)
{
return
false
;
}
const
pos
=
editor
.
getPosition
();
const
word
=
model
.
getWordAtPosition
(
pos
);
if
(
!
word
)
{
return
false
;
}
if
(
word
.
endColumn
!==
pos
.
column
)
{
return
false
;
}
if
(
!
isNaN
(
Number
(
word
.
word
)))
{
return
false
;
}
return
true
;
}
readonly
lineNumber
:
number
;
readonly
column
:
number
;
readonly
isInEditableRange
:
boolean
;
readonly
lineContentBefore
:
string
;
readonly
wordBefore
:
string
;
readonly
wordAfter
:
string
;
constructor
(
model
:
IModel
,
position
:
IPosition
,
private
auto
:
boolean
)
{
const
lineContent
=
model
.
getLineContent
(
position
.
lineNumber
);
...
...
@@ -47,10 +64,8 @@ export class Context {
if
(
wordUnderCursor
)
{
this
.
wordBefore
=
lineContent
.
substring
(
wordUnderCursor
.
startColumn
-
1
,
position
.
column
-
1
);
this
.
wordAfter
=
lineContent
.
substring
(
position
.
column
-
1
,
wordUnderCursor
.
endColumn
-
1
);
}
else
{
this
.
wordBefore
=
''
;
this
.
wordAfter
=
''
;
}
this
.
lineNumber
=
position
.
lineNumber
;
...
...
@@ -67,26 +82,6 @@ export class Context {
}
}
shouldAutoTrigger
():
boolean
{
if
(
this
.
wordBefore
.
length
===
0
)
{
// Word before position is empty
return
false
;
}
if
(
!
isNaN
(
Number
(
this
.
wordBefore
)))
{
// Word before is number only
return
false
;
}
if
(
this
.
wordAfter
.
length
>
0
)
{
// Word after position is non empty
return
false
;
}
return
true
;
}
isDifferentContext
(
context
:
Context
):
boolean
{
if
(
this
.
lineNumber
!==
context
.
lineNumber
)
{
// Line number has changed
...
...
@@ -292,14 +287,12 @@ export class SuggestModel implements IDisposable {
return
;
}
const
ctx
=
new
Context
(
model
,
this
.
editor
.
getPosition
(),
false
);
if
(
this
.
state
===
State
.
Idle
)
{
if
(
this
.
editor
.
getConfiguration
().
contribInfo
.
quickSuggestions
)
{
// trigger suggest from idle when configured to do so
this
.
cancel
();
if
(
ctx
.
shouldAutoTrigger
(
))
{
if
(
Context
.
shouldAutoTrigger
(
this
.
editor
))
{
this
.
triggerAutoSuggestPromise
=
TPromise
.
timeout
(
this
.
quickSuggestDelay
);
this
.
triggerAutoSuggestPromise
.
then
(()
=>
{
this
.
triggerAutoSuggestPromise
=
null
;
...
...
@@ -310,6 +303,7 @@ export class SuggestModel implements IDisposable {
}
else
{
// refine active suggestion
const
ctx
=
new
Context
(
model
,
this
.
editor
.
getPosition
(),
false
);
this
.
onNewContext
(
ctx
);
}
}
...
...
src/vs/editor/contrib/suggest/test/common/suggestModel.test.ts
浏览文件 @
549845ed
...
...
@@ -49,8 +49,10 @@ suite('SuggestModel - Context', function () {
function
assertAutoTrigger
(
offset
:
number
,
expected
:
boolean
):
void
{
const
pos
=
model
.
getPositionAt
(
offset
);
const
ctx
=
new
Context
(
model
,
pos
,
false
);
assert
.
equal
(
ctx
.
shouldAutoTrigger
(),
expected
);
const
editor
=
createMockEditor
(
model
);
editor
.
setPosition
(
pos
);
assert
.
equal
(
Context
.
shouldAutoTrigger
(
editor
),
expected
);
editor
.
dispose
();
}
assertAutoTrigger
(
3
,
true
);
// end of word, Das|
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录