Fixing URI openings for execution plans (#22139)

src/sql/workbench/contrib/executionPlan/browser/executionPlanContribution.ts

@@ -13,7 +13,7 @@ import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, IWo
 import { Disposable } from 'vs/base/common/lifecycle';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { IExecutionPlanService } from 'sql/workbench/services/executionPlan/common/interfaces';
-import { ExecutionPlanInput } from 'sql/workbench/contrib/executionPlan/common/executionPlanInput';
+import { ExecutionPlanInput } from 'sql/workbench/contrib/executionPlan/browser/executionPlanInput';
 import { ExecutionPlanEditor } from 'sql/workbench/contrib/executionPlan/browser/executionPlanEditor';
 import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService';
 import { ExecutionPlanComparisonEditor } from 'sql/workbench/contrib/executionPlan/browser/executionPlanComparisonEditor';
@@ -88,7 +88,7 @@ export class ExecutionPlanEditorOverrideContribution extends Disposable implemen
 }
 
 Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench)
-	.registerWorkbenchContribution(ExecutionPlanEditorOverrideContribution, LifecyclePhase.Restored);
+	.registerWorkbenchContribution(ExecutionPlanEditorOverrideContribution, LifecyclePhase.Starting);
 
 const comparisonExecutionPlanEditor = EditorPaneDescriptor.create(
 	ExecutionPlanComparisonEditor,

src/sql/workbench/contrib/executionPlan/browser/executionPlanEditor.ts

@@ -9,7 +9,7 @@ import { IEditorOpenContext } from 'vs/workbench/common/editor';
 import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ExecutionPlanInput } from 'sql/workbench/contrib/executionPlan/common/executionPlanInput';
+import { ExecutionPlanInput } from 'sql/workbench/contrib/executionPlan/browser/executionPlanInput';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { IEditorOptions } from 'vs/platform/editor/common/editor';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';

src/sql/workbench/contrib/executionPlan/browser/executionPlanInput.ts

@@ -11,6 +11,7 @@ import { EditorModel } from 'vs/workbench/common/editor/editorModel';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
 import * as azdata from 'azdata';
+import { ExecutionPlanEditor } from 'sql/workbench/contrib/executionPlan/browser/executionPlanEditor';
 
 export class ExecutionPlanInput extends EditorInput {
 
@@ -62,6 +63,10 @@ export class ExecutionPlanInput extends EditorInput {
 		return path.basename(this._uri.fsPath);
 	}
 
+	public override get editorId(): string {
+		return ExecutionPlanEditor.ID;
+	}
+
 	public async content(): Promise<string> {
 		if (!this.executionPlanGraphinfo.graphFileContent) {
 			this.executionPlanGraphinfo.graphFileContent = (await this._fileService.read(this._uri, { acceptTextOnly: true })).value;

src/sql/workbench/contrib/query/browser/gridPanel.ts

@@ -51,7 +51,7 @@ import { HybridDataProvider } from 'sql/base/browser/ui/table/hybridDataProvider
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { alert, status } from 'vs/base/browser/ui/aria/aria';
 import { IExecutionPlanService } from 'sql/workbench/services/executionPlan/common/interfaces';
-import { ExecutionPlanInput } from 'sql/workbench/contrib/executionPlan/common/executionPlanInput';
+import { ExecutionPlanInput } from 'sql/workbench/contrib/executionPlan/browser/executionPlanInput';
 import { CopyAction } from 'vs/editor/contrib/clipboard/browser/clipboard';
 import { formatDocumentWithSelectedProvider, FormattingMode } from 'vs/editor/contrib/format/browser/format';
 import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';

src/sql/workbench/services/executionPlan/common/executionPlanService.ts

@@ -10,6 +10,7 @@ import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilit
 import { IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { Event, Emitter } from 'vs/base/common/event';
+import { IDisposable } from 'vs/base/common/lifecycle';
 
 interface ExecutionPlanProviderRegisteredEvent {
 	id: string,
@@ -27,25 +28,57 @@ export class ExecutionPlanService implements IExecutionPlanService {
 		this._providerRegisterEvent = this._onProviderRegister.event;
 	}
 
-	private async ensureCapabilitiesRegistered(): Promise<void> {
+	/**
-		let providers = Object.keys(this._capabilitiesService.providers);
+	 * This ensures that the capabilities service has registered the providers to handle execution plan requests for the given file format.
-		if (!providers) {
+	 * @param fileExtension Execution plan file format
-			await new Promise<void>(resolve => {
+	 */
-				this._capabilitiesService.onCapabilitiesRegistered(e => {
+	public async ensureFileExtensionHandlerRegistered(fileExtension: string): Promise<void> {
+		for (let providerId in Object.keys(this._capabilitiesService.providers)) {
+			if (this._capabilitiesService.providers[providerId].connection.supportedExecutionPlanFileExtensions?.includes(fileExtension)) {
+				// We already have a provider registered that can handle this file extension so we're done
+				return;
+			}
+		}
+
+		let listener: IDisposable;
+		await new Promise<void>((resolve, reject) => {
+			listener = this._capabilitiesService.onCapabilitiesRegistered(e => {
+				if (e.features.connection.supportedExecutionPlanFileExtensions?.includes(fileExtension)) {
+					listener.dispose();
 					resolve();
+				}
+			});
+			setTimeout(() => {
+				listener.dispose();
+				reject(new Error(localize('executionPlanService.ensureFileExtensionHandlerRegistered', "Execution plan provider which supports file format '{0}' was not registered after 30 seconds.", fileExtension)));
+			}, 30000);
+		});
+	}
+
+	/**
+	 * This ensures that the capabilities service has registered the providers to handle execution plan requests.
+	 */
+	private async ensureCapabilitiesRegistered(providerId: string): Promise<void> {
+		// Wait until the provider with the given id is registered.
+		let listener: IDisposable;
+		if (!this._capabilitiesService.providers[providerId]) {
+			await new Promise<void>((resolve, reject) => {
+				listener = this._capabilitiesService.onCapabilitiesRegistered(e => {
+					if (e.id === providerId) {
+						listener.dispose();
+						resolve();
+					}
 				});
+				setTimeout(() => {
+					listener.dispose();
+					reject(new Error(localize('executionPlanService.ensureCapabilitiesRegistered', "Provider with id {0} was not registered after 30 seconds.", providerId)));
+				}, 30000);
 			});
 		}
 	}
 
 	private async getExecutionPlanProvider(providerId: string): Promise<azdata.executionPlan.ExecutionPlanProvider> {
-		await this.ensureCapabilitiesRegistered();
+		await this.ensureCapabilitiesRegistered(providerId);
-		const provider = this._capabilitiesService.providers[providerId];
-		// Return undefined if the provider is not registered or it is not a execution plan provider.
-		if (!provider || !provider.connection?.isExecutionPlanProvider) {
-			return undefined;
-		}
-
 		let handler = this._providers[providerId];
 		if (handler) {
 			return handler;
@@ -74,16 +107,16 @@ export class ExecutionPlanService implements IExecutionPlanService {
 
 	/**
 	 * Runs the actions using the provider that supports the fileFormat provided.
-	 * @param fileFormat fileformat of the underlying execution plan file. It is used to get the provider that support it.
+	 * @param fileExtension file extension of the underlying execution plan file. It is used to get the provider that support it.
 	 * @param action executionPlanService action to be performed.
 	 */
-	private async _runAction<T>(fileFormat: string, action: (handler: azdata.executionPlan.ExecutionPlanProvider) => Thenable<T>): Promise<T> {
+	private async _runAction<T>(fileExtension: string, action: (handler: azdata.executionPlan.ExecutionPlanProvider) => Thenable<T>): Promise<T> {
-		await this.ensureCapabilitiesRegistered();
+		await this.ensureFileExtensionHandlerRegistered(fileExtension);
 		let providers = Object.keys(this._capabilitiesService.providers);
 		let epProviders: string[] = [];
 		for (let i = 0; i < providers.length; i++) {
 			const providerCapabilities = this._capabilitiesService.getCapabilities(providers[i]);
-			if (providerCapabilities.connection.supportedExecutionPlanFileExtensions?.includes(fileFormat)) {
+			if (providerCapabilities.connection.supportedExecutionPlanFileExtensions?.includes(fileExtension)) {
 				epProviders.push(providers[i]);
 			}
 		}