Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
徽霖
Vscode
提交
9027646b
V
Vscode
项目概览
徽霖
/
Vscode
通知
9
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,发现更多精彩内容 >>
提交
9027646b
编写于
7月 13, 2017
作者:
R
Rob Lourens
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix ./ and absolute paths with glob patterns
上级
1a530ec1
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
39 addition
and
40 deletion
+39
-40
src/vs/workbench/parts/search/browser/patternInputWidget.ts
src/vs/workbench/parts/search/browser/patternInputWidget.ts
+2
-0
src/vs/workbench/parts/search/common/searchQuery.ts
src/vs/workbench/parts/search/common/searchQuery.ts
+34
-37
src/vs/workbench/services/search/node/ripgrepTextSearch.ts
src/vs/workbench/services/search/node/ripgrepTextSearch.ts
+3
-3
未找到文件。
src/vs/workbench/parts/search/browser/patternInputWidget.ts
浏览文件 @
9027646b
...
...
@@ -115,6 +115,7 @@ export class PatternInputWidget extends Widget {
let
searchPaths
:
string
[];
if
(
isGlobPattern
)
{
const
segments
=
splitGlobAware
(
pattern
,
'
,
'
)
.
map
(
s
=>
s
.
trim
())
.
filter
(
s
=>
!!
s
.
length
);
const
groups
=
this
.
groupByPathsAndExprSegments
(
segments
);
...
...
@@ -122,6 +123,7 @@ export class PatternInputWidget extends Widget {
exprSegments
=
groups
.
exprSegments
;
}
else
{
const
segments
=
pattern
.
split
(
'
,
'
)
.
map
(
s
=>
s
.
trim
())
.
filter
(
s
=>
!!
s
.
length
);
const
groups
=
this
.
groupByPathsAndExprSegments
(
segments
);
...
...
src/vs/workbench/parts/search/common/searchQuery.ts
浏览文件 @
9027646b
...
...
@@ -91,51 +91,48 @@ export class QueryBuilder {
const
searchPaths
:
string
[]
=
[];
const
additionalIncludePatterns
:
string
[]
=
[];
const
workspace
=
this
.
workspaceContextService
.
getWorkspace
();
if
(
workspace
.
roots
.
length
<
2
)
{
for
(
const
searchPath
of
options
.
searchPaths
)
{
// 1 open folder => just resolve the search paths to absolute paths
const
{
pathPortion
,
globPortion
}
=
splitGlobFromPath
(
searchPath
);
const
absolutePathPortion
=
paths
.
isAbsolute
(
pathPortion
)
?
pathPortion
:
paths
.
join
(
workspace
.
roots
[
0
].
fsPath
,
pathPortion
);
searchPaths
.
push
(
absolutePathPortion
);
if
(
globPortion
)
{
additionalIncludePatterns
.
push
(
paths
.
join
(
absolutePathPortion
,
globPortion
));
}
}
for
(
const
searchPath
of
options
.
searchPaths
)
{
// 1 open folder => just resolve the search paths to absolute paths
const
{
pathPortion
,
globPortion
}
=
splitGlobFromPath
(
searchPath
);
const
absolutePathPortions
=
this
.
expandAbsoluteSearchPaths
(
pathPortion
);
searchPaths
.
push
(...
absolutePathPortions
);
return
{
searchPaths
,
additionalIncludePatterns
};
if
(
globPortion
)
{
additionalIncludePatterns
.
push
(...
absolutePathPortions
.
map
(
abs
=>
paths
.
join
(
abs
,
globPortion
)));
}
}
// Is a multiroot workspace
// Resolve searchPaths, relative or absolute, against roots
for
(
const
searchPath
of
options
.
searchPaths
)
{
if
(
paths
.
isAbsolute
(
searchPath
))
{
searchPaths
.
push
(
searchPath
);
// later, pull out globs
}
else
{
const
relativeSearchPathMatch
=
searchPath
.
match
(
/
\.\/(
.+
)\/(
.+
)
/
);
if
(
relativeSearchPathMatch
)
{
const
searchPathRoot
=
relativeSearchPathMatch
[
1
];
const
matchingRoots
=
workspace
.
roots
.
filter
(
root
=>
paths
.
basename
(
root
.
fsPath
)
===
searchPathRoot
);
if
(
!
matchingRoots
.
length
)
{
// throw new Error(nls.localize('search.invalidRootFolder', 'No root folder named {}', searchPathRoot));
}
else
{
searchPaths
.
push
(...
matchingRoots
.
map
(
root
=>
paths
.
join
(
root
.
fsPath
,
relativeSearchPathMatch
[
2
])));
}
return
{
searchPaths
,
additionalIncludePatterns
};
}
private
expandAbsoluteSearchPaths
(
searchPath
:
string
):
string
[]
{
if
(
paths
.
isAbsolute
(
searchPath
))
{
return
[
searchPath
];
}
const
workspace
=
this
.
workspaceContextService
.
getWorkspace
();
if
(
workspace
.
roots
.
length
===
1
)
{
return
[
paths
.
join
(
workspace
.
roots
[
0
].
fsPath
,
searchPath
)];
}
else
{
const
relativeSearchPathMatch
=
searchPath
.
match
(
/
\.\/([^\/]
+
)(\/
.+
)?
/
);
if
(
relativeSearchPathMatch
)
{
const
searchPathRoot
=
relativeSearchPathMatch
[
1
];
const
matchingRoots
=
workspace
.
roots
.
filter
(
root
=>
paths
.
basename
(
root
.
fsPath
)
===
searchPathRoot
);
if
(
matchingRoots
.
length
)
{
return
matchingRoots
.
map
(
root
=>
paths
.
join
(
root
.
fsPath
,
relativeSearchPathMatch
[
2
]
||
''
));
}
else
{
// Malformed ./ search path
// throw new Error(nls.localize('search.invalidRelativeInclude', 'Invalid folder include pattern: {}', searchPath));
// throw new Error(nls.localize('search.invalidRootFolder', 'No root folder named {}', searchPathRoot));
}
}
else
{
// Malformed ./ search path
// throw new Error(nls.localize('search.invalidRelativeInclude', 'Invalid folder include pattern: {}', searchPath));
}
}
return
{
searchPaths
,
additionalIncludePatterns
}
;
return
[]
;
}
}
...
...
@@ -156,4 +153,4 @@ function splitGlobFromPath(searchPath: string): { pathPortion: string, globPorti
return
{
pathPortion
:
searchPath
};
}
\ No newline at end of file
}
src/vs/workbench/services/search/node/ripgrepTextSearch.ts
浏览文件 @
9027646b
...
...
@@ -398,13 +398,13 @@ function foldersToRgExcludeGlobs(folderQueries: IFolderSearch[], globalExclude:
}
function
foldersToIncludeGlobs
(
folderQueries
:
IFolderSearch
[],
globalInclude
:
glob
.
IExpression
):
string
[]
{
const
globArgs
:
string
[]
=
[]
;
const
globArgs
=
new
Set
<
string
>
()
;
folderQueries
.
forEach
(
folderQuery
=>
{
const
result
=
globExprsToRgGlobs
(
globalInclude
,
folderQuery
.
folder
);
globArgs
.
push
(...
result
.
globArgs
);
result
.
globArgs
.
forEach
(
arg
=>
globArgs
.
add
(
arg
)
);
});
return
globArgs
;
return
(
<
any
>
Array
).
from
(
globArgs
)
;
}
function
globExprsToRgGlobs
(
patterns
:
glob
.
IExpression
,
folder
:
string
):
IRgGlobResult
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录