Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
52e7f1c9
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,发现更多精彩内容 >>
提交
52e7f1c9
编写于
10月 15, 2018
作者:
R
Rob Lourens
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Refactor text search
Fix strict checks, multiline search
上级
c26d6e6c
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
17 addition
and
22 deletion
+17
-22
src/vs/workbench/services/search/node/ripgrepSearchUtils.ts
src/vs/workbench/services/search/node/ripgrepSearchUtils.ts
+16
-21
src/vs/workbench/services/search/node/search.ts
src/vs/workbench/services/search/node/search.ts
+1
-1
未找到文件。
src/vs/workbench/services/search/node/ripgrepSearchUtils.ts
浏览文件 @
52e7f1c9
...
...
@@ -5,6 +5,7 @@
import
{
startsWith
}
from
'
vs/base/common/strings
'
;
import
{
ILogService
}
from
'
vs/platform/log/common/log
'
;
import
{
SearchRange
,
TextSearchResult
}
from
'
vs/platform/search/common/search
'
;
import
*
as
vscode
from
'
vscode
'
;
export
type
Maybe
<
T
>
=
T
|
null
|
undefined
;
...
...
@@ -13,29 +14,23 @@ export function anchorGlob(glob: string): string {
return
startsWith
(
glob
,
'
**
'
)
||
startsWith
(
glob
,
'
/
'
)
?
glob
:
`/
${
glob
}
`
;
}
export
function
createTextSearchResult
(
uri
:
vscode
.
Uri
,
fullText
:
string
,
range
:
Range
,
previewOptions
?:
vscode
.
TextSearchPreviewOptions
):
vscode
.
TextSearchResult
{
let
preview
:
vscode
.
TextSearchResultPreview
;
if
(
previewOptions
)
{
const
leadingChars
=
Math
.
floor
(
previewOptions
.
charsPerLine
/
5
);
const
previewStart
=
Math
.
max
(
range
.
start
.
character
-
leadingChars
,
0
);
const
previewEnd
=
previewOptions
.
charsPerLine
+
previewStart
;
const
endOfMatchRangeInPreview
=
Math
.
min
(
previewEnd
,
range
.
end
.
character
-
previewStart
);
preview
=
{
text
:
fullText
.
substring
(
previewStart
,
previewEnd
),
match
:
new
Range
(
0
,
range
.
start
.
character
-
previewStart
,
0
,
endOfMatchRangeInPreview
)
};
}
else
{
preview
=
{
text
:
fullText
,
match
:
new
Range
(
0
,
range
.
start
.
character
,
0
,
range
.
end
.
character
)
};
}
export
function
createTextSearchResult
(
uri
:
vscode
.
Uri
,
text
:
string
,
range
:
Range
,
previewOptions
?:
vscode
.
TextSearchPreviewOptions
):
vscode
.
TextSearchResult
{
const
searchRange
:
SearchRange
=
{
startLineNumber
:
range
.
start
.
line
,
startColumn
:
range
.
start
.
character
,
endLineNumber
:
range
.
end
.
line
,
endColumn
:
range
.
end
.
character
,
};
return
<
vscode
.
TextSearchResult
>
{
const
internalResult
=
new
TextSearchResult
(
text
,
searchRange
,
previewOptions
);
const
internalPreviewRange
=
internalResult
.
preview
.
match
;
return
{
range
:
new
Range
(
internalResult
.
range
.
startLineNumber
,
internalResult
.
range
.
startColumn
,
internalResult
.
range
.
endLineNumber
,
internalResult
.
range
.
endColumn
),
uri
,
range
,
preview
preview
:
{
text
:
internalResult
.
preview
.
text
,
match
:
new
Range
(
internalPreviewRange
.
startLineNumber
,
internalPreviewRange
.
startColumn
,
internalPreviewRange
.
endLineNumber
,
internalPreviewRange
.
endColumn
),
}
};
}
...
...
src/vs/workbench/services/search/node/search.ts
浏览文件 @
52e7f1c9
...
...
@@ -159,7 +159,7 @@ export class QueryGlobTester {
this
.
_parsedExcludeExpression
=
glob
.
parse
(
this
.
_excludeExpression
);
// Empty includeExpression means include nothing, so no {} shortcuts
let
includeExpression
:
glob
.
IExpression
=
config
.
includePattern
;
let
includeExpression
:
glob
.
IExpression
|
undefined
=
config
.
includePattern
;
if
(
folderQuery
.
includePattern
)
{
if
(
includeExpression
)
{
includeExpression
=
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录