Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
3307e76f
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,发现更多精彩内容 >>
提交
3307e76f
编写于
9月 12, 2017
作者:
C
Christof Marti
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Relative file match (#24074)
上级
783df422
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
41 addition
and
22 deletion
+41
-22
scripts/test.sh
scripts/test.sh
+1
-0
src/vs/workbench/services/search/node/fileSearch.ts
src/vs/workbench/services/search/node/fileSearch.ts
+19
-1
src/vs/workbench/services/search/test/node/search.test.ts
src/vs/workbench/services/search/test/node/search.test.ts
+21
-21
未找到文件。
scripts/test.sh
浏览文件 @
3307e76f
...
@@ -28,6 +28,7 @@ test -d node_modules || ./scripts/npm.sh install
...
@@ -28,6 +28,7 @@ test -d node_modules || ./scripts/npm.sh install
(
test
-f
"
$CODE
"
&&
[
$INTENDED_VERSION
==
$INSTALLED_VERSION
])
||
./node_modules/.bin/gulp electron
(
test
-f
"
$CODE
"
&&
[
$INTENDED_VERSION
==
$INSTALLED_VERSION
])
||
./node_modules/.bin/gulp electron
# Unit Tests
# Unit Tests
export
ELECTRON_ENABLE_LOGGING
=
1
if
[[
"
$OSTYPE
"
==
"darwin"
*
]]
;
then
if
[[
"
$OSTYPE
"
==
"darwin"
*
]]
;
then
cd
$ROOT
;
ulimit
-n
4096
;
\
cd
$ROOT
;
ulimit
-n
4096
;
\
"
$CODE
"
\
"
$CODE
"
\
...
...
src/vs/workbench/services/search/node/fileSearch.ts
浏览文件 @
3307e76f
...
@@ -221,6 +221,7 @@ export class FileWalker {
...
@@ -221,6 +221,7 @@ export class FileWalker {
const
useRipgrep
=
this
.
useRipgrep
;
const
useRipgrep
=
this
.
useRipgrep
;
let
cmd
:
childProcess
.
ChildProcess
;
let
cmd
:
childProcess
.
ChildProcess
;
let
noSiblingsClauses
:
boolean
;
let
noSiblingsClauses
:
boolean
;
let
filePatternSeen
=
false
;
if
(
useRipgrep
)
{
if
(
useRipgrep
)
{
const
ripgrep
=
spawnRipgrepCmd
(
folderQuery
,
this
.
config
.
includePattern
,
this
.
folderExcludePatterns
.
get
(
folderQuery
.
folder
).
expression
);
const
ripgrep
=
spawnRipgrepCmd
(
folderQuery
,
this
.
config
.
includePattern
,
this
.
folderExcludePatterns
.
get
(
folderQuery
.
folder
).
expression
);
cmd
=
ripgrep
.
cmd
;
cmd
=
ripgrep
.
cmd
;
...
@@ -262,11 +263,28 @@ export class FileWalker {
...
@@ -262,11 +263,28 @@ export class FileWalker {
if
(
useRipgrep
&&
noSiblingsClauses
)
{
if
(
useRipgrep
&&
noSiblingsClauses
)
{
for
(
const
relativePath
of
relativeFiles
)
{
for
(
const
relativePath
of
relativeFiles
)
{
if
(
relativePath
===
this
.
filePattern
)
{
filePatternSeen
=
true
;
}
const
basename
=
path
.
basename
(
relativePath
);
const
basename
=
path
.
basename
(
relativePath
);
this
.
matchFile
(
onResult
,
{
base
:
rootFolder
,
relativePath
,
basename
});
this
.
matchFile
(
onResult
,
{
base
:
rootFolder
,
relativePath
,
basename
});
}
}
if
(
last
)
{
if
(
last
)
{
done
();
if
(
!
filePatternSeen
)
{
this
.
checkFilePatternRelativeMatch
(
folderQuery
.
folder
,
(
match
,
size
)
=>
{
if
(
match
)
{
this
.
resultCount
++
;
onResult
({
base
:
folderQuery
.
folder
,
relativePath
:
this
.
filePattern
,
basename
:
path
.
basename
(
this
.
filePattern
),
});
}
done
();
});
}
else
{
done
();
}
}
}
return
;
return
;
}
}
...
...
src/vs/workbench/services/search/test/node/search.test.ts
浏览文件 @
3307e76f
...
@@ -368,27 +368,27 @@ suite('FileSearchEngine', () => {
...
@@ -368,27 +368,27 @@ suite('FileSearchEngine', () => {
});
});
});
});
//
test('Files: relative path to file ignores excludes', function (done: () => void) {
test
(
'
Files: relative path to file ignores excludes
'
,
function
(
done
:
()
=>
void
)
{
//
let engine = new FileSearchEngine({
let
engine
=
new
FileSearchEngine
({
//
folderQueries: ROOT_FOLDER_QUERY,
folderQueries
:
ROOT_FOLDER_QUERY
,
//
filePattern: path.normalize(path.join('examples', 'company.js')),
filePattern
:
path
.
normalize
(
path
.
join
(
'
examples
'
,
'
company.js
'
)),
//
excludePattern: { '**/*.js': true }
excludePattern
:
{
'
**/*.js
'
:
true
}
//
});
});
//
let count = 0;
let
count
=
0
;
//
let res: IRawFileMatch;
let
res
:
IRawFileMatch
;
//
engine.search((result) => {
engine
.
search
((
result
)
=>
{
//
if (result) {
if
(
result
)
{
//
count++;
count
++
;
//
}
}
//
res = result;
res
=
result
;
//
}, () => { }, (error) => {
},
()
=>
{
},
(
error
)
=>
{
//
assert.ok(!error);
assert
.
ok
(
!
error
);
//
assert.equal(count, 1);
assert
.
equal
(
count
,
1
);
//
assert.equal(path.basename(res.relativePath), 'company.js');
assert
.
equal
(
path
.
basename
(
res
.
relativePath
),
'
company.js
'
);
//
done();
done
();
//
});
});
//
});
});
test
(
'
Files: Include pattern, single files
'
,
function
(
done
:
()
=>
void
)
{
test
(
'
Files: Include pattern, single files
'
,
function
(
done
:
()
=>
void
)
{
let
engine
=
new
FileSearchEngine
({
let
engine
=
new
FileSearchEngine
({
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录