Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
a6626a8d
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,发现更多精彩内容 >>
提交
a6626a8d
编写于
9月 06, 2018
作者:
C
Christof Marti
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Do not clear selection in single-select case (fixes #57850)
上级
94c48251
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
38 addition
and
9 deletion
+38
-9
extensions/vscode-api-tests/src/singlefolder-tests/quickInput.test.ts
...scode-api-tests/src/singlefolder-tests/quickInput.test.ts
+35
-4
src/vs/workbench/browser/parts/quickinput/quickInput.ts
src/vs/workbench/browser/parts/quickinput/quickInput.ts
+3
-0
src/vs/workbench/browser/parts/quickinput/quickInputList.ts
src/vs/workbench/browser/parts/quickinput/quickInputList.ts
+0
-5
未找到文件。
extensions/vscode-api-tests/src/singlefolder-tests/quickInput.test.ts
浏览文件 @
a6626a8d
...
...
@@ -16,6 +16,7 @@ interface QuickPickExpected {
acceptedItems
:
{
active
:
string
[][];
selection
:
string
[][];
dispose
:
boolean
[];
};
}
...
...
@@ -36,7 +37,8 @@ suite('window namespace tests', function () {
selectionItems
:
[[
'
zwei
'
]],
acceptedItems
:
{
active
:
[[
'
zwei
'
]],
selection
:
[[
'
zwei
'
]]
selection
:
[[
'
zwei
'
]],
dispose
:
[
true
]
},
},
(
err
?:
any
)
=>
done
(
err
));
quickPick
.
items
=
[
'
eins
'
,
'
zwei
'
,
'
drei
'
].
map
(
label
=>
({
label
}));
...
...
@@ -61,7 +63,8 @@ suite('window namespace tests', function () {
selectionItems
:
[[
'
zwei
'
]],
acceptedItems
:
{
active
:
[[
'
zwei
'
]],
selection
:
[[
'
zwei
'
]]
selection
:
[[
'
zwei
'
]],
dispose
:
[
true
]
},
},
(
err
?:
any
)
=>
done
(
err
));
quickPick
.
items
=
[
'
eins
'
,
'
zwei
'
,
'
drei
'
].
map
(
label
=>
({
label
}));
...
...
@@ -86,7 +89,8 @@ suite('window namespace tests', function () {
selectionItems
:
[[
'
eins
'
],
[
'
eins
'
,
'
zwei
'
]],
acceptedItems
:
{
active
:
[[
'
zwei
'
]],
selection
:
[[
'
eins
'
,
'
zwei
'
]]
selection
:
[[
'
eins
'
,
'
zwei
'
]],
dispose
:
[
true
]
},
},
(
err
?:
any
)
=>
done
(
err
));
quickPick
.
canSelectMany
=
true
;
...
...
@@ -102,6 +106,31 @@ suite('window namespace tests', function () {
})()
.
catch
(
err
=>
done
(
err
));
});
test
(
'
createQuickPick, selection events
'
,
function
(
_done
)
{
let
done
=
(
err
?:
any
)
=>
{
done
=
()
=>
{};
_done
(
err
);
};
const
quickPick
=
createQuickPick
({
events
:
[
'
active
'
,
'
selection
'
,
'
accept
'
,
'
selection
'
,
'
accept
'
,
'
hide
'
],
activeItems
:
[[
'
eins
'
]],
selectionItems
:
[[
'
zwei
'
],
[
'
drei
'
]],
acceptedItems
:
{
active
:
[[
'
eins
'
],
[
'
eins
'
]],
selection
:
[[
'
zwei
'
],
[
'
drei
'
]],
dispose
:
[
false
,
true
]
},
},
(
err
?:
any
)
=>
done
(
err
));
quickPick
.
items
=
[
'
eins
'
,
'
zwei
'
,
'
drei
'
].
map
(
label
=>
({
label
}));
quickPick
.
show
();
quickPick
.
selectedItems
=
[
quickPick
.
items
[
1
]];
setTimeout
(()
=>
{
quickPick
.
selectedItems
=
[
quickPick
.
items
[
2
]];
},
0
);
});
});
});
...
...
@@ -134,7 +163,9 @@ function createQuickPick(expected: QuickPickExpected, done: (err?: any) => void)
assert
.
deepEqual
(
quickPick
.
activeItems
.
map
(
item
=>
item
.
label
),
expectedActive
);
const
expectedSelection
=
expected
.
acceptedItems
.
selection
.
shift
();
assert
.
deepEqual
(
quickPick
.
selectedItems
.
map
(
item
=>
item
.
label
),
expectedSelection
);
quickPick
.
dispose
();
if
(
expected
.
acceptedItems
.
dispose
.
shift
())
{
quickPick
.
dispose
();
}
}
catch
(
err
)
{
done
(
err
);
}
...
...
src/vs/workbench/browser/parts/quickinput/quickInput.ts
浏览文件 @
a6626a8d
...
...
@@ -496,6 +496,9 @@ class QuickPick<T extends IQuickPickItem> extends QuickInput implements IQuickPi
}),
this
.
ui
.
list
.
onDidChangeSelection
(
selectedItems
=>
{
if
(
this
.
canSelectMany
)
{
if
(
selectedItems
.
length
)
{
this
.
ui
.
list
.
setSelectedElements
([]);
}
return
;
}
if
(
this
.
selectedItemsToConfirm
!==
this
.
_selectedItems
&&
equals
(
selectedItems
,
this
.
_selectedItems
,
(
a
,
b
)
=>
a
===
b
))
{
...
...
src/vs/workbench/browser/parts/quickinput/quickInputList.ts
浏览文件 @
a6626a8d
...
...
@@ -283,11 +283,6 @@ export class QuickInputList {
this
.
_onLeave
.
fire
();
}
}));
this
.
disposables
.
push
(
this
.
list
.
onSelectionChange
(
e
=>
{
if
(
e
.
elements
.
length
)
{
this
.
list
.
setSelection
([]);
}
}));
}
@
memoize
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录