Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
4855013f
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,发现更多精彩内容 >>
提交
4855013f
编写于
7月 15, 2020
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Quick open: Once "file results" are loaded, it resets selected file to the first (fix #102480)
上级
cb31fc6c
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
15 addition
and
2 deletion
+15
-2
src/vs/platform/quickinput/browser/pickerQuickAccess.ts
src/vs/platform/quickinput/browser/pickerQuickAccess.ts
+15
-2
未找到文件。
src/vs/platform/quickinput/browser/pickerQuickAccess.ts
浏览文件 @
4855013f
...
...
@@ -76,7 +76,6 @@ export type Pick<T> = T | IQuickPickSeparator;
export
type
PicksWithActive
<
T
>
=
{
items
:
ReadonlyArray
<
Pick
<
T
>>
,
active
?:
T
};
export
type
Picks
<
T
>
=
ReadonlyArray
<
Pick
<
T
>>
|
PicksWithActive
<
T
>
;
export
type
FastAndSlowPicks
<
T
>
=
{
picks
:
Picks
<
T
>
,
additionalPicks
:
Promise
<
Picks
<
T
>>
};
export
type
FastAndSlowPicksWithActive
<
T
>
=
{
picks
:
PicksWithActive
<
T
>
,
additionalPicks
:
PicksWithActive
<
Picks
<
T
>>
};
function
isPicksWithActive
<
T
>
(
obj
:
unknown
):
obj
is
PicksWithActive
<
T
>
{
const
candidate
=
obj
as
PicksWithActive
<
T
>
;
...
...
@@ -211,9 +210,23 @@ export abstract class PickerQuickAccessProvider<T extends IPickerQuickAccessItem
}
if
(
additionalPicks
.
length
>
0
||
!
fastPicksApplied
)
{
// If we do not have any activePick or additionalActivePick
// we try to preserve the currently active pick from the
// fast results. This fixes an issue where the user might
// have made a pick active before the additional results
// kick in.
// See https://github.com/microsoft/vscode/issues/102480
let
fallbackActivePick
:
Pick
<
T
>
|
undefined
=
undefined
;
if
(
!
activePick
&&
!
additionalActivePick
)
{
const
fallbackActivePickCandidate
=
picker
.
activeItems
[
0
];
if
(
fallbackActivePickCandidate
&&
picks
.
includes
(
fallbackActivePickCandidate
))
{
fallbackActivePick
=
fallbackActivePickCandidate
;
}
}
applyPicks
({
items
:
[...
picks
,
...
additionalPicks
],
active
:
activePick
||
additionalActivePick
active
:
activePick
||
additionalActivePick
||
fallbackActivePick
});
}
}
finally
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录