UI freeze when trusting/untrusting current folder (fix microsoft#159224) (microsoft#159258)

* UI freeze when trusting/untrusting current folder (fix microsoft#159224)

* Consolidate a few of the resolver events

Co-authored-by: Logan Ramos <[email protected]>

Author: bpasero

src/vs/workbench/browser/parts/editor/editor.contribution.ts

@@ -65,7 +65,7 @@ import { FileAccess } from 'vs/base/common/network';
 import { Codicon } from 'vs/base/common/codicons';
 import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
 import { UntitledTextEditorInputSerializer, UntitledTextEditorWorkingCopyEditorHandler } from 'vs/workbench/services/untitled/common/untitledTextEditorHandler';
-import { DynamicEditorResolverConfigurations } from 'vs/workbench/browser/parts/editor/editorConfiguration';
+import { DynamicEditorConfigurations } from 'vs/workbench/browser/parts/editor/editorConfiguration';
 
 //#region Editor Registrations
 
@@ -125,7 +125,7 @@ Registry.as<IEditorFactoryRegistry>(EditorExtensions.EditorFactory).registerEdit
 Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(EditorAutoSave, LifecyclePhase.Ready);
 Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(EditorStatus, LifecyclePhase.Ready);
 Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(UntitledTextEditorWorkingCopyEditorHandler, LifecyclePhase.Ready);
-Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(DynamicEditorResolverConfigurations, LifecyclePhase.Ready);
+Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(DynamicEditorConfigurations, LifecyclePhase.Ready);
 
 registerEditorContribution(FloatingClickMenu.ID, FloatingClickMenu);
 registerEditorContribution(OpenWorkspaceButtonContribution.ID, OpenWorkspaceButtonContribution);

src/vs/workbench/browser/parts/editor/editorConfiguration.ts

@@ -12,8 +12,10 @@ import { workbenchConfigurationNodeBase } from 'vs/workbench/common/configuratio
 import { IEditorResolverService, RegisteredEditorInfo, RegisteredEditorPriority } from 'vs/workbench/services/editor/common/editorResolverService';
 import { IJSONSchemaMap } from 'vs/base/common/jsonSchema';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+import { coalesce } from 'vs/base/common/arrays';
+import { Event } from 'vs/base/common/event';
 
-export class DynamicEditorResolverConfigurations extends Disposable implements IWorkbenchContribution {
+export class DynamicEditorConfigurations extends Disposable implements IWorkbenchContribution {
 
 	private static readonly AUTO_LOCK_DEFAULT_ENABLED = new Set<string>(['terminalEditor']);
 
@@ -29,10 +31,11 @@ export class DynamicEditorResolverConfigurations extends Disposable implements I
 		}
 	];
 
-	private configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
+	private readonly configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
+
 	private autoLockConfigurationNode: IConfigurationNode | undefined;
 	private defaultBinaryEditorConfigurationNode: IConfigurationNode | undefined;
-	private editorAssociationsConfiguratioNnode: IConfigurationNode | undefined;
+	private editorAssociationsConfigurationNode: IConfigurationNode | undefined;
 
 	constructor(
 		@IEditorResolverService private readonly editorResolverService: IEditorResolverService,
@@ -42,40 +45,40 @@ export class DynamicEditorResolverConfigurations extends Disposable implements I
 
 		// Editor configurations are getting updated very aggressively
 		// (atleast 20 times) while the extensions are getting registered.
-		// As such push out the dynamic editor auto lock configuration
-		// until after extensions registered.
+		// As such push out the dynamic configuration until after extensions
+		// are registered.
 		(async () => {
 			await extensionService.whenInstalledExtensionsRegistered();
 
-			this.updateConfiguration();
+			this.updateDynamicEditorConfigurations();
 			this.registerListeners();
 		})();
 	}
 
 	private registerListeners(): void {
 
-		// Registered editors
-		this._register(this.editorResolverService.onDidChangeEditorRegistrations(() => this.updateConfiguration()));
+		// Registered editors (debounced to reduce perf overhead)
+		Event.debounce(this.editorResolverService.onDidChangeEditorRegistrations, (_, e) => e)(() => this.updateDynamicEditorConfigurations());
 	}
 
-	private updateConfiguration(): void {
-		const lockableEditors = [...this.editorResolverService.getEditors(), ...DynamicEditorResolverConfigurations.AUTO_LOCK_EXTRA_EDITORS];
+	private updateDynamicEditorConfigurations(): void {
+		const lockableEditors = [...this.editorResolverService.getEditors(), ...DynamicEditorConfigurations.AUTO_LOCK_EXTRA_EDITORS];
 		const binaryEditorCandidates = this.editorResolverService.getEditors().filter(e => e.priority !== RegisteredEditorPriority.exclusive).map(e => e.id);
 
 		// Build config from registered editors
 		const autoLockGroupConfiguration: IJSONSchemaMap = Object.create(null);
 		for (const editor of lockableEditors) {
 			autoLockGroupConfiguration[editor.id] = {
 				type: 'boolean',
-				default: DynamicEditorResolverConfigurations.AUTO_LOCK_DEFAULT_ENABLED.has(editor.id),
+				default: DynamicEditorConfigurations.AUTO_LOCK_DEFAULT_ENABLED.has(editor.id),
 				description: editor.label
 			};
 		}
 
 		// Build default config too
 		const defaultAutoLockGroupConfiguration = Object.create(null);
 		for (const editor of lockableEditors) {
-			defaultAutoLockGroupConfiguration[editor.id] = DynamicEditorResolverConfigurations.AUTO_LOCK_DEFAULT_ENABLED.has(editor.id);
+			defaultAutoLockGroupConfiguration[editor.id] = DynamicEditorConfigurations.AUTO_LOCK_DEFAULT_ENABLED.has(editor.id);
 		}
 
 		// Register settng for auto locking groups
@@ -109,8 +112,8 @@ export class DynamicEditorResolverConfigurations extends Disposable implements I
 		};
 
 		// Registers setting for editorAssociations
-		const oldEditorAssociationsConfigurationNode = this.editorAssociationsConfiguratioNnode;
-		this.editorAssociationsConfiguratioNnode = {
+		const oldEditorAssociationsConfigurationNode = this.editorAssociationsConfigurationNode;
+		this.editorAssociationsConfigurationNode = {
 			...workbenchConfigurationNodeBase,
 			properties: {
 				'workbench.editorAssociations': {
@@ -126,8 +129,17 @@ export class DynamicEditorResolverConfigurations extends Disposable implements I
 			}
 		};
 
-		this.configurationRegistry.updateConfigurations({ add: [this.autoLockConfigurationNode], remove: oldAutoLockConfigurationNode ? [oldAutoLockConfigurationNode] : [] });
-		this.configurationRegistry.updateConfigurations({ add: [this.defaultBinaryEditorConfigurationNode], remove: oldDefaultBinaryEditorConfigurationNode ? [oldDefaultBinaryEditorConfigurationNode] : [] });
-		this.configurationRegistry.updateConfigurations({ add: [this.editorAssociationsConfiguratioNnode], remove: oldEditorAssociationsConfigurationNode ? [oldEditorAssociationsConfigurationNode] : [] });
+		this.configurationRegistry.updateConfigurations({
+			add: [
+				this.autoLockConfigurationNode,
+				this.defaultBinaryEditorConfigurationNode,
+				this.editorAssociationsConfigurationNode
+			],
+			remove: coalesce([
+				oldAutoLockConfigurationNode,
+				oldDefaultBinaryEditorConfigurationNode,
+				oldEditorAssociationsConfigurationNode
+			])
+		});
 	}
 }

src/vs/workbench/contrib/customEditor/browser/customEditors.ts

@@ -65,10 +65,12 @@ export class CustomEditorService extends Disposable implements ICustomEditorServ
 		this._focusedCustomEditorIsEditable = CONTEXT_FOCUSED_CUSTOM_EDITOR_IS_EDITABLE.bindTo(contextKeyService);
 
 		this._contributedEditors = this._register(new ContributedCustomEditors(storageService));
-		this.registerContributionPoints();
+		// Register the contribution points only emitting one change from the resolver
+		this.editorResolverService.bufferChangeEvents(this.registerContributionPoints.bind(this));
 
 		this._register(this._contributedEditors.onChange(() => {
-			this.registerContributionPoints();
+			// Register the contribution points only emitting one change from the resolver
+			this.editorResolverService.bufferChangeEvents(this.registerContributionPoints.bind(this));
 			this.updateContexts();
 			this._onDidChangeEditorTypes.fire();
 		}));

src/vs/workbench/contrib/notebook/browser/services/notebookServiceImpl.ts

@@ -61,12 +61,16 @@ export class NotebookProviderInfoStore extends Disposable {
 		@INotebookEditorModelResolverService private readonly _notebookEditorModelResolverService: INotebookEditorModelResolverService
 	) {
 		super();
+
 		this._memento = new Memento(NotebookProviderInfoStore.CUSTOM_EDITORS_STORAGE_ID, storageService);
 
 		const mementoObject = this._memento.getMemento(StorageScope.PROFILE, StorageTarget.MACHINE);
-		for (const info of (mementoObject[NotebookProviderInfoStore.CUSTOM_EDITORS_ENTRY_ID] || []) as NotebookEditorDescriptor[]) {
-			this.add(new NotebookProviderInfo(info));
-		}
+		// Process the notebook contributions but buffer changes from the resolver
+		this._editorResolverService.bufferChangeEvents(() => {
+			for (const info of (mementoObject[NotebookProviderInfoStore.CUSTOM_EDITORS_ENTRY_ID] || []) as NotebookEditorDescriptor[]) {
+				this.add(new NotebookProviderInfo(info));
+			}
+		});
 
 		this._register(extensionService.onDidRegisterExtensions(() => {
 			if (!this._handled) {

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

@@ -27,7 +27,7 @@ import { findGroup } from 'vs/workbench/services/editor/common/editorGroupFinder
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { PreferredGroup } from 'vs/workbench/services/editor/common/editorService';
 import { SideBySideEditorInput } from 'vs/workbench/common/editor/sideBySideEditorInput';
-import { Emitter } from 'vs/base/common/event';
+import { PauseableEmitter } from 'vs/base/common/event';
 
 interface RegisteredEditor {
 	globPattern: string | glob.IRelativePattern;
@@ -42,7 +42,7 @@ export class EditorResolverService extends Disposable implements IEditorResolver
 	readonly _serviceBrand: undefined;
 
 	// Events
-	private readonly _onDidChangeEditorRegistrations = this._register(new Emitter<void>());
+	private readonly _onDidChangeEditorRegistrations = this._register(new PauseableEmitter<void>());
 	readonly onDidChangeEditorRegistrations = this._onDidChangeEditorRegistrations.event;
 
 	// Constants
@@ -216,6 +216,15 @@ export class EditorResolverService extends Disposable implements IEditorResolver
 		};
 	}
 
+	bufferChangeEvents(callback: Function): void {
+		this._onDidChangeEditorRegistrations.pause();
+		try {
+			callback();
+		} finally {
+			this._onDidChangeEditorRegistrations.resume();
+		}
+	}
+
 	registerEditor(
 		globPattern: string | glob.IRelativePattern,
 		editorInfo: RegisteredEditorInfo,

src/vs/workbench/services/editor/common/editorResolverService.ts

@@ -140,6 +140,11 @@ export interface IEditorResolverService {
 	 */
 	readonly onDidChangeEditorRegistrations: Event<void>;
 
+	/**
+	 * Given a callback, run the callback pausing the registration emitter
+	 */
+	bufferChangeEvents(callback: Function): void;
+
 	/**
 	 * Registers a specific editor. Editors with the same glob pattern and ID will be grouped together by the resolver.
 	 * This allows for registration of the factories in different locations