Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
ddf5ecd4
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,发现更多精彩内容 >>
提交
ddf5ecd4
编写于
3月 20, 2018
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
wire up progress/cancellation, #45000
上级
20e7685f
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
26 addition
and
12 deletion
+26
-12
src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts
...vs/workbench/api/electron-browser/mainThreadFileSystem.ts
+24
-10
src/vs/workbench/api/node/extHost.protocol.ts
src/vs/workbench/api/node/extHost.protocol.ts
+1
-1
src/vs/workbench/api/node/extHostFileSystem.ts
src/vs/workbench/api/node/extHostFileSystem.ts
+1
-1
未找到文件。
src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts
浏览文件 @
ddf5ecd4
...
...
@@ -162,6 +162,16 @@ class SearchOperation {
)
{
//
}
addMatch
(
resource
:
URI
,
match
:
ILineMatch
):
void
{
if
(
!
this
.
matches
.
has
(
resource
.
toString
()))
{
this
.
matches
.
set
(
resource
.
toString
(),
{
resource
,
lineMatches
:
[]
});
}
if
(
match
)
{
this
.
matches
.
get
(
resource
.
toString
()).
lineMatches
.
push
(
match
);
}
this
.
progress
(
this
.
matches
.
get
(
resource
.
toString
()));
}
}
class
RemoteSearchProvider
implements
ISearchResultProvider
{
...
...
@@ -199,26 +209,36 @@ class RemoteSearchProvider implements ISearchResultProvider {
}
}
let
outer
:
TPromise
;
return
new
PPromise
((
resolve
,
reject
,
report
)
=>
{
const
search
=
new
SearchOperation
(
report
);
this
.
_searches
.
set
(
search
.
id
,
search
);
const
promise
=
query
.
type
===
QueryType
.
File
?
this
.
_proxy
.
$
findFile
s
(
this
.
_handle
,
search
.
id
,
query
.
filePattern
)
outer
=
query
.
type
===
QueryType
.
File
?
this
.
_proxy
.
$
provideFileSearchResult
s
(
this
.
_handle
,
search
.
id
,
query
.
filePattern
)
:
this
.
_proxy
.
$provideTextSearchResults
(
this
.
_handle
,
search
.
id
,
query
.
contentPattern
,
{
excludes
:
Object
.
keys
(
excludes
),
includes
:
Object
.
keys
(
includes
)
});
promise
.
then
(()
=>
{
outer
.
then
(()
=>
{
this
.
_searches
.
delete
(
search
.
id
);
resolve
(({
results
:
values
(
search
.
matches
),
stats
:
undefined
}));
},
err
=>
{
this
.
_searches
.
delete
(
search
.
id
);
reject
(
err
);
});
},
()
=>
{
if
(
outer
)
{
outer
.
cancel
();
}
});
}
handleFindMatch
(
session
:
number
,
dataOrUri
:
UriComponents
|
[
UriComponents
,
ILineMatch
]):
void
{
if
(
!
this
.
_searches
.
has
(
session
))
{
// ignore...
return
;
}
let
resource
:
URI
;
let
match
:
ILineMatch
;
...
...
@@ -229,12 +249,6 @@ class RemoteSearchProvider implements ISearchResultProvider {
resource
=
URI
.
revive
(
dataOrUri
);
}
const
{
matches
}
=
this
.
_searches
.
get
(
session
);
if
(
!
matches
.
has
(
resource
.
toString
()))
{
matches
.
set
(
resource
.
toString
(),
{
resource
,
lineMatches
:
[]
});
}
if
(
match
)
{
matches
.
get
(
resource
.
toString
()).
lineMatches
.
push
(
match
);
}
this
.
_searches
.
get
(
session
).
addMatch
(
resource
,
match
);
}
}
src/vs/workbench/api/node/extHost.protocol.ts
浏览文件 @
ddf5ecd4
...
...
@@ -566,7 +566,7 @@ export interface ExtHostFileSystemShape {
$mkdir
(
handle
:
number
,
resource
:
UriComponents
):
TPromise
<
IStat
>
;
$readdir
(
handle
:
number
,
resource
:
UriComponents
):
TPromise
<
[
UriComponents
,
IStat
][]
>
;
$rmdir
(
handle
:
number
,
resource
:
UriComponents
):
TPromise
<
void
>
;
$
findFile
s
(
handle
:
number
,
session
:
number
,
query
:
string
):
TPromise
<
void
>
;
$
provideFileSearchResult
s
(
handle
:
number
,
session
:
number
,
query
:
string
):
TPromise
<
void
>
;
$provideTextSearchResults
(
handle
:
number
,
session
:
number
,
pattern
:
IPatternInfo
,
options
:
{
includes
:
string
[],
excludes
:
string
[]
}):
TPromise
<
void
>
;
}
...
...
src/vs/workbench/api/node/extHostFileSystem.ts
浏览文件 @
ddf5ecd4
...
...
@@ -134,7 +134,7 @@ export class ExtHostFileSystem implements ExtHostFileSystemShape {
$rmdir
(
handle
:
number
,
resource
:
UriComponents
):
TPromise
<
void
,
any
>
{
return
asWinJsPromise
(
token
=>
this
.
_fsProvider
.
get
(
handle
).
rmdir
(
URI
.
revive
(
resource
)));
}
$
findFile
s
(
handle
:
number
,
session
:
number
,
query
:
string
):
TPromise
<
void
>
{
$
provideFileSearchResult
s
(
handle
:
number
,
session
:
number
,
query
:
string
):
TPromise
<
void
>
{
const
provider
=
this
.
_searchProvider
.
get
(
handle
);
if
(
!
provider
.
provideFileSearchResults
)
{
return
TPromise
.
as
(
undefined
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录