Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
0b03de63
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,发现更多精彩内容 >>
提交
0b03de63
编写于
10月 10, 2017
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
avoid disk search trouble when having workspace folders that aren't on disk
上级
dbcc641f
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
25 addition
and
10 deletion
+25
-10
src/vs/workbench/services/search/node/searchService.ts
src/vs/workbench/services/search/node/searchService.ts
+25
-10
未找到文件。
src/vs/workbench/services/search/node/searchService.ts
浏览文件 @
0b03de63
...
...
@@ -15,13 +15,14 @@ import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/un
import
{
IModelService
}
from
'
vs/editor/common/services/modelService
'
;
import
{
IWorkspaceContextService
}
from
'
vs/platform/workspace/common/workspace
'
;
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
IRawSearch
,
I
FolderSearch
,
I
SerializedSearchComplete
,
ISerializedSearchProgressItem
,
ISerializedFileMatch
,
IRawSearchService
,
ITelemetryEvent
}
from
'
./search
'
;
import
{
IRawSearch
,
ISerializedSearchComplete
,
ISerializedSearchProgressItem
,
ISerializedFileMatch
,
IRawSearchService
,
ITelemetryEvent
}
from
'
./search
'
;
import
{
ISearchChannel
,
SearchChannelClient
}
from
'
./searchIpc
'
;
import
{
IEnvironmentService
,
IDebugParams
}
from
'
vs/platform/environment/common/environment
'
;
import
{
ResourceMap
}
from
'
vs/base/common/map
'
;
import
{
IDisposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
ITelemetryService
}
from
'
vs/platform/telemetry/common/telemetry
'
;
import
{
onUnexpectedError
}
from
'
vs/base/common/errors
'
;
import
{
Schemas
}
from
'
vs/base/common/network
'
;
export
class
SearchService
implements
ISearchService
{
public
_serviceBrand
:
any
;
...
...
@@ -259,15 +260,8 @@ export class DiskSearch implements ISearchResultProvider {
let
request
:
PPromise
<
ISerializedSearchComplete
,
ISerializedSearchProgressItem
>
;
let
rawSearch
:
IRawSearch
=
{
folderQueries
:
query
.
folderQueries
?
query
.
folderQueries
.
map
(
q
=>
{
return
<
IFolderSearch
>
{
excludePattern
:
q
.
excludePattern
,
includePattern
:
q
.
includePattern
,
fileEncoding
:
q
.
fileEncoding
,
folder
:
q
.
folder
.
fsPath
};
})
:
[],
extraFiles
:
query
.
extraFileResources
?
query
.
extraFileResources
.
map
(
r
=>
r
.
fsPath
)
:
[],
folderQueries
:
[],
extraFiles
:
[],
filePattern
:
query
.
filePattern
,
excludePattern
:
query
.
excludePattern
,
includePattern
:
query
.
includePattern
,
...
...
@@ -278,6 +272,27 @@ export class DiskSearch implements ISearchResultProvider {
disregardIgnoreFiles
:
query
.
disregardIgnoreFiles
};
if
(
query
.
folderQueries
)
{
for
(
const
q
of
query
.
folderQueries
)
{
if
(
q
.
folder
.
scheme
===
Schemas
.
file
)
{
rawSearch
.
folderQueries
.
push
({
excludePattern
:
q
.
excludePattern
,
includePattern
:
q
.
includePattern
,
fileEncoding
:
q
.
fileEncoding
,
folder
:
q
.
folder
.
fsPath
});
}
}
}
if
(
query
.
extraFileResources
)
{
for
(
const
r
of
query
.
extraFileResources
)
{
if
(
r
.
scheme
===
Schemas
.
file
)
{
rawSearch
.
extraFiles
.
push
(
r
.
fsPath
);
}
}
}
if
(
query
.
type
===
QueryType
.
Text
)
{
rawSearch
.
contentPattern
=
query
.
contentPattern
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录