output - fix broken instantiation

Benjamin Pasero · Benjamin Pasero · commit c1793c0fc77b · 2020-01-21T12:05:55.000+01:00
diff --git a/src/vs/workbench/browser/parts/editor/textEditor.ts b/src/vs/workbench/browser/parts/editor/textEditor.ts
@@ -44,10 +44,16 @@ export abstract class BaseTextEditor extends BaseEditor implements ITextEditor {
 	private editorMemento: IEditorMemento<IEditorViewState>;
 	private inputDisposable: IDisposable | undefined;
 
+	// Allow subclasses to provide a different (e.g. scoped)
+	// instantiation service for this abstract text editor
+	protected get instantiationService(): IInstantiationService {
+		return this._instantiationService;
+	}
+
 	constructor(
 		id: string,
 		@ITelemetryService telemetryService: ITelemetryService,
-		@IInstantiationService protected readonly instantiationService: IInstantiationService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@IStorageService storageService: IStorageService,
 		@ITextResourceConfigurationService protected readonly configurationService: ITextResourceConfigurationService,
 		@IThemeService protected themeService: IThemeService,
diff --git a/src/vs/workbench/contrib/output/browser/outputPanel.ts b/src/vs/workbench/contrib/output/browser/outputPanel.ts
@@ -47,6 +47,11 @@ export class OutputPanel extends AbstractTextResourceEditor {
 		this.scopedInstantiationService = instantiationService;
 	}
 
+	protected get instantiationService(): IInstantiationService {
+		// Override instantiation service with our scoped service
+		return this.scopedInstantiationService;
+	}
+
 	getId(): string {
 		return OUTPUT_PANEL_ID;
 	}
@@ -158,8 +163,4 @@ export class OutputPanel extends AbstractTextResourceEditor {
 			}
 		});
 	}
-
-	get instantiationService(): IInstantiationService {
-		return this.scopedInstantiationService;
-	}
 }

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,11 @@ export class OutputPanel extends AbstractTextResourceEditor {`
`47`	`47`	`this.scopedInstantiationService = instantiationService;`
`48`	`48`	`}`
`49`	`49`
	`50`	`+ protected get instantiationService(): IInstantiationService {`
	`51`	`+ // Override instantiation service with our scoped service`
	`52`	`+ return this.scopedInstantiationService;`
	`53`	`+ }`
	`54`	`+`
`50`	`55`	`getId(): string {`
`51`	`56`	`return OUTPUT_PANEL_ID;`
`52`	`57`	`}`
`@@ -158,8 +163,4 @@ export class OutputPanel extends AbstractTextResourceEditor {`
`158`	`163`	`}`
`159`	`164`	`});`
`160`	`165`	`}`
`161`		`-`
`162`		`- get instantiationService(): IInstantiationService {`
`163`		`- return this.scopedInstantiationService;`
`164`		`- }`
`165`	`166`	`}`