@codingame/monaco-vscode-scm-service-override 37.6.1 → 38.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-scm-service-override",
-  "version": "37.6.1",
+  "version": "38.0.1",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - scm service-override",
   "keywords": [],
@@ -15,7 +15,7 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "37.6.1"
+    "@codingame/monaco-vscode-api": "38.0.1"
   },
   "main": "index.js",
   "module": "index.js",

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

@@ -112,7 +112,9 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
         this._register(autorun(reader => {
             const activeRepository = this.scmViewService.activeRepository.read(reader);
             const historyItemRefName = this._activeRepositoryHistoryItemRefName.read(reader);
-            this._updateActiveRepositoryContextKeys(activeRepository?.repository.provider.name, historyItemRefName);
+            const provider = activeRepository?.repository.provider;
+            const repositoryName = provider?.activeRepositoryName.read(reader) ?? provider?.name;
+            this._updateActiveRepositoryContextKeys(repositoryName, historyItemRefName);
         }));
     }
     _getRepositoryResourceCount(repository) {
@@ -126,7 +128,7 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
         if (count === 0) {
             return;
         }
-        const badge = ( new NumberBadge(count, num => ( localize(17882, "{0} pending changes", num))));
+        const badge = ( new NumberBadge(count, num => ( localize(20418, "{0} pending changes", num))));
         store.add(this.activityService.showViewActivity(VIEW_PANE_ID, {
             badge
         }));
@@ -141,7 +143,7 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
             const tooltip = `${label}${command.tooltip ? ` - ${command.tooltip}` : ""}`;
             const genericCommandName = getStatusBarCommandGenericName(command);
             const statusbarEntry = {
-                name: ( localize(17883, "Source Control")) + (genericCommandName ? ` ${genericCommandName}` : ""),
+                name: ( localize(20419, "Source Control")) + (genericCommandName ? ` ${genericCommandName}` : ""),
                 text: command.title,
                 ariaLabel: tooltip,
                 tooltip,
@@ -169,7 +171,7 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
         if (this.scmViewService.repositories.length > 1) {
             const icon = getSCMRepositoryIcon(activeRepository, activeRepository.repository);
             const repositoryStatusbarEntry = {
-                name: ( localize(17884, "Source Control Provider")),
+                name: ( localize(20420, "Source Control Provider")),
                 text: `$(${icon.id}) ${activeRepository.repository.provider.name}`,
                 ariaLabel: label,
                 tooltip: label,
@@ -202,8 +204,8 @@ let SCMActiveResourceContextKeyController = class SCMActiveResourceContextKeyCon
         this.scmService = scmService;
         this.uriIdentityService = uriIdentityService;
         this._onDidRepositoryChange = ( new Emitter());
-        const activeResourceHasChangesContextKey = new RawContextKey("scmActiveResourceHasChanges", false, ( localize(17885, "Whether the active resource has changes")));
-        const activeResourceRepositoryContextKey = new RawContextKey("scmActiveResourceRepository", undefined, ( localize(17886, "The active resource's repository")));
+        const activeResourceHasChangesContextKey = new RawContextKey("scmActiveResourceHasChanges", false, ( localize(20421, "Whether the active resource has changes")));
+        const activeResourceRepositoryContextKey = new RawContextKey("scmActiveResourceRepository", undefined, ( localize(20422, "The active resource's repository")));
         this._repositories = observableFromEvent(
             this,
             Event.any(this.scmService.onDidAddRepository, this.scmService.onDidRemoveRepository),

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

@@ -295,6 +295,19 @@
 	margin-right: 3px;
 }
 
+.scm-view .monaco-list-row .resource > .name > .monaco-icon-label.monaco-decoration-text-badge::after {
+	display: inline-flex;
+	align-items: center;
+	justify-content: center;
+	box-sizing: border-box;
+	flex-shrink: 0;
+	min-width: var(--vscode-spacing-size160);
+	height: var(--vscode-spacing-size160);
+	margin-block: auto;
+	font-size: var(--vscode-fontSize-label2);
+	font-weight: var(--vscode-fontWeight-semiBold);
+}
+
 .scm-view .monaco-list-row .resource > .decoration-icon {
 	width: 16px;
 	height: 100%;

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

@@ -313,7 +313,7 @@ let SCMMenus = class SCMMenus {
 };
 SCMMenus = ( __decorate([( __param(0, ISCMService)), ( __param(1, IInstantiationService))], SCMMenus));
 MenuRegistry.appendMenuItem(MenuId.SCMResourceContext, {
-    title: ( localize(17887, "Share")),
+    title: ( localize(20423, "Share")),
     submenu: MenuId.SCMResourceContextShare,
     group: "45_share",
     order: 3

package/vscode/src/vs/workbench/contrib/scm/browser/quickDiff.contribution.js

@@ -15,7 +15,7 @@ import './quickDiffModel.js';
 import { QuickDiffEditorController } from './quickDiffWidget.js';
 
 MenuRegistry.appendMenuItem(MenuId.EditorLineNumberContext, {
-    title: ( localize(17888, "Diff Decorations")),
+    title: ( localize(20424, "Diff Decorations")),
     submenu: MenuId.SCMQuickDiffDecorations,
     when: ( ContextKeyExpr.or(( ContextKeyExpr.equals("config.scm.diffDecorations", "all")), ( ContextKeyExpr.equals("config.scm.diffDecorations", "gutter")))),
     group: "9_quickDiffDecorations"
@@ -29,32 +29,32 @@ registerEditorContribution(
 ( Registry.as(Extensions$1.Configuration)).registerConfiguration({
     id: "scm",
     order: 5,
-    title: ( localize(17889, "Source Control")),
+    title: ( localize(20425, "Source Control")),
     type: "object",
     scope: ConfigurationScope.RESOURCE,
     properties: {
         "scm.diffDecorations": {
             type: "string",
             enum: ["all", "gutter", "overview", "minimap", "none"],
-            enumDescriptions: [( localize(17890, "Show the diff decorations in all available locations.")), ( localize(17891, "Show the diff decorations only in the editor gutter.")), ( localize(17892, "Show the diff decorations only in the overview ruler.")), ( localize(17893, "Show the diff decorations only in the minimap.")), ( localize(17894, "Do not show the diff decorations."))],
+            enumDescriptions: [( localize(20426, "Show the diff decorations in all available locations.")), ( localize(20427, "Show the diff decorations only in the editor gutter.")), ( localize(20428, "Show the diff decorations only in the overview ruler.")), ( localize(20429, "Show the diff decorations only in the minimap.")), ( localize(20430, "Do not show the diff decorations."))],
             default: "all",
-            description: ( localize(17895, "Controls diff decorations in the editor."))
+            description: ( localize(20431, "Controls diff decorations in the editor."))
         },
         "scm.diffDecorationsGutterWidth": {
             type: "number",
             enum: [1, 2, 3, 4, 5],
             default: 3,
             description: ( localize(
-                17896,
+                20432,
                 "Controls the width(px) of diff decorations in gutter (added & modified)."
             ))
         },
         "scm.diffDecorationsGutterVisibility": {
             type: "string",
             enum: ["always", "hover"],
-            enumDescriptions: [( localize(17897, "Show the diff decorator in the gutter at all times.")), ( localize(17898, "Show the diff decorator in the gutter only on hover."))],
+            enumDescriptions: [( localize(20433, "Show the diff decorator in the gutter at all times.")), ( localize(20434, "Show the diff decorator in the gutter only on hover."))],
             description: ( localize(
-                17899,
+                20435,
                 "Controls the visibility of the Source Control diff decorator in the gutter."
             )),
             default: "always"
@@ -62,26 +62,26 @@ registerEditorContribution(
         "scm.diffDecorationsGutterAction": {
             type: "string",
             enum: ["diff", "none"],
-            enumDescriptions: [( localize(17900, "Show the inline diff Peek view on click.")), ( localize(17901, "Do nothing."))],
-            description: ( localize(17902, "Controls the behavior of Source Control diff gutter decorations.")),
+            enumDescriptions: [( localize(20436, "Show the inline diff Peek view on click.")), ( localize(20437, "Do nothing."))],
+            description: ( localize(20438, "Controls the behavior of Source Control diff gutter decorations.")),
             default: "diff"
         },
         "scm.diffDecorationsGutterPattern": {
             type: "object",
             description: ( localize(
-                17903,
+                20439,
                 "Controls whether a pattern is used for the diff decorations in gutter."
             )),
             additionalProperties: false,
             properties: {
                 "added": {
                     type: "boolean",
-                    description: ( localize(17904, "Use pattern for the diff decorations in gutter for added lines."))
+                    description: ( localize(20440, "Use pattern for the diff decorations in gutter for added lines."))
                 },
                 "modified": {
                     type: "boolean",
                     description: ( localize(
-                        17905,
+                        20441,
                         "Use pattern for the diff decorations in gutter for modified lines."
                     ))
                 }
@@ -94,9 +94,9 @@ registerEditorContribution(
         "scm.diffDecorationsIgnoreTrimWhitespace": {
             type: "string",
             enum: ["true", "false", "inherit"],
-            enumDescriptions: [( localize(17906, "Ignore leading and trailing whitespace.")), ( localize(17907, "Do not ignore leading and trailing whitespace.")), ( localize(17908, "Inherit from `diffEditor.ignoreTrimWhitespace`."))],
+            enumDescriptions: [( localize(20442, "Ignore leading and trailing whitespace.")), ( localize(20443, "Do not ignore leading and trailing whitespace.")), ( localize(20444, "Inherit from `diffEditor.ignoreTrimWhitespace`."))],
             description: ( localize(
-                17909,
+                20445,
                 "Controls whether leading and trailing whitespace is ignored in Source Control diff gutter decorations."
             )),
             default: "false"

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

@@ -61,7 +61,7 @@ let QuickDiffDecorator = QuickDiffDecorator_1 = class QuickDiffDecorator extends
         const gutter = decorations === "all" || decorations === "gutter";
         const overview = decorations === "all" || decorations === "overview";
         const minimap = decorations === "all" || decorations === "minimap";
-        const diffAdded = ( localize(17910, "Added lines"));
+        const diffAdded = ( localize(20446, "Added lines"));
         const diffAddedOptions = {
             gutter,
             overview: {
@@ -78,7 +78,7 @@ let QuickDiffDecorator = QuickDiffDecorator_1 = class QuickDiffDecorator extends
         this.addedPatternOptions = QuickDiffDecorator_1.createDecoration("dirty-diff-added primary pattern", diffAdded, diffAddedOptions);
         this.addedSecondaryOptions = QuickDiffDecorator_1.createDecoration("dirty-diff-added secondary", diffAdded, diffAddedOptions);
         this.addedSecondaryPatternOptions = QuickDiffDecorator_1.createDecoration("dirty-diff-added secondary pattern", diffAdded, diffAddedOptions);
-        const diffModified = ( localize(17911, "Changed lines"));
+        const diffModified = ( localize(20447, "Changed lines"));
         const diffModifiedOptions = {
             gutter,
             overview: {
@@ -95,7 +95,7 @@ let QuickDiffDecorator = QuickDiffDecorator_1 = class QuickDiffDecorator extends
         this.modifiedPatternOptions = QuickDiffDecorator_1.createDecoration("dirty-diff-modified primary pattern", diffModified, diffModifiedOptions);
         this.modifiedSecondaryOptions = QuickDiffDecorator_1.createDecoration("dirty-diff-modified secondary", diffModified, diffModifiedOptions);
         this.modifiedSecondaryPatternOptions = QuickDiffDecorator_1.createDecoration("dirty-diff-modified secondary pattern", diffModified, diffModifiedOptions);
-        const diffDeleted = ( localize(17912, "Removed lines"));
+        const diffDeleted = ( localize(20448, "Removed lines"));
         const diffDeletedOptions = {
             gutter,
             overview: {

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

@@ -71,7 +71,7 @@ let QuickDiffPickerViewItem = class QuickDiffPickerViewItem extends SelectAction
         const opaqueTitleColor = peekTitleColor?.makeOpaque(editorBackgroundColor) ?? editorBackgroundColor;
         styles.selectBackground = ( ( opaqueTitleColor.lighten(.6)).toString());
         super(null, action, [], 0, contextViewService, styles, {
-            ariaLabel: ( localize(17913, "Switch quick diff base")),
+            ariaLabel: ( localize(20449, "Switch quick diff base")),
             useCustomDrawn: !hasNativeContextMenu(configurationService)
         });
         this.optionsItems = [];
@@ -98,7 +98,7 @@ class QuickDiffPickerBaseAction extends Action {
         this.ID = "quickDiff.base.switch";
     }
     static {
-        this.LABEL = ( localize(17914, "Switch Quick Diff Base"));
+        this.LABEL = ( localize(20450, "Switch Quick Diff Base"));
     }
     constructor(callback) {
         super(
@@ -248,13 +248,13 @@ let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
         if (!this.shouldUseDropdown()) {
             const label = this.model.quickDiffs.find(quickDiff => quickDiff.id === this._providerId)?.label ?? "";
             detail = this.model.changes.length > 1 ? ( localize(
-                17915,
+                20451,
                 "{0} - {1} of {2} changes",
                 label,
                 providerIndex + 1,
                 providerChanges.length
             )) : ( localize(
-                17916,
+                20452,
                 "{0} - {1} of {2} change",
                 label,
                 providerIndex + 1,
@@ -262,7 +262,7 @@ let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
             ));
             this.dropdownContainer.style.display = "none";
         } else {
-            detail = this.model.changes.length > 1 ? ( localize(17917, "{0} of {1} changes", providerIndex + 1, providerChanges.length)) : ( localize(17918, "{0} of {1} change", providerIndex + 1, providerChanges.length));
+            detail = this.model.changes.length > 1 ? ( localize(20453, "{0} of {1} changes", providerIndex + 1, providerChanges.length)) : ( localize(20454, "{0} of {1} change", providerIndex + 1, providerChanges.length));
             this.dropdownContainer.style.display = "inherit";
         }
         this.setTitle(this.title, detail);
@@ -321,7 +321,7 @@ let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
             label: false,
             icon: true
         });
-        this._actionbarWidget.push(this._disposables.add(( new Action("peekview.close", ( localize(17919, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => this.dispose()))), {
+        this._actionbarWidget.push(this._disposables.add(( new Action("peekview.close", ( localize(20455, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => this.dispose()))), {
             label: false,
             icon: true
         });
@@ -706,7 +706,7 @@ class ShowPreviousChangeAction extends EditorAction {
     constructor(outerEditor) {
         super({
             id: "editor.action.dirtydiff.previous",
-            label: ( localize2(17920, "Show Previous Change")),
+            label: ( localize2(20456, "Show Previous Change")),
             precondition: ( TextCompareEditorActiveContext.toNegated()),
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -736,7 +736,7 @@ class ShowNextChangeAction extends EditorAction {
     constructor(outerEditor) {
         super({
             id: "editor.action.dirtydiff.next",
-            label: ( localize2(17921, "Show Next Change")),
+            label: ( localize2(20457, "Show Next Change")),
             precondition: ( TextCompareEditorActiveContext.toNegated()),
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -766,7 +766,7 @@ class GotoPreviousChangeAction extends EditorAction {
     constructor() {
         super({
             id: "workbench.action.editor.previousChange",
-            label: ( localize2(17922, "Go to Previous Change")),
+            label: ( localize2(20458, "Go to Previous Change")),
             precondition: ( ContextKeyExpr.and(( TextCompareEditorActiveContext.toNegated()), ( quickDiffDecorationCount.notEqualsTo(0)))),
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -804,7 +804,7 @@ class GotoNextChangeAction extends EditorAction {
     constructor() {
         super({
             id: "workbench.action.editor.nextChange",
-            label: ( localize2(17923, "Go to Next Change")),
+            label: ( localize2(20459, "Go to Next Change")),
             precondition: ( ContextKeyExpr.and(( TextCompareEditorActiveContext.toNegated()), ( quickDiffDecorationCount.notEqualsTo(0)))),
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -842,7 +842,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
     group: "7_change_nav",
     command: {
         id: "editor.action.dirtydiff.next",
-        title: ( localize(17924, "Next &&Change"))
+        title: ( localize(20460, "Next &&Change"))
     },
     order: 1
 });
@@ -850,7 +850,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
     group: "7_change_nav",
     command: {
         id: "editor.action.dirtydiff.previous",
-        title: ( localize(17925, "Previous &&Change"))
+        title: ( localize(20461, "Previous &&Change"))
     },
     order: 2
 });