Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
0b30dbfc
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,发现更多精彩内容 >>
提交
0b30dbfc
编写于
7月 13, 2016
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
change LanguageFilter matching rule to be the max not the sum of each match, fixes #7031
上级
9b33a963
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
19 addition
and
15 deletion
+19
-15
src/vs/editor/common/modes/languageSelector.ts
src/vs/editor/common/modes/languageSelector.ts
+12
-8
src/vs/editor/test/common/modes/languageSelector.test.ts
src/vs/editor/test/common/modes/languageSelector.test.ts
+3
-3
src/vs/vscode.d.ts
src/vs/vscode.d.ts
+4
-4
未找到文件。
src/vs/editor/common/modes/languageSelector.ts
浏览文件 @
0b30dbfc
...
...
@@ -37,15 +37,19 @@ export function score(selector: LanguageSelector, uri: URI, language: string): n
return
0
;
}
}
else
if
(
selector
)
{
let
filter
=
<
LanguageFilter
>
selector
;
let
value
=
0
;
// all must match but only highest score counts
const
filter
=
<
LanguageFilter
>
selector
;
let
valueLanguage
=
0
;
let
valueScheme
=
0
;
let
valuePattern
=
0
;
// language id
if
(
filter
.
language
)
{
if
(
filter
.
language
===
language
)
{
value
+
=
10
;
value
Language
=
10
;
}
else
if
(
filter
.
language
===
'
*
'
)
{
value
+
=
5
;
value
Language
=
5
;
}
else
{
return
0
;
}
...
...
@@ -54,7 +58,7 @@ export function score(selector: LanguageSelector, uri: URI, language: string): n
// scheme
if
(
filter
.
scheme
)
{
if
(
filter
.
scheme
===
uri
.
scheme
)
{
value
+
=
10
;
value
Scheme
=
10
;
}
else
{
return
0
;
}
...
...
@@ -63,14 +67,14 @@ export function score(selector: LanguageSelector, uri: URI, language: string): n
// match fsPath with pattern
if
(
filter
.
pattern
)
{
if
(
filter
.
pattern
===
uri
.
fsPath
)
{
value
+
=
10
;
value
Pattern
=
10
;
}
else
if
(
matchGlobPattern
(
filter
.
pattern
,
uri
.
fsPath
))
{
value
+
=
5
;
value
Pattern
=
5
;
}
else
{
return
0
;
}
}
return
value
;
return
Math
.
max
(
valueLanguage
,
valueScheme
,
valuePattern
)
;
}
}
src/vs/editor/test/common/modes/languageSelector.test.ts
浏览文件 @
0b30dbfc
...
...
@@ -31,7 +31,7 @@ suite('LanguageSelector', function() {
test
(
'
score, filter
'
,
function
()
{
assert
.
equal
(
score
(
'
farboo
'
,
model
.
uri
,
model
.
language
),
10
);
assert
.
equal
(
score
({
language
:
'
farboo
'
},
model
.
uri
,
model
.
language
),
10
);
assert
.
equal
(
score
({
language
:
'
farboo
'
,
scheme
:
'
file
'
},
model
.
uri
,
model
.
language
),
2
0
);
assert
.
equal
(
score
({
language
:
'
farboo
'
,
scheme
:
'
file
'
},
model
.
uri
,
model
.
language
),
1
0
);
assert
.
equal
(
score
({
language
:
'
farboo
'
,
scheme
:
'
http
'
},
model
.
uri
,
model
.
language
),
0
);
assert
.
equal
(
score
({
pattern
:
'
**/*.fb
'
},
model
.
uri
,
model
.
language
),
5
);
...
...
@@ -42,9 +42,9 @@ suite('LanguageSelector', function() {
let
match
=
{
language
:
'
farboo
'
,
scheme
:
'
file
'
};
let
fail
=
{
language
:
'
farboo
'
,
scheme
:
'
http
'
};
assert
.
equal
(
score
(
match
,
model
.
uri
,
model
.
language
),
2
0
);
assert
.
equal
(
score
(
match
,
model
.
uri
,
model
.
language
),
1
0
);
assert
.
equal
(
score
(
fail
,
model
.
uri
,
model
.
language
),
0
);
assert
.
equal
(
score
([
match
,
fail
],
model
.
uri
,
model
.
language
),
2
0
);
assert
.
equal
(
score
([
match
,
fail
],
model
.
uri
,
model
.
language
),
1
0
);
assert
.
equal
(
score
([
'
farboo
'
,
'
*
'
],
model
.
uri
,
model
.
language
),
10
);
assert
.
equal
(
score
([
'
*
'
,
'
farboo
'
],
model
.
uri
,
model
.
language
),
10
);
});
...
...
src/vs/vscode.d.ts
浏览文件 @
0b30dbfc
...
...
@@ -3543,12 +3543,12 @@ declare namespace vscode {
* (2.1) When both are equal score is `10`,
* (2.2) When the selector is `*` score is `5`,
* (2.3) Else score is `0`.
* (3) When selector is a [filter](#DocumentFilter)
every property must score higher `0`. Iff the score is the sum of the following:
* (3) When selector is a [filter](#DocumentFilter)
return the maximum individual score given that each score is `>0`.
* (3.1) When [language](#DocumentFilter.language) is set apply rules from #2, when `0` the total score is `0`.
* (3.2) When [scheme](#Document.scheme) is set and equals the [uri](#TextDocument.uri)-scheme
add `10` to the score
, else the total score is `0`.
* (3.2) When [scheme](#Document.scheme) is set and equals the [uri](#TextDocument.uri)-scheme
score with `10`
, else the total score is `0`.
* (3.3) When [pattern](#Document.pattern) is set
* (3.3.1) pattern eq
auls the [uri](#TextDocument.uri)-fsPath add `10` to the score
,
* (3.3.1) if the pattern matches as glob-pattern
add `5` to the score
,
* (3.3.1) pattern eq
uals the [uri](#TextDocument.uri)-fsPath score with `10`
,
* (3.3.1) if the pattern matches as glob-pattern
score with `5`
,
* (3.3.1) the total score is `0`
* ```
*
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录