@codingame/monaco-vscode-scm-service-override 2.0.1 → 2.0.3-improve-modularity.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-scm-service-override",
-  "version": "2.0.1",
+  "version": "2.0.3-improve-modularity.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,7 +18,7 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@2.0.1",
+    "vscode": "npm:@codingame/monaco-vscode-api@2.0.3-improve-modularity.1",
     "vscode-marked": "npm:marked@=3.0.2"
   }
 }

package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPane.js

@@ -1176,19 +1176,13 @@ class RepositoryVisibilityAction extends Action2 {
     }
 }
 let RepositoryVisibilityActionController = class RepositoryVisibilityActionController {
-    constructor(contextKeyService, scmViewService, configurationService, scmService) {
+    constructor(contextKeyService, scmViewService, scmService) {
         this.contextKeyService = contextKeyService;
         this.scmViewService = scmViewService;
-        this.alwaysShowRepositories = false;
         this.items = ( new Map());
         this.disposables = ( new DisposableStore());
         this.repositoryCountContextKey = ContextKeys.RepositoryCount.bindTo(contextKeyService);
         this.repositoryVisibilityCountContextKey = ContextKeys.RepositoryVisibilityCount.bindTo(contextKeyService);
-        this.scmProviderContextKey = ContextKeys.SCMProvider.bindTo(contextKeyService);
-        this.scmProviderRootUriContextKey = ContextKeys.SCMProviderRootUri.bindTo(contextKeyService);
-        this.scmProviderHasRootUriContextKey = ContextKeys.SCMProviderHasRootUri.bindTo(contextKeyService);
-        configurationService.onDidChangeConfiguration(this.onDidChangeConfiguration, this, this.disposables);
-        this.onDidChangeConfiguration();
         scmViewService.onDidChangeVisibleRepositories(this.onDidChangeVisibleRepositories, this, this.disposables);
         scmService.onDidAddRepository(this.onDidAddRepository, this, this.disposables);
         scmService.onDidRemoveRepository(this.onDidRemoveRepository, this, this.disposables);
@@ -1230,26 +1224,9 @@ let RepositoryVisibilityActionController = class RepositoryVisibilityActionContr
         this.repositoryCountContextKey.set(this.items.size);
         this.repositoryVisibilityCountContextKey.set(count);
     }
-    onDidChangeConfiguration(e) {
-        if (!e || e.affectsConfiguration('scm.alwaysShowRepositories')) {
-            this.alwaysShowRepositories = this.contextKeyService.getContextKeyValue('scm.alwaysShowRepositories') === true;
-            this.updateRepositoryContextKeys();
-        }
-    }
     updateRepositoryContextKeys() {
         this.repositoryCountContextKey.set(this.items.size);
         this.repositoryVisibilityCountContextKey.set(Iterable.reduce(( this.items.keys()), (r, repository) => r + (this.scmViewService.isVisible(repository) ? 1 : 0), 0));
-        if (!this.alwaysShowRepositories && this.items.size === 1) {
-            const provider = Iterable.first(( this.items.keys())).provider;
-            this.scmProviderContextKey.set(provider.contextValue);
-            this.scmProviderRootUriContextKey.set(provider.rootUri?.toString());
-            this.scmProviderHasRootUriContextKey.set(!!provider.rootUri);
-        }
-        else {
-            this.scmProviderContextKey.set(undefined);
-            this.scmProviderRootUriContextKey.set(undefined);
-            this.scmProviderHasRootUriContextKey.set(false);
-        }
     }
     dispose() {
         this.disposables.dispose();
@@ -1260,8 +1237,7 @@ let RepositoryVisibilityActionController = class RepositoryVisibilityActionContr
 RepositoryVisibilityActionController = ( __decorate([
     ( __param(0, IContextKeyService)),
     ( __param(1, ISCMViewService)),
-    ( __param(2, IConfigurationService)),
-    ( __param(3, ISCMService))
+    ( __param(2, ISCMService))
 ], RepositoryVisibilityActionController));
 class SetListViewModeAction extends ViewAction {
     constructor(menu = {}) {
@@ -1571,10 +1547,15 @@ SCMInputWidgetActionRunner = ( __decorate([
 ], SCMInputWidgetActionRunner));
 let SCMInputWidgetToolbar = class SCMInputWidgetToolbar extends WorkbenchToolBar {
     get dropdownActions() { return this._dropdownActions; }
-    constructor(container, menuId, options, menuService, contextKeyService, contextMenuService, commandService, keybindingService, storageService, telemetryService) {
+    constructor(container, input, menuId, options, menuService, contextKeyService, contextMenuService, commandService, keybindingService, storageService, telemetryService) {
         super(container, { resetMenu: menuId, ...options }, menuService, contextKeyService, contextMenuService, keybindingService, telemetryService);
         this._dropdownActions = [];
-        const menu = this._store.add(menuService.createMenu(menuId, contextKeyService, { emitEventsForSubmenuChanges: true }));
+        const contextKeyServiceWithOverlay = contextKeyService.createOverlay([
+            ['scmProvider', input.repository.provider.contextValue],
+            ['scmProviderRootUri', input.repository.provider.rootUri?.toString()],
+            ['scmProviderHasRootUri', !!input.repository.provider.rootUri]
+        ]);
+        const menu = this._store.add(menuService.createMenu(menuId, contextKeyServiceWithOverlay, { emitEventsForSubmenuChanges: true }));
         const cancelAction = ( new MenuItemAction({
             id: "scm.input.cancelAction" ,
             title: ( localizeWithPath(
@@ -1618,13 +1599,13 @@ let SCMInputWidgetToolbar = class SCMInputWidgetToolbar extends WorkbenchToolBar
     }
 };
 SCMInputWidgetToolbar = ( __decorate([
-    ( __param(3, IMenuService)),
-    ( __param(4, IContextKeyService)),
-    ( __param(5, IContextMenuService)),
-    ( __param(6, ICommandService)),
-    ( __param(7, IKeybindingService)),
-    ( __param(8, IStorageService)),
-    ( __param(9, ITelemetryService))
+    ( __param(4, IMenuService)),
+    ( __param(5, IContextKeyService)),
+    ( __param(6, IContextMenuService)),
+    ( __param(7, ICommandService)),
+    ( __param(8, IKeybindingService)),
+    ( __param(9, IStorageService)),
+    ( __param(10, ITelemetryService))
 ], SCMInputWidgetToolbar));
 let SCMInputWidget = class SCMInputWidget {
     static { SCMInputWidget_1 = this; }
@@ -1770,7 +1751,7 @@ let SCMInputWidget = class SCMInputWidget {
         ctxIsActionEnabled.set(( input.repository.provider.groups.some(r => r.resources.length > 0)));
         const actionRunner = instantiationService2.createInstance(SCMInputWidgetActionRunner, input);
         this.repositoryDisposables.add(actionRunner);
-        const toolbar = instantiationService2.createInstance(SCMInputWidgetToolbar, this.toolbarContainer, MenuId.SCMInputBox, {
+        const toolbar = instantiationService2.createInstance(SCMInputWidgetToolbar, this.toolbarContainer, input, MenuId.SCMInputBox, {
             actionRunner,
             actionViewItemProvider: action => {
                 if (action instanceof MenuItemAction && toolbar.dropdownActions.length > 1) {
@@ -2172,6 +2153,9 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
         this.viewSortKeyContextKey.set(this.viewSortKey);
         this.areAllRepositoriesCollapsedContextKey = ContextKeys.SCMViewAreAllRepositoriesCollapsed.bindTo(contextKeyService);
         this.isAnyRepositoryCollapsibleContextKey = ContextKeys.SCMViewIsAnyRepositoryCollapsible.bindTo(contextKeyService);
+        this.scmProviderContextKey = ContextKeys.SCMProvider.bindTo(contextKeyService);
+        this.scmProviderRootUriContextKey = ContextKeys.SCMProviderRootUri.bindTo(contextKeyService);
+        this.scmProviderHasRootUriContextKey = ContextKeys.SCMProviderHasRootUri.bindTo(contextKeyService);
         this._onDidLayout = ( new Emitter());
         this.layoutCache = { height: undefined, width: undefined, onDidChange: this._onDidLayout.event };
         this.storageService.onDidChangeValue(1 , undefined, this.disposables)(e => {
@@ -2576,6 +2560,7 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
             if (focusedInput) {
                 this.inputRenderer.getRenderedInputWidget(focusedInput)?.forEach(widget => widget.focus());
             }
+            this.updateScmProviderContextKeys();
             this.updateRepositoryCollapseAllContextKeys();
         }));
     }
@@ -2585,6 +2570,19 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
         this.treeContainer.classList.toggle('align-icons-and-twisties', (this.viewMode === "list"  && theme.hasFileIcons) || (theme.hasFileIcons && !theme.hasFolderIcons));
         this.treeContainer.classList.toggle('hide-arrows', this.viewMode === "tree"  && theme.hidesExplorerArrows === true);
     }
+    updateScmProviderContextKeys() {
+        if (!this.alwaysShowRepositories && this.items.size === 1) {
+            const provider = Iterable.first(( this.items.keys())).provider;
+            this.scmProviderContextKey.set(provider.contextValue);
+            this.scmProviderRootUriContextKey.set(provider.rootUri?.toString());
+            this.scmProviderHasRootUriContextKey.set(!!provider.rootUri);
+        }
+        else {
+            this.scmProviderContextKey.set(undefined);
+            this.scmProviderRootUriContextKey.set(undefined);
+            this.scmProviderHasRootUriContextKey.set(false);
+        }
+    }
     updateRepositoryCollapseAllContextKeys() {
         if (!this.isBodyVisible() || this.items.size === 1) {
             this.isAnyRepositoryCollapsibleContextKey.set(false);