Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
c1f9ef97
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,发现更多精彩内容 >>
提交
c1f9ef97
编写于
12月 27, 2018
作者:
R
Rob Lourens
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Strict null check some legacy search files
上级
4326d051
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
13 addition
and
12 deletion
+13
-12
src/tsconfig.strictNullChecks.json
src/tsconfig.strictNullChecks.json
+2
-0
src/vs/workbench/services/search/node/legacy/rawLegacyTextSearchService.ts
...services/search/node/legacy/rawLegacyTextSearchService.ts
+1
-1
src/vs/workbench/services/search/node/legacy/search.ts
src/vs/workbench/services/search/node/legacy/search.ts
+1
-1
src/vs/workbench/services/search/node/legacy/textSearch.ts
src/vs/workbench/services/search/node/legacy/textSearch.ts
+8
-9
src/vs/workbench/services/search/node/search.ts
src/vs/workbench/services/search/node/search.ts
+1
-1
未找到文件。
src/tsconfig.strictNullChecks.json
浏览文件 @
c1f9ef97
...
...
@@ -769,6 +769,8 @@
"./vs/workbench/services/scm/common/scmService.ts"
,
"./vs/workbench/services/search/common/searchHelpers.ts"
,
"./vs/workbench/services/search/node/fileSearch.ts"
,
"./vs/workbench/services/search/node/legacy/rawLegacyTextSearchService.ts"
,
"./vs/workbench/services/search/node/legacy/textSearch.ts"
,
"./vs/workbench/services/search/node/fileSearchManager.ts"
,
"./vs/workbench/services/search/node/legacy/search.ts"
,
"./vs/workbench/services/search/node/legacy/textSearchWorkerProvider.ts"
,
...
...
src/vs/workbench/services/search/node/legacy/rawLegacyTextSearchService.ts
浏览文件 @
c1f9ef97
...
...
@@ -52,7 +52,7 @@ export class LegacyTextSearchService {
// Use BatchedCollector to get new results to the frontend every 2s at least, until 50 results have been returned
const
collector
=
new
BatchedCollector
<
ISerializedFileMatch
>
(
batchSize
,
progressCallback
);
engine
.
search
((
matches
)
=>
{
const
totalMatches
=
matches
.
reduce
((
acc
,
m
)
=>
acc
+
m
.
numMatches
,
0
);
const
totalMatches
=
matches
.
reduce
((
acc
,
m
)
=>
acc
+
m
.
numMatches
!
,
0
);
collector
.
addItems
(
matches
,
totalMatches
);
},
(
progress
)
=>
{
progressCallback
(
progress
);
...
...
src/vs/workbench/services/search/node/legacy/search.ts
浏览文件 @
c1f9ef97
...
...
@@ -22,7 +22,7 @@ export interface IRawSearch {
filePattern
?:
string
;
excludePattern
?:
glob
.
IExpression
;
includePattern
?:
glob
.
IExpression
;
contentPattern
?
:
IPatternInfo
;
contentPattern
:
IPatternInfo
;
maxResults
?:
number
;
exists
?:
boolean
;
sortByScore
?:
boolean
;
...
...
src/vs/workbench/services/search/node/legacy/textSearch.ts
浏览文件 @
c1f9ef97
...
...
@@ -19,7 +19,7 @@ export class Engine implements ISearchEngine<ISerializedFileMatch[]> {
private
config
:
IRawSearch
;
private
config2
:
ITextQuery
;
private
walker
:
FileWalker
;
private
walkerError
:
Error
;
private
walkerError
:
Error
|
null
;
private
isCanceled
=
false
;
private
isDone
=
false
;
...
...
@@ -59,7 +59,7 @@ export class Engine implements ISearchEngine<ISerializedFileMatch[]> {
});
}
search
(
onResult
:
(
match
:
ISerializedFileMatch
[])
=>
void
,
onProgress
:
(
progress
:
IProgress
)
=>
void
,
done
:
(
error
:
Error
,
complete
:
ISearchEngineSuccess
)
=>
void
):
void
{
search
(
onResult
:
(
match
:
ISerializedFileMatch
[])
=>
void
,
onProgress
:
(
progress
:
IProgress
)
=>
void
,
done
:
(
error
:
Error
|
null
,
complete
:
ISearchEngineSuccess
)
=>
void
):
void
{
this
.
workers
=
this
.
workerProvider
.
getWorkers
();
this
.
initializeWorkers
();
...
...
@@ -177,10 +177,11 @@ export function makeRawSearch(query: ITextQuery): IRawSearch {
includePattern
:
query
.
includePattern
,
maxResults
:
query
.
maxResults
,
useRipgrep
:
query
.
useRipgrep
,
disregardIgnoreFiles
:
query
.
folderQueries
.
some
(
fq
=>
fq
.
disregardIgnoreFiles
),
disregardGlobalIgnoreFiles
:
query
.
folderQueries
.
some
(
fq
=>
fq
.
disregardGlobalIgnoreFiles
),
ignoreSymlinks
:
query
.
folderQueries
.
some
(
fq
=>
fq
.
ignoreSymlinks
),
previewOptions
:
query
.
previewOptions
disregardIgnoreFiles
:
query
.
folderQueries
.
some
(
fq
=>
fq
.
disregardIgnoreFiles
!
),
disregardGlobalIgnoreFiles
:
query
.
folderQueries
.
some
(
fq
=>
fq
.
disregardGlobalIgnoreFiles
!
),
ignoreSymlinks
:
query
.
folderQueries
.
some
(
fq
=>
fq
.
ignoreSymlinks
!
),
previewOptions
:
query
.
previewOptions
,
contentPattern
:
query
.
contentPattern
};
for
(
const
q
of
query
.
folderQueries
)
{
...
...
@@ -196,11 +197,9 @@ export function makeRawSearch(query: ITextQuery): IRawSearch {
if
(
query
.
extraFileResources
)
{
for
(
const
r
of
query
.
extraFileResources
)
{
rawSearch
.
extraFiles
.
push
(
r
.
fsPath
);
rawSearch
.
extraFiles
!
.
push
(
r
.
fsPath
);
}
}
rawSearch
.
contentPattern
=
query
.
contentPattern
;
return
rawSearch
;
}
src/vs/workbench/services/search/node/search.ts
浏览文件 @
c1f9ef97
...
...
@@ -27,7 +27,7 @@ export interface IRawFileMatch {
}
export
interface
ISearchEngine
<
T
>
{
search
:
(
onResult
:
(
matches
:
T
)
=>
void
,
onProgress
:
(
progress
:
IProgress
)
=>
void
,
done
:
(
error
:
Error
,
complete
:
ISearchEngineSuccess
)
=>
void
)
=>
void
;
search
:
(
onResult
:
(
matches
:
T
)
=>
void
,
onProgress
:
(
progress
:
IProgress
)
=>
void
,
done
:
(
error
:
Error
|
null
,
complete
:
ISearchEngineSuccess
)
=>
void
)
=>
void
;
cancel
:
()
=>
void
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录