grid - fix some lifecycle issues

Benjamin Pasero · Benjamin Pasero · commit ce6acc922079 · 2018-05-27T12:36:56.000+02:00
diff --git a/src/vs/platform/progress/common/progress.ts b/src/vs/platform/progress/common/progress.ts
@@ -152,4 +152,8 @@ export class LongRunningOperation {
 			this.currentOperationDisposables = dispose(this.currentOperationDisposables);
 		}
 	}
+
+	dispose(): void {
+		this.currentOperationDisposables = dispose(this.currentOperationDisposables);
+	}
 }
diff --git a/src/vs/workbench/browser/parts/editor/editorCommands.ts b/src/vs/workbench/browser/parts/editor/editorCommands.ts
@@ -194,16 +194,14 @@ function moveActiveEditorToGroup(args: ActiveEditorMoveArguments, control: IEdit
 }
 
 function registerEditorGroupsLayoutCommand(): void {
-	CommandsRegistry.registerCommand(LAYOUT_EDITOR_GROUPS_COMMAND_ID, applyEditorGroupLayout);
-}
-
-function applyEditorGroupLayout(accessor: ServicesAccessor, args: EditorGroupLayout): void {
-	if (!args || typeof args !== 'object') {
-		return;
-	}
+	CommandsRegistry.registerCommand(LAYOUT_EDITOR_GROUPS_COMMAND_ID, (accessor: ServicesAccessor, args: EditorGroupLayout) => {
+		if (!args || typeof args !== 'object') {
+			return;
+		}
 
-	const editorGroupService = accessor.get(IEditorGroupsService);
-	editorGroupService.applyLayout(args);
+		const editorGroupService = accessor.get(IEditorGroupsService);
+		editorGroupService.applyLayout(args);
+	});
 }
 
 export function mergeAllGroups(editorGroupService: IEditorGroupsService, target = editorGroupService.groups[0]): void {
@@ -262,18 +260,6 @@ function registerDiffEditorCommands(): void {
 	});
 }
 
-function getCommandsContext(resourceOrContext: URI | IEditorCommandsContext, context?: IEditorCommandsContext): IEditorCommandsContext {
-	if (URI.isUri(resourceOrContext)) {
-		return context;
-	}
-
-	if (typeof resourceOrContext.groupId === 'number') {
-		return resourceOrContext;
-	}
-
-	return void 0;
-}
-
 function registerOpenEditorAtIndexCommands(): void {
 
 	// Keybindings to focus a specific index in the tab folder if tabs are enabled
@@ -598,6 +584,18 @@ function registerCloseEditorCommands() {
 	});
 }
 
+function getCommandsContext(resourceOrContext: URI | IEditorCommandsContext, context?: IEditorCommandsContext): IEditorCommandsContext {
+	if (URI.isUri(resourceOrContext)) {
+		return context;
+	}
+
+	if (resourceOrContext && typeof resourceOrContext.groupId === 'number') {
+		return resourceOrContext;
+	}
+
+	return void 0;
+}
+
 function resolveCommandsContext(editorGroupService: IEditorGroupsService, context?: IEditorCommandsContext): { group: IEditorGroup, editor: IEditorInput, control: IEditor } {
 
 	// Resolve from context
diff --git a/src/vs/workbench/browser/parts/editor/editorControl.ts b/src/vs/workbench/browser/parts/editor/editorControl.ts
@@ -46,7 +46,7 @@ export class EditorControl extends Disposable {
 	) {
 		super();
 
-		this.editorOperation = new LongRunningOperation(progressService);
+		this.editorOperation = this._register(new LongRunningOperation(progressService));
 	}
 
 	get activeControl(): BaseEditor {

Original file line number	Diff line number	Diff line change
`@@ -152,4 +152,8 @@ export class LongRunningOperation {`
`152`	`152`	`this.currentOperationDisposables = dispose(this.currentOperationDisposables);`
`153`	`153`	`}`
`154`	`154`	`}`
	`155`	`+`
	`156`	`+ dispose(): void {`
	`157`	`+ this.currentOperationDisposables = dispose(this.currentOperationDisposables);`
	`158`	`+ }`
`155`	`159`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ export class EditorControl extends Disposable {`
`46`	`46`	`) {`
`47`	`47`	`super();`
`48`	`48`
`49`		`- this.editorOperation = new LongRunningOperation(progressService);`
	`49`	`+ this.editorOperation = this._register(new LongRunningOperation(progressService));`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`get activeControl(): BaseEditor {`