@codingame/monaco-vscode-scm-service-override 2.0.3 → 2.1.0

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

@@ -1,4 +1,5 @@
 import { basename } from 'vscode/vscode/vs/base/common/path';
+import { MenuItemAction } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { Action } from 'vscode/vscode/vs/base/common/actions';
 import { createAndFillInActionBarActions, createAndFillInContextMenuActions, createActionViewItem } from 'vscode/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
 import { equals } from 'vscode/vscode/vs/base/common/arrays';
@@ -32,7 +33,8 @@ function isSCMHistoryItemGroupTreeElement(element) {
     return element.type === 'historyItemGroup';
 }
 function isSCMHistoryItemTreeElement(element) {
-    return element.type === 'historyItem';
+    return element.type === 'allChanges' ||
+        element.type === 'historyItem';
 }
 function isSCMHistoryItemChangeTreeElement(element) {
     return element.type === 'historyItemChange';
@@ -51,7 +53,12 @@ function toDiffEditorArguments(uri, originalUri, modifiedUri) {
     const modifiedShortRef = modifiedQuery.ref.substring(0, 8).concat(modifiedQuery.ref.endsWith('^') ? '^' : '');
     return [originalUri, modifiedUri, `${basename$1} (${originalShortRef}) ↔ ${basename$1} (${modifiedShortRef})`, null];
 }
-const compareActions = (a, b) => a.id === b.id && a.enabled === b.enabled;
+const compareActions = (a, b) => {
+    if (a instanceof MenuItemAction && b instanceof MenuItemAction) {
+        return a.id === b.id && a.enabled === b.enabled && a.hideActions?.isHidden === b.hideActions?.isHidden;
+    }
+    return a.id === b.id && a.enabled === b.enabled;
+};
 function connectPrimaryMenu(menu, callback, primaryGroup) {
     let cachedPrimary = [];
     let cachedSecondary = [];

package/vscode/src/vs/workbench/contrib/scm/common/scmService.js

@@ -103,7 +103,7 @@ class SCMInput {
             return;
         }
         if (!transient) {
-            this.saveValue();
+            this.historyNavigator.add(this._value);
             this.historyNavigator.add(value);
             this.didChangeHistory = true;
         }
@@ -275,13 +275,10 @@ let SCMService = class SCMService {
     constructor(logService, workspaceContextService, contextKeyService, storageService) {
         this.logService = logService;
         this._repositories = ( new Map());
-        this._inputValueProviders = ( new Map());
         this._onDidAddProvider = ( new Emitter());
         this.onDidAddRepository = this._onDidAddProvider.event;
         this._onDidRemoveProvider = ( new Emitter());
         this.onDidRemoveRepository = this._onDidRemoveProvider.event;
-        this._onDidChangeInputValueProviders = ( new Emitter());
-        this.onDidChangeInputValueProviders = this._onDidChangeInputValueProviders.event;
         this.inputHistory = ( new SCMInputHistory(storageService, workspaceContextService));
         this.providerCount = contextKeyService.createKey('scm.providerCount', 0);
     }
@@ -304,31 +301,6 @@ let SCMService = class SCMService {
     getRepository(id) {
         return this._repositories.get(id);
     }
-    registerSCMInputValueProvider(sourceControlId, provider) {
-        const providers = this._inputValueProviders.get(sourceControlId) ?? ( new Set());
-        this._inputValueProviders.set(sourceControlId, providers.add(provider));
-        this._onDidChangeInputValueProviders.fire();
-        return toDisposable(() => {
-            const providers = this._inputValueProviders.get(sourceControlId);
-            providers.delete(provider);
-            this._inputValueProviders.set(sourceControlId, providers);
-            if (providers.size === 0) {
-                this._inputValueProviders.delete(sourceControlId);
-            }
-            this._onDidChangeInputValueProviders.fire();
-        });
-    }
-    getDefaultInputValueProvider(repository) {
-        if (!repository.provider.rootUri) {
-            return undefined;
-        }
-        const sourceControlId = repository.provider.contextValue;
-        const providers = this._inputValueProviders.get(sourceControlId) ?? ( new Set());
-        if (providers.size === 0) {
-            return undefined;
-        }
-        return Iterable.first(providers);
-    }
 };
 SCMService = ( __decorate([
     ( __param(0, ILogService)),