From 29aea5b688d4a92d8dea91f5cc35bb19644f52ef Mon Sep 17 00:00:00 2001
From: Remi Schnekenburger <rschnekenburger@eclipsesource.com>
Date: Wed, 5 Jun 2024 12:38:07 +0200
Subject: [PATCH] Avoid changing context key view when changing selection

fixes #13375

contributed on behalf of STMicroelectronics

Signed-off-by: Remi Schnekenburger <rschnekenburger@eclipsesource.com>
---
 CHANGELOG.md                                                | 4 +++-
 .../plugin-ext/src/main/browser/view/tree-views-main.ts     | 4 ----
 .../src/main/browser/view/view-context-key-service.ts       | 6 ------
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a29f079c913c..d1fa54a24e354 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,9 @@
 
 - [Previous Changelogs](https://github.com/eclipse-theia/theia/tree/master/doc/changelogs/)
 
-<!-- ## not yet released
+<!-- ## not yet released 
+
+- [plugin] Avoid pollution of all toolbars by actions contributed by tree views in extensions [#13768](https://github.com/eclipse-theia/theia/pull/13768) - contributed on behalf of STMicroelectronics
 
 <a name="breaking_changes_not_yet_released">[Breaking Changes:](#breaking_changes_not_yet_released)</a> 
 
diff --git a/packages/plugin-ext/src/main/browser/view/tree-views-main.ts b/packages/plugin-ext/src/main/browser/view/tree-views-main.ts
index 7809098732fbf..4d875798d5c09 100644
--- a/packages/plugin-ext/src/main/browser/view/tree-views-main.ts
+++ b/packages/plugin-ext/src/main/browser/view/tree-views-main.ts
@@ -24,7 +24,6 @@ import {
     CompositeTreeNode,
     WidgetManager
 } from '@theia/core/lib/browser';
-import { ViewContextKeyService } from './view-context-key-service';
 import { Disposable, DisposableCollection } from '@theia/core';
 import { TreeViewWidget, TreeViewNode, PluginTreeModel, TreeViewWidgetOptions } from './tree-view-widget';
 import { PluginViewWidget } from './plugin-view-widget';
@@ -36,7 +35,6 @@ export class TreeViewsMainImpl implements TreeViewsMain, Disposable {
 
     private readonly proxy: TreeViewsExt;
     private readonly viewRegistry: PluginViewRegistry;
-    private readonly contextKeys: ViewContextKeyService;
     private readonly widgetManager: WidgetManager;
     private readonly fileContentStore: DnDFileContentStore;
 
@@ -50,7 +48,6 @@ export class TreeViewsMainImpl implements TreeViewsMain, Disposable {
         this.proxy = rpc.getProxy(MAIN_RPC_CONTEXT.TREE_VIEWS_EXT);
         this.viewRegistry = container.get(PluginViewRegistry);
 
-        this.contextKeys = this.container.get(ViewContextKeyService);
         this.widgetManager = this.container.get(WidgetManager);
         this.fileContentStore = this.container.get(DnDFileContentStore);
     }
@@ -197,7 +194,6 @@ export class TreeViewsMainImpl implements TreeViewsMain, Disposable {
         }));
 
         this.toDispose.push(treeViewWidget.model.onSelectionChanged(event => {
-            this.contextKeys.view.set(treeViewId);
             this.proxy.$setSelection(treeViewId, event.map((node: TreeViewNode) => node.id));
         }));
 
diff --git a/packages/plugin-ext/src/main/browser/view/view-context-key-service.ts b/packages/plugin-ext/src/main/browser/view/view-context-key-service.ts
index 943c864d46590..8bf65e0c3af6d 100644
--- a/packages/plugin-ext/src/main/browser/view/view-context-key-service.ts
+++ b/packages/plugin-ext/src/main/browser/view/view-context-key-service.ts
@@ -19,11 +19,6 @@ import { ContextKey, ContextKeyService } from '@theia/core/lib/browser/context-k
 
 @injectable()
 export class ViewContextKeyService {
-    protected _view: ContextKey<string>;
-    get view(): ContextKey<string> {
-        return this._view;
-    }
-
     protected _viewItem: ContextKey<string>;
     get viewItem(): ContextKey<string> {
         return this._viewItem;
@@ -56,7 +51,6 @@ export class ViewContextKeyService {
 
     @postConstruct()
     protected init(): void {
-        this._view = this.contextKeyService.createKey('view', '');
         this._viewItem = this.contextKeyService.createKey('viewItem', '');
         this._activeViewlet = this.contextKeyService.createKey('activeViewlet', '');
         this._activePanel = this.contextKeyService.createKey('activePanel', '');