Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
2158b1aa
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
2158b1aa
编写于
3月 02, 2020
作者:
J
Jackson Kearl
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[Search Editor] Align results from the same file
上级
24a5df3c
变更
3
展开全部
隐藏空白更改
内联
并排
Showing
3 changed file
with
174 addition
and
175 deletion
+174
-175
extensions/search-result/syntaxes/generateTMLanguage.js
extensions/search-result/syntaxes/generateTMLanguage.js
+4
-4
extensions/search-result/syntaxes/searchResult.tmLanguage.json
...sions/search-result/syntaxes/searchResult.tmLanguage.json
+163
-163
src/vs/workbench/contrib/searchEditor/browser/searchEditorSerialization.ts
...contrib/searchEditor/browser/searchEditorSerialization.ts
+7
-8
未找到文件。
extensions/search-result/syntaxes/generateTMLanguage.js
浏览文件 @
2158b1aa
...
...
@@ -113,8 +113,8 @@ mappings.forEach(([ext, scope, regexp]) =>
patterns
:
[
{
name
:
[
scopes
.
resultBlock
.
result
.
meta
,
scopes
.
resultBlock
.
result
.
metaMultiLine
].
join
(
'
'
),
begin
:
'
^ ((
\\
d+) )
'
,
while
:
'
^ (?:((
\\
d+)(:))|((
\\
d+) ))
'
,
begin
:
'
^ (
?:
\\
s*)(
(
\\
d+) )
'
,
while
:
'
^ (?:
\\
s*)(?:
((
\\
d+)(:))|((
\\
d+) ))
'
,
beginCaptures
:
{
'
0
'
:
{
name
:
scopes
.
resultBlock
.
result
.
prefix
.
meta
},
'
1
'
:
{
name
:
scopes
.
resultBlock
.
result
.
prefix
.
metaContext
},
...
...
@@ -132,7 +132,7 @@ mappings.forEach(([ext, scope, regexp]) =>
patterns
:
[{
include
:
scope
}]
},
{
begin
:
'
^ ((
\\
d+)(:))
'
,
begin
:
'
^ (
?:
\\
s*)(
(
\\
d+)(:))
'
,
while
:
'
(?=not)possible
'
,
name
:
[
scopes
.
resultBlock
.
result
.
meta
,
scopes
.
resultBlock
.
result
.
metaSingleLine
].
join
(
'
'
),
beginCaptures
:
{
...
...
@@ -214,7 +214,7 @@ const plainText = [
}
},
{
match
:
'
^ (?:((
\\
d+)(:))|((
\\
d+)( ))(.*))
'
,
match
:
'
^ (?:
\\
s*)(?:
((
\\
d+)(:))|((
\\
d+)( ))(.*))
'
,
name
:
[
scopes
.
resultBlock
.
meta
,
scopes
.
resultBlock
.
result
.
meta
].
join
(
'
'
),
captures
:
{
'
1
'
:
{
name
:
[
scopes
.
resultBlock
.
result
.
prefix
.
meta
,
scopes
.
resultBlock
.
result
.
prefix
.
metaMatch
].
join
(
'
'
)
},
...
...
extensions/search-result/syntaxes/searchResult.tmLanguage.json
浏览文件 @
2158b1aa
此差异已折叠。
点击以展开。
src/vs/workbench/contrib/searchEditor/browser/searchEditorSerialization.ts
浏览文件 @
2158b1aa
...
...
@@ -22,11 +22,10 @@ const translateRangeLines =
(
range
:
Range
)
=>
new
Range
(
range
.
startLineNumber
+
n
,
range
.
startColumn
,
range
.
endLineNumber
+
n
,
range
.
endColumn
);
const
matchToSearchResultFormat
=
(
match
:
Match
):
{
line
:
string
,
ranges
:
Range
[],
lineNumber
:
string
}[]
=>
{
const
matchToSearchResultFormat
=
(
match
:
Match
,
longestLineNumber
:
number
):
{
line
:
string
,
ranges
:
Range
[],
lineNumber
:
string
}[]
=>
{
const
getLinePrefix
=
(
i
:
number
)
=>
`
${
match
.
range
().
startLineNumber
+
i
}
`
;
const
fullMatchLines
=
match
.
fullPreviewLines
();
const
largestPrefixSize
=
fullMatchLines
.
reduce
((
largest
,
_
,
i
)
=>
Math
.
max
(
getLinePrefix
(
i
).
length
,
largest
),
0
);
const
results
:
{
line
:
string
,
ranges
:
Range
[],
lineNumber
:
string
}[]
=
[];
...
...
@@ -34,8 +33,8 @@ const matchToSearchResultFormat = (match: Match): { line: string, ranges: Range[
fullMatchLines
.
forEach
((
sourceLine
,
i
)
=>
{
const
lineNumber
=
getLinePrefix
(
i
);
const
paddingStr
=
repeat
(
'
'
,
l
argestPrefixSize
-
lineNumber
.
length
);
const
prefix
=
`
${
lineNumber
}
:
${
paddingStr
}
`
;
const
paddingStr
=
repeat
(
'
'
,
l
ongestLineNumber
-
lineNumber
.
length
);
const
prefix
=
`
${
paddingStr
}${
lineNumber
}
:
`
;
const
prefixOffset
=
prefix
.
length
;
const
line
=
(
prefix
+
sourceLine
).
replace
(
/
\r?\n?
$/
,
''
);
...
...
@@ -60,9 +59,9 @@ const matchToSearchResultFormat = (match: Match): { line: string, ranges: Range[
type
SearchResultSerialization
=
{
text
:
string
[],
matchRanges
:
Range
[]
};
function
fileMatchToSearchResultFormat
(
fileMatch
:
FileMatch
,
labelFormatter
:
(
x
:
URI
)
=>
string
):
SearchResultSerialization
{
const
s
erializedMatches
=
flatten
(
fileMatch
.
matches
()
.
sort
(
searchMatchComparer
)
.
map
(
match
=>
matchToSearchResultFormat
(
match
)));
const
s
ortedMatches
=
fileMatch
.
matches
().
sort
(
searchMatchComparer
);
const
longestLineNumber
=
sortedMatches
[
sortedMatches
.
length
-
1
].
range
().
endLineNumber
.
toString
().
length
;
const
serializedMatches
=
flatten
(
sortedMatches
.
map
(
match
=>
matchToSearchResultFormat
(
match
,
longestLineNumber
)));
const
uriString
=
labelFormatter
(
fileMatch
.
resource
);
let
text
:
string
[]
=
[
`
${
uriString
}
:`
];
...
...
@@ -84,7 +83,7 @@ function fileMatchToSearchResultFormat(fileMatch: FileMatch, labelFormatter: (x:
if
(
lastLine
!==
undefined
&&
lineNumber
!==
lastLine
+
1
)
{
text
.
push
(
''
);
}
text
.
push
(
`
${
lineNumber
}
${
line
}
`
);
text
.
push
(
`
${
repeat
(
'
'
,
longestLineNumber
-
`
${
lineNumber
}
`
.
length
)}${
lineNumber
}
${
line
}
`
);
lastLine
=
lineNumber
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录