Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
f4b63ac0
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,发现更多精彩内容 >>
提交
f4b63ac0
编写于
4月 23, 2018
作者:
C
Christof Marti
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update for tests (#48116)
上级
32ebc3c4
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
45 addition
and
9 deletion
+45
-9
extensions/vscode-api-tests/src/singlefolder-tests/window.test.ts
...ns/vscode-api-tests/src/singlefolder-tests/window.test.ts
+13
-4
src/vs/platform/quickinput/common/quickInput.ts
src/vs/platform/quickinput/common/quickInput.ts
+3
-0
src/vs/workbench/browser/parts/quickinput/quickInput.ts
src/vs/workbench/browser/parts/quickinput/quickInput.ts
+22
-5
src/vs/workbench/browser/parts/quickopen/quickopen.contribution.ts
...rkbench/browser/parts/quickopen/quickopen.contribution.ts
+7
-0
未找到文件。
extensions/vscode-api-tests/src/singlefolder-tests/window.test.ts
浏览文件 @
f4b63ac0
...
@@ -369,12 +369,21 @@ suite('window namespace tests', () => {
...
@@ -369,12 +369,21 @@ suite('window namespace tests', () => {
}
}
return
null
;
return
null
;
}
}
}).
then
(
value
=>
{
assert
.
equal
(
value
,
undefined
);
});
});
const
exec
=
commands
.
executeCommand
(
'
workbench.action.acceptSelectedQuickOpenItem
'
);
const
accept
=
commands
.
executeCommand
(
'
workbench.action.acceptSelectedQuickOpenItem
'
);
return
Promise
.
all
([
result
,
exec
]);
return
Promise
.
race
([
result
.
then
(()
=>
assert
.
ok
(
false
)),
accept
.
then
(()
=>
assert
.
ok
(
false
),
err
=>
assert
.
ok
(
err
))
.
then
(()
=>
new
Promise
(
resolve
=>
setTimeout
(
resolve
,
10
)))
])
.
then
(()
=>
{
const
close
=
commands
.
executeCommand
(
'
workbench.action.closeQuickOpen
'
);
return
Promise
.
all
([
result
,
close
])
.
then
(([
value
])
=>
{
assert
.
equal
(
value
,
undefined
);
});
});
});
});
...
...
src/vs/platform/quickinput/common/quickInput.ts
浏览文件 @
f4b63ac0
...
@@ -17,4 +17,7 @@ export interface IQuickInputService {
...
@@ -17,4 +17,7 @@ export interface IQuickInputService {
pick
<
T
extends
IPickOpenEntry
>
(
picks
:
TPromise
<
T
[]
>
,
options
?:
IPickOptions
,
token
?:
CancellationToken
):
TPromise
<
T
[]
>
;
pick
<
T
extends
IPickOpenEntry
>
(
picks
:
TPromise
<
T
[]
>
,
options
?:
IPickOptions
,
token
?:
CancellationToken
):
TPromise
<
T
[]
>
;
input
(
options
?:
IInputOptions
,
token
?:
CancellationToken
):
TPromise
<
string
>
;
input
(
options
?:
IInputOptions
,
token
?:
CancellationToken
):
TPromise
<
string
>
;
focus
():
void
;
accept
():
TPromise
<
void
>
;
cancel
():
TPromise
<
void
>
;
}
}
src/vs/workbench/browser/parts/quickinput/quickInput.ts
浏览文件 @
f4b63ac0
...
@@ -365,13 +365,16 @@ export class QuickInputService extends Component implements IQuickInputService {
...
@@ -365,13 +365,16 @@ export class QuickInputService extends Component implements IQuickInputService {
if
(
this
.
controller
)
{
if
(
this
.
controller
)
{
const
resolved
=
this
.
controller
.
resolve
(
ok
);
const
resolved
=
this
.
controller
.
resolve
(
ok
);
if
(
resolved
)
{
if
(
resolved
)
{
resolved
const
result
=
resolved
.
then
(()
=>
this
.
container
.
style
.
display
=
'
none
'
)
.
then
(()
=>
{
.
then
(
null
,
onUnexpectedError
);
this
.
container
.
style
.
display
=
'
none
'
;
return
;
});
result
.
then
(
null
,
onUnexpectedError
);
return
result
;
}
}
}
}
this
.
container
.
style
.
display
=
'
none
'
;
this
.
container
.
style
.
display
=
'
none
'
;
return
TPromise
.
as
(
undefined
);
}
}
pick
<
T
extends
IPickOpenEntry
>
(
picks
:
TPromise
<
T
[]
>
,
options
:
IPickOptions
=
{},
token
?:
CancellationToken
):
TPromise
<
T
[]
>
{
pick
<
T
extends
IPickOpenEntry
>
(
picks
:
TPromise
<
T
[]
>
,
options
:
IPickOptions
=
{},
token
?:
CancellationToken
):
TPromise
<
T
[]
>
{
...
@@ -449,7 +452,21 @@ export class QuickInputService extends Component implements IQuickInputService {
...
@@ -449,7 +452,21 @@ export class QuickInputService extends Component implements IQuickInputService {
return
this
.
controller
.
result
;
return
this
.
controller
.
result
;
}
}
public
layout
(
dimension
:
dom
.
Dimension
):
void
{
focus
()
{
if
(
this
.
ui
)
{
this
.
ui
.
inputBox
.
setFocus
();
}
}
accept
()
{
return
this
.
close
(
true
);
}
cancel
()
{
return
this
.
close
();
}
layout
(
dimension
:
dom
.
Dimension
):
void
{
this
.
layoutDimensions
=
dimension
;
this
.
layoutDimensions
=
dimension
;
this
.
updateLayout
();
this
.
updateLayout
();
}
}
...
...
src/vs/workbench/browser/parts/quickopen/quickopen.contribution.ts
浏览文件 @
f4b63ac0
...
@@ -12,6 +12,7 @@ import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/wor
...
@@ -12,6 +12,7 @@ import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/wor
import
{
KeybindingsRegistry
}
from
'
vs/platform/keybinding/common/keybindingsRegistry
'
;
import
{
KeybindingsRegistry
}
from
'
vs/platform/keybinding/common/keybindingsRegistry
'
;
import
{
RemoveFromEditorHistoryAction
}
from
'
vs/workbench/browser/parts/quickopen/quickOpenController
'
;
import
{
RemoveFromEditorHistoryAction
}
from
'
vs/workbench/browser/parts/quickopen/quickOpenController
'
;
import
{
QuickOpenSelectNextAction
,
QuickOpenSelectPreviousAction
,
inQuickOpenContext
,
getQuickNavigateHandler
,
QuickOpenNavigateNextAction
,
QuickOpenNavigatePreviousAction
,
defaultQuickOpenContext
,
QUICKOPEN_ACTION_ID
,
QUICKOPEN_ACION_LABEL
}
from
'
vs/workbench/browser/parts/quickopen/quickopen
'
;
import
{
QuickOpenSelectNextAction
,
QuickOpenSelectPreviousAction
,
inQuickOpenContext
,
getQuickNavigateHandler
,
QuickOpenNavigateNextAction
,
QuickOpenNavigatePreviousAction
,
defaultQuickOpenContext
,
QUICKOPEN_ACTION_ID
,
QUICKOPEN_ACION_LABEL
}
from
'
vs/workbench/browser/parts/quickopen/quickopen
'
;
import
{
IQuickInputService
}
from
'
vs/platform/quickinput/common/quickInput
'
;
KeybindingsRegistry
.
registerCommandAndKeybindingRule
({
KeybindingsRegistry
.
registerCommandAndKeybindingRule
({
id
:
'
workbench.action.closeQuickOpen
'
,
id
:
'
workbench.action.closeQuickOpen
'
,
...
@@ -21,6 +22,8 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
...
@@ -21,6 +22,8 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
handler
:
accessor
=>
{
handler
:
accessor
=>
{
const
quickOpenService
=
accessor
.
get
(
IQuickOpenService
);
const
quickOpenService
=
accessor
.
get
(
IQuickOpenService
);
quickOpenService
.
close
();
quickOpenService
.
close
();
const
quickInputService
=
accessor
.
get
(
IQuickInputService
);
return
quickInputService
.
cancel
();
}
}
});
});
...
@@ -32,6 +35,8 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
...
@@ -32,6 +35,8 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
handler
:
accessor
=>
{
handler
:
accessor
=>
{
const
quickOpenService
=
accessor
.
get
(
IQuickOpenService
);
const
quickOpenService
=
accessor
.
get
(
IQuickOpenService
);
quickOpenService
.
accept
();
quickOpenService
.
accept
();
const
quickInputService
=
accessor
.
get
(
IQuickInputService
);
return
quickInputService
.
accept
();
}
}
});
});
...
@@ -43,6 +48,8 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
...
@@ -43,6 +48,8 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
handler
:
accessor
=>
{
handler
:
accessor
=>
{
const
quickOpenService
=
accessor
.
get
(
IQuickOpenService
);
const
quickOpenService
=
accessor
.
get
(
IQuickOpenService
);
quickOpenService
.
focus
();
quickOpenService
.
focus
();
const
quickInputService
=
accessor
.
get
(
IQuickInputService
);
quickInputService
.
focus
();
}
}
});
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录