Fix SQL/Notebook editors opening as plaintext (#16442) (#16456)

* Register overrides at startup

* Always wait for extensions

* Fix compile errors

(cherry picked from commit 2d8e0d648a)

src/sql/workbench/contrib/notebook/browser/notebook.contribution.ts

@@ -677,13 +677,15 @@ export class NotebookEditorOverrideContribution extends Disposable implements IW
 		@IModeService private _modeService: IModeService
 	) {
 		super();
-		this.registerEditorOverride();
+		this.registerEditorOverrides();
-	}
-
-	private registerEditorOverride(): void {
 		// Refresh the editor overrides whenever the languages change so we ensure we always have
 		// the latest up to date list of extensions for each language
 		this._modeService.onLanguagesMaybeChanged(() => {
+			this.registerEditorOverrides();
+		});
+	}
+
+	private registerEditorOverrides(): void {
 		this._registeredOverrides.clear();
 		// List of language IDs to associate the query editor for. These are case sensitive.
 		NotebookEditorInputAssociation.languages.map(lang => {
@@ -718,7 +720,6 @@ export class NotebookEditorOverrideContribution extends Disposable implements IW
 				}
 			));
 		});
-		});
 	}
 
 	private tryConvertInput(input: IEditorInput, lang: string): IEditorInput | undefined {
@@ -733,4 +734,4 @@ export class NotebookEditorOverrideContribution extends Disposable implements IW
 }
 
 Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench)
-	.registerWorkbenchContribution(NotebookEditorOverrideContribution, LifecyclePhase.Restored);
+	.registerWorkbenchContribution(NotebookEditorOverrideContribution, LifecyclePhase.Starting);

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

@@ -510,12 +510,14 @@ export class QueryEditorOverrideContribution extends Disposable implements IWork
 	) {
 		super();
 		this.registerEditorOverrides();
-	}
-
-	private registerEditorOverrides(): void {
 		// Refresh the editor overrides whenever the languages change so we ensure we always have
 		// the latest up to date list of extensions for each language
 		this._modeService.onLanguagesMaybeChanged(() => {
+			this.registerEditorOverrides();
+		});
+	}
+
+	private registerEditorOverrides(): void {
 		this._registeredOverrides.clear();
 		// List of language IDs to associate the query editor for. These are case sensitive.
 		QueryEditorLanguageAssociation.languages.map(lang => {
@@ -549,8 +551,6 @@ export class QueryEditorOverrideContribution extends Disposable implements IWork
 				}
 			));
 		});
-		});
 	}
 }
-
+workbenchRegistry.registerWorkbenchContribution(QueryEditorOverrideContribution, LifecyclePhase.Starting);
-workbenchRegistry.registerWorkbenchContribution(QueryEditorOverrideContribution, LifecyclePhase.Restored);

src/vs/workbench/services/editor/browser/editorOverrideService.ts

@@ -43,7 +43,7 @@ export class EditorOverrideService extends Disposable implements IEditorOverride
 
 	private _contributionPoints: Map<string | glob.IRelativePattern, ContributionPoints> = new Map<string | glob.IRelativePattern, ContributionPoints>();
 	private static readonly overrideCacheStorageID = 'editorOverrideService.cache';
-	private cache: Set<string> | undefined;
+	// private cache: Set<string> | undefined; {{SQL CARBON EDIT}} Remove unused
 
 	constructor(
 		@IEditorGroupsService private readonly editorGroupService: IEditorGroupsService,
@@ -56,7 +56,7 @@ export class EditorOverrideService extends Disposable implements IEditorOverride
 	) {
 		super();
 		// Read in the cache on statup
-		this.cache = new Set<string>(JSON.parse(this.storageService.get(EditorOverrideService.overrideCacheStorageID, StorageScope.GLOBAL, JSON.stringify([]))));
+		// this.cache = new Set<string>(JSON.parse(this.storageService.get(EditorOverrideService.overrideCacheStorageID, StorageScope.GLOBAL, JSON.stringify([])))); {{SQL CARBON EDIT}} Remove unused
 		this.storageService.remove(EditorOverrideService.overrideCacheStorageID, StorageScope.GLOBAL);
 
 		this._register(this.storageService.onWillSaveState(() => {
@@ -65,16 +65,18 @@ export class EditorOverrideService extends Disposable implements IEditorOverride
 		}));
 
 		// When extensions have registered we no longer need the cache
+		/* {{SQL CARBON EDIT}} Remove unused
 		this.extensionService.onDidRegisterExtensions(() => {
 			this.cache = undefined;
 		});
+		*/
 	}
 
 	async resolveEditorOverride(editor: IEditorInput, options: IEditorOptions | ITextEditorOptions | undefined, group: IEditorGroup): Promise<IEditorInputWithOptionsAndGroup | undefined> {
 		// If it was an override before we await for the extensions to activate and then proceed with overriding or else they won't be registered
-		if (this.cache && editor.resource && this.resourceMatchesCache(editor.resource)) {
+		//if (this.cache && editor.resource && this.resourceMatchesCache(editor.resource)) { // {{SQL CARBON EDIT}} Always wait for extensions so that our language-based overrides (SQL/Notebooks) will always have those registered
 		await this.extensionService.whenInstalledExtensionsRegistered();
-		}
+		//}
 
 		if (options?.override === EditorOverride.DISABLED) {
 			throw new Error(`Calling resolve editor override when override is explicitly disabled!`);
@@ -547,6 +549,7 @@ export class EditorOverrideService extends Disposable implements IEditorOverride
 		this.storageService.store(EditorOverrideService.overrideCacheStorageID, JSON.stringify(Array.from(cacheStorage)), StorageScope.GLOBAL, StorageTarget.MACHINE);
 	}
 
+	/* {{SQL CARBON EDIT}} Remove unused
 	private resourceMatchesCache(resource: URI): boolean {
 		if (!this.cache) {
 			return false;
@@ -559,6 +562,7 @@ export class EditorOverrideService extends Disposable implements IEditorOverride
 		}
 		return false;
 	}
+	*/
 }
 
 registerSingleton(IEditorOverrideService, EditorOverrideService);