@codingame/monaco-vscode-scm-service-override 7.1.0 → 8.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-scm-service-override",
-  "version": "7.1.0",
+  "version": "8.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,6 +26,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@7.1.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@8.0.0"
   }
 }

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

@@ -1,7 +1,7 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { basename } from 'vscode/vscode/vs/base/common/resources';
-import { Disposable, DisposableStore, combinedDisposable, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Event, Emitter } from 'vscode/vscode/vs/base/common/event';
 import { VIEW_PANE_ID } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
 import { ISCMService, ISCMViewService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm.service';
@@ -15,28 +15,28 @@ import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/commo
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { EditorResourceAccessor } from 'vscode/vscode/vs/workbench/common/editor';
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
-import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
 import { ITitleService } from 'vscode/vscode/vs/workbench/services/title/browser/titleService.service';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { getRepositoryResourceCount } from './util.js';
 import 'vscode/vscode/vs/base/common/arrays';
 import { derived } from 'vscode/vscode/vs/base/common/observableInternal/derived';
-import { autorun, autorunWithStore } from 'vscode/vscode/vs/base/common/observableInternal/autorun';
+import { autorunWithStore, autorun } from 'vscode/vscode/vs/base/common/observableInternal/autorun';
 import { observableFromEvent, observableFromEventOpts, derivedObservableWithCache, latestChangedValue } from 'vscode/vscode/vs/base/common/observableInternal/utils';
 import 'vscode/vscode/vs/base/common/cancellation';
 import { observableConfigValue } from 'vscode/vscode/vs/platform/observable/common/platformObservableUtils';
-import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 
-const _moduleId = "vs/workbench/contrib/scm/browser/activity";
+const ActiveRepositoryContextKeys = {
+    ActiveRepositoryName: ( (new RawContextKey('scmActiveRepositoryName', ''))),
+    ActiveRepositoryBranchName: ( (new RawContextKey('scmActiveRepositoryBranchName', ''))),
+};
 let SCMActiveRepositoryController = class SCMActiveRepositoryController extends Disposable {
-    constructor(activityService, configurationService, contextKeyService, editorService, logService, scmService, scmViewService, statusbarService, titleService) {
+    constructor(activityService, configurationService, contextKeyService, editorService, scmService, scmViewService, statusbarService, titleService) {
         super();
         this.activityService = activityService;
         this.configurationService = configurationService;
         this.contextKeyService = contextKeyService;
         this.editorService = editorService;
-        this.logService = logService;
         this.scmService = scmService;
         this.scmViewService = scmViewService;
         this.statusbarService = statusbarService;
@@ -48,12 +48,10 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
         this._activeEditorRepository = derivedObservableWithCache(this, (reader, lastValue) => {
             const activeResource = EditorResourceAccessor.getOriginalUri(this._activeEditor.read(reader));
             if (!activeResource) {
-                this.logService.trace('SCMActiveRepositoryController (activeEditorRepository derived): no activeResource');
                 return lastValue;
             }
             const repository = this.scmService.getRepository(activeResource);
             if (!repository) {
-                this.logService.trace(`SCMActiveRepositoryController (activeEditorRepository derived): no repository for '${( (activeResource.toString()))}'`);
                 return lastValue;
             }
             return Object.create(repository);
@@ -65,12 +63,12 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
                     const repositories = this._repositories.read(reader);
                     return [...( (Iterable.map(
                         repositories,
-                        r => ({ ...r.provider, resourceCount: this._getRepositoryResourceCount(r) })
+                        r => ({ provider: r.provider, resourceCount: this._getRepositoryResourceCount(r) })
                     )))];
                 }
                 case 'focused': {
                     const repository = this._activeRepository.read(reader);
-                    return repository ? [{ ...repository.provider, resourceCount: this._getRepositoryResourceCount(repository) }] : [];
+                    return repository ? [{ provider: repository.provider, resourceCount: this._getRepositoryResourceCount(repository) }] : [];
                 }
                 case 'off':
                     return [];
@@ -81,7 +79,7 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
         this._countBadge = derived(this, reader => {
             let total = 0;
             for (const repository of this._countBadgeRepositories.read(reader)) {
-                const count = repository.count?.read(reader);
+                const count = repository.provider.count?.read(reader);
                 const resourceCount = repository.resourceCount.read(reader);
                 total = total + (count ?? resourceCount);
             }
@@ -93,32 +91,19 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
             { name: 'activeRepositoryName', contextKey: ActiveRepositoryContextKeys.ActiveRepositoryName.key },
             { name: 'activeRepositoryBranchName', contextKey: ActiveRepositoryContextKeys.ActiveRepositoryBranchName.key, }
         ]);
-        this._register(autorun(reader => {
-            const repository = this._focusedRepository.read(reader);
-            const commands = repository?.provider.statusBarCommands.read(reader);
-            this.logService.trace('SCMActiveRepositoryController (focusedRepository):', repository?.id ?? 'no id');
-            this.logService.trace('SCMActiveRepositoryController (focusedRepository):', commands ? ( (commands.map(c => c.title))).join(', ') : 'no commands');
-        }));
-        this._register(autorun(reader => {
-            const repository = this._activeEditorRepository.read(reader);
-            const commands = repository?.provider.statusBarCommands.read(reader);
-            this.logService.trace('SCMActiveRepositoryController (activeEditorRepository):', repository?.id ?? 'no id');
-            this.logService.trace('SCMActiveRepositoryController (activeEditorRepository):', commands ? ( (commands.map(c => c.title))).join(', ') : 'no commands');
-        }));
         this._register(autorunWithStore((reader, store) => {
             this._updateActivityCountBadge(this._countBadge.read(reader), store);
         }));
         this._register(autorunWithStore((reader, store) => {
             const repository = this._activeRepository.read(reader);
             const commands = repository?.provider.statusBarCommands.read(reader);
-            this.logService.trace('SCMActiveRepositoryController (status bar):', repository?.id ?? 'no id');
-            this.logService.trace('SCMActiveRepositoryController (status bar):', commands ? ( (commands.map(c => c.title))).join(', ') : 'no commands');
             this._updateStatusBar(repository, commands ?? [], store);
         }));
         this._register(autorun(reader => {
             const repository = this._activeRepository.read(reader);
-            const currentHistoryItemGroup = repository?.provider.historyProviderObs.read(reader)?.currentHistoryItemGroupObs.read(reader);
-            this._updateActiveRepositoryContextKeys(repository, currentHistoryItemGroup);
+            const historyProvider = repository?.provider.historyProvider.read(reader);
+            const branchName = historyProvider?.currentHistoryItemGroupName.read(reader);
+            this._updateActiveRepositoryContextKeys(repository?.provider.name, branchName);
         }));
     }
     _getRepositoryResourceCount(repository) {
@@ -128,12 +113,11 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
         if (count === 0) {
             return;
         }
-        const badge = ( (new NumberBadge(count, num => ( localizeWithPath(_moduleId, 0, '{0} pending changes', num)))));
+        const badge = ( (new NumberBadge(count, num => ( localize(6316, '{0} pending changes', num)))));
         store.add(this.activityService.showViewActivity(VIEW_PANE_ID, { badge }));
     }
     _updateStatusBar(repository, commands, store) {
         if (!repository) {
-            this.logService.trace('SCMActiveRepositoryController (status bar): repository is undefined');
             return;
         }
         const label = repository.provider.rootUri
@@ -155,7 +139,7 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
                 repoAgnosticActionName = '';
             }
             const statusbarEntry = {
-                name: ( localizeWithPath(_moduleId, 1, "Source Control")) + (repoAgnosticActionName ? ` ${repoAgnosticActionName}` : ''),
+                name: ( localize(6317, "Source Control")) + (repoAgnosticActionName ? ` ${repoAgnosticActionName}` : ''),
                 text: command.title,
                 ariaLabel: tooltip,
                 tooltip,
@@ -166,9 +150,9 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
                 this.statusbarService.addEntry(statusbarEntry, `status.scm.${index}`, StatusbarAlignment.LEFT, { id: `status.scm.${index - 1}`, alignment: StatusbarAlignment.RIGHT, compact: true }));
         }
     }
-    _updateActiveRepositoryContextKeys(repository, currentHistoryItemGroup) {
-        this._activeRepositoryNameContextKey.set(repository?.provider.name ?? '');
-        this._activeRepositoryBranchNameContextKey.set(currentHistoryItemGroup?.name ?? '');
+    _updateActiveRepositoryContextKeys(repositoryName, branchName) {
+        this._activeRepositoryNameContextKey.set(repositoryName ?? '');
+        this._activeRepositoryBranchNameContextKey.set(branchName ?? '');
     }
 };
 SCMActiveRepositoryController = ( (__decorate([
@@ -176,84 +160,67 @@ SCMActiveRepositoryController = ( (__decorate([
     ( (__param(1, IConfigurationService))),
     ( (__param(2, IContextKeyService))),
     ( (__param(3, IEditorService))),
-    ( (__param(4, ILogService))),
-    ( (__param(5, ISCMService))),
-    ( (__param(6, ISCMViewService))),
-    ( (__param(7, IStatusbarService))),
-    ( (__param(8, ITitleService)))
+    ( (__param(4, ISCMService))),
+    ( (__param(5, ISCMViewService))),
+    ( (__param(6, IStatusbarService))),
+    ( (__param(7, ITitleService)))
 ], SCMActiveRepositoryController)));
-const ActiveRepositoryContextKeys = {
-    ActiveRepositoryName: ( (new RawContextKey('scmActiveRepositoryName', ''))),
-    ActiveRepositoryBranchName: ( (new RawContextKey('scmActiveRepositoryBranchName', ''))),
-};
-let SCMActiveResourceContextKeyController = class SCMActiveResourceContextKeyController {
+let SCMActiveResourceContextKeyController = class SCMActiveResourceContextKeyController extends Disposable {
     constructor(editorGroupsService, scmService, uriIdentityService) {
+        super();
         this.scmService = scmService;
         this.uriIdentityService = uriIdentityService;
-        this.disposables = ( (new DisposableStore()));
-        this.repositoryDisposables = ( (new Set()));
-        this.onDidRepositoryChange = ( (new Emitter()));
-        const activeResourceHasChangesContextKey = ( (new RawContextKey('scmActiveResourceHasChanges', false, ( localizeWithPath(_moduleId, 2, "Whether the active resource has changes")))));
-        const activeResourceRepositoryContextKey = ( (new RawContextKey('scmActiveResourceRepository', undefined, ( localizeWithPath(_moduleId, 3, "The active resource's repository")))));
-        this.scmService.onDidAddRepository(this.onDidAddRepository, this, this.disposables);
-        for (const repository of this.scmService.repositories) {
-            this.onDidAddRepository(repository);
-        }
+        this._repositories = observableFromEvent(this, Event.any(this.scmService.onDidAddRepository, this.scmService.onDidRemoveRepository), () => this.scmService.repositories);
+        this._onDidRepositoryChange = ( (new Emitter()));
+        const activeResourceHasChangesContextKey = ( (new RawContextKey('scmActiveResourceHasChanges', false, ( localize(6318, "Whether the active resource has changes")))));
+        const activeResourceRepositoryContextKey = ( (new RawContextKey('scmActiveResourceRepository', undefined, ( localize(6319, "The active resource's repository")))));
+        this._store.add(autorunWithStore((reader, store) => {
+            for (const repository of this._repositories.read(reader)) {
+                store.add(Event.runAndSubscribe(repository.provider.onDidChangeResources, () => {
+                    this._onDidRepositoryChange.fire();
+                }));
+            }
+        }));
         const hasChangesContextKeyProvider = {
             contextKey: activeResourceHasChangesContextKey,
-            getGroupContextKeyValue: (group) => this.getEditorHasChanges(group.activeEditor),
-            onDidChange: this.onDidRepositoryChange.event
+            getGroupContextKeyValue: (group) => this._getEditorHasChanges(group.activeEditor),
+            onDidChange: this._onDidRepositoryChange.event
         };
         const repositoryContextKeyProvider = {
             contextKey: activeResourceRepositoryContextKey,
-            getGroupContextKeyValue: (group) => this.getEditorRepositoryId(group.activeEditor),
-            onDidChange: this.onDidRepositoryChange.event
+            getGroupContextKeyValue: (group) => this._getEditorRepositoryId(group.activeEditor),
+            onDidChange: this._onDidRepositoryChange.event
         };
-        this.disposables.add(editorGroupsService.registerContextKeyProvider(hasChangesContextKeyProvider));
-        this.disposables.add(editorGroupsService.registerContextKeyProvider(repositoryContextKeyProvider));
-    }
-    onDidAddRepository(repository) {
-        const onDidChange = Event.any(repository.provider.onDidChange, repository.provider.onDidChangeResources);
-        const changeDisposable = onDidChange(() => {
-            this.onDidRepositoryChange.fire();
-        });
-        const onDidRemove = Event.filter(this.scmService.onDidRemoveRepository, e => e === repository);
-        const removeDisposable = onDidRemove(() => {
-            disposable.dispose();
-            this.repositoryDisposables.delete(disposable);
-            this.onDidRepositoryChange.fire();
-        });
-        const disposable = combinedDisposable(changeDisposable, removeDisposable);
-        this.repositoryDisposables.add(disposable);
+        this._store.add(editorGroupsService.registerContextKeyProvider(hasChangesContextKeyProvider));
+        this._store.add(editorGroupsService.registerContextKeyProvider(repositoryContextKeyProvider));
     }
-    getEditorRepositoryId(activeEditor) {
+    _getEditorHasChanges(activeEditor) {
         const activeResource = EditorResourceAccessor.getOriginalUri(activeEditor);
-        if (activeResource?.scheme === Schemas.file || activeResource?.scheme === Schemas.vscodeRemote) {
-            const activeResourceRepository = Iterable.find(this.scmService.repositories, r => Boolean(r.provider.rootUri && this.uriIdentityService.extUri.isEqualOrParent(activeResource, r.provider.rootUri)));
-            return activeResourceRepository?.id;
+        if (!activeResource) {
+            return false;
         }
-        return undefined;
-    }
-    getEditorHasChanges(activeEditor) {
-        const activeResource = EditorResourceAccessor.getOriginalUri(activeEditor);
-        if (activeResource?.scheme === Schemas.file || activeResource?.scheme === Schemas.vscodeRemote) {
-            const activeResourceRepository = Iterable.find(this.scmService.repositories, r => Boolean(r.provider.rootUri && this.uriIdentityService.extUri.isEqualOrParent(activeResource, r.provider.rootUri)));
-            for (const resourceGroup of activeResourceRepository?.provider.groups ?? []) {
-                if (( (resourceGroup.resources
-                    .some(
-                    scmResource => this.uriIdentityService.extUri.isEqual(activeResource, scmResource.sourceUri)
-                )))) {
-                    return true;
-                }
+        const activeResourceRepository = this.scmService.getRepository(activeResource);
+        for (const resourceGroup of activeResourceRepository?.provider.groups ?? []) {
+            if (( (resourceGroup.resources
+                .some(
+                scmResource => this.uriIdentityService.extUri.isEqual(activeResource, scmResource.sourceUri)
+            )))) {
+                return true;
             }
         }
         return false;
     }
+    _getEditorRepositoryId(activeEditor) {
+        const activeResource = EditorResourceAccessor.getOriginalUri(activeEditor);
+        if (!activeResource) {
+            return undefined;
+        }
+        const activeResourceRepository = this.scmService.getRepository(activeResource);
+        return activeResourceRepository?.id;
+    }
     dispose() {
-        this.disposables.dispose();
-        dispose(( (this.repositoryDisposables.values())));
-        this.repositoryDisposables.clear();
-        this.onDidRepositoryChange.dispose();
+        this._onDidRepositoryChange.dispose();
+        super.dispose();
     }
 };
 SCMActiveResourceContextKeyController = ( (__decorate([

package/vscode/src/vs/workbench/contrib/scm/browser/media/scm.css.js

@@ -1,6 +1,6 @@
 import n from 'vscode/external/rollup-plugin-styles/dist/runtime/inject-css.js';
 
-var css = ".scm-view{height:100%;position:relative}.scm-overflow-widgets-container{height:0;left:0;overflow:visible;position:absolute;top:0;width:0;z-index:5000}.scm-view .monaco-tl-contents>div{overflow:hidden;padding-right:12px}.scm-view .count{display:flex;margin-left:6px}.scm-view .count.hidden{display:none}.scm-view .scm-provider{align-items:center;display:flex;flex-direction:column;flex-flow:nowrap;height:100%}.scm-view.auto-provider-counts .scm-provider>.count[data-count=\"0\"],.scm-view.hide-provider-counts .scm-provider>.count{display:none}.scm-view .scm-provider>.label{flex:1;min-width:50px;overflow:hidden;text-overflow:ellipsis}.scm-view .scm-provider>.label>.name{font-weight:700}.scm-view .scm-provider>.label>.description{font-size:.9em;margin-left:.5em;opacity:.7}.scm-view .scm-provider>.actions{justify-content:flex-end;overflow:hidden}.scm-view .scm-provider>.actions>.monaco-toolbar>.monaco-action-bar>.actions-container>.action-item{align-items:center;display:flex;padding-left:4px}.scm-view .scm-provider>.actions>.monaco-toolbar>.monaco-action-bar>.actions-container>.action-item:first-child{min-width:20px}.scm-view .scm-provider>.actions>.monaco-toolbar>.monaco-action-bar>.actions-container>.action-item>.action-label,.scm-view .scm-provider>.actions>.monaco-toolbar>.monaco-action-bar>.actions-container>.action-item>.monaco-dropdown>.dropdown-label>.action-label{align-items:center;display:flex;line-height:16px;overflow:hidden}.scm-view .scm-provider>.actions>.monaco-toolbar>.monaco-action-bar>.actions-container>.action-item>.action-label>.codicon{font-size:12px;justify-content:center}.scm-view .scm-provider>.actions>.monaco-toolbar>.monaco-action-bar>.actions-container>.action-item:last-of-type{padding-right:0}.scm-view .scm-provider>.body{flex-grow:1}.scm-view .scm-provider>.status>.monaco-action-bar>.actions-container{border-color:var(--vscode-sideBar-border)}.scm-view .monaco-list-row{line-height:22px}.scm-view .monaco-list-row .history,.scm-view .monaco-list-row .history-item-group,.scm-view .monaco-list-row .resource-group{align-items:center;display:flex;height:100%}.scm-view .monaco-list-row .history-item .monaco-icon-label,.scm-view .monaco-list-row .history-item-group .monaco-icon-label{align-items:center;flex-grow:1}.scm-view .monaco-list-row .history-item{align-items:center;display:flex}.scm-view .monaco-list-row .history-item>.graph-container{display:flex;flex-shrink:0;height:22px}.scm-view .monaco-list-row .history-item>.graph-container>.graph>circle{stroke:var(--vscode-sideBar-background)}.scm-view .monaco-list-row .history-item>.label-container{display:flex;flex-shrink:0;gap:4px;opacity:.75}.scm-view .monaco-list-row .history-item>.label-container>.codicon{border:1px solid var(--vscode-scm-historyItemStatisticsBorder);border-radius:2px;font-size:14px;margin:1px 0;padding:2px}.scm-view .monaco-list-row .history-item .stats-container{border:1px solid var(--vscode-scm-historyItemStatisticsBorder);border-radius:2px;display:flex;font-size:11px;gap:4px;line-height:11px;margin-left:6px;min-height:18px;padding:0 4px}.scm-view .monaco-list-row.focused .history-item .stats-container,.scm-view .monaco-list-row.selected .history-item .stats-container{border:1px solid var(--vscode-scm-historyItemSelectedStatisticsBorder)}.scm-view .monaco-list-row .history-item .stats-container>.deletions-label,.scm-view .monaco-list-row .history-item .stats-container>.files-label,.scm-view .monaco-list-row .history-item .stats-container>.insertions-label{align-items:center;display:flex;opacity:.75}.scm-view .monaco-list-row .history-item .stats-container>.insertions-label{color:var(--vscode-scm-historyItemAdditionsForeground)}.scm-view .monaco-list-row .history-item .stats-container>.deletions-label{color:var(--vscode-scm-historyItemDeletionsForeground)}.scm-view .monaco-list-row .history-item .stats-container.hidden,.scm-view .monaco-list-row .history-item .stats-container>.deletions-label.hidden,.scm-view .monaco-list-row .history-item .stats-container>.insertions-label.hidden{display:none}.scm-view .monaco-list-row .history-item .monaco-icon-label .icon-container,.scm-view .monaco-list-row .history-item-group .monaco-icon-label .icon-container{display:flex;padding-right:4px}.scm-view .monaco-list-row .history-item .monaco-icon-label .avatar{border-radius:14px;height:14px;width:14px}.scm-view .monaco-list-row .separator-container{align-items:center;display:flex;padding-left:11px}.scm-view .monaco-list-row .separator-container .label-name{font-size:10px}.scm-view .monaco-list-row.focused .separator-container .label-name,.scm-view .monaco-list-row.selected .separator-container .label-name{color:var(--vscode-foreground)}.scm-view .monaco-list-row .separator-container .separator{border-top:1px solid var(--vscode-sideBar-border);display:flex;flex-grow:1;height:0;margin-left:6px}.scm-view .monaco-list-row .separator-container .actions{padding-left:6px}.scm-view .monaco-list-row .history-item-group>.name,.scm-view .monaco-list-row .history>.name,.scm-view .monaco-list-row .resource-group>.name{flex:1;overflow:hidden;text-overflow:ellipsis}.scm-view .monaco-list-row .resource{display:flex;height:100%}.scm-view .monaco-list-row .resource.faded{opacity:.7}.scm-view .monaco-list-row .resource>.name{flex:1;overflow:hidden}.scm-view .monaco-list-row .resource>.name>.monaco-icon-label:after{margin-right:3px}.scm-view .monaco-list-row .resource>.decoration-icon{background-position:50% 50%;background-repeat:no-repeat;height:100%;margin-left:5px;width:16px}.scm-view .monaco-list-row .resource>.decoration-icon.codicon{margin-right:0;margin-top:3px}.scm-view .monaco-list .monaco-list-row .resource>.name>.monaco-icon-label>.actions{flex-grow:100}.scm-view .monaco-list .monaco-list-row .history-item-group>.actions,.scm-view .monaco-list .monaco-list-row .history-item>.actions,.scm-view .monaco-list .monaco-list-row .resource-group>.actions,.scm-view .monaco-list .monaco-list-row .resource>.name>.monaco-icon-label>.actions,.scm-view .monaco-list .monaco-list-row .separator-container>.actions{display:none;max-width:fit-content}.scm-view .monaco-list .monaco-list-row.focused .history-item-group>.actions,.scm-view .monaco-list .monaco-list-row.focused .history-item>.actions,.scm-view .monaco-list .monaco-list-row.focused .resource-group>.actions,.scm-view .monaco-list .monaco-list-row.focused .resource>.name>.monaco-icon-label>.actions,.scm-view .monaco-list .monaco-list-row.focused .separator-container>.actions,.scm-view .monaco-list .monaco-list-row:hover .history-item-group>.actions,.scm-view .monaco-list .monaco-list-row:hover .history-item>.actions,.scm-view .monaco-list .monaco-list-row:hover .resource-group>.actions,.scm-view .monaco-list .monaco-list-row:hover .resource>.name>.monaco-icon-label>.actions,.scm-view .monaco-list .monaco-list-row:hover .separator-container>.actions,.scm-view .monaco-list:not(.selection-multiple) .monaco-list-row .resource:hover>.actions{display:block}.scm-view .monaco-list .monaco-list-row.focused.force-no-hover,.scm-view .monaco-list .monaco-list-row.force-no-hover,.scm-view .monaco-list .monaco-list-row.selected.force-no-hover,.scm-view .monaco-list .monaco-list-row:hover.force-no-hover{background:transparent!important}.scm-view .monaco-list .monaco-list-row.cursor-default{cursor:default}.scm-view.show-actions .scm-provider>.actions,.scm-view.show-actions>.monaco-list .monaco-list-row .history-item-group>.actions,.scm-view.show-actions>.monaco-list .monaco-list-row .history-item>.actions,.scm-view.show-actions>.monaco-list .monaco-list-row .resource-group>.actions,.scm-view.show-actions>.monaco-list .monaco-list-row .resource>.name>.monaco-icon-label>.actions,.scm-view.show-actions>.monaco-list .monaco-list-row .scm-input>.scm-editor>.actions,.scm-view.show-actions>.monaco-list .monaco-list-row .separator-container>.actions{display:block}.scm-view .monaco-list-row .actions .action-label{padding:2px}.scm-view .scm-input{align-items:center;display:flex;height:100%;padding-left:11px}.scm-view .scm-input .scm-editor .scm-editor-toolbar{padding:1px 3px 1px 1px}.scm-view .scm-input .scm-editor .scm-editor-toolbar.hidden{display:none}.scm-view .scm-input .scm-editor .scm-editor-toolbar.scroll-decoration{box-shadow:var(--vscode-scrollbar-shadow) 0 6px 6px -6px inset}.scm-view .scm-input .scm-editor .scm-editor-toolbar .action-label.codicon.codicon-debug-stop{color:var(--vscode-icon-foreground)!important}.scm-view .scm-editor-container .monaco-editor{border-radius:2px}.scm-view .scm-editor{align-items:flex-start;background-color:var(--vscode-input-background);border:1px solid var(--vscode-input-border,transparent);border-radius:2px;box-sizing:border-box;display:flex;width:100%}.scm-view .button-container{align-items:center;display:flex;height:100%;padding-left:11px}.scm-view .button-container .codicon.codicon-cloud-upload,.scm-view .button-container .codicon.codicon-sync{margin:0 4px 0 0}.scm-view .button-container .codicon.codicon-arrow-down,.scm-view .button-container .codicon.codicon-arrow-up{font-size:small!important;margin:0 4px 0 0}.scm-view .button-container>.monaco-button-dropdown{flex-grow:1;overflow:hidden}.scm-view .button-container>.monaco-button-dropdown>.monaco-dropdown-button{align-items:center;display:flex;padding:0 4px}.scm-view .button-container>.monaco-button-dropdown>.monaco-button.monaco-text-button{min-width:0}.scm-view .button-container>.monaco-button-dropdown>.monaco-button.monaco-text-button>span:not(.codicon){overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.scm-view .scm-editor.hidden{display:none}.monaco-workbench .part.panel .scm-view .scm-editor-container{outline:1px solid var(--vscode-panelInput-border)}.monaco-workbench .part.panel .scm-view .scm-editor.synthetic-focus,.scm-view .scm-editor.synthetic-focus{outline:1px solid var(--vscode-focusBorder);outline-offset:-1px}.scm-view .scm-editor.validation-info{outline:1px solid var(--vscode-inputValidation-infoBorder)!important;outline-offset:-1px}.scm-view .scm-editor.validation-warning{outline:1px solid var(--vscode-inputValidation-warningBorder)!important;outline-offset:-1px}.scm-view .scm-editor.validation-error{outline:1px solid var(--vscode-inputValidation-errorBorder)!important;outline-offset:-1px}.scm-editor-validation-container{border-bottom-left-radius:2px;border-bottom-right-radius:2px;border-style:solid;border-width:1px;border-top:none;box-sizing:border-box;display:flex;padding:2px}.scm-editor-validation-container.validation-info{background-color:var(--vscode-inputValidation-infoBackground);border-color:var(--vscode-inputValidation-infoBorder);color:var(--vscode-inputValidation-infoForeground)}.scm-editor-validation-container.validation-warning{background-color:var(--vscode-inputValidation-warningBackground);border-color:var(--vscode-inputValidation-warningBorder);color:var(--vscode-inputValidation-warningForeground)}.scm-editor-validation-container.validation-error{background-color:var(--vscode-inputValidation-errorBackground);border-color:var(--vscode-inputValidation-errorBorder);color:var(--vscode-inputValidation-errorForeground)}.scm-editor-validation{border-style:none;box-sizing:border-box;display:block;flex:auto;font-size:.9em;padding:1px 3px}.scm-editor-validation p{margin:0;padding:0}.scm-editor-validation a{color:var(--vscode-textLink-foreground);-webkit-user-select:none;user-select:none}.scm-editor-validation a:active,.scm-editor-validation a:hover{color:var(--vscode-textLink-activeForeground)}.scm-editor-validation-actions{align-self:start;margin-top:1px}.scm-view .scm-editor-placeholder{box-sizing:border-box;color:var(--vscode-input-placeholderForeground);overflow:hidden;padding:2px 6px;pointer-events:none;position:absolute;text-overflow:ellipsis;white-space:nowrap;z-index:1}.scm-view .scm-editor-placeholder.hidden{display:none}.monaco-workbench .part.basepanel>.content .scm-view .scm-editor-container .monaco-editor,.monaco-workbench .part.basepanel>.content .scm-view .scm-editor-container .monaco-editor .margin,.monaco-workbench .part.basepanel>.content .scm-view .scm-editor-container .monaco-editor .monaco-editor-background,.scm-view .scm-editor-container .monaco-editor,.scm-view .scm-editor-container .monaco-editor .margin,.scm-view .scm-editor-container .monaco-editor-background{background-color:var(--vscode-input-background);color:inherit}.scm-view .scm-editor-container .mtk1{color:var(--vscode-input-foreground)}.scm-repositories-view .scm-provider{margin:0 12px 0 20px;overflow:hidden}.scm-repositories-view .scm-provider>.label>.name{font-weight:400}";
+var css = ".scm-view{height:100%;position:relative}.scm-overflow-widgets-container{height:0;left:0;overflow:visible;position:absolute;top:0;width:0;z-index:5000}.scm-view .monaco-tl-contents>div{overflow:hidden;padding-right:12px}.scm-view .count{display:flex;margin-left:6px}.scm-view .count.hidden{display:none}.scm-view .scm-provider{align-items:center;display:flex;flex-direction:column;flex-flow:nowrap;height:100%}.scm-view.auto-provider-counts .scm-provider>.count[data-count=\"0\"],.scm-view.hide-provider-counts .scm-provider>.count{display:none}.scm-view .scm-provider>.label{flex:1;min-width:50px;overflow:hidden;text-overflow:ellipsis}.scm-view .scm-provider>.label>.name{font-weight:700}.scm-view .scm-provider>.label>.description{font-size:.9em;margin-left:.5em;opacity:.7}.scm-view .scm-provider>.actions{justify-content:flex-end;overflow:hidden}.scm-view .scm-provider>.actions>.monaco-toolbar>.monaco-action-bar>.actions-container>.action-item{align-items:center;display:flex;padding-left:4px}.scm-view .scm-provider>.actions>.monaco-toolbar>.monaco-action-bar>.actions-container>.action-item:first-child{min-width:20px}.scm-view .scm-provider>.actions>.monaco-toolbar>.monaco-action-bar>.actions-container>.action-item>.action-label,.scm-view .scm-provider>.actions>.monaco-toolbar>.monaco-action-bar>.actions-container>.action-item>.monaco-dropdown>.dropdown-label>.action-label{align-items:center;display:flex;line-height:16px;overflow:hidden}.scm-view .scm-provider>.actions>.monaco-toolbar>.monaco-action-bar>.actions-container>.action-item>.action-label>.codicon{font-size:12px;justify-content:center}.scm-view .scm-provider>.actions>.monaco-toolbar>.monaco-action-bar>.actions-container>.action-item:last-of-type{padding-right:0}.scm-view .scm-provider>.body{flex-grow:1}.scm-view .scm-provider>.status>.monaco-action-bar>.actions-container{border-color:var(--vscode-sideBar-border)}.scm-view .monaco-list-row{line-height:22px}.scm-view .monaco-list-row .monaco-icon-label-container{height:22px}.scm-view .monaco-list-row .history,.scm-view .monaco-list-row .history-item-group,.scm-view .monaco-list-row .resource-group{align-items:center;display:flex;height:100%}.scm-view .monaco-list-row .history-item .monaco-icon-label,.scm-view .monaco-list-row .history-item-group .monaco-icon-label{align-items:center;flex-grow:1}.scm-view .monaco-list-row .history-item{align-items:center;display:flex}.scm-view .monaco-list-row .history-item>.graph-container{display:flex;flex-shrink:0;height:22px}.scm-view .monaco-list-row .history-item>.graph-container>.graph>circle{stroke:var(--vscode-sideBar-background)}.scm-view .monaco-list-row .history-item>.label-container{display:flex;flex-shrink:0;gap:4px;opacity:.75}.scm-view .monaco-list-row .history-item>.label-container>.codicon{border:1px solid var(--vscode-scm-historyItemStatisticsBorder);border-radius:2px;font-size:14px;margin:1px 0;padding:2px}.scm-view .monaco-list-row .history-item .stats-container{border:1px solid var(--vscode-scm-historyItemStatisticsBorder);border-radius:2px;display:flex;font-size:11px;gap:4px;line-height:11px;margin-left:6px;min-height:18px;padding:0 4px}.scm-view .monaco-list-row.focused .history-item .stats-container,.scm-view .monaco-list-row.selected .history-item .stats-container{border:1px solid var(--vscode-scm-historyItemSelectedStatisticsBorder)}.scm-view .monaco-list-row .history-item .stats-container>.deletions-label,.scm-view .monaco-list-row .history-item .stats-container>.files-label,.scm-view .monaco-list-row .history-item .stats-container>.insertions-label{align-items:center;display:flex;opacity:.75}.scm-view .monaco-list-row .history-item .stats-container>.insertions-label{color:var(--vscode-scm-historyItemAdditionsForeground)}.scm-view .monaco-list-row .history-item .stats-container>.deletions-label{color:var(--vscode-scm-historyItemDeletionsForeground)}.scm-view .monaco-list-row .history-item .stats-container.hidden,.scm-view .monaco-list-row .history-item .stats-container>.deletions-label.hidden,.scm-view .monaco-list-row .history-item .stats-container>.insertions-label.hidden{display:none}.scm-view .monaco-list-row .history-item .monaco-icon-label .icon-container,.scm-view .monaco-list-row .history-item-group .monaco-icon-label .icon-container{display:flex;padding-right:4px}.scm-view .monaco-list-row .history-item .monaco-icon-label .avatar{border-radius:14px;height:14px;width:14px}.scm-view .monaco-list-row .separator-container{align-items:center;display:flex;padding-left:11px}.scm-view .monaco-list-row .separator-container .label-name{font-size:10px}.scm-view .monaco-list-row.focused .separator-container .action-label:before,.scm-view .monaco-list-row.focused .separator-container .label-name,.scm-view .monaco-list-row.selected .separator-container .action-label:before,.scm-view .monaco-list-row.selected .separator-container .label-name{color:var(--vscode-foreground)}.scm-view .monaco-list-row .separator-container .separator{border-top:1px solid var(--vscode-sideBar-border);display:flex;flex-grow:1;height:0;margin-left:6px}.scm-view .monaco-list-row .separator-container .actions{padding-left:6px}.scm-view .monaco-list-row .history-item-group>.name,.scm-view .monaco-list-row .history>.name,.scm-view .monaco-list-row .resource-group>.name{flex:1;overflow:hidden;text-overflow:ellipsis}.scm-view .monaco-list-row .resource{display:flex;height:100%}.scm-view .monaco-list-row .resource.faded{opacity:.7}.scm-view .monaco-list-row .resource>.name{flex:1;overflow:hidden}.scm-view .monaco-list-row .resource>.name>.monaco-icon-label:after{margin-right:3px}.scm-view .monaco-list-row .resource>.decoration-icon{background-position:50% 50%;background-repeat:no-repeat;height:100%;margin-left:5px;width:16px}.scm-view .monaco-list-row .resource>.decoration-icon.codicon{margin-right:0;margin-top:3px}.scm-view .monaco-list .monaco-list-row .resource>.name>.monaco-icon-label>.actions{flex-grow:100}.scm-view .monaco-list .monaco-list-row .history-item-group>.actions,.scm-view .monaco-list .monaco-list-row .history-item>.actions,.scm-view .monaco-list .monaco-list-row .resource-group>.actions,.scm-view .monaco-list .monaco-list-row .resource>.name>.monaco-icon-label>.actions,.scm-view .monaco-list .monaco-list-row .separator-container>.actions{display:none;max-width:fit-content}.scm-view .monaco-list .monaco-list-row.focused .history-item-group>.actions,.scm-view .monaco-list .monaco-list-row.focused .history-item>.actions,.scm-view .monaco-list .monaco-list-row.focused .resource-group>.actions,.scm-view .monaco-list .monaco-list-row.focused .resource>.name>.monaco-icon-label>.actions,.scm-view .monaco-list .monaco-list-row.focused .separator-container>.actions,.scm-view .monaco-list .monaco-list-row:hover .history-item-group>.actions,.scm-view .monaco-list .monaco-list-row:hover .history-item>.actions,.scm-view .monaco-list .monaco-list-row:hover .resource-group>.actions,.scm-view .monaco-list .monaco-list-row:hover .resource>.name>.monaco-icon-label>.actions,.scm-view .monaco-list .monaco-list-row:hover .separator-container>.actions,.scm-view .monaco-list:not(.selection-multiple) .monaco-list-row .resource:hover>.actions{display:block}.scm-view .monaco-list .monaco-list-row.focused.force-no-hover,.scm-view .monaco-list .monaco-list-row.force-no-hover,.scm-view .monaco-list .monaco-list-row.selected.force-no-hover,.scm-view .monaco-list .monaco-list-row:hover.force-no-hover{background:transparent!important}.scm-view .monaco-list .monaco-list-row.cursor-default{cursor:default}.scm-view.show-actions .scm-provider>.actions,.scm-view.show-actions>.monaco-list .monaco-list-row .history-item-group>.actions,.scm-view.show-actions>.monaco-list .monaco-list-row .history-item>.actions,.scm-view.show-actions>.monaco-list .monaco-list-row .resource-group>.actions,.scm-view.show-actions>.monaco-list .monaco-list-row .resource>.name>.monaco-icon-label>.actions,.scm-view.show-actions>.monaco-list .monaco-list-row .scm-input>.scm-editor>.actions,.scm-view.show-actions>.monaco-list .monaco-list-row .separator-container>.actions{display:block}.scm-view .monaco-list-row .actions .action-label{padding:2px}.scm-view .scm-input{align-items:center;display:flex;height:100%;padding-left:11px}.scm-view .scm-input .scm-editor .scm-editor-toolbar{padding:1px 3px 1px 1px}.scm-view .scm-input .scm-editor .scm-editor-toolbar.hidden{display:none}.scm-view .scm-input .scm-editor .scm-editor-toolbar.scroll-decoration{box-shadow:var(--vscode-scrollbar-shadow) 0 6px 6px -6px inset}.scm-view .scm-input .scm-editor .scm-editor-toolbar .action-label.codicon.codicon-debug-stop{color:var(--vscode-icon-foreground)!important}.scm-view .scm-editor-container .monaco-editor{border-radius:2px}.scm-view .scm-editor{align-items:flex-start;background-color:var(--vscode-input-background);border:1px solid var(--vscode-input-border,transparent);border-radius:2px;box-sizing:border-box;display:flex;width:100%}.scm-view .button-container{align-items:center;display:flex;height:100%;padding-left:11px}.scm-view .button-container .codicon.codicon-cloud-upload,.scm-view .button-container .codicon.codicon-sync{margin:0 4px 0 0}.scm-view .button-container .codicon.codicon-arrow-down,.scm-view .button-container .codicon.codicon-arrow-up{font-size:small!important;margin:0 4px 0 0}.scm-view .button-container>.monaco-button-dropdown{flex-grow:1;overflow:hidden}.scm-view .button-container>.monaco-button-dropdown>.monaco-dropdown-button{align-items:center;display:flex;padding:0 4px}.scm-view .button-container>.monaco-button-dropdown>.monaco-button.monaco-text-button{min-width:0}.scm-view .button-container>.monaco-button-dropdown>.monaco-button.monaco-text-button>span:not(.codicon){overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.scm-view .scm-editor.hidden{display:none}.monaco-workbench .part.panel .scm-view .scm-editor-container{outline:1px solid var(--vscode-panelInput-border)}.monaco-workbench .part.panel .scm-view .scm-editor.synthetic-focus,.scm-view .scm-editor.synthetic-focus{outline:1px solid var(--vscode-focusBorder);outline-offset:-1px}.scm-view .scm-editor.validation-info{outline:1px solid var(--vscode-inputValidation-infoBorder)!important;outline-offset:-1px}.scm-view .scm-editor.validation-warning{outline:1px solid var(--vscode-inputValidation-warningBorder)!important;outline-offset:-1px}.scm-view .scm-editor.validation-error{outline:1px solid var(--vscode-inputValidation-errorBorder)!important;outline-offset:-1px}.scm-editor-validation-container{border-bottom-left-radius:2px;border-bottom-right-radius:2px;border-style:solid;border-width:1px;border-top:none;box-sizing:border-box;display:flex;padding:2px}.scm-editor-validation-container.validation-info{background-color:var(--vscode-inputValidation-infoBackground);border-color:var(--vscode-inputValidation-infoBorder);color:var(--vscode-inputValidation-infoForeground)}.scm-editor-validation-container.validation-warning{background-color:var(--vscode-inputValidation-warningBackground);border-color:var(--vscode-inputValidation-warningBorder);color:var(--vscode-inputValidation-warningForeground)}.scm-editor-validation-container.validation-error{background-color:var(--vscode-inputValidation-errorBackground);border-color:var(--vscode-inputValidation-errorBorder);color:var(--vscode-inputValidation-errorForeground)}.scm-editor-validation{border-style:none;box-sizing:border-box;display:block;flex:auto;font-size:.9em;padding:1px 3px}.scm-editor-validation p{margin:0;padding:0}.scm-editor-validation a{color:var(--vscode-textLink-foreground);-webkit-user-select:none;user-select:none}.scm-editor-validation a:active,.scm-editor-validation a:hover{color:var(--vscode-textLink-activeForeground)}.scm-editor-validation-actions{align-self:start;margin-top:1px}.monaco-workbench .part.basepanel>.content .scm-view .scm-editor-container .monaco-editor,.monaco-workbench .part.basepanel>.content .scm-view .scm-editor-container .monaco-editor .margin,.monaco-workbench .part.basepanel>.content .scm-view .scm-editor-container .monaco-editor .monaco-editor-background,.scm-view .scm-editor-container .monaco-editor,.scm-view .scm-editor-container .monaco-editor .margin,.scm-view .scm-editor-container .monaco-editor-background{background-color:var(--vscode-input-background);color:inherit}.scm-view .scm-editor-container .mtk1{color:var(--vscode-input-foreground)}.scm-view .scm-editor-container .placeholder-text.mtk1{color:var(--vscode-input-placeholderForeground)}.scm-repositories-view .scm-provider{margin:0 12px 0 20px;overflow:hidden}.scm-repositories-view .scm-provider>.label>.name{font-weight:400}.monaco-hover.history-item-hover p:first-child{margin-top:4px}.monaco-hover.history-item-hover p:last-child{margin-bottom:4px}.monaco-hover.history-item-hover hr{margin-bottom:4px;margin-top:4px}.monaco-hover.history-item-hover hr+p{margin:4px 0}.monaco-hover.history-item-hover .markdown-hover .hover-contents:not(.code-hover-contents):not(.html-hover-contents) span:not(.codicon){margin-bottom:0!important}";
 n(css,{});
 
 export { css, css as default };

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

@@ -3,7 +3,7 @@ import { equals } from 'vscode/vscode/vs/base/common/arrays';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { DisposableStore, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
 import './media/scm.css.js';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { createAndFillInActionBarActions } from 'vscode/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
 import { MenuRegistry, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions.service';
@@ -12,7 +12,6 @@ import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/c
 import { ServiceCollection } from 'vscode/vscode/vs/platform/instantiation/common/serviceCollection';
 import { ISCMService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm.service';
 
-const _moduleId = "vs/workbench/contrib/scm/browser/menus";
 function actionEquals(a, b) {
     return a.id === b.id;
 }
@@ -118,7 +117,7 @@ let SCMRepositoryMenus = class SCMRepositoryMenus {
         return this._repositoryContextMenu;
     }
     get historyProviderMenu() {
-        if (this.provider.historyProvider && !this._historyProviderMenu) {
+        if (this.provider.historyProvider.get() && !this._historyProviderMenu) {
             this._historyProviderMenu = ( (new SCMHistoryProviderMenus(this.contextKeyService, this.menuService)));
             this.disposables.add(this._historyProviderMenu);
         }
@@ -187,11 +186,15 @@ let SCMHistoryProviderMenus = class SCMHistoryProviderMenus {
         this.contextKeyService = contextKeyService;
         this.menuService = menuService;
         this.historyItemMenus = ( (new Map()));
+        this.historyItemMenus2 = ( (new Map()));
         this.disposables = ( (new DisposableStore()));
     }
     getHistoryItemMenu(historyItem) {
         return this.getOrCreateHistoryItemMenu(historyItem);
     }
+    getHistoryItemMenu2(historyItem) {
+        return this.getOrCreateHistoryItemMenu2(historyItem);
+    }
     getHistoryItemGroupMenu(historyItemGroup) {
         return historyItemGroup.direction === 'incoming' ?
             this.menuService.createMenu(MenuId.SCMIncomingChanges, this.contextKeyService) :
@@ -224,9 +227,17 @@ let SCMHistoryProviderMenus = class SCMHistoryProviderMenus {
         }
         return result;
     }
+    getOrCreateHistoryItemMenu2(historyItem) {
+        let result = this.historyItemMenus2.get(historyItem);
+        if (!result) {
+            result = this.menuService.createMenu(MenuId.SCMChangesContext, this.contextKeyService);
+            this.historyItemMenus2.set(historyItem, result);
+        }
+        return result;
+    }
     getOutgoingHistoryItemGroupMenu(menuId, historyItemGroup) {
         const contextKeyService = this.contextKeyService.createOverlay([
-            ['scmHistoryItemGroupHasRemote', !!historyItemGroup.repository.provider.historyProvider?.currentHistoryItemGroup?.remote],
+            ['scmHistoryItemGroupHasRemote', !!historyItemGroup.repository.provider.historyProvider.get()?.currentHistoryItemGroup.get()?.remote],
         ]);
         return this.menuService.createMenu(menuId, contextKeyService);
     }
@@ -273,7 +284,7 @@ SCMMenus = ( (__decorate([
     ( (__param(1, IInstantiationService)))
 ], SCMMenus)));
 MenuRegistry.appendMenuItem(MenuId.SCMResourceContext, {
-    title: ( localizeWithPath(_moduleId, 0, "Share")),
+    title: ( localize(6292, "Share")),
     submenu: MenuId.SCMResourceContextShare,
     group: '45_share',
     order: 3,