Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
dfff4c5e
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,发现更多精彩内容 >>
提交
dfff4c5e
编写于
5月 24, 2017
作者:
R
Rob Lourens
提交者:
Dirk Baeumer
5月 26, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix #26634 - if a `./` include pattern contains glob characters, ignore the `./`
上级
eae2a774
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
27 addition
and
12 deletion
+27
-12
src/vs/workbench/parts/search/browser/patternInputWidget.ts
src/vs/workbench/parts/search/browser/patternInputWidget.ts
+27
-12
未找到文件。
src/vs/workbench/parts/search/browser/patternInputWidget.ts
浏览文件 @
dfff4c5e
...
...
@@ -110,8 +110,6 @@ export class PatternInputWidget extends Widget {
return
{};
}
const
isSearchPath
=
segment
=>
segment
.
match
(
/^
\.\/
/
);
let
exprSegments
:
string
[];
let
searchPaths
:
string
[];
if
(
isGlobPattern
)
{
...
...
@@ -119,21 +117,17 @@ export class PatternInputWidget extends Widget {
.
map
(
s
=>
s
.
trim
())
.
filter
(
s
=>
!!
s
.
length
);
const
groups
=
collections
.
groupBy
(
segments
,
segment
=>
isSearchPath
(
segment
)
?
'
searchPaths
'
:
'
exprSegments
'
);
searchPaths
=
groups
.
searchPaths
||
[];
exprSegments
=
groups
.
exprSegments
||
[];
const
groups
=
this
.
groupByPathsAndExprSegments
(
segments
);
searchPaths
=
groups
.
searchPaths
;
exprSegments
=
groups
.
exprSegments
;
}
else
{
const
segments
=
pattern
.
split
(
'
,
'
)
.
map
(
s
=>
strings
.
trim
(
s
.
trim
(),
'
/
'
))
.
filter
(
s
=>
!!
s
.
length
);
const
groups
=
collections
.
groupBy
(
segments
,
segment
=>
isSearchPath
(
segment
)
?
'
searchPaths
'
:
'
exprSegments
'
);
searchPaths
=
groups
.
searchPaths
||
[];
exprSegments
=
groups
.
exprSegments
||
[];
exprSegments
=
exprSegments
const
groups
=
this
.
groupByPathsAndExprSegments
(
segments
);
searchPaths
=
groups
.
searchPaths
;
exprSegments
=
groups
.
exprSegments
.
map
(
p
=>
{
if
(
p
[
0
]
===
'
.
'
)
{
p
=
'
*
'
+
p
;
// convert ".js" to "*.js"
...
...
@@ -147,6 +141,27 @@ export class PatternInputWidget extends Widget {
return
{
expression
,
searchPaths
};
}
private
groupByPathsAndExprSegments
(
segments
:
string
[])
{
const
isSearchPath
=
segment
=>
segment
.
match
(
/^
\.\/
/
);
const
groups
=
collections
.
groupBy
(
segments
,
segment
=>
isSearchPath
(
segment
)
?
'
searchPaths
'
:
'
exprSegments
'
);
groups
.
searchPaths
=
groups
.
searchPaths
||
[];
groups
.
exprSegments
=
groups
.
exprSegments
||
[];
// If a ./searchPath has a glob character, remove ./ and use it as an expression segment
groups
.
searchPaths
=
groups
.
searchPaths
.
filter
(
searchPath
=>
{
if
(
searchPath
.
match
(
/
[\*\{\}\(\)\[\]\?]
/
))
{
groups
.
exprSegments
.
push
(
strings
.
ltrim
(
searchPath
,
'
./
'
));
return
false
;
}
return
true
;
});
return
groups
;
}
public
select
():
void
{
this
.
inputBox
.
select
();
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录