Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
8244f53c
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,发现更多精彩内容 >>
提交
8244f53c
编写于
12月 21, 2018
作者:
R
Rob Lourens
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix search results sort - Fix #65502
上级
b1926207
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
11 addition
and
4 deletion
+11
-4
src/vs/workbench/parts/search/browser/searchView.ts
src/vs/workbench/parts/search/browser/searchView.ts
+11
-4
未找到文件。
src/vs/workbench/parts/search/browser/searchView.ts
浏览文件 @
8244f53c
...
...
@@ -56,7 +56,7 @@ import * as Constants from 'vs/workbench/parts/search/common/constants';
import
{
ITextQueryBuilderOptions
,
QueryBuilder
}
from
'
vs/workbench/parts/search/common/queryBuilder
'
;
import
{
IReplaceService
}
from
'
vs/workbench/parts/search/common/replace
'
;
import
{
getOutOfWorkspaceEditorResources
}
from
'
vs/workbench/parts/search/common/search
'
;
import
{
FileMatch
,
FileMatchOrMatch
,
FolderMatch
,
IChangeEvent
,
ISearchWorkbenchService
,
Match
,
RenderableMatch
,
SearchModel
,
SearchResult
}
from
'
vs/workbench/parts/search/common/searchModel
'
;
import
{
FileMatch
,
FileMatchOrMatch
,
FolderMatch
,
IChangeEvent
,
ISearchWorkbenchService
,
Match
,
RenderableMatch
,
SearchModel
,
SearchResult
,
searchMatchComparer
}
from
'
vs/workbench/parts/search/common/searchModel
'
;
import
{
ACTIVE_GROUP
,
IEditorService
,
SIDE_GROUP
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
IEditorGroupsService
}
from
'
vs/workbench/services/group/common/editorGroupsService
'
;
import
{
IPartService
}
from
'
vs/workbench/services/part/common/partService
'
;
...
...
@@ -67,7 +67,10 @@ import { ResourceLabels } from 'vs/workbench/browser/labels';
const
$
=
dom
.
$
;
function
createResultIterator
(
searchResult
:
SearchResult
,
collapseResults
:
ISearchConfigurationProperties
[
'
collapseResults
'
]):
Iterator
<
ITreeElement
<
RenderableMatch
>>
{
const
folderMatches
=
searchResult
.
folderMatches
().
filter
(
fm
=>
!
fm
.
isEmpty
());
const
folderMatches
=
searchResult
.
folderMatches
()
.
filter
(
fm
=>
!
fm
.
isEmpty
())
.
sort
(
searchMatchComparer
);
if
(
folderMatches
.
length
===
1
)
{
return
createFolderIterator
(
folderMatches
[
0
],
collapseResults
);
}
...
...
@@ -80,7 +83,9 @@ function createResultIterator(searchResult: SearchResult, collapseResults: ISear
}
function
createFolderIterator
(
folderMatch
:
FolderMatch
,
collapseResults
:
ISearchConfigurationProperties
[
'
collapseResults
'
]):
Iterator
<
ITreeElement
<
RenderableMatch
>>
{
const
filesIt
=
Iterator
.
fromArray
(
folderMatch
.
matches
());
const
filesIt
=
Iterator
.
fromArray
(
folderMatch
.
matches
()
.
sort
(
searchMatchComparer
));
return
Iterator
.
map
(
filesIt
,
fileMatch
=>
{
const
children
=
createFileIterator
(
fileMatch
);
...
...
@@ -92,7 +97,9 @@ function createFolderIterator(folderMatch: FolderMatch, collapseResults: ISearch
}
function
createFileIterator
(
fileMatch
:
FileMatch
):
Iterator
<
ITreeElement
<
RenderableMatch
>>
{
const
matchesIt
=
Iterator
.
from
(
fileMatch
.
matches
());
const
matchesIt
=
Iterator
.
from
(
fileMatch
.
matches
()
.
sort
(
searchMatchComparer
));
return
Iterator
.
map
(
matchesIt
,
r
=>
(
<
ITreeElement
<
RenderableMatch
>>
{
element
:
r
}));
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录