Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
c9e6b4bb
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,发现更多精彩内容 >>
提交
c9e6b4bb
编写于
7月 03, 2018
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
avoid async and winjs.promise, #53442
上级
d8a39866
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
8 addition
and
8 deletion
+8
-8
src/vs/workbench/node/extensionHostMain.ts
src/vs/workbench/node/extensionHostMain.ts
+2
-2
src/vs/workbench/parts/comments/electron-browser/commentService.ts
...rkbench/parts/comments/electron-browser/commentService.ts
+1
-1
src/vs/workbench/parts/debug/electron-browser/terminalSupport.ts
...workbench/parts/debug/electron-browser/terminalSupport.ts
+1
-1
src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts
...h/parts/preferences/electron-browser/preferencesSearch.ts
+4
-4
未找到文件。
src/vs/workbench/node/extensionHostMain.ts
浏览文件 @
c9e6b4bb
...
@@ -234,7 +234,7 @@ export class ExtensionHostMain {
...
@@ -234,7 +234,7 @@ export class ExtensionHostMain {
return
TPromise
.
join
([
fileNamePromise
,
globPatternPromise
]).
then
(()
=>
{
});
return
TPromise
.
join
([
fileNamePromise
,
globPatternPromise
]).
then
(()
=>
{
});
}
}
private
async
activateIfFileName
(
extensionId
:
string
,
fileName
:
string
):
T
Promise
<
void
>
{
private
async
activateIfFileName
(
extensionId
:
string
,
fileName
:
string
):
Promise
<
void
>
{
// find exact path
// find exact path
for
(
const
{
uri
}
of
this
.
_workspace
.
folders
)
{
for
(
const
{
uri
}
of
this
.
_workspace
.
folders
)
{
...
@@ -250,7 +250,7 @@ export class ExtensionHostMain {
...
@@ -250,7 +250,7 @@ export class ExtensionHostMain {
return
undefined
;
return
undefined
;
}
}
private
async
activateIfGlobPatterns
(
extensionId
:
string
,
globPatterns
:
string
[]):
T
Promise
<
void
>
{
private
async
activateIfGlobPatterns
(
extensionId
:
string
,
globPatterns
:
string
[]):
Promise
<
void
>
{
this
.
_extHostLogService
.
trace
(
`extensionHostMain#activateIfGlobPatterns: fileSearch, extension:
${
extensionId
}
, entryPoint: workspaceContains`
);
this
.
_extHostLogService
.
trace
(
`extensionHostMain#activateIfGlobPatterns: fileSearch, extension:
${
extensionId
}
, entryPoint: workspaceContains`
);
if
(
globPatterns
.
length
===
0
)
{
if
(
globPatterns
.
length
===
0
)
{
...
...
src/vs/workbench/parts/comments/electron-browser/commentService.ts
浏览文件 @
c9e6b4bb
...
@@ -115,7 +115,7 @@ export class CommentService extends Disposable implements ICommentService {
...
@@ -115,7 +115,7 @@ export class CommentService extends Disposable implements ICommentService {
return
null
;
return
null
;
}
}
async
getComments
(
resource
:
URI
):
TPromise
<
CommentInfo
[]
>
{
getComments
(
resource
:
URI
):
TPromise
<
CommentInfo
[]
>
{
const
result
=
[];
const
result
=
[];
for
(
const
handle
of
keys
(
this
.
_commentProviders
))
{
for
(
const
handle
of
keys
(
this
.
_commentProviders
))
{
const
provider
=
this
.
_commentProviders
.
get
(
handle
);
const
provider
=
this
.
_commentProviders
.
get
(
handle
);
...
...
src/vs/workbench/parts/debug/electron-browser/terminalSupport.ts
浏览文件 @
c9e6b4bb
...
@@ -22,7 +22,7 @@ export class TerminalLauncher implements ITerminalLauncher {
...
@@ -22,7 +22,7 @@ export class TerminalLauncher implements ITerminalLauncher {
)
{
)
{
}
}
async
runInTerminal
(
args
:
DebugProtocol
.
RunInTerminalRequestArguments
,
config
:
ITerminalSettings
):
TPromise
<
void
>
{
runInTerminal
(
args
:
DebugProtocol
.
RunInTerminalRequestArguments
,
config
:
ITerminalSettings
):
TPromise
<
void
>
{
if
(
args
.
kind
===
'
external
'
)
{
if
(
args
.
kind
===
'
external
'
)
{
return
this
.
nativeTerminalService
.
runInTerminal
(
args
.
title
,
args
.
cwd
,
args
.
args
,
args
.
env
||
{});
return
this
.
nativeTerminalService
.
runInTerminal
(
args
.
title
,
args
.
cwd
,
args
.
args
,
args
.
env
||
{});
...
...
src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts
浏览文件 @
c9e6b4bb
...
@@ -155,7 +155,7 @@ class RemoteSearchProvider implements ISearchProvider {
...
@@ -155,7 +155,7 @@ class RemoteSearchProvider implements ISearchProvider {
@
ILogService
private
logService
:
ILogService
@
ILogService
private
logService
:
ILogService
)
{
)
{
this
.
_remoteSearchP
=
this
.
options
.
filter
?
this
.
_remoteSearchP
=
this
.
options
.
filter
?
this
.
getSettingsForFilter
(
this
.
options
.
filter
)
:
TPromise
.
wrap
(
this
.
getSettingsForFilter
(
this
.
options
.
filter
)
)
:
TPromise
.
wrap
(
null
);
TPromise
.
wrap
(
null
);
}
}
...
@@ -196,7 +196,7 @@ class RemoteSearchProvider implements ISearchProvider {
...
@@ -196,7 +196,7 @@ class RemoteSearchProvider implements ISearchProvider {
});
});
}
}
private
async
getSettingsForFilter
(
filter
:
string
):
T
Promise
<
IFilterMetadata
>
{
private
async
getSettingsForFilter
(
filter
:
string
):
Promise
<
IFilterMetadata
>
{
const
allRequestDetails
:
IBingRequestDetails
[]
=
[];
const
allRequestDetails
:
IBingRequestDetails
[]
=
[];
// Only send MAX_REQUESTS requests in total just to keep it sane
// Only send MAX_REQUESTS requests in total just to keep it sane
...
@@ -308,7 +308,7 @@ class RemoteSearchProvider implements ISearchProvider {
...
@@ -308,7 +308,7 @@ class RemoteSearchProvider implements ISearchProvider {
};
};
}
}
private
async
prepareRequest
(
query
:
string
,
filterPage
=
0
):
T
Promise
<
IBingRequestDetails
>
{
private
async
prepareRequest
(
query
:
string
,
filterPage
=
0
):
Promise
<
IBingRequestDetails
>
{
const
verbatimQuery
=
query
;
const
verbatimQuery
=
query
;
query
=
escapeSpecialChars
(
query
);
query
=
escapeSpecialChars
(
query
);
const
boost
=
10
;
const
boost
=
10
;
...
@@ -526,4 +526,4 @@ class SettingMatches {
...
@@ -526,4 +526,4 @@ class SettingMatches {
endColumn
:
setting
.
valueRange
.
startColumn
+
match
.
end
+
1
endColumn
:
setting
.
valueRange
.
startColumn
+
match
.
end
+
1
};
};
}
}
}
}
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录