Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
e4217281
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,体验更适合开发者的 AI 搜索 >>
提交
e4217281
编写于
8月 10, 2020
作者:
J
Jackson Kearl
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add limitHit messaging to search editor.
上级
c539d219
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
16 addition
and
4 deletion
+16
-4
src/vs/workbench/contrib/searchEditor/browser/searchEditor.ts
...vs/workbench/contrib/searchEditor/browser/searchEditor.ts
+10
-2
src/vs/workbench/contrib/searchEditor/browser/searchEditorSerialization.ts
...contrib/searchEditor/browser/searchEditorSerialization.ts
+6
-2
未找到文件。
src/vs/workbench/contrib/searchEditor/browser/searchEditor.ts
浏览文件 @
e4217281
...
...
@@ -82,6 +82,7 @@ export class SearchEditor extends BaseTextEditor {
private
messageDisposables
:
IDisposable
[]
=
[];
private
container
:
HTMLElement
;
private
searchModel
:
SearchModel
;
private
ongoingOperations
:
number
=
0
;
constructor
(
@
ITelemetryService
telemetryService
:
ITelemetryService
,
...
...
@@ -493,7 +494,14 @@ export class SearchEditor extends BaseTextEditor {
}
this
.
searchOperation
.
start
(
500
);
await
this
.
searchModel
.
search
(
query
).
finally
(()
=>
this
.
searchOperation
.
stop
());
this
.
ongoingOperations
++
;
const
exit
=
await
this
.
searchModel
.
search
(
query
).
finally
(()
=>
{
this
.
ongoingOperations
--
;
if
(
this
.
ongoingOperations
===
0
)
{
this
.
searchOperation
.
stop
();
}
});
const
input
=
this
.
getInput
();
if
(
!
input
||
input
!==
startInput
||
...
...
@@ -505,7 +513,7 @@ export class SearchEditor extends BaseTextEditor {
const
controller
=
ReferencesController
.
get
(
this
.
searchResultEditor
);
controller
.
closeWidget
(
false
);
const
labelFormatter
=
(
uri
:
URI
):
string
=>
this
.
labelService
.
getUriLabel
(
uri
,
{
relative
:
true
});
const
results
=
serializeSearchResultForEditor
(
this
.
searchModel
.
searchResult
,
config
.
includes
,
config
.
excludes
,
config
.
contextLines
,
labelFormatter
,
sortOrder
);
const
results
=
serializeSearchResultForEditor
(
this
.
searchModel
.
searchResult
,
config
.
includes
,
config
.
excludes
,
config
.
contextLines
,
labelFormatter
,
sortOrder
,
exit
?.
limitHit
);
const
{
body
}
=
await
input
.
getModels
();
this
.
modelService
.
updateModel
(
body
,
results
.
text
);
input
.
config
=
config
;
...
...
src/vs/workbench/contrib/searchEditor/browser/searchEditorSerialization.ts
浏览文件 @
e4217281
...
...
@@ -208,7 +208,7 @@ export const extractSearchQueryFromLines = (lines: string[]): SearchConfiguratio
};
export
const
serializeSearchResultForEditor
=
(
searchResult
:
SearchResult
,
rawIncludePattern
:
string
,
rawExcludePattern
:
string
,
contextLines
:
number
,
labelFormatter
:
(
x
:
URI
)
=>
string
,
sortOrder
:
SearchSortOrder
):
{
matchRanges
:
Range
[],
text
:
string
,
config
:
Partial
<
SearchConfiguration
>
}
=>
{
(
searchResult
:
SearchResult
,
rawIncludePattern
:
string
,
rawExcludePattern
:
string
,
contextLines
:
number
,
labelFormatter
:
(
x
:
URI
)
=>
string
,
sortOrder
:
SearchSortOrder
,
limitHit
?:
boolean
):
{
matchRanges
:
Range
[],
text
:
string
,
config
:
Partial
<
SearchConfiguration
>
}
=>
{
if
(
!
searchResult
.
query
)
{
throw
Error
(
'
Internal Error: Expected query, got null
'
);
}
const
config
=
contentPatternToSearchConfiguration
(
searchResult
.
query
,
rawIncludePattern
,
rawExcludePattern
,
contextLines
);
...
...
@@ -219,7 +219,11 @@ export const serializeSearchResultForEditor =
searchResult
.
count
()
?
`
${
resultcount
}
-
${
filecount
}
`
:
localize
(
'
noResults
'
,
"
No Results
"
),
''
];
];
if
(
limitHit
)
{
info
.
push
(
localize
(
'
searchMaxResultsWarning
'
,
"
The result set only contains a subset of all matches. Please be more specific in your search to narrow down the results.
"
));
}
info
.
push
(
''
);
const
matchComparer
=
(
a
:
FileMatch
|
FolderMatch
,
b
:
FileMatch
|
FolderMatch
)
=>
searchMatchComparer
(
a
,
b
,
sortOrder
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录