deprate registerWorkbenchAction more but make it leak less (#159668)

microsoft · Aug 31, 2022 · 2ccc23b · 2ccc23b
1 parent 70c7237
commit 2ccc23b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/src/vs/platform/actions/common/actions.ts b/src/vs/platform/actions/common/actions.ts
@@ -466,6 +466,9 @@ export class MenuItemAction implements IAction {
 	}
 }
 
+/**
+ * @deprecated Use {@link registerAction2} instead.
+ */
 export class SyncActionDescriptor {
 
 	private readonly _descriptor: SyncDescriptor0<Action>;

diff --git a/src/vs/workbench/common/actions.ts b/src/vs/workbench/common/actions.ts
@@ -44,7 +44,7 @@ Registry.add(Extensions.WorkbenchActions, new class implements IWorkbenchActionR
 		// keybinding
 		const weight = (typeof descriptor.keybindingWeight === 'undefined' ? KeybindingWeight.WorkbenchContrib : descriptor.keybindingWeight);
 		const keybindings = descriptor.keybindings;
-		KeybindingsRegistry.registerKeybindingRule({
+		registrations.add(KeybindingsRegistry.registerKeybindingRule({
 			id: descriptor.id,
 			weight: weight,
 			when:
@@ -56,7 +56,7 @@ Registry.add(Extensions.WorkbenchActions, new class implements IWorkbenchActionR
 			win: keybindings?.win,
 			mac: keybindings?.mac,
 			linux: keybindings?.linux
-		});
+		}));
 
 		// menu item
 		// TODO@Rob slightly weird if-check required because of
@@ -76,14 +76,10 @@ Registry.add(Extensions.WorkbenchActions, new class implements IWorkbenchActionR
 				category: category ? { value: category, original: categoryOriginal } : undefined
 			};
 
-			MenuRegistry.addCommand(command);
+			registrations.add(MenuRegistry.addCommand(command));
 
 			registrations.add(MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command, when }));
 		}
-
-		// TODO@alex,joh
-		// support removal of keybinding rule
-		// support removal of command-ui
 		return registrations;
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -466,6 +466,9 @@ export class MenuItemAction implements IAction { @@
     	}
     }
+    /**
+     * @deprecated Use {@link registerAction2} instead.
+     */
     export class SyncActionDescriptor {
     	private readonly _descriptor: SyncDescriptor0<Action>;
@@ Expand Down @@