Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
e3b0eae7
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
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,发现更多精彩内容 >>
提交
e3b0eae7
编写于
1月 27, 2021
作者:
J
Jackson Kearl
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Test fix for #114795
上级
cdbc22a9
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
22 addition
and
11 deletion
+22
-11
src/vs/workbench/contrib/search/common/queryBuilder.ts
src/vs/workbench/contrib/search/common/queryBuilder.ts
+22
-11
未找到文件。
src/vs/workbench/contrib/search/common/queryBuilder.ts
浏览文件 @
e3b0eae7
...
...
@@ -10,13 +10,14 @@ import { untildify } from 'vs/base/common/labels';
import
{
ResourceMap
}
from
'
vs/base/common/map
'
;
import
{
Schemas
}
from
'
vs/base/common/network
'
;
import
*
as
path
from
'
vs/base/common/path
'
;
import
{
isEqual
,
basename
,
relativePath
}
from
'
vs/base/common/resources
'
;
import
{
isEqual
,
basename
,
relativePath
,
isAbsolutePath
}
from
'
vs/base/common/resources
'
;
import
*
as
strings
from
'
vs/base/common/strings
'
;
import
{
assertIsDefined
}
from
'
vs/base/common/types
'
;
import
{
URI
,
URI
as
uri
}
from
'
vs/base/common/uri
'
;
import
{
isMultilineRegexSource
}
from
'
vs/editor/common/model/textModelSearch
'
;
import
*
as
nls
from
'
vs/nls
'
;
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
IFileService
}
from
'
vs/platform/files/common/files
'
;
import
{
IWorkspaceContextService
,
IWorkspaceFolderData
,
toWorkspaceFolder
,
WorkbenchState
}
from
'
vs/platform/workspace/common/workspace
'
;
import
{
IEditorGroupsService
}
from
'
vs/workbench/services/editor/common/editorGroupsService
'
;
import
{
IPathService
}
from
'
vs/workbench/services/path/common/pathService
'
;
...
...
@@ -86,6 +87,7 @@ export class QueryBuilder {
@
IConfigurationService
private
readonly
configurationService
:
IConfigurationService
,
@
IWorkspaceContextService
private
readonly
workspaceContextService
:
IWorkspaceContextService
,
@
IEditorGroupsService
private
readonly
editorGroupsService
:
IEditorGroupsService
,
@
IFileService
private
readonly
fileService
:
IFileService
,
@
IPathService
private
readonly
pathService
:
IPathService
)
{
}
...
...
@@ -204,7 +206,11 @@ export class QueryBuilder {
private
commonQueryFromFileList
(
files
:
URI
[]):
ICommonQueryProps
<
URI
>
{
const
folderQueries
:
IFolderQuery
[]
=
[];
const
foldersToSearch
:
ResourceMap
<
IFolderQuery
>
=
new
ResourceMap
();
const
includePattern
:
glob
.
IExpression
=
{};
files
.
forEach
(
file
=>
{
const
providerExists
=
isAbsolutePath
(
file
);
if
(
providerExists
)
{
const
searchRoot
=
this
.
workspaceContextService
.
getWorkspaceFolder
(
file
)?.
uri
??
file
.
with
({
path
:
path
.
dirname
(
file
.
fsPath
)
});
let
folderQuery
=
foldersToSearch
.
get
(
searchRoot
);
...
...
@@ -216,11 +222,16 @@ export class QueryBuilder {
const
relPath
=
path
.
relative
(
searchRoot
.
fsPath
,
file
.
fsPath
);
assertIsDefined
(
folderQuery
.
includePattern
)[
relPath
]
=
true
;
}
else
{
if
(
file
.
path
)
{
includePattern
[
file
.
path
]
=
true
;
}
}
});
return
{
folderQueries
,
includePattern
:
undefined
,
includePattern
,
usingSearchPaths
:
true
,
excludePattern
:
folderQueries
.
length
?
undefined
:
{
'
**/*
'
:
true
}
};
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录