Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
52cd7df9
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,发现更多精彩内容 >>
未验证
提交
52cd7df9
编写于
10月 25, 2021
作者:
T
Tyler Leonhardt
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fixes #75046 - ensure selectedItems is updated onAccept
上级
243b64d3
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
61 addition
and
5 deletion
+61
-5
src/vs/base/parts/quickinput/browser/quickInput.ts
src/vs/base/parts/quickinput/browser/quickInput.ts
+4
-1
src/vs/base/test/parts/quickinput/browser/quickinput.test.ts
src/vs/base/test/parts/quickinput/browser/quickinput.test.ts
+57
-4
未找到文件。
src/vs/base/parts/quickinput/browser/quickInput.ts
浏览文件 @
52cd7df9
...
...
@@ -817,7 +817,10 @@ class QuickPick<T extends IQuickPickItem> extends QuickInput implements IQuickPi
}
}));
this
.
visibleDisposables
.
add
(
this
.
ui
.
onDidAccept
(()
=>
{
if
(
!
this
.
canSelectMany
&&
this
.
activeItems
[
0
])
{
if
(
this
.
canSelectMany
)
{
this
.
_selectedItems
=
this
.
ui
.
list
.
getCheckedElements
()
as
T
[];
this
.
onDidChangeSelectionEmitter
.
fire
(
this
.
selectedItems
);
}
else
if
(
this
.
activeItems
[
0
])
{
this
.
_selectedItems
=
[
this
.
activeItems
[
0
]];
this
.
onDidChangeSelectionEmitter
.
fire
(
this
.
selectedItems
);
}
...
...
src/vs/base/test/parts/quickinput/browser/quickinput.test.ts
浏览文件 @
52cd7df9
...
...
@@ -59,12 +59,41 @@ suite('QuickInput', () => {
});
teardown
(()
=>
{
quickpick
.
dispose
();
quickpick
?
.
dispose
();
controller
.
dispose
();
document
.
body
.
removeChild
(
fixture
);
});
test
(
'
onDidChangeValue gets triggered when .value is set
'
,
async
()
=>
{
test
(
'
pick - basecase
'
,
async
()
=>
{
const
item
=
{
label
:
'
foo
'
};
const
pickPromise
=
controller
.
pick
([
item
,
{
label
:
'
bar
'
}]);
// wait a bit to let the pick get set up.
await
wait
(
200
);
controller
.
accept
();
const
pick
=
await
pickPromise
;
assert
.
strictEqual
(
pick
,
item
);
});
test
(
'
pick - activeItem is honored
'
,
async
()
=>
{
const
item
=
{
label
:
'
foo
'
};
const
pickPromise
=
controller
.
pick
([{
label
:
'
bar
'
},
item
],
{
activeItem
:
item
});
// wait a bit to let the pick get set up.
await
wait
(
200
);
controller
.
accept
();
const
pick
=
await
pickPromise
;
assert
.
strictEqual
(
pick
,
item
);
});
test
(
'
input - basecase
'
,
async
()
=>
{
const
inputPromise
=
controller
.
input
({
value
:
'
foo
'
});
// wait a bit to let the pick get set up.
await
wait
(
200
);
controller
.
accept
();
const
value
=
await
inputPromise
;
assert
.
strictEqual
(
value
,
'
foo
'
);
});
test
(
'
onDidChangeValue - gets triggered when .value is set
'
,
async
()
=>
{
quickpick
=
controller
.
createQuickPick
();
let
value
:
string
|
undefined
=
undefined
;
...
...
@@ -82,7 +111,7 @@ suite('QuickInput', () => {
}
});
test
(
'
keepScrollPosition works with activeItems
'
,
async
()
=>
{
test
(
'
keepScrollPosition
-
works with activeItems
'
,
async
()
=>
{
quickpick
=
controller
.
createQuickPick
();
const
items
=
[];
...
...
@@ -107,7 +136,7 @@ suite('QuickInput', () => {
assert
.
strictEqual
(
getScrollTop
(),
0
);
});
test
(
'
keepScrollPosition works with items
'
,
async
()
=>
{
test
(
'
keepScrollPosition
-
works with items
'
,
async
()
=>
{
quickpick
=
controller
.
createQuickPick
();
const
items
=
[];
...
...
@@ -130,4 +159,28 @@ suite('QuickInput', () => {
quickpick
.
items
=
items
;
assert
.
strictEqual
(
getScrollTop
(),
0
);
});
test
(
'
selectedItems - verify previous selectedItems does not hang over to next set of items
'
,
async
()
=>
{
quickpick
=
controller
.
createQuickPick
();
quickpick
.
items
=
[{
label
:
'
step 1
'
}];
quickpick
.
show
();
void
(
await
new
Promise
<
void
>
(
resolve
=>
{
quickpick
.
onDidAccept
(()
=>
{
console
.
log
(
quickpick
.
selectedItems
.
map
(
i
=>
i
.
label
).
join
(
'
,
'
));
quickpick
.
canSelectMany
=
true
;
quickpick
.
items
=
[{
label
:
'
a
'
},
{
label
:
'
b
'
},
{
label
:
'
c
'
}];
resolve
();
});
// accept 'step 1'
controller
.
accept
();
}));
// accept in multi-select
controller
.
accept
();
// Since we don't select any items, the selected items should be empty
assert
.
strictEqual
(
quickpick
.
selectedItems
.
length
,
0
);
});
});
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录