Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-08 09:08:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

tabs - cleanup listeners properly after perf work

Browse Source
This commit is contained in:
Benjamin Pasero
2016-12-16 09:55:22 +01:00
parent ddfac23163
commit c362e02525
1 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/browser/parts/editor/tabsTitleControl.ts
+22 -19
View File
@@ -33,7 +33,7 @@ import { IMenuService } from 'vs/platform/actions/common/actions';
import { IWindowService } from 'vs/platform/windows/common/windows'; import { IWindowService } from 'vs/platform/windows/common/windows';
import { TitleControl } from 'vs/workbench/browser/parts/editor/titleControl'; import { TitleControl } from 'vs/workbench/browser/parts/editor/titleControl';
import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen'; import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen';
import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { IDisposable, dispose, combinedDisposable } from 'vs/base/common/lifecycle';
import { ScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement'; import { ScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
import { ScrollbarVisibility } from 'vs/base/common/scrollable'; import { ScrollbarVisibility } from 'vs/base/common/scrollable';
import { extractResources } from 'vs/base/browser/dnd'; import { extractResources } from 'vs/base/browser/dnd';
@@ -54,7 +54,7 @@ export class TabsTitleControl extends TitleControl {
private activeTab: HTMLElement; private activeTab: HTMLElement;
private editorLabels: EditorLabel[]; private editorLabels: EditorLabel[];
private scrollbar: ScrollableElement; private scrollbar: ScrollableElement;
private tabDisposeables: IDisposable[] = []; private tabDisposeables: IDisposable[];
constructor( constructor(
@IContextMenuService contextMenuService: IContextMenuService, @IContextMenuService contextMenuService: IContextMenuService,
@@ -322,7 +322,7 @@ export class TabsTitleControl extends TitleControl {
DOM.clearNode(this.tabsContainer); DOM.clearNode(this.tabsContainer);
this.tabDisposeables = dispose(this.tabDisposeables); this.tabDisposeables = dispose(this.tabDisposeables);
this.editorLabels = dispose(this.editorLabels); this.editorLabels = [];
DOM.removeClass(this.titleContainer, 'shows-tabs'); DOM.removeClass(this.titleContainer, 'shows-tabs');
} }
@@ -347,7 +347,7 @@ export class TabsTitleControl extends TitleControl {
else { else {
for (let i = 0; i < tabsCount - tabsNeeded; i++) { for (let i = 0; i < tabsCount - tabsNeeded; i++) {
(this.tabsContainer.lastChild as HTMLElement).remove(); (this.tabsContainer.lastChild as HTMLElement).remove();
this.editorLabels.pop().dispose(); this.editorLabels.pop();
this.tabDisposeables.pop().dispose(); this.tabDisposeables.pop().dispose();
} }
} }
@@ -380,10 +380,10 @@ export class TabsTitleControl extends TitleControl {
const bar = new ActionBar(tabCloseContainer, { ariaLabel: nls.localize('araLabelTabActions', "Tab actions"), actionRunner: new TabActionRunner(() => this.context, index) }); const bar = new ActionBar(tabCloseContainer, { ariaLabel: nls.localize('araLabelTabActions', "Tab actions"), actionRunner: new TabActionRunner(() => this.context, index) });
bar.push(this.closeEditorAction, { icon: true, label: false, keybinding: this.getKeybindingLabel(this.closeEditorAction) }); bar.push(this.closeEditorAction, { icon: true, label: false, keybinding: this.getKeybindingLabel(this.closeEditorAction) });
this.tabDisposeables.push(bar);
// Eventing // Eventing
this.hookTabListeners(tabContainer, index); const disposable = this.hookTabListeners(tabContainer, index);
this.tabDisposeables.push(combinedDisposable([disposable, bar, editorLabel]));
return tabContainer; return tabContainer;
} }
@@ -424,10 +424,11 @@ export class TabsTitleControl extends TitleControl {
} }
} }
private hookTabListeners(tab: HTMLElement, index: number): void { private hookTabListeners(tab: HTMLElement, index: number): IDisposable {
const disposables = [];
// Open on Click // Open on Click
this.tabDisposeables.push(DOM.addDisposableListener(tab, DOM.EventType.MOUSE_DOWN, (e: MouseEvent) => { disposables.push(DOM.addDisposableListener(tab, DOM.EventType.MOUSE_DOWN, (e: MouseEvent) => {
tab.blur(); tab.blur();
const { editor, position } = this.toTabContext(index); const { editor, position } = this.toTabContext(index);
@@ -437,7 +438,7 @@ export class TabsTitleControl extends TitleControl {
})); }));
// Close on mouse middle click // Close on mouse middle click
this.tabDisposeables.push(DOM.addDisposableListener(tab, DOM.EventType.MOUSE_UP, (e: MouseEvent) => { disposables.push(DOM.addDisposableListener(tab, DOM.EventType.MOUSE_UP, (e: MouseEvent) => {
DOM.EventHelper.stop(e); DOM.EventHelper.stop(e);
tab.blur(); tab.blur();
@@ -449,7 +450,7 @@ export class TabsTitleControl extends TitleControl {
})); }));
// Context menu on Shift+F10 // Context menu on Shift+F10
this.tabDisposeables.push(DOM.addDisposableListener(tab, DOM.EventType.KEY_DOWN, (e: KeyboardEvent) => { disposables.push(DOM.addDisposableListener(tab, DOM.EventType.KEY_DOWN, (e: KeyboardEvent) => {
const event = new StandardKeyboardEvent(e); const event = new StandardKeyboardEvent(e);
if (event.shiftKey && event.keyCode === KeyCode.F10) { if (event.shiftKey && event.keyCode === KeyCode.F10) {
DOM.EventHelper.stop(e); DOM.EventHelper.stop(e);
@@ -461,7 +462,7 @@ export class TabsTitleControl extends TitleControl {
})); }));
// Keyboard accessibility // Keyboard accessibility
this.tabDisposeables.push(DOM.addDisposableListener(tab, DOM.EventType.KEY_UP, (e: KeyboardEvent) => { disposables.push(DOM.addDisposableListener(tab, DOM.EventType.KEY_UP, (e: KeyboardEvent) => {
const event = new StandardKeyboardEvent(e); const event = new StandardKeyboardEvent(e);
let handled = false; let handled = false;
@@ -505,7 +506,7 @@ export class TabsTitleControl extends TitleControl {
})); }));
// Pin on double click // Pin on double click
this.tabDisposeables.push(DOM.addDisposableListener(tab, DOM.EventType.DBLCLICK, (e: MouseEvent) => { disposables.push(DOM.addDisposableListener(tab, DOM.EventType.DBLCLICK, (e: MouseEvent) => {
DOM.EventHelper.stop(e); DOM.EventHelper.stop(e);
const { group, editor } = this.toTabContext(index); const { group, editor } = this.toTabContext(index);
@@ -514,14 +515,14 @@ export class TabsTitleControl extends TitleControl {
})); }));
// Context menu // Context menu
this.tabDisposeables.push(DOM.addDisposableListener(tab, DOM.EventType.CONTEXT_MENU, (e: Event) => { disposables.push(DOM.addDisposableListener(tab, DOM.EventType.CONTEXT_MENU, (e: Event) => {
const { group, editor } = this.toTabContext(index); const { group, editor } = this.toTabContext(index);
this.onContextMenu({ group, editor }, e, tab); this.onContextMenu({ group, editor }, e, tab);
})); }));
// Drag start // Drag start
this.tabDisposeables.push(DOM.addDisposableListener(tab, DOM.EventType.DRAG_START, (e: DragEvent) => { disposables.push(DOM.addDisposableListener(tab, DOM.EventType.DRAG_START, (e: DragEvent) => {
const { group, editor } = this.toTabContext(index); const { group, editor } = this.toTabContext(index);
this.onEditorDragStart({ editor, group }); this.onEditorDragStart({ editor, group });
@@ -543,13 +544,13 @@ export class TabsTitleControl extends TitleControl {
let counter = 0; let counter = 0;
// Drag over // Drag over
this.tabDisposeables.push(DOM.addDisposableListener(tab, DOM.EventType.DRAG_ENTER, (e: DragEvent) => { disposables.push(DOM.addDisposableListener(tab, DOM.EventType.DRAG_ENTER, (e: DragEvent) => {
counter++; counter++;
DOM.addClass(tab, 'dropfeedback'); DOM.addClass(tab, 'dropfeedback');
})); }));
// Drag leave // Drag leave
this.tabDisposeables.push(DOM.addDisposableListener(tab, DOM.EventType.DRAG_LEAVE, (e: DragEvent) => { disposables.push(DOM.addDisposableListener(tab, DOM.EventType.DRAG_LEAVE, (e: DragEvent) => {
counter--; counter--;
if (counter === 0) { if (counter === 0) {
DOM.removeClass(tab, 'dropfeedback'); DOM.removeClass(tab, 'dropfeedback');
@@ -557,7 +558,7 @@ export class TabsTitleControl extends TitleControl {
})); }));
// Drag end // Drag end
this.tabDisposeables.push(DOM.addDisposableListener(tab, DOM.EventType.DRAG_END, (e: DragEvent) => { disposables.push(DOM.addDisposableListener(tab, DOM.EventType.DRAG_END, (e: DragEvent) => {
counter = 0; counter = 0;
DOM.removeClass(tab, 'dropfeedback'); DOM.removeClass(tab, 'dropfeedback');
@@ -565,7 +566,7 @@ export class TabsTitleControl extends TitleControl {
})); }));
// Drop // Drop
this.tabDisposeables.push(DOM.addDisposableListener(tab, DOM.EventType.DROP, (e: DragEvent) => { disposables.push(DOM.addDisposableListener(tab, DOM.EventType.DROP, (e: DragEvent) => {
counter = 0; counter = 0;
DOM.removeClass(tab, 'dropfeedback'); DOM.removeClass(tab, 'dropfeedback');
@@ -573,6 +574,8 @@ export class TabsTitleControl extends TitleControl {
this.onDrop(e, group, position, index); this.onDrop(e, group, position, index);
})); }));
return combinedDisposable(disposables);
} }
private toTabContext(index: number): { group: IEditorGroup, position: Position, editor: IEditorInput } { private toTabContext(index: number): { group: IEditorGroup, position: Position, editor: IEditorInput } {