Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
a834c0fb
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,发现更多精彩内容 >>
提交
a834c0fb
编写于
10月 03, 2017
作者:
C
Christof Marti
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use "search.useIgnoreFilesByDefault" in QuickOpen (fixes #34991)
上级
35b91522
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
14 addition
and
9 deletion
+14
-9
src/vs/workbench/parts/search/browser/openFileHandler.ts
src/vs/workbench/parts/search/browser/openFileHandler.ts
+5
-2
src/vs/workbench/services/search/node/fileSearch.ts
src/vs/workbench/services/search/node/fileSearch.ts
+1
-1
src/vs/workbench/services/search/node/ripgrepFileSearch.ts
src/vs/workbench/services/search/node/ripgrepFileSearch.ts
+8
-6
未找到文件。
src/vs/workbench/parts/search/browser/openFileHandler.ts
浏览文件 @
a834c0fb
...
...
@@ -27,7 +27,7 @@ import { IResourceInput } from 'vs/platform/editor/common/editor';
import
{
IWorkbenchEditorService
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
IInstantiationService
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
IQueryOptions
,
ISearchService
,
ISearchStats
,
ISearchQuery
}
from
'
vs/platform/search/common/search
'
;
import
{
IQueryOptions
,
ISearchService
,
ISearchStats
,
ISearchQuery
,
ISearchConfiguration
}
from
'
vs/platform/search/common/search
'
;
import
{
IWorkspaceContextService
}
from
'
vs/platform/workspace/common/workspace
'
;
import
{
IEnvironmentService
}
from
'
vs/platform/environment/common/environment
'
;
import
{
IRange
}
from
'
vs/editor/common/core/range
'
;
...
...
@@ -122,6 +122,7 @@ export class OpenFileHandler extends QuickOpenHandler {
@
IWorkbenchThemeService
private
themeService
:
IWorkbenchThemeService
,
@
IWorkspaceContextService
private
contextService
:
IWorkspaceContextService
,
@
ISearchService
private
searchService
:
ISearchService
,
@
IConfigurationService
private
configurationService
:
IConfigurationService
,
@
IEnvironmentService
private
environmentService
:
IEnvironmentService
)
{
super
();
...
...
@@ -149,7 +150,8 @@ export class OpenFileHandler extends QuickOpenHandler {
const
query
:
IQueryOptions
=
{
extraFileResources
:
getOutOfWorkspaceEditorResources
(
this
.
editorGroupService
,
this
.
contextService
),
filePattern
:
searchValue
,
cacheKey
:
cacheKey
cacheKey
:
cacheKey
,
disregardIgnoreFiles
:
!
this
.
configurationService
.
getConfiguration
<
ISearchConfiguration
>
().
search
.
useIgnoreFilesByDefault
,
};
if
(
typeof
maxSortedResults
===
'
number
'
)
{
...
...
@@ -192,6 +194,7 @@ export class OpenFileHandler extends QuickOpenHandler {
extraFileResources
:
getOutOfWorkspaceEditorResources
(
this
.
editorGroupService
,
this
.
contextService
),
filePattern
:
''
,
cacheKey
:
cacheKey
,
disregardIgnoreFiles
:
!
this
.
configurationService
.
getConfiguration
<
ISearchConfiguration
>
().
search
.
useIgnoreFilesByDefault
,
maxResults
:
0
,
sortByScore
:
true
,
};
...
...
src/vs/workbench/services/search/node/fileSearch.ts
浏览文件 @
a834c0fb
...
...
@@ -220,7 +220,7 @@ export class FileWalker {
let
noSiblingsClauses
:
boolean
;
let
filePatternSeen
=
false
;
if
(
useRipgrep
)
{
const
ripgrep
=
spawnRipgrepCmd
(
folderQuery
,
this
.
config
.
includePattern
,
this
.
folderExcludePatterns
.
get
(
folderQuery
.
folder
).
expression
);
const
ripgrep
=
spawnRipgrepCmd
(
this
.
config
,
folderQuery
,
this
.
config
.
includePattern
,
this
.
folderExcludePatterns
.
get
(
folderQuery
.
folder
).
expression
);
cmd
=
ripgrep
.
cmd
;
noSiblingsClauses
=
!
Object
.
keys
(
ripgrep
.
siblingClauses
).
length
;
}
else
{
...
...
src/vs/workbench/services/search/node/ripgrepFileSearch.ts
浏览文件 @
a834c0fb
...
...
@@ -10,18 +10,18 @@ import { isMacintosh as isMac } from 'vs/base/common/platform';
import
*
as
glob
from
'
vs/base/common/glob
'
;
import
{
normalizeNFD
}
from
'
vs/base/common/strings
'
;
import
{
IFolderSearch
}
from
'
./search
'
;
import
{
IFolderSearch
,
IRawSearch
}
from
'
./search
'
;
import
{
foldersToIncludeGlobs
,
foldersToRgExcludeGlobs
}
from
'
./ripgrepTextSearch
'
;
export
function
spawnRipgrepCmd
(
folderQuery
:
IFolderSearch
,
includePattern
:
glob
.
IExpression
,
excludePattern
:
glob
.
IExpression
)
{
const
rgArgs
=
getRgArgs
(
folderQuery
,
includePattern
,
excludePattern
);
export
function
spawnRipgrepCmd
(
config
:
IRawSearch
,
folderQuery
:
IFolderSearch
,
includePattern
:
glob
.
IExpression
,
excludePattern
:
glob
.
IExpression
)
{
const
rgArgs
=
getRgArgs
(
config
,
folderQuery
,
includePattern
,
excludePattern
);
return
{
cmd
:
cp
.
spawn
(
rgPath
,
rgArgs
.
globArgs
,
{
cwd
:
folderQuery
.
folder
}),
siblingClauses
:
rgArgs
.
siblingClauses
};
}
function
getRgArgs
(
folderQuery
:
IFolderSearch
,
includePattern
:
glob
.
IExpression
,
excludePattern
:
glob
.
IExpression
)
{
function
getRgArgs
(
config
:
IRawSearch
,
folderQuery
:
IFolderSearch
,
includePattern
:
glob
.
IExpression
,
excludePattern
:
glob
.
IExpression
)
{
const
args
=
[
'
--files
'
,
'
--hidden
'
,
'
--case-sensitive
'
];
// includePattern can't have siblingClauses
...
...
@@ -36,8 +36,10 @@ function getRgArgs(folderQuery: IFolderSearch, includePattern: glob.IExpression,
.
forEach
(
rgGlob
=>
args
.
push
(
'
-g
'
,
`!
${
isMac
?
normalizeNFD
(
rgGlob
)
:
rgGlob
}
`
));
siblingClauses
=
rgGlobs
.
siblingClauses
;
// Don't use .gitignore or .ignore
args
.
push
(
'
--no-ignore
'
);
if
(
config
.
disregardIgnoreFiles
)
{
// Don't use .gitignore or .ignore
args
.
push
(
'
--no-ignore
'
);
}
// Follow symlinks
args
.
push
(
'
--follow
'
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录