Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
b59fd519
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,发现更多精彩内容 >>
提交
b59fd519
编写于
10月 19, 2018
作者:
R
Rob Lourens
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Change `search.useRipgrep: false` to enable the PCRE2 search option instead
上级
b59a4513
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
16 addition
and
3 deletion
+16
-3
src/vs/platform/search/common/search.ts
src/vs/platform/search/common/search.ts
+1
-0
src/vs/workbench/parts/search/common/queryBuilder.ts
src/vs/workbench/parts/search/common/queryBuilder.ts
+7
-2
src/vs/workbench/parts/search/electron-browser/search.contribution.ts
...ench/parts/search/electron-browser/search.contribution.ts
+8
-1
未找到文件。
src/vs/platform/search/common/search.ts
浏览文件 @
b59fd519
...
@@ -302,6 +302,7 @@ export class OneLineRange extends SearchRange {
...
@@ -302,6 +302,7 @@ export class OneLineRange extends SearchRange {
export
interface
ISearchConfigurationProperties
{
export
interface
ISearchConfigurationProperties
{
exclude
:
glob
.
IExpression
;
exclude
:
glob
.
IExpression
;
useRipgrep
:
boolean
;
useRipgrep
:
boolean
;
disableRipgrep
:
boolean
;
/**
/**
* Use ignore file for file search.
* Use ignore file for file search.
*/
*/
...
...
src/vs/workbench/parts/search/common/queryBuilder.ts
浏览文件 @
b59fd519
...
@@ -70,6 +70,11 @@ export class QueryBuilder {
...
@@ -70,6 +70,11 @@ export class QueryBuilder {
const
searchConfig
=
this
.
configurationService
.
getValue
<
ISearchConfiguration
>
();
const
searchConfig
=
this
.
configurationService
.
getValue
<
ISearchConfiguration
>
();
contentPattern
.
wordSeparators
=
searchConfig
.
editor
.
wordSeparators
;
contentPattern
.
wordSeparators
=
searchConfig
.
editor
.
wordSeparators
;
const
fallbackToPCRE
=
!
folderResources
||
folderResources
.
some
(
folder
=>
{
const
folderConfig
=
this
.
configurationService
.
getValue
<
ISearchConfiguration
>
({
resource
:
folder
});
return
!
folderConfig
.
search
.
useRipgrep
;
});
const
commonQuery
=
this
.
commonQuery
(
folderResources
,
options
);
const
commonQuery
=
this
.
commonQuery
(
folderResources
,
options
);
return
<
ITextQuery
>
{
return
<
ITextQuery
>
{
...
commonQuery
,
...
commonQuery
,
...
@@ -77,7 +82,7 @@ export class QueryBuilder {
...
@@ -77,7 +82,7 @@ export class QueryBuilder {
contentPattern
,
contentPattern
,
previewOptions
:
options
&&
options
.
previewOptions
,
previewOptions
:
options
&&
options
.
previewOptions
,
maxFileSize
:
options
&&
options
.
maxFileSize
,
maxFileSize
:
options
&&
options
.
maxFileSize
,
usePCRE2
:
searchConfig
.
search
.
usePCRE2
usePCRE2
:
searchConfig
.
search
.
usePCRE2
||
fallbackToPCRE
};
};
}
}
...
@@ -111,7 +116,7 @@ export class QueryBuilder {
...
@@ -111,7 +116,7 @@ export class QueryBuilder {
const
useRipgrep
=
!
folderResources
||
folderResources
.
every
(
folder
=>
{
const
useRipgrep
=
!
folderResources
||
folderResources
.
every
(
folder
=>
{
const
folderConfig
=
this
.
configurationService
.
getValue
<
ISearchConfiguration
>
({
resource
:
folder
});
const
folderConfig
=
this
.
configurationService
.
getValue
<
ISearchConfiguration
>
({
resource
:
folder
});
return
folderConfig
.
search
.
us
eRipgrep
;
return
!
folderConfig
.
search
.
disabl
eRipgrep
;
});
});
const
queryProps
:
ICommonQueryProps
<
uri
>
=
{
const
queryProps
:
ICommonQueryProps
<
uri
>
=
{
...
...
src/vs/workbench/parts/search/electron-browser/search.contribution.ts
浏览文件 @
b59fd519
...
@@ -586,9 +586,16 @@ configurationRegistry.registerConfiguration({
...
@@ -586,9 +586,16 @@ configurationRegistry.registerConfiguration({
},
},
'
search.useRipgrep
'
:
{
'
search.useRipgrep
'
:
{
type
:
'
boolean
'
,
type
:
'
boolean
'
,
description
:
nls
.
localize
(
'
useRipgrep
'
,
"
Controls whether to use ripgrep in text and file search.
"
),
description
:
nls
.
localize
(
'
useRipgrep
'
,
"
Deprecated. This setting now falls back on
\"
search.usePCRE2
\"
.
"
),
deprecationMessage
:
nls
.
localize
(
'
useRipgrepDeprecated
'
,
"
Deprecated. Consider
\"
search.usePCRE2
\"
for advanced regex feature support.
"
),
default
:
true
default
:
true
},
},
'
search.disableRipgrep
'
:
{
type
:
'
boolean
'
,
description
:
nls
.
localize
(
'
disableRipgrep
'
,
"
Deprecated. Controls whether to use ripgrep in text and file search.
"
),
deprecationMessage
:
nls
.
localize
(
'
disableRipgrepDeprecated
'
,
"
Deprecated. Consider
\"
search.usePCRE2
\"
for advanced regex feature support.
"
),
default
:
false
},
'
search.useIgnoreFiles
'
:
{
'
search.useIgnoreFiles
'
:
{
type
:
'
boolean
'
,
type
:
'
boolean
'
,
markdownDescription
:
nls
.
localize
(
'
useIgnoreFiles
'
,
"
Controls whether to use `.gitignore` and `.ignore` files when searching for files.
"
),
markdownDescription
:
nls
.
localize
(
'
useIgnoreFiles
'
,
"
Controls whether to use `.gitignore` and `.ignore` files when searching for files.
"
),
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录