Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
803e7c29
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,发现更多精彩内容 >>
提交
803e7c29
编写于
5月 24, 2017
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
don't score when the word is the empty word, #26096
上级
fe740b4b
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
37 addition
and
3 deletion
+37
-3
src/vs/base/common/filters.ts
src/vs/base/common/filters.ts
+1
-1
src/vs/editor/contrib/suggest/browser/completionModel.ts
src/vs/editor/contrib/suggest/browser/completionModel.ts
+9
-1
src/vs/editor/contrib/suggest/test/browser/completionModel.test.ts
...itor/contrib/suggest/test/browser/completionModel.test.ts
+27
-1
未找到文件。
src/vs/base/common/filters.ts
浏览文件 @
803e7c29
...
@@ -473,7 +473,7 @@ export function fuzzyScore(pattern: string, word: string): [number, number[]] {
...
@@ -473,7 +473,7 @@ export function fuzzyScore(pattern: string, word: string): [number, number[]] {
}
}
if
(
patternLen
===
patternStartPos
)
{
if
(
patternLen
===
patternStartPos
)
{
return
[
-
1
,
[]];
return
[
-
1
00
,
[]];
}
}
if
(
patternLen
>
wordLen
)
{
if
(
patternLen
>
wordLen
)
{
...
...
src/vs/editor/contrib/suggest/browser/completionModel.ts
浏览文件 @
803e7c29
...
@@ -124,7 +124,15 @@ export class CompletionModel {
...
@@ -124,7 +124,15 @@ export class CompletionModel {
word
=
wordLen
===
0
?
''
:
leadingLineContent
.
slice
(
-
wordLen
);
word
=
wordLen
===
0
?
''
:
leadingLineContent
.
slice
(
-
wordLen
);
}
}
if
(
typeof
suggestion
.
filterText
===
'
string
'
)
{
if
(
wordLen
===
0
)
{
// when there is nothing to score against, don't
// event try to do. Use a const rank and rely on
// the fallback-sort using the initial sort order.
// use a score of `-100` because that is out of the
// bound of values `fuzzyScore` will return
item
.
score
=
-
100
;
}
else
if
(
typeof
suggestion
.
filterText
===
'
string
'
)
{
// when there is a `filterText` it must match the `word`.
// when there is a `filterText` it must match the `word`.
// if it matches we check with the label to compute highlights
// if it matches we check with the label to compute highlights
// and if that doesn't yield a result we have no highlights,
// and if that doesn't yield a result we have no highlights,
...
...
src/vs/editor/contrib/suggest/test/browser/completionModel.test.ts
浏览文件 @
803e7c29
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
import
*
as
assert
from
'
assert
'
;
import
*
as
assert
from
'
assert
'
;
import
{
ISuggestion
,
ISuggestResult
,
ISuggestSupport
,
SuggestionType
}
from
'
vs/editor/common/modes
'
;
import
{
ISuggestion
,
ISuggestResult
,
ISuggestSupport
,
SuggestionType
}
from
'
vs/editor/common/modes
'
;
import
{
ISuggestionItem
}
from
'
vs/editor/contrib/suggest/browser/suggest
'
;
import
{
ISuggestionItem
,
getSuggestionComparator
}
from
'
vs/editor/contrib/suggest/browser/suggest
'
;
import
{
CompletionModel
}
from
'
vs/editor/contrib/suggest/browser/completionModel
'
;
import
{
CompletionModel
}
from
'
vs/editor/contrib/suggest/browser/completionModel
'
;
import
{
IPosition
}
from
'
vs/editor/common/core/position
'
;
import
{
IPosition
}
from
'
vs/editor/common/core/position
'
;
import
{
TPromise
}
from
"
vs/base/common/winjs.base
"
;
import
{
TPromise
}
from
"
vs/base/common/winjs.base
"
;
...
@@ -202,4 +202,30 @@ suite('CompletionModel', function () {
...
@@ -202,4 +202,30 @@ suite('CompletionModel', function () {
};
};
assert
.
equal
(
model
.
items
.
length
,
1
);
assert
.
equal
(
model
.
items
.
length
,
1
);
});
});
test
(
'
Vscode 1.12 no longer obeys
\'
sortText
\'
in completion items (from language server), #26096
'
,
function
()
{
const
item1
=
createSuggestItem
(
'
<- groups
'
,
2
,
'
property
'
,
false
,
{
lineNumber
:
1
,
column
:
3
});
item1
.
suggestion
.
filterText
=
'
groups
'
;
item1
.
suggestion
.
sortText
=
'
00002
'
;
const
item2
=
createSuggestItem
(
'
source
'
,
0
,
'
property
'
,
false
,
{
lineNumber
:
1
,
column
:
3
});
item2
.
suggestion
.
filterText
=
'
source
'
;
item2
.
suggestion
.
sortText
=
'
00001
'
;
const
items
=
[
item1
,
item2
].
sort
(
getSuggestionComparator
(
'
inline
'
));
model
=
new
CompletionModel
(
items
,
3
,
{
leadingLineContent
:
'
'
,
characterCountDelta
:
0
});
assert
.
equal
(
model
.
items
.
length
,
2
);
const
[
first
,
second
]
=
model
.
items
;
assert
.
equal
(
first
.
suggestion
.
label
,
'
source
'
);
assert
.
equal
(
second
.
suggestion
.
label
,
'
<- groups
'
);
});
});
});
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录