development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-01 08:50:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

print warning about reused action ids, fix view action duplication (#202000)

Browse source 
* print warning about reused action ids, fix view action duplication

* remove debug code

* make tests happy-ish
This commit is contained in:
Johannes Rieken 2024-01-08 16:27:32 +01:00 committed by GitHub
parent 6eed4af2d4
commit 880eee6a96
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/vs/platform/actions/common/actions.ts
View file

@ -577,6 +577,11 @@ export function registerAction2(ctor: { new(): Action2 }): IDisposable {
const { f1, menu, keybinding, ...command } = action.desc;
if (CommandsRegistry.getCommand(command.id)) {
// throw new Error(`Cannot register two commands with the same id: ${command.id}`);
console.warn(`Cannot register two commands with the same id: ${command.id}`);
}
// command
disposables.add(CommandsRegistry.registerCommand({
id: command.id,

6
src/vs/workbench/services/views/browser/viewDescriptorService.ts
View file

@ -756,13 +756,17 @@ export class ViewDescriptorService extends Disposable implements IViewDescriptor
}
private registerViewsVisibilityActions(viewContainer: ViewContainer, { viewContainerModel, disposables }: { viewContainerModel: ViewContainerModel; disposables: DisposableStore }): void {
this.viewsVisibilityActionDisposables.deleteAndDispose(viewContainer);
this.viewsVisibilityActionDisposables.set(viewContainer, this.registerViewsVisibilityActionsForContainer(viewContainerModel));
disposables.add(Event.any(
viewContainerModel.onDidChangeActiveViewDescriptors,
viewContainerModel.onDidAddVisibleViewDescriptors,
viewContainerModel.onDidRemoveVisibleViewDescriptors,
viewContainerModel.onDidMoveVisibleViewDescriptors
)(e => this.viewsVisibilityActionDisposables.set(viewContainer, this.registerViewsVisibilityActionsForContainer(viewContainerModel))));
)(e => {
this.viewsVisibilityActionDisposables.deleteAndDispose(viewContainer);
this.viewsVisibilityActionDisposables.set(viewContainer, this.registerViewsVisibilityActionsForContainer(viewContainerModel));
}));
}
private registerViewsVisibilityActionsForContainer(viewContainerModel: ViewContainerModel): IDisposable {

1
test/unit/electron/renderer.js
View file

@ -195,6 +195,7 @@ function loadTests(opts) {
'issue #149130: vscode freezes because of Bracket Pair Colorization', // https://github.com/microsoft/vscode/issues/192440
'property limits', // https://github.com/microsoft/vscode/issues/192443
'Error events', // https://github.com/microsoft/vscode/issues/192443
'fetch returns keybinding with user first if title and id matches' //
]);
let _testsWithUnexpectedOutput = false;