Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
729cf967
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,发现更多精彩内容 >>
提交
729cf967
编写于
6月 11, 2018
作者:
R
Rob Lourens
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix #51623 - tweak rg error message for \n
上级
d8555f56
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
22 addition
and
17 deletion
+22
-17
extensions/search-rg/src/ripgrepTextSearch.ts
extensions/search-rg/src/ripgrepTextSearch.ts
+7
-4
src/vs/workbench/services/search/node/ripgrepTextSearch.ts
src/vs/workbench/services/search/node/ripgrepTextSearch.ts
+15
-13
未找到文件。
extensions/search-rg/src/ripgrepTextSearch.ts
浏览文件 @
729cf967
...
...
@@ -12,8 +12,6 @@ import * as vscode from 'vscode';
import
{
rgPath
}
from
'
vscode-ripgrep
'
;
import
{
anchorGlob
}
from
'
./ripgrepHelpers
'
;
// If vscode-ripgrep is in an .asar file, then the binary is unpacked.
const
rgDiskPath
=
rgPath
.
replace
(
/
\b
node_modules
\.
asar
\b
/
,
'
node_modules.asar.unpacked
'
);
...
...
@@ -118,7 +116,7 @@ export class RipgrepTextSearchEngine {
* "failed" when a fatal error was produced.
*/
export
function
rgErrorMsgForDisplay
(
msg
:
string
):
string
|
undefined
{
const
firstLine
=
msg
.
split
(
'
\n
'
)[
0
];
const
firstLine
=
msg
.
split
(
'
\n
'
)[
0
]
.
trim
()
;
if
(
firstLine
.
startsWith
(
'
Error parsing regex
'
))
{
return
firstLine
;
...
...
@@ -130,8 +128,13 @@ export function rgErrorMsgForDisplay(msg: string): string | undefined {
return
firstLine
.
charAt
(
0
).
toUpperCase
()
+
firstLine
.
substr
(
1
);
}
if
(
firstLine
===
`Literal '\\n' not allowed.`
)
{
// I won't localize this because none of the Ripgrep error messages are localized
return
`Literal '\\n' currently not supported`
;
}
if
(
firstLine
.
startsWith
(
'
Literal
'
))
{
//
e.g. "Literal \n not allowed"
//
Other unsupported chars
return
firstLine
;
}
...
...
src/vs/workbench/services/search/node/ripgrepTextSearch.ts
浏览文件 @
729cf967
...
...
@@ -4,24 +4,21 @@
*--------------------------------------------------------------------------------------------*/
'
use strict
'
;
import
*
as
cp
from
'
child_process
'
;
import
{
EventEmitter
}
from
'
events
'
;
import
*
as
path
from
'
path
'
;
import
{
StringDecoder
,
NodeStringDecoder
}
from
'
string_decoder
'
;
import
*
as
cp
from
'
child_process
'
;
import
{
rgPath
}
from
'
vscode-ripgrep
'
;
import
{
NodeStringDecoder
,
StringDecoder
}
from
'
string_decoder
'
;
import
*
as
glob
from
'
vs/base/common/glob
'
;
import
*
as
objects
from
'
vs/base/common/objects
'
;
import
*
as
paths
from
'
vs/base/common/paths
'
;
import
*
as
platform
from
'
vs/base/common/platform
'
;
import
*
as
strings
from
'
vs/base/common/strings
'
;
import
*
as
paths
from
'
vs/base/common/paths
'
;
import
*
as
extfs
from
'
vs/base/node/extfs
'
;
import
*
as
encoding
from
'
vs/base/node/encoding
'
;
import
*
as
glob
from
'
vs/base/common/glob
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
ISerializedFileMatch
,
ISerializedSearchComplete
,
IRawSearch
,
IFolderSearch
,
LineMatch
,
FileMatch
}
from
'
./search
'
;
import
*
as
encoding
from
'
vs/base/node/encoding
'
;
import
*
as
extfs
from
'
vs/base/node/extfs
'
;
import
{
IProgress
}
from
'
vs/platform/search/common/search
'
;
import
{
rgPath
}
from
'
vscode-ripgrep
'
;
import
{
FileMatch
,
IFolderSearch
,
IRawSearch
,
ISerializedFileMatch
,
ISerializedSearchComplete
,
LineMatch
}
from
'
./search
'
;
// If vscode-ripgrep is in an .asar file, then the binary is unpacked.
const
rgDiskPath
=
rgPath
.
replace
(
/
\b
node_modules
\.
asar
\b
/
,
'
node_modules.asar.unpacked
'
);
...
...
@@ -148,7 +145,7 @@ export class RipgrepEngine {
* "failed" when a fatal error was produced.
*/
export
function
rgErrorMsgForDisplay
(
msg
:
string
):
string
|
undefined
{
const
firstLine
=
msg
.
split
(
'
\n
'
)[
0
];
const
firstLine
=
msg
.
split
(
'
\n
'
)[
0
]
.
trim
()
;
if
(
strings
.
startsWith
(
firstLine
,
'
Error parsing regex
'
))
{
return
firstLine
;
...
...
@@ -160,8 +157,13 @@ export function rgErrorMsgForDisplay(msg: string): string | undefined {
return
firstLine
.
charAt
(
0
).
toUpperCase
()
+
firstLine
.
substr
(
1
);
}
if
(
firstLine
===
`Literal '\\n' not allowed.`
)
{
// I won't localize this because none of the Ripgrep error messages are localized
return
`Literal '\\n' currently not supported`
;
}
if
(
strings
.
startsWith
(
firstLine
,
'
Literal
'
))
{
//
e.g. "Literal \n not allowed"
//
Other unsupported chars
return
firstLine
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录