Make context the first arugment to constructors

mjbvz · mjbvz · commit 08be66406f2d · 2020-08-27T13:51:11.000-07:00
diff --git a/src/vs/workbench/api/browser/mainThreadCustomEditors.ts b/src/vs/workbench/api/browser/mainThreadCustomEditors.ts
@@ -50,9 +50,9 @@ export class MainThreadCustomEditors extends Disposable implements extHostProtoc
 	private readonly _editorProviders = new Map<string, IDisposable>();
 
 	constructor(
+		context: extHostProtocol.IExtHostContext,
 		private readonly mainThreadWebview: MainThreadWebviews,
 		private readonly mainThreadWebviewPanels: MainThreadWebviewPanels,
-		context: extHostProtocol.IExtHostContext,
 		@IExtensionService extensionService: IExtensionService,
 		@IWorkingCopyService workingCopyService: IWorkingCopyService,
 		@IWorkingCopyFileService workingCopyFileService: IWorkingCopyFileService,
diff --git a/src/vs/workbench/api/browser/mainThreadWebviewManager.ts b/src/vs/workbench/api/browser/mainThreadWebviewManager.ts
@@ -23,13 +23,13 @@ export class MainThreadWebviewManager extends Disposable {
 		const webviews = this._register(instantiationService.createInstance(MainThreadWebviews, context));
 		context.set(extHostProtocol.MainContext.MainThreadWebviews, webviews);
 
-		const webviewPanels = this._register(instantiationService.createInstance(MainThreadWebviewPanels, webviews, context));
+		const webviewPanels = this._register(instantiationService.createInstance(MainThreadWebviewPanels, context, webviews));
 		context.set(extHostProtocol.MainContext.MainThreadWebviewPanels, webviewPanels);
 
-		const customEditors = this._register(instantiationService.createInstance(MainThreadCustomEditors, webviews, webviewPanels, context));
+		const customEditors = this._register(instantiationService.createInstance(MainThreadCustomEditors, context, webviews, webviewPanels));
 		context.set(extHostProtocol.MainContext.MainThreadCustomEditors, customEditors);
 
-		const webviewViews = this._register(instantiationService.createInstance(MainThreadWebviewsViews, webviews, context));
+		const webviewViews = this._register(instantiationService.createInstance(MainThreadWebviewsViews, context, webviews));
 		context.set(extHostProtocol.MainContext.MainThreadWebviewViews, webviewViews);
 	}
 }
diff --git a/src/vs/workbench/api/browser/mainThreadWebviewPanels.ts b/src/vs/workbench/api/browser/mainThreadWebviewPanels.ts
@@ -86,8 +86,8 @@ export class MainThreadWebviewPanels extends Disposable implements extHostProtoc
 	private readonly _revivers = new Map<string, IDisposable>();
 
 	constructor(
-		private readonly _mainThreadWebviews: MainThreadWebviews,
 		context: extHostProtocol.IExtHostContext,
+		private readonly _mainThreadWebviews: MainThreadWebviews,
 		@IExtensionService extensionService: IExtensionService,
 		@IEditorGroupsService private readonly _editorGroupService: IEditorGroupsService,
 		@IEditorService private readonly _editorService: IEditorService,
diff --git a/src/vs/workbench/api/browser/mainThreadWebviewViews.ts b/src/vs/workbench/api/browser/mainThreadWebviewViews.ts
@@ -19,8 +19,8 @@ export class MainThreadWebviewsViews extends Disposable implements extHostProtoc
 	private readonly _webviewViewProviders = new Map<string, IDisposable>();
 
 	constructor(
-		private readonly mainThreadWebviews: MainThreadWebviews,
 		context: extHostProtocol.IExtHostContext,
+		private readonly mainThreadWebviews: MainThreadWebviews,
 		@IWebviewViewService private readonly _webviewViewService: IWebviewViewService,
 	) {
 		super();

Original file line number	Diff line number	Diff line change
`@@ -23,13 +23,13 @@ export class MainThreadWebviewManager extends Disposable {`
`23`	`23`	`const webviews = this._register(instantiationService.createInstance(MainThreadWebviews, context));`
`24`	`24`	`context.set(extHostProtocol.MainContext.MainThreadWebviews, webviews);`
`25`	`25`
`26`		`- const webviewPanels = this._register(instantiationService.createInstance(MainThreadWebviewPanels, webviews, context));`
	`26`	`+ const webviewPanels = this._register(instantiationService.createInstance(MainThreadWebviewPanels, context, webviews));`
`27`	`27`	`context.set(extHostProtocol.MainContext.MainThreadWebviewPanels, webviewPanels);`
`28`	`28`
`29`		`- const customEditors = this._register(instantiationService.createInstance(MainThreadCustomEditors, webviews, webviewPanels, context));`
	`29`	`+ const customEditors = this._register(instantiationService.createInstance(MainThreadCustomEditors, context, webviews, webviewPanels));`
`30`	`30`	`context.set(extHostProtocol.MainContext.MainThreadCustomEditors, customEditors);`
`31`	`31`
`32`		`- const webviewViews = this._register(instantiationService.createInstance(MainThreadWebviewsViews, webviews, context));`
	`32`	`+ const webviewViews = this._register(instantiationService.createInstance(MainThreadWebviewsViews, context, webviews));`
`33`	`33`	`context.set(extHostProtocol.MainContext.MainThreadWebviewViews, webviewViews);`
`34`	`34`	`}`
`35`	`35`	`}`