Always generates an instance id for webviews

Author: eamodio

src/webviews/webviewCommandRegistrar.ts

@@ -37,9 +37,10 @@ export class WebviewCommandRegistrar implements Disposable {
 							return;
 						}
 
-						const key = context.webviewInstance
-							? `${context.webview}:${context.webviewInstance}`
-							: context.webview;
+						const key =
+							context.webviewInstance && instanceId
+								? `${context.webview}:${context.webviewInstance}`
+								: context.webview;
 
 						const handler = handlers.get(key);
 						if (handler == null) {

src/webviews/webviewController.ts

@@ -94,7 +94,7 @@ export class WebviewController<
 		container: Container,
 		commandRegistrar: WebviewCommandRegistrar,
 		descriptor: WebviewPanelDescriptor<ID>,
-		instanceId: string | undefined,
+		instanceId: string,
 		parent: WebviewPanel,
 		resolveProvider: (
 			container: Container,
@@ -110,7 +110,7 @@ export class WebviewController<
 		container: Container,
 		commandRegistrar: WebviewCommandRegistrar,
 		descriptor: WebviewViewDescriptor<ID>,
-		instanceId: string | undefined,
+		instanceId: string,
 		parent: WebviewView,
 		resolveProvider: (
 			container: Container,
@@ -126,7 +126,7 @@ export class WebviewController<
 		container: Container,
 		commandRegistrar: WebviewCommandRegistrar,
 		descriptor: GetWebviewDescriptor<ID>,
-		instanceId: string | undefined,
+		instanceId: string,
 		parent: GetWebviewParent<ID>,
 		resolveProvider: (
 			container: Container,
@@ -173,7 +173,7 @@ export class WebviewController<
 		private readonly container: Container,
 		private readonly _commandRegistrar: WebviewCommandRegistrar,
 		private readonly descriptor: GetWebviewDescriptor<ID>,
-		public readonly instanceId: string | undefined,
+		public readonly instanceId: string,
 		public readonly parent: GetWebviewParent<ID>,
 		resolveProvider: (
 			container: Container,
@@ -240,7 +240,14 @@ export class WebviewController<
 		command: WebviewCommands | WebviewViewCommands,
 		callback: WebviewCommandCallback<T>,
 	): Disposable {
-		return this._commandRegistrar.registerCommand(this.provider, this.id, this.instanceId, command, callback);
+		return this._commandRegistrar.registerCommand(
+			this.provider,
+			this.id,
+			// We should be able to remove this in the future and always use the instanceId, but we need to do more testing to make sure each webview command always comes with the instanceId
+			this.descriptor.allowMultipleInstances ? this.instanceId : undefined,
+			command,
+			callback,
+		);
 	}
 
 	private _initializing: Promise<void> | undefined;

src/webviews/webviewsController.ts

@@ -55,7 +55,7 @@ export interface WebviewPanelProxy<
 	SerializedState = unknown,
 > extends Disposable {
 	readonly id: ID;
-	readonly instanceId: string | undefined;
+	readonly instanceId: string;
 	readonly ready: boolean;
 	readonly active: boolean;
 	readonly visible: boolean;
@@ -96,6 +96,8 @@ export interface WebviewViewDescriptor<ID extends WebviewViewIds = WebviewViewId
 	readonly webviewHostOptions?: {
 		readonly retainContextWhenHidden?: boolean;
 	};
+
+	readonly allowMultipleInstances?: never;
 }
 
 interface WebviewViewRegistration<
@@ -192,7 +194,7 @@ export class WebviewsController implements Disposable {
 							this.container,
 							this._commandRegistrar,
 							descriptor,
-							undefined,
+							uuid(),
 							webviewView,
 							resolveProvider,
 						);
@@ -346,7 +348,7 @@ export class WebviewsController implements Disposable {
 					container,
 					commandRegistrar,
 					descriptor,
-					descriptor.allowMultipleInstances ? uuid() : undefined,
+					uuid(),
 					panel,
 					resolveProvider,
 				);