Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
08635265
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,发现更多精彩内容 >>
未验证
提交
08635265
编写于
9月 24, 2017
作者:
R
Rob Lourens
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix #34296
上级
e3e9226c
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
8 addition
and
7 deletion
+8
-7
src/vs/workbench/parts/search/common/queryBuilder.ts
src/vs/workbench/parts/search/common/queryBuilder.ts
+8
-7
未找到文件。
src/vs/workbench/parts/search/common/queryBuilder.ts
浏览文件 @
08635265
...
...
@@ -195,7 +195,7 @@ export class QueryBuilder {
const
pathPortions
=
this
.
expandAbsoluteSearchPaths
(
pathPortion
);
return
pathPortions
.
map
(
searchPath
=>
{
return
<
ISearchPathPattern
>
{
searchPath
:
uri
.
file
(
searchPath
)
,
searchPath
,
pattern
:
globPortion
};
});
...
...
@@ -207,14 +207,15 @@ export class QueryBuilder {
/**
* Takes a searchPath like `./a/foo` and expands it to absolute paths for all the workspaces it matches.
*/
private
expandAbsoluteSearchPaths
(
searchPath
:
string
):
string
[]
{
private
expandAbsoluteSearchPaths
(
searchPath
:
string
):
uri
[]
{
if
(
paths
.
isAbsolute
(
searchPath
))
{
return
[
paths
.
normalize
(
searchPath
)];
// Currently only local resources can be searched for with absolute search paths
return
[
uri
.
file
(
paths
.
normalize
(
searchPath
))];
}
if
(
this
.
workspaceContextService
.
getWorkbenchState
()
===
WorkbenchState
.
FOLDER
)
{
// TODO: @Sandy Try checking workspace folders length instead.
return
[
paths
.
normalize
(
paths
.
join
(
this
.
workspaceContextService
.
getWorkspace
().
folders
[
0
].
uri
.
fsPath
,
searchPath
)
)];
const
workspaceUri
=
this
.
workspaceContextService
.
getWorkspace
().
folders
[
0
].
uri
;
return
[
workspaceUri
.
with
({
path
:
paths
.
normalize
(
paths
.
join
(
workspaceUri
.
path
,
searchPath
))
}
)];
}
else
if
(
searchPath
===
'
./
'
)
{
return
[];
// ./ or ./**/foo makes sense for single-folder but not multi-folder workspaces
}
else
{
...
...
@@ -225,8 +226,8 @@ export class QueryBuilder {
if
(
matchingRoots
.
length
)
{
return
matchingRoots
.
map
(
root
=>
{
return
relativeSearchPathMatch
[
2
]
?
paths
.
normalize
(
paths
.
join
(
root
.
uri
.
fsPath
,
relativeSearchPathMatch
[
2
])
)
:
root
.
uri
.
fsPath
;
root
.
uri
.
with
({
path
:
paths
.
normalize
(
paths
.
join
(
root
.
uri
.
fsPath
,
relativeSearchPathMatch
[
2
]))
}
)
:
root
.
uri
;
});
}
else
{
// No root folder with name
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录