Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
c4928076
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,发现更多精彩内容 >>
提交
c4928076
编写于
10月 02, 2018
作者:
P
pkoushik
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix #59364 - Review #2
上级
a9767b90
变更
11
显示空白变更内容
内联
并排
Showing
11 changed file
with
28 addition
and
4 deletion
+28
-4
src/vs/platform/search/common/search.ts
src/vs/platform/search/common/search.ts
+3
-0
src/vs/vscode.proposed.d.ts
src/vs/vscode.proposed.d.ts
+6
-0
src/vs/workbench/api/node/extHostSearch.fileIndex.ts
src/vs/workbench/api/node/extHostSearch.fileIndex.ts
+1
-0
src/vs/workbench/api/node/extHostSearch.ts
src/vs/workbench/api/node/extHostSearch.ts
+2
-0
src/vs/workbench/api/node/extHostWorkspace.ts
src/vs/workbench/api/node/extHostWorkspace.ts
+1
-0
src/vs/workbench/parts/search/common/queryBuilder.ts
src/vs/workbench/parts/search/common/queryBuilder.ts
+8
-1
src/vs/workbench/parts/search/electron-browser/search.contribution.ts
...ench/parts/search/electron-browser/search.contribution.ts
+1
-0
src/vs/workbench/parts/search/test/common/queryBuilder.test.ts
...s/workbench/parts/search/test/common/queryBuilder.test.ts
+1
-1
src/vs/workbench/services/search/node/ripgrepTextSearch.ts
src/vs/workbench/services/search/node/ripgrepTextSearch.ts
+1
-1
src/vs/workbench/services/search/node/search.ts
src/vs/workbench/services/search/node/search.ts
+2
-1
src/vs/workbench/services/search/node/searchService.ts
src/vs/workbench/services/search/node/searchService.ts
+2
-0
未找到文件。
src/vs/platform/search/common/search.ts
浏览文件 @
c4928076
...
...
@@ -66,6 +66,7 @@ export interface IFolderQuery<U extends UriComponents=uri> {
includePattern
?:
glob
.
IExpression
;
fileEncoding
?:
string
;
disregardIgnoreFiles
?:
boolean
;
disregardGlobalIgnoreFiles
:
boolean
;
}
export
interface
ICommonQueryOptions
<
U
>
{
...
...
@@ -83,6 +84,7 @@ export interface ICommonQueryOptions<U> {
cacheKey
?:
string
;
useRipgrep
?:
boolean
;
disregardIgnoreFiles
?:
boolean
;
disregardGlobalIgnoreFiles
?:
boolean
;
disregardExcludeSettings
?:
boolean
;
ignoreSymlinks
?:
boolean
;
maxFileSize
?:
number
;
...
...
@@ -276,6 +278,7 @@ export interface ISearchConfigurationProperties {
* Use ignore file for file search.
*/
useIgnoreFiles
:
boolean
;
useGlobalIgnoreFiles
:
boolean
;
followSymlinks
:
boolean
;
smartCase
:
boolean
;
globalFindClipboard
:
boolean
;
...
...
src/vs/vscode.proposed.d.ts
浏览文件 @
c4928076
...
...
@@ -298,6 +298,12 @@ declare module 'vscode' {
*/
useIgnoreFiles
?:
boolean
;
/**
* Whether global files that exclude files, like .gitignore, should be respected.
* See the vscode setting `"search.useGlobalIgnoreFiles"`.
*/
useGlobalIgnoreFiles
:
boolean
;
/**
* Whether symlinks should be followed while searching.
* See the vscode setting `"search.followSymlinks"`.
...
...
src/vs/workbench/api/node/extHostSearch.fileIndex.ts
浏览文件 @
c4928076
...
...
@@ -303,6 +303,7 @@ export class FileIndexSearchEngine {
excludes
,
includes
,
useIgnoreFiles
:
!
this
.
config
.
disregardIgnoreFiles
,
useGlobalIgnoreFiles
:
!
this
.
config
.
disregardGlobalIgnoreFiles
,
followSymlinks
:
!
this
.
config
.
ignoreSymlinks
};
}
...
...
src/vs/workbench/api/node/extHostSearch.ts
浏览文件 @
c4928076
...
...
@@ -387,6 +387,7 @@ class TextSearchEngine {
excludes
,
includes
,
useIgnoreFiles
:
!
this
.
config
.
disregardIgnoreFiles
,
useGlobalIgnoreFiles
:
!
this
.
config
.
disregardGlobalIgnoreFiles
,
followSymlinks
:
!
this
.
config
.
ignoreSymlinks
,
encoding
:
this
.
config
.
fileEncoding
,
maxFileSize
:
this
.
config
.
maxFileSize
,
...
...
@@ -560,6 +561,7 @@ class FileSearchEngine {
excludes
,
includes
,
useIgnoreFiles
:
!
this
.
config
.
disregardIgnoreFiles
,
useGlobalIgnoreFiles
:
!
this
.
config
.
disregardGlobalIgnoreFiles
,
followSymlinks
:
!
this
.
config
.
ignoreSymlinks
,
maxResults
:
this
.
config
.
maxResults
};
...
...
src/vs/workbench/api/node/extHostWorkspace.ts
浏览文件 @
c4928076
...
...
@@ -404,6 +404,7 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape {
const
queryOptions
:
IQueryOptions
=
{
ignoreSymlinks
:
typeof
options
.
followSymlinks
===
'
boolean
'
?
!
options
.
followSymlinks
:
undefined
,
disregardIgnoreFiles
:
typeof
options
.
useIgnoreFiles
===
'
boolean
'
?
!
options
.
useIgnoreFiles
:
undefined
,
disregardGlobalIgnoreFiles
:
typeof
options
.
useGlobalIgnoreFiles
===
'
boolean
'
?
!
options
.
useGlobalIgnoreFiles
:
undefined
,
disregardExcludeSettings
:
options
.
exclude
===
null
,
fileEncoding
:
options
.
encoding
,
maxResults
:
options
.
maxResults
,
...
...
src/vs/workbench/parts/search/common/queryBuilder.ts
浏览文件 @
c4928076
...
...
@@ -65,6 +65,11 @@ export class QueryBuilder {
return
folderConfig
.
search
.
useIgnoreFiles
;
});
const
useGlobalIgnoreFiles
=
!
folderResources
||
folderResources
.
every
(
folder
=>
{
const
folderConfig
=
this
.
configurationService
.
getValue
<
ISearchConfiguration
>
({
resource
:
folder
});
return
folderConfig
.
search
.
useGlobalIgnoreFiles
;
});
const
useRipgrep
=
!
folderResources
||
folderResources
.
every
(
folder
=>
{
const
folderConfig
=
this
.
configurationService
.
getValue
<
ISearchConfiguration
>
({
resource
:
folder
});
return
folderConfig
.
search
.
useRipgrep
;
...
...
@@ -94,6 +99,7 @@ export class QueryBuilder {
contentPattern
,
useRipgrep
,
disregardIgnoreFiles
:
options
.
disregardIgnoreFiles
||
!
useIgnoreFiles
,
disregardGlobalIgnoreFiles
:
options
.
disregardGlobalIgnoreFiles
||
!
useGlobalIgnoreFiles
,
disregardExcludeSettings
:
options
.
disregardExcludeSettings
,
ignoreSymlinks
,
previewOptions
:
options
.
previewOptions
,
...
...
@@ -298,7 +304,8 @@ export class QueryBuilder {
folder
,
excludePattern
:
this
.
getExcludesForFolder
(
folderConfig
,
options
),
fileEncoding
:
folderConfig
.
files
&&
folderConfig
.
files
.
encoding
,
disregardIgnoreFiles
:
perFolderUseIgnoreFiles
?
!
folderConfig
.
search
.
useIgnoreFiles
:
undefined
disregardIgnoreFiles
:
perFolderUseIgnoreFiles
?
!
folderConfig
.
search
.
useIgnoreFiles
:
undefined
,
disregardGlobalIgnoreFiles
:
perFolderUseIgnoreFiles
?
!
folderConfig
.
search
.
useGlobalIgnoreFiles
:
undefined
};
}
}
...
...
src/vs/workbench/parts/search/electron-browser/search.contribution.ts
浏览文件 @
c4928076
...
...
@@ -601,6 +601,7 @@ configurationRegistry.registerConfiguration({
type
:
'
boolean
'
,
markdownDescription
:
nls
.
localize
(
'
useGlobalIgnoreFiles
'
,
"
Controls whether to use global `.gitignore` and `.ignore` files when searching for files.
"
),
default
:
false
,
scope
:
ConfigurationScope
.
RESOURCE
},
'
search.quickOpen.includeSymbols
'
:
{
type
:
'
boolean
'
,
...
...
src/vs/workbench/parts/search/test/common/queryBuilder.test.ts
浏览文件 @
c4928076
...
...
@@ -99,7 +99,7 @@ suite('QueryBuilder', () => {
}
}
}],
type
:
QueryType
.
Text
type
:
QueryType
.
Text
useIgnoreFiles
});
});
...
...
src/vs/workbench/services/search/node/ripgrepTextSearch.ts
浏览文件 @
c4928076
...
...
@@ -511,7 +511,7 @@ function getRgArgs(config: IRawSearch) {
}
args
.
push
(
'
--no-config
'
);
if
(
!
config
.
use
GlobalIgnoreFiles
)
{
if
(
!
config
.
disregard
GlobalIgnoreFiles
)
{
args
.
push
(
'
--no-ignore-global
'
);
}
...
...
src/vs/workbench/services/search/node/search.ts
浏览文件 @
c4928076
...
...
@@ -17,6 +17,7 @@ export interface IFolderSearch {
includePattern
?:
IExpression
;
fileEncoding
?:
string
;
disregardIgnoreFiles
?:
boolean
;
disregardGlobalIgnoreFiles
:
boolean
;
}
export
interface
IRawSearch
{
...
...
@@ -35,7 +36,7 @@ export interface IRawSearch {
useRipgrep
?:
boolean
;
disregardIgnoreFiles
?:
boolean
;
previewOptions
?:
ITextSearchPreviewOptions
;
use
GlobalIgnoreFiles
?:
boolean
;
disregard
GlobalIgnoreFiles
?:
boolean
;
}
export
interface
ITelemetryEvent
{
...
...
src/vs/workbench/services/search/node/searchService.ts
浏览文件 @
c4928076
...
...
@@ -489,6 +489,7 @@ export class DiskSearch implements ISearchResultProvider {
cacheKey
:
query
.
cacheKey
,
useRipgrep
:
query
.
useRipgrep
,
disregardIgnoreFiles
:
query
.
disregardIgnoreFiles
,
disregardGlobalIgnoreFiles
:
query
.
disregardGlobalIgnoreFiles
,
ignoreSymlinks
:
query
.
ignoreSymlinks
,
previewOptions
:
query
.
previewOptions
};
...
...
@@ -499,6 +500,7 @@ export class DiskSearch implements ISearchResultProvider {
includePattern
:
q
.
includePattern
,
fileEncoding
:
q
.
fileEncoding
,
disregardIgnoreFiles
:
q
.
disregardIgnoreFiles
,
disregardGlobalIgnoreFiles
:
q
.
disregardGlobalIgnoreFiles
,
folder
:
q
.
folder
.
fsPath
});
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录