@codingame/monaco-vscode-scm-service-override 22.1.9 → 23.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-scm-service-override",
-  "version": "22.1.9",
+  "version": "23.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - scm service-override",
   "keywords": [],
@@ -15,20 +15,18 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-09e9b2e8-42a8-5a68-864f-bfcdad0ca1df-common": "22.1.9",
-    "@codingame/monaco-vscode-27663a0b-1249-58ba-9085-e52d706b50bc-common": "22.1.9",
-    "@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common": "22.1.9",
-    "@codingame/monaco-vscode-5084de40-f866-5cb5-9d9b-33a10f6f235d-common": "22.1.9",
-    "@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common": "22.1.9",
-    "@codingame/monaco-vscode-7969284a-1a12-5148-9750-fcf9656a693f-common": "22.1.9",
-    "@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common": "22.1.9",
-    "@codingame/monaco-vscode-api": "22.1.9",
-    "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common": "22.1.9",
-    "@codingame/monaco-vscode-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common": "22.1.9",
-    "@codingame/monaco-vscode-dbfe5f85-b426-55ed-a79b-5f811b395762-common": "22.1.9",
-    "@codingame/monaco-vscode-e39a1c8f-7892-5d9b-9987-7b10b79e1a0a-common": "22.1.9",
-    "@codingame/monaco-vscode-ef4149eb-cc74-500f-a75b-c54539f01afa-common": "22.1.9",
-    "@codingame/monaco-vscode-ff9fa663-eae3-5274-8573-c2b918871e4b-common": "22.1.9"
+    "@codingame/monaco-vscode-05c09f77-cd1d-5960-b387-e7023df3160b-common": "23.0.0",
+    "@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common": "23.0.0",
+    "@codingame/monaco-vscode-262ed59d-4f76-57cd-9e9f-1877f26ae049-common": "23.0.0",
+    "@codingame/monaco-vscode-27663a0b-1249-58ba-9085-e52d706b50bc-common": "23.0.0",
+    "@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common": "23.0.0",
+    "@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common": "23.0.0",
+    "@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common": "23.0.0",
+    "@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common": "23.0.0",
+    "@codingame/monaco-vscode-aac7027b-326c-513a-95a9-e4eedd151b38-common": "23.0.0",
+    "@codingame/monaco-vscode-api": "23.0.0",
+    "@codingame/monaco-vscode-bc6f260d-ec63-5c95-9446-1ca7d0872719-common": "23.0.0",
+    "@codingame/monaco-vscode-be8ddbb5-094a-5657-b1cc-fe106c94c632-common": "23.0.0"
   },
   "main": "index.js",
   "module": "index.js",

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

@@ -4,9 +4,9 @@ import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { Event, Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
-import { VIEW_PANE_ID } from '@codingame/monaco-vscode-ff9fa663-eae3-5274-8573-c2b918871e4b-common/vscode/vs/workbench/contrib/scm/common/scm';
+import { VIEW_PANE_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm';
 import { ISCMService, ISCMViewService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service';
-import { NumberBadge } from '@codingame/monaco-vscode-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common/vscode/vs/workbench/services/activity/common/activity';
+import { NumberBadge } from '@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common/vscode/vs/workbench/services/activity/common/activity';
 import { IActivityService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/activity/common/activity.service';
 import { RawContextKey } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
@@ -18,13 +18,12 @@ import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/plat
 import { Iterable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iterator';
 import { ITitleService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/title/browser/titleService.service';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
-import { getRepositoryResourceCount } from '@codingame/monaco-vscode-5084de40-f866-5cb5-9d9b-33a10f6f235d-common/vscode/vs/workbench/contrib/scm/browser/util';
+import { getRepositoryResourceCount, getStatusBarCommandGenericName, getSCMRepositoryIcon } from '@codingame/monaco-vscode-bc6f260d-ec63-5c95-9446-1ca7d0872719-common/vscode/vs/workbench/contrib/scm/browser/util';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/platformObservableUtils';
-import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
 import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
-import { autorunWithStore, autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 const ActiveRepositoryContextKeys = {
     ActiveRepositoryName: ( new RawContextKey('scmActiveRepositoryName', '')),
@@ -49,8 +48,8 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
         this._countBadgeConfig = observableConfigValue('scm.countBadge', 'all', this.configurationService);
         this._repositories = observableFromEvent(this, Event.any(this.scmService.onDidAddRepository, this.scmService.onDidRemoveRepository), () => this.scmService.repositories);
         this._activeRepositoryHistoryItemRefName = derived(reader => {
-            const repository = this.scmViewService.activeRepository.read(reader);
-            const historyProvider = repository?.provider.historyProvider.read(reader);
+            const activeRepository = this.scmViewService.activeRepository.read(reader);
+            const historyProvider = activeRepository?.repository.provider.historyProvider.read(reader);
             const historyItemRef = historyProvider?.historyItemRef.read(reader);
             return historyItemRef?.name;
         });
@@ -64,8 +63,8 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
                     ))];
                 }
                 case 'focused': {
-                    const repository = this.scmViewService.activeRepository.read(reader);
-                    return repository ? [{ provider: repository.provider, resourceCount: this._getRepositoryResourceCount(repository) }] : [];
+                    const activeRepository = this.scmViewService.activeRepository.read(reader);
+                    return activeRepository ? [{ provider: activeRepository.repository.provider, resourceCount: this._getRepositoryResourceCount(activeRepository.repository) }] : [];
                 }
                 case 'off':
                     return [];
@@ -82,19 +81,19 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
             }
             return total;
         });
-        this._register(autorunWithStore((reader, store) => {
+        this._register(autorun(reader => {
             const countBadge = this._countBadge.read(reader);
-            this._updateActivityCountBadge(countBadge, store);
+            this._updateActivityCountBadge(countBadge, reader.store);
         }));
-        this._register(autorunWithStore((reader, store) => {
-            const repository = this.scmViewService.activeRepository.read(reader);
-            const commands = repository?.provider.statusBarCommands.read(reader);
-            this._updateStatusBar(repository, commands ?? [], store);
+        this._register(autorun(reader => {
+            const activeRepository = this.scmViewService.activeRepository.read(reader);
+            const commands = activeRepository?.repository.provider.statusBarCommands.read(reader);
+            this._updateStatusBar(activeRepository, commands ?? [], reader.store);
         }));
         this._register(autorun(reader => {
-            const repository = this.scmViewService.activeRepository.read(reader);
+            const activeRepository = this.scmViewService.activeRepository.read(reader);
             const historyItemRefName = this._activeRepositoryHistoryItemRefName.read(reader);
-            this._updateActiveRepositoryContextKeys(repository?.provider.name, historyItemRefName);
+            this._updateActiveRepositoryContextKeys(activeRepository?.repository.provider.name, historyItemRefName);
         }));
     }
     _getRepositoryResourceCount(repository) {
@@ -104,33 +103,22 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
         if (count === 0) {
             return;
         }
-        const badge = ( new NumberBadge(count, num => ( localize(9999, '{0} pending changes', num))));
+        const badge = ( new NumberBadge(count, num => ( localize(10248, '{0} pending changes', num))));
         store.add(this.activityService.showViewActivity(VIEW_PANE_ID, { badge }));
     }
-    _updateStatusBar(repository, commands, store) {
-        if (!repository) {
+    _updateStatusBar(activeRepository, commands, store) {
+        if (!activeRepository) {
             return;
         }
-        const label = repository.provider.rootUri
-            ? `${basename(repository.provider.rootUri)} (${repository.provider.label})`
-            : repository.provider.label;
+        const label = activeRepository.repository.provider.rootUri
+            ? `${basename(activeRepository.repository.provider.rootUri)} (${activeRepository.repository.provider.label})`
+            : activeRepository.repository.provider.label;
         for (let index = 0; index < commands.length; index++) {
             const command = commands[index];
             const tooltip = `${label}${command.tooltip ? ` - ${command.tooltip}` : ''}`;
-            let repoAgnosticActionName = command.arguments?.[0];
-            if (repoAgnosticActionName && typeof repoAgnosticActionName === 'string') {
-                repoAgnosticActionName = repoAgnosticActionName
-                    .substring(0, repoAgnosticActionName.lastIndexOf('/'))
-                    .replace(/^(?:git\.|remoteHub\.)/, '');
-                if (repoAgnosticActionName.length > 1) {
-                    repoAgnosticActionName = repoAgnosticActionName[0].toLocaleUpperCase() + repoAgnosticActionName.slice(1);
-                }
-            }
-            else {
-                repoAgnosticActionName = '';
-            }
+            const genericCommandName = getStatusBarCommandGenericName(command);
             const statusbarEntry = {
-                name: ( localize(10000, "Source Control")) + (repoAgnosticActionName ? ` ${repoAgnosticActionName}` : ''),
+                name: ( localize(10249, "Source Control")) + (genericCommandName ? ` ${genericCommandName}` : ''),
                 text: command.title,
                 ariaLabel: tooltip,
                 tooltip,
@@ -141,12 +129,10 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
                 this.statusbarService.addEntry(statusbarEntry, `status.scm.${index}`, StatusbarAlignment.LEFT, { location: { id: `status.scm.${index - 1}`, priority: 10000 }, alignment: StatusbarAlignment.RIGHT, compact: true }));
         }
         if (this.scmService.repositoryCount > 1) {
-            const icon = ThemeIcon.isThemeIcon(repository.provider.iconPath)
-                ? `$(${repository.provider.iconPath.id})`
-                : '$(repo)';
+            const icon = getSCMRepositoryIcon(activeRepository, activeRepository.repository);
             const repositoryStatusbarEntry = {
-                name: ( localize(10001, "Source Control Provider")),
-                text: `${icon} ${repository.provider.name}`,
+                name: ( localize(10250, "Source Control Provider")),
+                text: `$(${icon.id}) ${activeRepository.repository.provider.name}`,
                 ariaLabel: label,
                 tooltip: label,
                 command: 'scm.setActiveProvider'
@@ -174,12 +160,12 @@ let SCMActiveResourceContextKeyController = class SCMActiveResourceContextKeyCon
         this.scmService = scmService;
         this.uriIdentityService = uriIdentityService;
         this._onDidRepositoryChange = ( new Emitter());
-        const activeResourceHasChangesContextKey = ( new RawContextKey('scmActiveResourceHasChanges', false, ( localize(10002, "Whether the active resource has changes"))));
-        const activeResourceRepositoryContextKey = ( new RawContextKey('scmActiveResourceRepository', undefined, ( localize(10003, "The active resource's repository"))));
+        const activeResourceHasChangesContextKey = ( new RawContextKey('scmActiveResourceHasChanges', false, ( localize(10251, "Whether the active resource has changes"))));
+        const activeResourceRepositoryContextKey = ( new RawContextKey('scmActiveResourceRepository', undefined, ( localize(10252, "The active resource's repository"))));
         this._repositories = observableFromEvent(this, Event.any(this.scmService.onDidAddRepository, this.scmService.onDidRemoveRepository), () => this.scmService.repositories);
-        this._store.add(autorunWithStore((reader, store) => {
+        this._register(autorun((reader) => {
             for (const repository of this._repositories.read(reader)) {
-                store.add(Event.runAndSubscribe(repository.provider.onDidChangeResources, () => {
+                reader.store.add(Event.runAndSubscribe(repository.provider.onDidChangeResources, () => {
                     this._onDidRepositoryChange.fire();
                 }));
             }

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

@@ -16,7 +16,7 @@
 	left: -2px;
 }
 
-.monaco-workbench:not(.reduce-motion) .monaco-editor .dirty-diff-glyph:before {
+.monaco-workbench.monaco-enable-motion .monaco-editor .dirty-diff-glyph:before {
 	transition: width 80ms linear, left 80ms linear, transform 80ms linear;
 }
 
@@ -101,9 +101,9 @@
 	background-image: linear-gradient(45deg, var(--vscode-editorGutter-modifiedSecondaryBackground) 25%, var(--vscode-editorGutter-background) 25%, var(--vscode-editorGutter-background) 50%, var(--vscode-editorGutter-modifiedSecondaryBackground) 50%, var(--vscode-editorGutter-modifiedSecondaryBackground) 75%, var(--vscode-editorGutter-background) 75%, var(--vscode-editorGutter-background));
 }
 
-.monaco-workbench:not(.reduce-motion) .monaco-editor .dirty-diff-added,
-.monaco-workbench:not(.reduce-motion) .monaco-editor .dirty-diff-modified,
-.monaco-workbench:not(.reduce-motion) .monaco-editor .dirty-diff-deleted {
+.monaco-workbench.monaco-enable-motion .monaco-editor .dirty-diff-added,
+.monaco-workbench.monaco-enable-motion .monaco-editor .dirty-diff-modified,
+.monaco-workbench.monaco-enable-motion .monaco-editor .dirty-diff-deleted {
 	transition: opacity 0.5s;
 }
 
@@ -134,7 +134,7 @@
 	border-left: 4px solid var(--vscode-editorGutter-deletedSecondaryBackground);
 }
 
-.monaco-workbench:not(.reduce-motion) .monaco-editor .dirty-diff-deleted:after {
+.monaco-workbench.monaco-enable-motion .monaco-editor .dirty-diff-deleted:after {
 	transition: border-top-width 80ms linear, border-bottom-width 80ms linear, bottom 80ms linear, opacity 0.5s;
 }
 
@@ -153,7 +153,7 @@
 	background: var(--vscode-editorGutter-deletedSecondaryBackground);
 }
 
-.monaco-workbench:not(.reduce-motion) .monaco-editor .dirty-diff-deleted:before {
+.monaco-workbench.monaco-enable-motion .monaco-editor .dirty-diff-deleted:before {
 	transition: height 80ms linear;
 }
 

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

@@ -45,12 +45,19 @@
 	display: none;
 }
 
-.scm-view .scm-provider .monaco-icon-label-container {
-	display: flex;
+.scm-view .scm-provider > .codicon {
+	padding-right: 2px;
 }
 
 .scm-view .scm-provider > .monaco-icon-label {
-	flex: 1;
+	min-width: 0;
+	flex: 0 1 auto;
+}
+
+.scm-view .scm-provider > .monaco-icon-label .monaco-icon-name-container {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
 }
 
 .scm-view .scm-provider .monaco-highlighted-label {
@@ -59,13 +66,14 @@
 	font-weight: bold;
 }
 
-.scm-view .scm-provider .monaco-highlighted-label .codicon {
-	font-size: 14px;
-}
-
 .scm-view .scm-provider > .actions {
+	min-width: 24px;
+	flex: 1 10000 auto;
 	overflow: hidden;
-	justify-content: flex-end;
+}
+
+.scm-view .scm-provider > .actions .actions-container {
+	justify-content: end;
 }
 
 /**
@@ -78,8 +86,22 @@
 	align-items: center;
 }
 
-.scm-view .scm-provider > .actions > .monaco-toolbar > .monaco-action-bar > .actions-container > .action-item:nth-child(1) {
-	min-width: 20px;
+.scm-view .scm-provider > .actions > .monaco-toolbar > .monaco-action-bar > .actions-container > .action-item.scm-status-bar-action {
+	.action-label > span:not(.codicon) {
+		margin-left: 2px;
+	}
+}
+
+.scm-view .scm-provider > .actions > .monaco-toolbar > .monaco-action-bar > .actions-container > .action-item.scm-status-bar-action > .action-label > .codicon {
+	display: inline-block;
+	vertical-align: middle;
+}
+
+.scm-view .scm-provider > .actions > .monaco-toolbar > .monaco-action-bar > .actions-container > .action-item.scm-status-bar-action > .action-label > span:not(.codicon) {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	min-width: 0;
 }
 
 .scm-view .scm-provider > .actions > .monaco-toolbar > .monaco-action-bar > .actions-container  > .action-item > .action-label,
@@ -91,7 +113,6 @@
 }
 
 .scm-view .scm-provider > .actions > .monaco-toolbar > .monaco-action-bar > .actions-container  > .action-item > .action-label > .codicon {
-	font-size: 12px;
 	justify-content: center;
 }
 
@@ -144,11 +165,15 @@
 	height: 22px;
 }
 
-.scm-view .monaco-list-row .history-item > .graph-container.current > .graph > circle:last-child {
+.scm-view .monaco-list-row .history-item > .graph-container.current > .graph > circle:last-child,
+.scm-view .monaco-list-row .history-item > .graph-container.incoming-changes > .graph > circle:last-child,
+.scm-view .monaco-list-row .history-item > .graph-container.outgoing-changes > .graph > circle:last-child {
 	fill: var(--vscode-sideBar-background);
 }
 
-.scm-view .monaco-list-row:hover .history-item > .graph-container.current > .graph > circle:last-child {
+.scm-view .monaco-list-row:hover .history-item > .graph-container.current > .graph > circle:last-child,
+.scm-view .monaco-list-row:hover .history-item > .graph-container.incoming-changes > .graph > circle:last-child,
+.scm-view .monaco-list-row:hover .history-item > .graph-container.outgoing-changes > .graph > circle:last-child {
 	fill: var(--vscode-list-hoverBackground);
 }
 
@@ -160,6 +185,32 @@
 	stroke: transparent;
 }
 
+.scm-view .monaco-list-row:hover .history-item > .graph-container > .graph > circle:nth-of-type(2) {
+	stroke: var(--vscode-list-hoverBackground);
+}
+
+.scm-view .monaco-list-row.focused.selected .history-item > .graph-container > .graph > circle:first-of-type {
+	stroke: transparent !important;
+}
+
+.scm-view.scm-history-view > .monaco-list:focus .monaco-list-row.selected .history-item > .graph-container > .graph > circle:nth-of-type(2) {
+	stroke: var(--vscode-list-activeSelectionBackground);
+}
+
+.scm-view.scm-history-view > .monaco-list:focus .monaco-list-row.selected .history-item > .graph-container.incoming-changes > .graph > circle:last-child,
+.scm-view.scm-history-view > .monaco-list:focus .monaco-list-row.selected .history-item > .graph-container.outgoing-changes > .graph > circle:last-child {
+	fill: var(--vscode-list-activeSelectionBackground);
+}
+
+.scm-view.scm-history-view > .monaco-list .monaco-list-row.focused .history-item > .graph-container > .graph > circle:nth-of-type(2) {
+	stroke: var(--vscode-list-inactiveSelectionBackground);
+}
+
+.scm-view.scm-history-view > .monaco-list .monaco-list-row.focused .history-item > .graph-container.incoming-changes > .graph > circle:last-child,
+.scm-view.scm-history-view > .monaco-list .monaco-list-row.focused .history-item > .graph-container.outgoing-changes > .graph > circle:last-child {
+	fill: var(--vscode-list-inactiveSelectionBackground);
+}
+
 .scm-view .monaco-list-row .history-item > .label-container {
 	display: flex;
 	flex-shrink: 0;
@@ -181,9 +232,8 @@
 }
 
 .scm-view .monaco-list-row .history-item > .label-container > .label > .codicon {
-	font-size: 14px;
 	color: inherit !important;
-	padding: 2px;
+	padding: 1px;
 }
 
 .scm-view .monaco-list-row .history-item > .label-container > .label > .codicon.codicon-git-branch {
@@ -494,12 +544,49 @@
 
 /* Repositories */
 
+.scm-repositories-view .monaco-list .monaco-list-row .scm-artifact-group > .actions,
+.scm-repositories-view .monaco-list .monaco-list-row .scm-artifact > .actions {
+	display: none;
+	max-width: fit-content;
+}
+
+.scm-repositories-view .monaco-list .monaco-list-row:hover .scm-artifact-group > .actions,
+.scm-repositories-view .monaco-list .monaco-list-row.focused .scm-artifact-group > .actions,
+.scm-repositories-view .monaco-list .monaco-list-row:hover .scm-artifact > .actions,
+.scm-repositories-view .monaco-list .monaco-list-row.focused .scm-artifact > .actions {
+	display: block;
+}
+
 .scm-view.scm-repositories-view .monaco-highlighted-label {
 	font-weight: normal;
 }
 
-.scm-view.scm-repositories-view .scm-provider .monaco-icon-label-container {
+.scm-repositories-view .scm-artifact-group,
+.scm-repositories-view .scm-artifact {
+	display: flex;
+	align-items: center;
+
+	.icon {
+		margin-right: 2px;
+	}
+}
+
+.scm-repositories-view .scm-artifact-group .monaco-icon-label,
+.scm-repositories-view .scm-artifact .monaco-icon-label {
+	flex-grow: 1;
+}
+
+.scm-repositories-view .scm-artifact-group .monaco-highlighted-label,
+.scm-repositories-view .scm-artifact .monaco-highlighted-label {
 	display: flex;
+	align-items: center;
+}
+
+.scm-repositories-view .scm-artifact .monaco-icon-description-container {
+	min-width: 0;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
 }
 
 /* History item hover */
@@ -552,7 +639,6 @@
 
 .monaco-hover.history-item-hover .hover-row.status-bar .action .codicon {
 	color: inherit;
-	font-size: 12px;
 }
 
 /* Graph */
@@ -595,7 +681,6 @@
 
 .monaco-toolbar .action-label.scm-graph-repository-picker .codicon,
 .monaco-toolbar .action-label.scm-graph-history-item-picker .codicon {
-	font-size: 14px;
 	color: inherit;
 }
 

package/vscode/src/vs/workbench/contrib/scm/browser/menus.d.ts

@@ -1,19 +1,19 @@
 import { IAction } from "@codingame/monaco-vscode-api/vscode/vs/base/common/actions";
-import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IMenu } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions";
 import { IMenuService } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions.service";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
-import { ISCMMenus, ISCMProvider, ISCMRepository, ISCMRepositoryMenus, ISCMResource, ISCMResourceGroup } from "@codingame/monaco-vscode-ff9fa663-eae3-5274-8573-c2b918871e4b-common/vscode/vs/workbench/contrib/scm/common/scm";
+import { ISCMMenus, ISCMProvider, ISCMRepository, ISCMRepositoryMenus, ISCMResource, ISCMResourceGroup } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm";
 import { ISCMService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service";
+import { ISCMArtifact, ISCMArtifactGroup } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/artifact";
 export declare class SCMTitleMenu implements IDisposable {
     private _actions;
     get actions(): IAction[];
     private _secondaryActions;
     get secondaryActions(): IAction[];
     private readonly _onDidChangeTitle;
-    readonly onDidChangeTitle: Event<void>;
+    readonly onDidChangeTitle: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
     readonly menu: IMenu;
     private readonly disposables;
     constructor(menuService: IMenuService, contextKeyService: IContextKeyService);
@@ -29,9 +29,13 @@ export declare class SCMRepositoryMenus implements ISCMRepositoryMenus, IDisposa
     private contextualRepositoryMenus;
     private genericRepositoryContextMenu;
     private contextualRepositoryContextMenus;
+    private artifactGroupMenus;
+    private artifactMenus;
     private readonly resourceGroupMenusItems;
     private readonly disposables;
     constructor(provider: ISCMProvider, contextKeyService: IContextKeyService, instantiationService: IInstantiationService, menuService: IMenuService);
+    getArtifactGroupMenu(artifactGroup: ISCMArtifactGroup): IMenu;
+    getArtifactMenu(artifactGroup: ISCMArtifactGroup, artifact: ISCMArtifact): IMenu;
     getRepositoryMenu(repository: ISCMRepository): IMenu;
     getRepositoryContextMenu(repository: ISCMRepository): IMenu;
     getResourceGroupMenu(group: ISCMResourceGroup): IMenu;
@@ -45,7 +49,6 @@ export declare class SCMMenus implements ISCMMenus, IDisposable {
     private instantiationService;
     readonly titleMenu: SCMTitleMenu;
     private readonly disposables;
-    private readonly repositoryMenuDisposables;
     private readonly menus;
     constructor(scmService: ISCMService, instantiationService: IInstantiationService);
     private onDidRemoveRepository;

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

@@ -2,7 +2,7 @@
 import { registerCss } from '@codingame/monaco-vscode-api/css';
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { equals } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
-import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { DisposableStore, dispose } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import * as scm from './media/scm.css';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
@@ -126,6 +126,8 @@ let SCMRepositoryMenus = class SCMRepositoryMenus {
     constructor(provider, contextKeyService, instantiationService, menuService) {
         this.provider = provider;
         this.menuService = menuService;
+        this.artifactGroupMenus = ( new Map());
+        this.artifactMenus = ( new Map());
         this.resourceGroupMenusItems = ( new Map());
         this.disposables = ( new DisposableStore());
         this.contextKeyService = contextKeyService.createOverlay([
@@ -140,6 +142,41 @@ let SCMRepositoryMenus = class SCMRepositoryMenus {
         provider.onDidChangeResourceGroups(this.onDidChangeResourceGroups, this, this.disposables);
         this.onDidChangeResourceGroups();
     }
+    getArtifactGroupMenu(artifactGroup) {
+        let item = this.artifactGroupMenus.get(artifactGroup.id);
+        if (!item) {
+            const contextKeyService = this.contextKeyService.createOverlay([['scmArtifactGroup', artifactGroup.id]]);
+            const menu = this.menuService.createMenu(MenuId.SCMArtifactGroupContext, contextKeyService);
+            item = {
+                menu, dispose() {
+                    menu.dispose();
+                }
+            };
+            this.artifactGroupMenus.set(artifactGroup.id, item);
+        }
+        return item.menu;
+    }
+    getArtifactMenu(artifactGroup, artifact) {
+        const historyProvider = this.provider.historyProvider.get();
+        const historyItemRef = historyProvider?.historyItemRef.get();
+        const isHistoryItemRef = artifact.id === historyItemRef?.id;
+        const key = isHistoryItemRef ? `${artifactGroup.id}|historyItemRef` : artifactGroup.id;
+        let item = this.artifactMenus.get(key);
+        if (!item) {
+            const contextKeyService = this.contextKeyService.createOverlay([
+                ['scmArtifactGroupId', artifactGroup.id],
+                ['scmArtifactIsHistoryItemRef', isHistoryItemRef]
+            ]);
+            const menu = this.menuService.createMenu(MenuId.SCMArtifactContext, contextKeyService);
+            item = {
+                menu, dispose() {
+                    menu.dispose();
+                }
+            };
+            this.artifactMenus.set(key, item);
+        }
+        return item.menu;
+    }
     getRepositoryMenu(repository) {
         const contextValue = repository.provider.contextValue.get();
         if (typeof contextValue === 'undefined') {
@@ -237,19 +274,9 @@ let SCMMenus = class SCMMenus {
     constructor(scmService, instantiationService) {
         this.instantiationService = instantiationService;
         this.disposables = ( new DisposableStore());
-        this.repositoryMenuDisposables = ( new DisposableStore());
         this.menus = ( new Map());
         this.titleMenu = instantiationService.createInstance(SCMTitleMenu);
         scmService.onDidRemoveRepository(this.onDidRemoveRepository, this, this.disposables);
-        this.disposables.add(Event.runAndSubscribe(MenuRegistry.onDidChangeMenu, e => {
-            if (e && !( e.has(MenuId.SCMTitle))) {
-                return;
-            }
-            this.repositoryMenuDisposables.clear();
-            for (const menuItem of MenuRegistry.getMenuItems(MenuId.SCMTitle)) {
-                this.repositoryMenuDisposables.add(MenuRegistry.appendMenuItem(MenuId.SCMSourceControlInline, menuItem));
-            }
-        }));
     }
     onDidRemoveRepository(repository) {
         const menus = this.menus.get(repository.provider);
@@ -278,7 +305,7 @@ SCMMenus = ( __decorate([
     ( __param(1, IInstantiationService))
 ], SCMMenus));
 MenuRegistry.appendMenuItem(MenuId.SCMResourceContext, {
-    title: ( localize(10004, "Share")),
+    title: ( localize(10253, "Share")),
     submenu: MenuId.SCMResourceContextShare,
     group: '45_share',
     order: 3,