Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve QuickPickList perf by having a single emitter #184678

Merged
merged 1 commit into from
Jun 9, 2023
Merged

Improve QuickPickList perf by having a single emitter #184678

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 13 additions & 13 deletions src/vs/platform/quickinput/browser/quickInputList.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ interface IListElement extends IListElementLazyParts {
separator?: IQuickPickSeparator;
}

class ListElement implements IListElement, IDisposable {
class ListElement implements IListElement {
private readonly _init: Lazy<IListElementLazyParts>;

readonly hasCheckbox: boolean;
Expand All @@ -74,6 +74,7 @@ class ListElement implements IListElement, IDisposable {
readonly fireButtonTriggered: (event: IQuickPickItemButtonEvent<IQuickPickItem>) => void;
readonly fireSeparatorButtonTriggered: (event: IQuickPickSeparatorButtonEvent) => void;

// state will get updated later
private _checked: boolean = false;
private _hidden: boolean = false;
private _element?: HTMLElement;
Expand All @@ -82,21 +83,24 @@ class ListElement implements IListElement, IDisposable {
private _detailHighlights?: IMatch[];
private _separator?: IQuickPickSeparator;

private readonly _onChecked = new Emitter<boolean>();
onChecked = this._onChecked.event;
private readonly _onChecked: Emitter<{ listElement: IListElement; checked: boolean }>;
onChecked: Event<boolean>;

constructor(
mainItem: QuickPickItem,
previous: QuickPickItem | undefined,
index: number,
hasCheckbox: boolean,
fireButtonTriggered: (event: IQuickPickItemButtonEvent<IQuickPickItem>) => void,
fireSeparatorButtonTriggered: (event: IQuickPickSeparatorButtonEvent) => void
fireSeparatorButtonTriggered: (event: IQuickPickSeparatorButtonEvent) => void,
onCheckedEmitter: Emitter<{ listElement: IListElement; checked: boolean }>
) {
this.hasCheckbox = hasCheckbox;
this.index = index;
this.fireButtonTriggered = fireButtonTriggered;
this.fireSeparatorButtonTriggered = fireSeparatorButtonTriggered;
this._onChecked = onCheckedEmitter;
this.onChecked = Event.map(Event.filter<{ listElement: IListElement; checked: boolean }>(this._onChecked.event, e => e.listElement === this), e => e.checked);

if (mainItem.type === 'separator') {
this._separator = mainItem;
Expand Down Expand Up @@ -170,7 +174,7 @@ class ListElement implements IListElement, IDisposable {
set checked(value: boolean) {
if (value !== this._checked) {
this._checked = value;
this._onChecked.fire(value);
this._onChecked.fire({ listElement: this, checked: value });
}
}

Expand Down Expand Up @@ -207,10 +211,6 @@ class ListElement implements IListElement, IDisposable {
}

// #endregion

dispose() {
this._onChecked.dispose();
}
}

interface IListElementTemplateData {
Expand Down Expand Up @@ -431,6 +431,7 @@ export class QuickInputList {
onKeyDown: Event<StandardKeyboardEvent> = this._onKeyDown.event;
private readonly _onLeave = new Emitter<void>();
onLeave: Event<void> = this._onLeave.event;
private readonly _listElementChecked = new Emitter<{ listElement: IListElement; checked: boolean }>();
private _fireCheckedEvents = true;
private elementDisposables: IDisposable[] = [];
private disposables: IDisposable[] = [];
Expand Down Expand Up @@ -551,6 +552,7 @@ export class QuickInputList {
}
delayer.cancel();
}));
this.disposables.push(this._listElementChecked.event(_ => this.fireCheckedEvents()));
this.disposables.push(
this._onChangedAllVisibleChecked,
this._onChangedCheckedCount,
Expand Down Expand Up @@ -666,12 +668,10 @@ export class QuickInputList {
index,
hasCheckbox,
fireButtonTriggered,
fireSeparatorButtonTriggered
fireSeparatorButtonTriggered,
this._listElementChecked
);

this.elementDisposables.push(element);
this.elementDisposables.push(element.onChecked(() => this.fireCheckedEvents()));

result.push(element);
elementsToIndexes.set(element.item ?? element.separator!, index);
return result;
Expand Down