Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
12bc7c7f
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,发现更多精彩内容 >>
提交
12bc7c7f
编写于
10月 23, 2018
作者:
R
Rob Lourens
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix text search around multibyte characters
上级
c2e4cda6
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
39 addition
and
14 deletion
+39
-14
src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts
...workbench/services/search/node/ripgrepTextSearchEngine.ts
+6
-2
src/vs/workbench/services/search/test/node/textSearch.integrationTest.ts
...h/services/search/test/node/textSearch.integrationTest.ts
+33
-12
未找到文件。
src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts
浏览文件 @
12bc7c7f
...
@@ -222,9 +222,13 @@ export class RipgrepParser extends EventEmitter {
...
@@ -222,9 +222,13 @@ export class RipgrepParser extends EventEmitter {
let
matchText
=
bytesOrTextToString
(
match
.
match
);
let
matchText
=
bytesOrTextToString
(
match
.
match
);
const
newlineMatches
=
matchText
.
match
(
/
\n
/g
);
const
newlineMatches
=
matchText
.
match
(
/
\n
/g
);
const
newlines
=
newlineMatches
?
newlineMatches
.
length
:
0
;
const
newlines
=
newlineMatches
?
newlineMatches
.
length
:
0
;
let
startCol
=
match
.
start
;
const
textBytes
=
new
Buffer
(
lineText
);
let
startCol
=
textBytes
.
slice
(
0
,
match
.
start
).
toString
().
length
;
const
endChars
=
startCol
+
textBytes
.
slice
(
match
.
start
,
match
.
end
).
toString
().
length
;
const
endLineNumber
=
lineNumber
+
newlines
;
const
endLineNumber
=
lineNumber
+
newlines
;
let
endCol
=
match
.
end
-
(
lineText
.
lastIndexOf
(
'
\n
'
,
lineText
.
length
-
2
)
+
1
);
let
endCol
=
endChars
-
(
lineText
.
lastIndexOf
(
'
\n
'
,
lineText
.
length
-
2
)
+
1
);
if
(
lineNumber
===
0
)
{
if
(
lineNumber
===
0
)
{
if
(
startsWithUTF8BOM
(
matchText
))
{
if
(
startsWithUTF8BOM
(
matchText
))
{
...
...
src/vs/workbench/services/search/test/node/textSearch.integrationTest.ts
浏览文件 @
12bc7c7f
...
@@ -49,22 +49,25 @@ function doLegacySearchTest(config: ITextQuery, expectedResultCount: number | Fu
...
@@ -49,22 +49,25 @@ function doLegacySearchTest(config: ITextQuery, expectedResultCount: number | Fu
});
});
}
}
function
doRipgrepSearchTest
(
query
:
ITextQuery
,
expectedResultCount
:
number
|
Function
):
TPromise
<
void
>
{
function
doRipgrepSearchTest
(
query
:
ITextQuery
,
expectedResultCount
:
number
|
Function
):
TPromise
<
ISerializedFileMatch
[]
>
{
let
engine
=
new
TextSearchEngineAdapter
(
query
);
let
engine
=
new
TextSearchEngineAdapter
(
query
);
let
c
=
0
;
let
c
=
0
;
return
engine
.
search
(
new
CancellationTokenSource
().
token
,
(
results
)
=>
{
const
results
:
ISerializedFileMatch
[]
=
[];
if
(
results
)
{
return
engine
.
search
(
new
CancellationTokenSource
().
token
,
_results
=>
{
c
+=
results
.
reduce
((
acc
,
cur
)
=>
acc
+
cur
.
numMatches
,
0
);
if
(
_results
)
{
c
+=
_results
.
reduce
((
acc
,
cur
)
=>
acc
+
cur
.
numMatches
,
0
);
results
.
push
(...
_results
);
}
}
},
()
=>
{
}).
then
(
},
()
=>
{
}).
then
(()
=>
{
()
=>
{
if
(
typeof
expectedResultCount
===
'
function
'
)
{
if
(
typeof
expectedResultCount
===
'
function
'
)
{
assert
(
expectedResultCount
(
c
));
assert
(
expectedResultCount
(
c
));
}
else
{
}
else
{
assert
.
equal
(
c
,
expectedResultCount
,
`rg
${
c
}
!==
${
expectedResultCount
}
`
);
assert
.
equal
(
c
,
expectedResultCount
,
`rg
${
c
}
!==
${
expectedResultCount
}
`
);
}
}
});
return
results
;
});
}
}
function
doSearchTest
(
query
:
ITextQuery
,
expectedResultCount
:
number
)
{
function
doSearchTest
(
query
:
ITextQuery
,
expectedResultCount
:
number
)
{
...
@@ -373,6 +376,24 @@ suite('Search-integration', function () {
...
@@ -373,6 +376,24 @@ suite('Search-integration', function () {
assert
.
equal
(
err
.
message
,
'
The literal
\'
"
\\
n"
\'
is not allowed in a regex
'
);
assert
.
equal
(
err
.
message
,
'
The literal
\'
"
\\
n"
\'
is not allowed in a regex
'
);
});
});
});
});
test
(
'
Text: 语
'
,
()
=>
{
const
config
=
<
ITextQuery
>
{
type
:
QueryType
.
Text
,
folderQueries
:
ROOT_FOLDER_QUERY
,
contentPattern
:
{
pattern
:
'
语
'
}
};
return
doRipgrepSearchTest
(
config
,
1
).
then
(
results
=>
{
const
matchRange
=
results
[
0
].
matches
[
0
].
range
;
assert
.
deepEqual
(
matchRange
,
{
startLineNumber
:
0
,
startColumn
:
1
,
endLineNumber
:
0
,
endColumn
:
2
});
});
});
});
});
});
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录