Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
8ca017ea
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,发现更多精彩内容 >>
未验证
提交
8ca017ea
编写于
7月 27, 2018
作者:
R
Ramya Rao
提交者:
GitHub
7月 27, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Polish tag search as per feedback (#55269)
* Polish tag search as per feedback * Updated regex
上级
5c7b2f32
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
18 addition
and
14 deletion
+18
-14
src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
...vs/workbench/parts/preferences/browser/settingsEditor2.ts
+15
-9
src/vs/workbench/parts/preferences/browser/settingsTree.ts
src/vs/workbench/parts/preferences/browser/settingsTree.ts
+3
-5
未找到文件。
src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
浏览文件 @
8ca017ea
...
...
@@ -84,6 +84,8 @@ export class SettingsEditor2 extends BaseEditor {
private
inSettingsEditorContextKey
:
IContextKey
<
boolean
>
;
private
searchFocusContextKey
:
IContextKey
<
boolean
>
;
private
tagRegex
=
/
(
^|
\s)
@tag:
(
"
([^
"
]
*
)
"|
[^
"
]\S
*
)
/g
;
/** Don't spam warnings */
private
hasWarnedMissingSettings
:
boolean
;
...
...
@@ -181,10 +183,10 @@ export class SettingsEditor2 extends BaseEditor {
this
.
searchWidget
.
clear
();
}
filterByTag
(
tag
:
string
):
void
{
search
(
text
:
string
):
void
{
if
(
this
.
searchWidget
)
{
this
.
searchWidget
.
focus
();
this
.
searchWidget
.
setValue
(
`@tag:
${
tag
}
`
);
this
.
searchWidget
.
setValue
(
text
);
}
}
...
...
@@ -233,7 +235,7 @@ export class SettingsEditor2 extends BaseEditor {
const
actions
=
[
this
.
instantiationService
.
createInstance
(
FilterByTagAction
,
localize
(
'
filterModifiedLabel
'
,
"
Show modified settings
only
"
),
localize
(
'
filterModifiedLabel
'
,
"
Show modified settings
"
),
MODIFIED_SETTING_TAG
,
this
),
this
.
instantiationService
.
createInstance
(
...
...
@@ -664,12 +666,16 @@ export class SettingsEditor2 extends BaseEditor {
private
triggerSearch
(
query
:
string
):
TPromise
<
void
>
{
this
.
viewState
.
tagFilters
=
new
Set
<
string
>
();
if
(
query
)
{
const
tagMatches
=
query
.
match
(
/
\s
*@tag:
(\S
+
)(
.*
)
/
);
// For now, we support single tag at a time.
if
(
tagMatches
)
{
this
.
viewState
.
tagFilters
.
add
(
tagMatches
[
1
]);
query
=
tagMatches
[
2
];
}
query
=
query
.
replace
(
this
.
tagRegex
,
(
_
,
__
,
quotedTag
,
tag
)
=>
{
this
.
viewState
.
tagFilters
.
add
(
tag
||
quotedTag
);
return
''
;
});
query
=
query
.
replace
(
`@
${
MODIFIED_SETTING_TAG
}
`
,
()
=>
{
this
.
viewState
.
tagFilters
.
add
(
MODIFIED_SETTING_TAG
);
return
''
;
});
}
query
=
query
.
trim
();
if
(
query
)
{
return
this
.
searchInProgress
=
TPromise
.
join
([
this
.
localSearchDelayer
.
trigger
(()
=>
this
.
localFilterPreferences
(
query
)),
...
...
@@ -856,7 +862,7 @@ class FilterByTagAction extends Action {
}
run
():
TPromise
<
void
>
{
this
.
settingsEditor
.
filterByTag
(
this
.
tag
);
this
.
settingsEditor
.
search
(
this
.
tag
===
MODIFIED_SETTING_TAG
?
`@
${
this
.
tag
}
`
:
`@tag:
${
this
.
tag
}
`
);
return
TPromise
.
as
(
null
);
}
}
src/vs/workbench/parts/preferences/browser/settingsTree.ts
浏览文件 @
8ca017ea
...
...
@@ -1181,11 +1181,9 @@ export class SettingsTreeFilter implements IFilter {
if
(
element
instanceof
SettingsTreeSettingElement
&&
this
.
viewState
.
tagFilters
&&
this
.
viewState
.
tagFilters
.
size
)
{
if
(
element
.
tags
)
{
let
hasFilteredTag
=
false
;
element
.
tags
.
forEach
(
tag
=>
{
if
(
this
.
viewState
.
tagFilters
.
has
(
tag
))
{
hasFilteredTag
=
true
;
}
let
hasFilteredTag
=
true
;
this
.
viewState
.
tagFilters
.
forEach
(
tag
=>
{
hasFilteredTag
=
hasFilteredTag
&&
element
.
tags
.
has
(
tag
);
});
return
hasFilteredTag
;
}
else
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录