Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
83cc5b71
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,发现更多精彩内容 >>
提交
83cc5b71
编写于
3月 05, 2020
作者:
R
Rob Lourens
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix missing result count warning for untitled files
Fix #90383
上级
ea91347c
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
23 addition
and
6 deletion
+23
-6
src/vs/workbench/services/search/common/searchService.ts
src/vs/workbench/services/search/common/searchService.ts
+23
-6
未找到文件。
src/vs/workbench/services/search/common/searchService.ts
浏览文件 @
83cc5b71
...
...
@@ -74,13 +74,13 @@ export class SearchService extends Disposable implements ISearchService {
const
localResults
=
this
.
getLocalResults
(
query
);
if
(
onProgress
)
{
arrays
.
coalesce
(
localResults
.
values
()).
forEach
(
onProgress
);
arrays
.
coalesce
(
localResults
.
results
.
values
()).
forEach
(
onProgress
);
}
const
onProviderProgress
=
(
progress
:
ISearchProgressItem
)
=>
{
if
(
isFileMatch
(
progress
))
{
// Match
if
(
!
localResults
.
has
(
progress
.
resource
)
&&
onProgress
)
{
// don't override local results
if
(
!
localResults
.
results
.
has
(
progress
.
resource
)
&&
onProgress
)
{
// don't override local results
onProgress
(
progress
);
}
}
else
if
(
onProgress
)
{
...
...
@@ -96,7 +96,10 @@ export class SearchService extends Disposable implements ISearchService {
const
otherResults
=
await
this
.
doSearch
(
query
,
token
,
onProviderProgress
);
return
{
...
otherResults
,
results
:
[...
otherResults
.
results
,
...
arrays
.
coalesce
(
localResults
.
values
())]
...{
limitHit
:
otherResults
.
limitHit
||
localResults
.
limitHit
},
results
:
[...
otherResults
.
results
,
...
arrays
.
coalesce
(
localResults
.
results
.
values
())]
};
}
...
...
@@ -407,8 +410,9 @@ export class SearchService extends Disposable implements ISearchService {
}
}
private
getLocalResults
(
query
:
ITextQuery
):
ResourceMap
<
IFileMatch
|
null
>
{
private
getLocalResults
(
query
:
ITextQuery
):
{
results
:
ResourceMap
<
IFileMatch
|
null
>
;
limitHit
:
boolean
}
{
const
localResults
=
new
ResourceMap
<
IFileMatch
|
null
>
();
let
limitHit
=
false
;
if
(
query
.
type
===
QueryType
.
Text
)
{
const
models
=
this
.
modelService
.
getModels
();
...
...
@@ -418,6 +422,10 @@ export class SearchService extends Disposable implements ISearchService {
return
;
}
if
(
limitHit
)
{
return
;
}
// Skip files that are not opened as text file
if
(
!
this
.
editorService
.
isOpen
({
resource
}))
{
return
;
...
...
@@ -444,8 +452,14 @@ export class SearchService extends Disposable implements ISearchService {
}
// Use editor API to find matches
const
matches
=
model
.
findMatches
(
query
.
contentPattern
.
pattern
,
false
,
!!
query
.
contentPattern
.
isRegExp
,
!!
query
.
contentPattern
.
isCaseSensitive
,
query
.
contentPattern
.
isWordMatch
?
query
.
contentPattern
.
wordSeparators
!
:
null
,
false
,
query
.
maxResults
);
const
askMax
=
typeof
query
.
maxResults
===
'
number
'
?
query
.
maxResults
+
1
:
undefined
;
let
matches
=
model
.
findMatches
(
query
.
contentPattern
.
pattern
,
false
,
!!
query
.
contentPattern
.
isRegExp
,
!!
query
.
contentPattern
.
isCaseSensitive
,
query
.
contentPattern
.
isWordMatch
?
query
.
contentPattern
.
wordSeparators
!
:
null
,
false
,
askMax
);
if
(
matches
.
length
)
{
if
(
askMax
&&
matches
.
length
>=
askMax
)
{
limitHit
=
true
;
matches
=
matches
.
slice
(
0
,
askMax
-
1
);
}
const
fileMatch
=
new
FileMatch
(
resource
);
localResults
.
set
(
resource
,
fileMatch
);
...
...
@@ -457,7 +471,10 @@ export class SearchService extends Disposable implements ISearchService {
});
}
return
localResults
;
return
{
results
:
localResults
,
limitHit
};
}
private
matches
(
resource
:
uri
,
query
:
ITextQuery
):
boolean
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录