Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
f742c33a
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,发现更多精彩内容 >>
提交
f742c33a
编写于
11月 08, 2018
作者:
M
Matt Bierner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Strict null check quick open scorer
上级
20153f1d
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
17 addition
and
21 deletion
+17
-21
src/tsconfig.strictNullChecks.json
src/tsconfig.strictNullChecks.json
+2
-1
src/vs/base/parts/quickopen/common/quickOpenScorer.ts
src/vs/base/parts/quickopen/common/quickOpenScorer.ts
+15
-20
未找到文件。
src/tsconfig.strictNullChecks.json
浏览文件 @
f742c33a
...
...
@@ -680,7 +680,8 @@
"./vs/workbench/services/themes/common/workbenchThemeService.ts"
,
"./vs/workbench/services/title/common/titleService.ts"
,
"./vs/workbench/services/workspace/common/workspaceEditing.ts"
,
"./vs/workbench/test/electron-browser/api/mock.ts"
"./vs/workbench/test/electron-browser/api/mock.ts"
,
"./vs/base/parts/quickopen/common/quickOpenScorer.ts"
],
"exclude"
:
[
"./typings/require-monaco.d.ts"
,
...
...
src/vs/base/parts/quickopen/common/quickOpenScorer.ts
浏览文件 @
f742c33a
...
...
@@ -304,19 +304,17 @@ export interface IPreparedQuery {
* Helper function to prepare a search value for scoring in quick open by removing unwanted characters.
*/
export
function
prepareQuery
(
original
:
string
):
IPreparedQuery
{
let
lowercase
:
string
;
let
containsPathSeparator
:
boolean
;
let
value
:
string
;
if
(
!
original
)
{
original
=
''
;
}
if
(
original
)
{
value
=
stripWildcards
(
original
).
replace
(
/
\s
/g
,
''
);
// get rid of all wildcards and whitespace
let
value
=
stripWildcards
(
original
).
replace
(
/
\s
/g
,
''
);
// get rid of all wildcards and whitespace
if
(
isWindows
)
{
value
=
value
.
replace
(
/
\/
/g
,
nativeSep
);
// Help Windows users to search for paths when using slash
}
lowercase
=
value
.
toLowerCase
();
containsPathSeparator
=
value
.
indexOf
(
nativeSep
)
>=
0
;
}
const
lowercase
=
value
.
toLowerCase
();
const
containsPathSeparator
=
value
.
indexOf
(
nativeSep
)
>=
0
;
return
{
original
,
value
,
lowercase
,
containsPathSeparator
};
}
...
...
@@ -503,28 +501,25 @@ export function compareItemsByScore<T>(itemA: T, itemB: T, query: IPreparedQuery
}
function
computeLabelAndDescriptionMatchDistance
<
T
>
(
item
:
T
,
score
:
IItemScore
,
accessor
:
IItemAccessor
<
T
>
):
number
{
const
hasLabelMatches
=
(
score
.
labelMatch
&&
score
.
labelMatch
.
length
);
const
hasDescriptionMatches
=
(
score
.
descriptionMatch
&&
score
.
descriptionMatch
.
length
);
let
matchStart
:
number
=
-
1
;
let
matchEnd
:
number
=
-
1
;
// If we have description matches, the start is first of description match
if
(
hasDescriptionMatches
)
{
if
(
score
.
descriptionMatch
&&
score
.
descriptionMatch
.
length
)
{
matchStart
=
score
.
descriptionMatch
[
0
].
start
;
}
// Otherwise, the start is the first label match
else
if
(
hasLabelMatches
)
{
else
if
(
score
.
labelMatch
&&
score
.
labelMatch
.
length
)
{
matchStart
=
score
.
labelMatch
[
0
].
start
;
}
// If we have label match, the end is the last label match
// If we had a description match, we add the length of the description
// as offset to the end to indicate this.
if
(
hasLabelMatches
)
{
if
(
score
.
labelMatch
&&
score
.
labelMatch
.
length
)
{
matchEnd
=
score
.
labelMatch
[
score
.
labelMatch
.
length
-
1
].
end
;
if
(
hasDescriptionMatches
)
{
if
(
score
.
descriptionMatch
&&
score
.
descriptionMatch
.
length
)
{
const
itemDescription
=
accessor
.
getItemDescription
(
item
);
if
(
itemDescription
)
{
matchEnd
+=
itemDescription
.
length
;
...
...
@@ -533,7 +528,7 @@ function computeLabelAndDescriptionMatchDistance<T>(item: T, score: IItemScore,
}
// If we have just a description match, the end is the last description match
else
if
(
hasDescriptionMatches
)
{
else
if
(
score
.
descriptionMatch
&&
score
.
descriptionMatch
.
length
)
{
matchEnd
=
score
.
descriptionMatch
[
score
.
descriptionMatch
.
length
-
1
].
end
;
}
...
...
@@ -541,7 +536,7 @@ function computeLabelAndDescriptionMatchDistance<T>(item: T, score: IItemScore,
}
function
compareByMatchLength
(
matchesA
?:
IMatch
[],
matchesB
?:
IMatch
[]):
number
{
if
((
!
matchesA
&&
!
matchesB
)
||
(
!
matchesA
.
length
&&
!
matchesB
.
length
))
{
if
((
!
matchesA
&&
!
matchesB
)
||
(
(
!
matchesA
||
!
matchesA
.
length
)
&&
(
!
matchesB
||
!
matchesB
.
length
)
))
{
return
0
;
// make sure to not cause bad comparing when matches are not provided
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录