Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
22f49f8c
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,发现更多精彩内容 >>
提交
22f49f8c
编写于
3月 14, 2018
作者:
R
Rob Lourens
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Improve migrating from split include/exclude inputs to the new merged one
上级
4c8fae3c
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
9 addition
and
3 deletion
+9
-3
src/vs/workbench/parts/search/browser/searchView.ts
src/vs/workbench/parts/search/browser/searchView.ts
+9
-3
未找到文件。
src/vs/workbench/parts/search/browser/searchView.ts
浏览文件 @
22f49f8c
...
...
@@ -62,6 +62,7 @@ import { IPanel } from 'vs/workbench/common/panel';
import
{
IViewlet
}
from
'
vs/workbench/common/viewlet
'
;
import
{
Viewlet
}
from
'
vs/workbench/browser/viewlet
'
;
import
{
IPartService
}
from
'
vs/workbench/services/part/common/partService
'
;
import
{
splitGlobAware
}
from
'
vs/base/common/glob
'
;
export
class
SearchView
extends
Viewlet
implements
IViewlet
,
IPanel
{
...
...
@@ -174,7 +175,8 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
this
.
createSearchWidget
(
this
.
searchWidgetsContainer
);
const
filePatterns
=
this
.
viewletSettings
[
'
query.filePatterns
'
]
||
''
;
const
patternExclusions
=
this
.
viewletSettings
[
'
query.folderExclusions
'
]
||
''
;
const
patternExclusions
=
this
.
viewletSettings
[
'
query.folderExclusions
'
]
||
'
foo, bar/**/*.js
'
;
delete
this
.
viewletSettings
[
'
query.folderExclusions
'
];
// Migrating from versions that have dedicated exclusions persisted
const
patternIncludes
=
this
.
viewletSettings
[
'
query.folderIncludes
'
]
||
''
;
const
patternIncludesHistory
=
this
.
viewletSettings
[
'
query.folderIncludesHistory
'
]
||
[];
const
queryDetailsExpanded
=
this
.
viewletSettings
[
'
query.queryDetailsExpanded
'
]
||
''
;
...
...
@@ -205,14 +207,18 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
placeholder
:
nls
.
localize
(
'
searchIncludeExclude.placeholder
'
,
"
Examples: src, !*.ts, test/**/*.log
"
)
});
// For migrating from versions that have dedicated exclusions persisted
let
mergedIncludeExcludes
=
patternIncludes
;
if
(
patternExclusions
)
{
if
(
mergedIncludeExcludes
)
{
mergedIncludeExcludes
+=
'
,
'
;
}
mergedIncludeExcludes
+=
patternExclusions
;
mergedIncludeExcludes
+=
splitGlobAware
(
patternExclusions
,
'
,
'
)
.
map
(
s
=>
s
.
trim
())
.
filter
(
s
=>
!!
s
.
length
)
.
map
(
s
=>
'
!
'
+
s
)
.
join
(
'
,
'
);
}
this
.
inputPatternIncludes
.
setValue
(
mergedIncludeExcludes
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录