Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
6531a5cf
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,发现更多精彩内容 >>
提交
6531a5cf
编写于
7月 29, 2017
作者:
R
Rob Lourens
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix './' syntax when using a single-folder workspace
上级
8527af58
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
8 addition
and
5 deletion
+8
-5
src/vs/workbench/parts/search/browser/searchViewlet.ts
src/vs/workbench/parts/search/browser/searchViewlet.ts
+1
-1
src/vs/workbench/parts/search/common/queryBuilder.ts
src/vs/workbench/parts/search/common/queryBuilder.ts
+2
-2
src/vs/workbench/parts/search/test/common/queryBuilder.test.ts
...s/workbench/parts/search/test/common/queryBuilder.test.ts
+3
-0
src/vs/workbench/test/workbenchTestServices.ts
src/vs/workbench/test/workbenchTestServices.ts
+2
-2
未找到文件。
src/vs/workbench/parts/search/browser/searchViewlet.ts
浏览文件 @
6531a5cf
...
...
@@ -864,7 +864,7 @@ export class SearchViewlet extends Viewlet {
let
folderPath
=
null
;
const
workspace
=
this
.
contextService
.
getWorkspace
();
if
(
workspace
&&
resource
)
{
if
(
workspace
.
roots
.
length
===
1
)
{
if
(
this
.
contextService
.
hasFolderWorkspace
()
)
{
// Show relative path from the root for single-root mode
folderPath
=
paths
.
relative
(
workspace
.
roots
[
0
].
fsPath
,
resource
.
fsPath
);
if
(
folderPath
&&
folderPath
!==
'
.
'
)
{
...
...
src/vs/workbench/parts/search/common/queryBuilder.ts
浏览文件 @
6531a5cf
...
...
@@ -206,11 +206,11 @@ export class QueryBuilder {
}
const
workspace
=
this
.
workspaceContextService
.
getWorkspace
();
if
(
workspace
.
roots
.
length
===
1
)
{
if
(
this
.
workspaceContextService
.
hasFolderWorkspace
()
)
{
return
[
paths
.
normalize
(
paths
.
join
(
workspace
.
roots
[
0
].
fsPath
,
searchPath
))];
}
else
if
(
searchPath
===
'
./
'
)
{
return
[];
// ./ or ./**/foo makes sense for single-
root but not multiroot
return
[];
// ./ or ./**/foo makes sense for single-
folder but not multi-folder workspaces
}
else
{
const
relativeSearchPathMatch
=
searchPath
.
match
(
/
\.\/([^\/]
+
)(\/
.+
)?
/
);
if
(
relativeSearchPathMatch
)
{
...
...
src/vs/workbench/parts/search/test/common/queryBuilder.test.ts
浏览文件 @
6531a5cf
...
...
@@ -139,6 +139,7 @@ suite('QueryBuilder', () => {
const
ROOT_3
=
fixPath
(
'
/project/root3
'
);
const
ROOT_3_URI
=
getUri
(
ROOT_3
);
mockWorkspace
.
roots
=
[
ROOT_1_URI
,
ROOT_2_URI
,
ROOT_3_URI
];
mockWorkspace
.
configuration
=
uri
.
file
(
fixPath
(
'
/config
'
));
mockConfigService
.
setUserConfiguration
(
'
search
'
,
{
useRipgrep
:
true
,
...
...
@@ -385,6 +386,7 @@ suite('QueryBuilder', () => {
test
(
'
relative includes w/two root folders
'
,
()
=>
{
const
ROOT_2
=
'
/project/root2
'
;
mockWorkspace
.
roots
=
[
ROOT_1_URI
,
getUri
(
ROOT_2
)];
mockWorkspace
.
configuration
=
uri
.
file
(
fixPath
(
'
config
'
));
[
[
...
...
@@ -424,6 +426,7 @@ suite('QueryBuilder', () => {
const
ROOT_2
=
'
/project/rootB
'
;
const
ROOT_3
=
'
/otherproject/rootB
'
;
mockWorkspace
.
roots
=
[
ROOT_1_URI
,
getUri
(
ROOT_2
),
getUri
(
ROOT_3
)];
mockWorkspace
.
configuration
=
uri
.
file
(
fixPath
(
'
/config
'
));
[
[
...
...
src/vs/workbench/test/workbenchTestServices.ts
浏览文件 @
6531a5cf
...
...
@@ -97,11 +97,11 @@ export class TestContextService implements IWorkspaceContextService {
}
public
hasFolderWorkspace
():
boolean
{
return
this
.
hasWorkspace
()
;
return
this
.
workspace
&&
!
this
.
workspace
.
configuration
;
}
public
hasMultiFolderWorkspace
():
boolean
{
return
false
;
return
this
.
workspace
&&
!!
this
.
workspace
.
configuration
;
}
public
getLegacyWorkspace
():
ILegacyWorkspace
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录