fix: fix user defined action keybinding not showing up in command palette

Author: Loïc Mangeonjean

scripts/vscode.patch

@@ -252,6 +252,26 @@ index 23d547570e9..31dfb4fd8d4 100644
 -import 'vs/editor/standalone/browser/toggleHighContrast/toggleHighContrast';
 
  export * from 'vs/editor/editor.api';
+diff --git a/src/vs/editor/standalone/browser/standaloneServices.ts b/src/vs/editor/standalone/browser/standaloneServices.ts
+index f026f61f400..706d3e15da0 100644
+--- a/src/vs/editor/standalone/browser/standaloneServices.ts
++++ b/src/vs/editor/standalone/browser/standaloneServices.ts
+@@ -517,10 +517,14 @@ export class StandaloneKeybindingService extends AbstractKeybindingService {
+ 		this._onDidUpdateKeybindings.fire();
+ 	}
+ 
++	protected getUserKeybindingItems() {
++		return this._toNormalizedKeybindingItems(this._dynamicKeybindings, false);
++	}
++
+ 	protected _getResolver(): KeybindingResolver {
+ 		if (!this._cachedResolver) {
+ 			const defaults = this._toNormalizedKeybindingItems(KeybindingsRegistry.getDefaultKeybindings(), true);
+-			const overrides = this._toNormalizedKeybindingItems(this._dynamicKeybindings, false);
++			const overrides = this.getUserKeybindingItems();
+ 			this._cachedResolver = new KeybindingResolver(defaults, overrides, (str) => this._log(str));
+ 		}
+ 		return this._cachedResolver;
 diff --git a/src/vs/platform/assignment/common/assignmentService.ts b/src/vs/platform/assignment/common/assignmentService.ts
 index 67e34826627..7c5287d6a32 100644
 --- a/src/vs/platform/assignment/common/assignmentService.ts
@@ -1108,6 +1128,32 @@ index c529886ca92..2311e7a0fb5 100644
  	constructor(
  		public readonly toAdd: IExtension[],
  		public readonly toRemove: string[] | IExtension[]
+diff --git a/src/vs/workbench/services/keybinding/browser/keybindingService.ts b/src/vs/workbench/services/keybinding/browser/keybindingService.ts
+index e6112182d25..0bc70e55633 100644
+--- a/src/vs/workbench/services/keybinding/browser/keybindingService.ts
++++ b/src/vs/workbench/services/keybinding/browser/keybindingService.ts
+@@ -381,15 +381,19 @@ export class WorkbenchKeybindingService extends AbstractKeybindingService {
+ 		return this.userKeybindings.keybindings.length;
+ 	}
+ 
+-	private updateResolver(): void {
++	protected updateResolver(): void {
+ 		this._cachedResolver = null;
+ 		this._onDidUpdateKeybindings.fire();
+ 	}
+ 
++	protected getUserKeybindingItems() {
++		return this._resolveUserKeybindingItems(this.userKeybindings.keybindings, false);
++	}
++
+ 	protected _getResolver(): KeybindingResolver {
+ 		if (!this._cachedResolver) {
+ 			const defaults = this._resolveKeybindingItems(KeybindingsRegistry.getDefaultKeybindings(), true);
+-			const overrides = this._resolveUserKeybindingItems(this.userKeybindings.keybindings, false);
++			const overrides = this.getUserKeybindingItems();
+ 			this._cachedResolver = new KeybindingResolver(defaults, overrides, (str) => this._log(str));
+ 		}
+ 		return this._cachedResolver;
 diff --git a/src/vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorker.ts b/src/vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorker.ts
 index e8c8239b35f..9017a971ee5 100644
 --- a/src/vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorker.ts

src/monaco.ts

@@ -11,7 +11,7 @@ import type { create as createEditor, createDiffEditor } from 'vs/editor/standal
 import { errorHandler } from 'vs/base/common/errors'
 import { FoldingModel, setCollapseStateForMatchingLines } from 'vs/editor/contrib/folding/browser/foldingModel'
 import { FoldingController } from 'vs/editor/contrib/folding/browser/folding'
-import { DisposableStore, IReference } from 'vs/base/common/lifecycle'
+import { DisposableStore, IDisposable, IReference } from 'vs/base/common/lifecycle'
 import { Registry } from 'vs/platform/registry/common/platform'
 import { IJSONContributionRegistry, Extensions as JsonExtensions } from 'vs/platform/jsonschemas/common/jsonContributionRegistry'
 import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands'
@@ -39,7 +39,7 @@ import { ILogService } from 'vs/platform/log/common/log'
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService'
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'
 import { KeybindingResolver } from 'vs/platform/keybinding/common/keybindingResolver'
-import { WorkbenchKeybindingService } from 'vs/workbench/services/keybinding/browser/keybindingService'
+import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem'
 import { createInjectedClass } from './tools/injection'
 // Selectively comes from vs/workbench/contrib/codeEditor/browser/codeEditor.contribution.ts
 import 'vs/workbench/contrib/codeEditor/browser/workbenchReferenceSearch'
@@ -178,13 +178,21 @@ export async function createModelReference (resource: URI, content?: string): Pr
   return (await StandaloneServices.get(ITextModelService).createModelReference(resource)) as IReference<ITextFileEditorModel>
 }
 
+export interface DynamicKeybindingService extends IKeybindingService {
+  registerKeybindingProvider (provider: () => ResolvedKeybindingItem[]): IDisposable
+  _getResolver(): KeybindingResolver
+}
+
+function isDynamicKeybindingService (keybindingService: IKeybindingService) {
+  // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+  return (keybindingService as DynamicKeybindingService).registerKeybindingProvider != null
+}
+
 // This class use useful so editor.addAction and editor.addCommand still work
 // Monaco do an `instanceof` on the KeybindingService so we need it to extends `StandaloneKeybindingService`
 class DelegateStandaloneKeybindingService extends StandaloneKeybindingService {
-  private _cachedOverridenResolver: KeybindingResolver | null
-
   constructor (
-    private delegate: WorkbenchKeybindingService,
+    private delegate: DynamicKeybindingService,
     @IContextKeyService contextKeyService: IContextKeyService,
     @ICommandService commandService: ICommandService,
     @ITelemetryService telemetryService: ITelemetryService,
@@ -193,29 +201,12 @@ class DelegateStandaloneKeybindingService extends StandaloneKeybindingService {
     @ICodeEditorService codeEditorService: ICodeEditorService
   ) {
     super(contextKeyService, commandService, telemetryService, notificationService, logService, codeEditorService)
-    this._cachedOverridenResolver = null
-
-    this.onDidUpdateKeybindings(() => {
-      this._cachedOverridenResolver = null
-    })
-    this.delegate.onDidUpdateKeybindings(() => {
-      this._cachedOverridenResolver = null
-    })
+
+    this._register(delegate.registerKeybindingProvider(() => this.getUserKeybindingItems()))
   }
 
   protected override _getResolver (): KeybindingResolver {
-    // Create a new resolver that uses the keybindings from WorkbenchKeybindingService, overriden by _dynamicKeybindings from StandaloneKeybindingService
-    if (this._cachedOverridenResolver == null) {
-      // eslint-disable-next-line dot-notation
-      const overrides = this['_toNormalizedKeybindingItems'](this['_dynamicKeybindings'], false)
-      this._cachedOverridenResolver = new KeybindingResolver(
-        // eslint-disable-next-line dot-notation
-        [...this.delegate['_getResolver']().getKeybindings()],
-        overrides
-        , (str) => this._log(str)
-      )
-    }
-    return this._cachedOverridenResolver
+    return this.delegate._getResolver()
   }
 }
 
@@ -225,7 +216,7 @@ function getStandaloneEditorInstantiationService () {
     const serviceCollection = new ServiceCollection()
     serviceCollection.set(IQuickInputService, new SyncDescriptor(StandaloneQuickInputService, undefined, true))
     const keybindingService = StandaloneServices.get(IKeybindingService)
-    if (keybindingService instanceof WorkbenchKeybindingService) {
+    if (!(keybindingService instanceof StandaloneKeybindingService) && isDynamicKeybindingService(keybindingService)) {
       serviceCollection.set(IKeybindingService, new SyncDescriptor(DelegateStandaloneKeybindingService, [keybindingService], true))
     }
     standaloneEditorInstantiationService = StandaloneServices.get(IInstantiationService).createChild(serviceCollection)

src/service-override/keybindings.ts

@@ -10,7 +10,11 @@ import { BrowserKeyboardLayoutService } from 'vs/workbench/services/keybinding/b
 import { IFileService } from 'vs/platform/files/common/files'
 import { ICommandService } from 'vs/platform/commands/common/commands'
 import { CommandService } from 'vs/workbench/services/commands/common/commandService'
+import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem'
+import { toDisposable } from 'vs/base/common/lifecycle'
+import { KeybindingResolver } from 'vs/platform/keybinding/common/keybindingResolver'
 import getFileServiceOverride from './files'
+import { DynamicKeybindingService } from '../monaco'
 import 'vs/workbench/browser/workbench.contribution'
 import 'vs/workbench/contrib/keybindings/browser/keybindings.contribution'
 
@@ -19,10 +23,35 @@ async function updateUserKeybindings (keybindingsJson: string): Promise<void> {
   await StandaloneServices.get(IFileService).writeFile(userDataProfilesService.defaultProfile.keybindingsResource, VSBuffer.fromString(keybindingsJson))
 }
 
+class DynamicWorkbenchKeybindingService extends WorkbenchKeybindingService implements DynamicKeybindingService {
+  private keybindingProviders: (() => ResolvedKeybindingItem[])[] = []
+
+  public registerKeybindingProvider (provider: () => ResolvedKeybindingItem[]) {
+    this.keybindingProviders.push(provider)
+    this.updateResolver()
+
+    return toDisposable(() => {
+      const idx = this.keybindingProviders.indexOf(provider)
+      if (idx >= 0) {
+        this.keybindingProviders.splice(idx, 1)
+        this.updateResolver()
+      }
+    })
+  }
+
+  public override _getResolver (): KeybindingResolver {
+    return super._getResolver()
+  }
+
+  protected override getUserKeybindingItems () {
+    return [...super.getUserKeybindingItems(), ...this.keybindingProviders.flatMap(provider => provider())]
+  }
+}
+
 export default function getServiceOverride (): IEditorOverrideServices {
   return {
     ...getFileServiceOverride(),
-    [IKeybindingService.toString()]: new SyncDescriptor(WorkbenchKeybindingService, [], false),
+    [IKeybindingService.toString()]: new SyncDescriptor(DynamicWorkbenchKeybindingService, [], false),
     [IKeyboardLayoutService.toString()]: new SyncDescriptor(BrowserKeyboardLayoutService, undefined, true),
     [ICommandService.toString()]: new SyncDescriptor(CommandService, [], true)
   }