From 993c987e939b43d2cab404bcce8222c3e69f1105 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= Date: Mon, 5 Oct 2020 17:56:28 +0200 Subject: [PATCH] fixes #107903 --- .../contrib/extensions/browser/extensionsActions.ts | 1 + src/vs/workbench/contrib/timeline/browser/timelinePane.ts | 1 + src/vs/workbench/contrib/views/browser/treeView.ts | 5 ++--- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts index d9c4aa1def4..2fa7e74947c 100644 --- a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts +++ b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts @@ -731,6 +731,7 @@ export function getContextMenuActions(menuService: IMenuService, contextKeyServi return instantiationService.createInstance(MenuItemExtensionAction, action); }))); menu.dispose(); + scopedContextKeyService.dispose(); return groups; } diff --git a/src/vs/workbench/contrib/timeline/browser/timelinePane.ts b/src/vs/workbench/contrib/timeline/browser/timelinePane.ts index 4fac480fc7c..761a811dbbd 100644 --- a/src/vs/workbench/contrib/timeline/browser/timelinePane.ts +++ b/src/vs/workbench/contrib/timeline/browser/timelinePane.ts @@ -1236,6 +1236,7 @@ class TimelinePaneCommands extends Disposable { createAndFillInContextMenuActions(menu, { shouldForwardArgs: true }, result, this.contextMenuService, g => /^inline/.test(g)); menu.dispose(); + scoped.dispose(); return result; } diff --git a/src/vs/workbench/contrib/views/browser/treeView.ts b/src/vs/workbench/contrib/views/browser/treeView.ts index 613e62662ea..9cf77011c6d 100644 --- a/src/vs/workbench/contrib/views/browser/treeView.ts +++ b/src/vs/workbench/contrib/views/browser/treeView.ts @@ -1027,9 +1027,8 @@ class TreeMenus extends Disposable implements IDisposable { createAndFillInContextMenuActions(menu, { shouldForwardArgs: true }, result, this.contextMenuService, g => /^inline/.test(g)); menu.dispose(); - // When called without a parameter, updateParent will dispose the parent change listener. - // We cannot call dispose on the contextKeyService because it will break submenus. - contextKeyService.updateParent(); + contextKeyService.dispose(); + return result; } } -- GitLab