Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
0f965d5b
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,发现更多精彩内容 >>
提交
0f965d5b
编写于
7月 02, 2018
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#53442 Avoid async and winjs promise
上级
aa75fbd6
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
12 addition
and
11 deletion
+12
-11
src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
.../workbench/parts/preferences/browser/preferencesEditor.ts
+4
-4
src/vs/workbench/parts/search/browser/searchActions.ts
src/vs/workbench/parts/search/browser/searchActions.ts
+8
-7
未找到文件。
src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
浏览文件 @
0f965d5b
...
...
@@ -434,7 +434,7 @@ class PreferencesRenderersController extends Disposable {
}
}
private
async
_onEditableContentDidChange
():
T
Promise
<
void
>
{
private
async
_onEditableContentDidChange
():
Promise
<
void
>
{
await
this
.
localFilterPreferences
(
this
.
_lastQuery
,
true
);
await
this
.
remoteSearchPreferences
(
this
.
_lastQuery
,
true
);
}
...
...
@@ -511,11 +511,11 @@ class PreferencesRenderersController extends Disposable {
return
TPromise
.
join
(
searchPs
).
then
(()
=>
{
});
}
private
searchSettingsTarget
(
query
:
string
,
provider
:
ISearchProvider
,
target
:
SettingsTarget
,
groupId
:
string
,
groupLabel
:
string
,
groupOrder
:
number
):
T
Promise
<
void
>
{
private
searchSettingsTarget
(
query
:
string
,
provider
:
ISearchProvider
,
target
:
SettingsTarget
,
groupId
:
string
,
groupLabel
:
string
,
groupOrder
:
number
):
Promise
<
void
>
{
if
(
!
query
)
{
// Don't open the other settings targets when query is empty
this
.
_onDidFilterResultsCountChange
.
fire
({
target
,
count
:
0
});
return
TPromise
.
wrap
(
null
);
return
Promise
.
resolve
(
null
);
}
return
this
.
getPreferencesEditorModel
(
target
).
then
(
model
=>
{
...
...
@@ -532,7 +532,7 @@ class PreferencesRenderersController extends Disposable {
});
}
private
async
getPreferencesEditorModel
(
target
:
SettingsTarget
):
T
Promise
<
ISettingsEditorModel
|
null
>
{
private
async
getPreferencesEditorModel
(
target
:
SettingsTarget
):
Promise
<
ISettingsEditorModel
|
null
>
{
const
resource
=
target
===
ConfigurationTarget
.
USER
?
this
.
preferencesService
.
userSettingsResource
:
target
===
ConfigurationTarget
.
WORKSPACE
?
this
.
preferencesService
.
workspaceSettingsResource
:
target
;
...
...
src/vs/workbench/parts/search/browser/searchActions.ts
浏览文件 @
0f965d5b
...
...
@@ -492,14 +492,15 @@ export class ReplaceAllInFolderAction extends AbstractSearchAndReplaceAction {
super
(
Constants
.
ReplaceAllInFolderActionId
,
appendKeyBindingLabel
(
ReplaceAllInFolderAction
.
LABEL
,
keyBindingService
.
lookupKeybinding
(
Constants
.
ReplaceAllInFolderActionId
),
keyBindingService
),
'
action-replace-all
'
);
}
public
async
run
():
TPromise
<
any
>
{
public
run
():
TPromise
<
any
>
{
let
nextFocusElement
=
this
.
getElementToFocusAfterRemoved
(
this
.
viewer
,
this
.
folderMatch
);
await
this
.
folderMatch
.
replaceAll
();
if
(
nextFocusElement
)
{
this
.
viewer
.
setFocus
(
nextFocusElement
);
}
this
.
viewer
.
domFocus
();
return
this
.
folderMatch
.
replaceAll
()
.
then
(()
=>
{
if
(
nextFocusElement
)
{
this
.
viewer
.
setFocus
(
nextFocusElement
);
}
this
.
viewer
.
domFocus
();
});
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录