@codingame/monaco-vscode-scm-service-override 20.5.0 → 21.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-scm-service-override",
-  "version": "20.5.0",
+  "version": "21.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - scm service-override",
   "keywords": [],
@@ -15,18 +15,19 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-262ed59d-4f76-57cd-9e9f-1877f26ae049-common": "20.5.0",
-    "@codingame/monaco-vscode-27663a0b-1249-58ba-9085-e52d706b50bc-common": "20.5.0",
-    "@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common": "20.5.0",
-    "@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common": "20.5.0",
-    "@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common": "20.5.0",
-    "@codingame/monaco-vscode-api": "20.5.0",
-    "@codingame/monaco-vscode-bb83fe45-f4c7-5673-b9f1-5c409a63f19c-common": "20.5.0",
-    "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common": "20.5.0",
-    "@codingame/monaco-vscode-d0569cfb-4706-5ad6-b0b0-5115ad8685db-common": "20.5.0",
-    "@codingame/monaco-vscode-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common": "20.5.0",
-    "@codingame/monaco-vscode-dbfe5f85-b426-55ed-a79b-5f811b395762-common": "20.5.0",
-    "@codingame/monaco-vscode-ff9fa663-eae3-5274-8573-c2b918871e4b-common": "20.5.0"
+    "@codingame/monaco-vscode-09e9b2e8-42a8-5a68-864f-bfcdad0ca1df-common": "21.0.0",
+    "@codingame/monaco-vscode-23b6fb38-5e58-5886-b34b-27abc4f5df02-common": "21.0.0",
+    "@codingame/monaco-vscode-27663a0b-1249-58ba-9085-e52d706b50bc-common": "21.0.0",
+    "@codingame/monaco-vscode-4fad3647-b95d-5c19-bab1-bb9de627a5ec-common": "21.0.0",
+    "@codingame/monaco-vscode-71c8dbff-4c98-552f-aef0-e72b00fdcfc0-common": "21.0.0",
+    "@codingame/monaco-vscode-9a5ab9e7-d838-5831-9eb4-e79ea3764dcb-common": "21.0.0",
+    "@codingame/monaco-vscode-api": "21.0.0",
+    "@codingame/monaco-vscode-bb83fe45-f4c7-5673-b9f1-5c409a63f19c-common": "21.0.0",
+    "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common": "21.0.0",
+    "@codingame/monaco-vscode-d0569cfb-4706-5ad6-b0b0-5115ad8685db-common": "21.0.0",
+    "@codingame/monaco-vscode-dbfe5f85-b426-55ed-a79b-5f811b395762-common": "21.0.0",
+    "@codingame/monaco-vscode-e39a1c8f-7892-5d9b-9987-7b10b79e1a0a-common": "21.0.0",
+    "@codingame/monaco-vscode-ff9fa663-eae3-5274-8573-c2b918871e4b-common": "21.0.0"
   },
   "main": "index.js",
   "module": "index.js",

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

@@ -6,7 +6,7 @@ import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/l
 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 { 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-9a5ab9e7-d838-5831-9eb4-e79ea3764dcb-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';
@@ -87,7 +87,6 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
             this._updateActivityCountBadge(countBadge, store);
         }));
         this._register(autorunWithStore((reader, store) => {
-            this._repositories.read(reader);
             const repository = this.scmViewService.activeRepository.read(reader);
             const commands = repository?.provider.statusBarCommands.read(reader);
             this._updateStatusBar(repository, commands ?? [], store);
@@ -105,7 +104,7 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
         if (count === 0) {
             return;
         }
-        const badge = ( new NumberBadge(count, num => ( localize(9723, '{0} pending changes', num))));
+        const badge = ( new NumberBadge(count, num => ( localize(9885, '{0} pending changes', num))));
         store.add(this.activityService.showViewActivity(VIEW_PANE_ID, { badge }));
     }
     _updateStatusBar(repository, commands, store) {
@@ -122,7 +121,7 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
             if (repoAgnosticActionName && typeof repoAgnosticActionName === 'string') {
                 repoAgnosticActionName = repoAgnosticActionName
                     .substring(0, repoAgnosticActionName.lastIndexOf('/'))
-                    .replace(/^git\./, '');
+                    .replace(/^(?:git\.|remoteHub\.)/, '');
                 if (repoAgnosticActionName.length > 1) {
                     repoAgnosticActionName = repoAgnosticActionName[0].toLocaleUpperCase() + repoAgnosticActionName.slice(1);
                 }
@@ -131,7 +130,7 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
                 repoAgnosticActionName = '';
             }
             const statusbarEntry = {
-                name: ( localize(9724, "Source Control")) + (repoAgnosticActionName ? ` ${repoAgnosticActionName}` : ''),
+                name: ( localize(9886, "Source Control")) + (repoAgnosticActionName ? ` ${repoAgnosticActionName}` : ''),
                 text: command.title,
                 ariaLabel: tooltip,
                 tooltip,
@@ -146,7 +145,7 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
                 ? `$(${repository.provider.iconPath.id})`
                 : '$(repo)';
             const repositoryStatusbarEntry = {
-                name: ( localize(9725, "Source Control Provider")),
+                name: ( localize(9887, "Source Control Provider")),
                 text: `${icon} ${repository.provider.name}`,
                 ariaLabel: label,
                 tooltip: label,
@@ -175,8 +174,8 @@ let SCMActiveResourceContextKeyController = class SCMActiveResourceContextKeyCon
         this.scmService = scmService;
         this.uriIdentityService = uriIdentityService;
         this._onDidRepositoryChange = ( new Emitter());
-        const activeResourceHasChangesContextKey = ( new RawContextKey('scmActiveResourceHasChanges', false, ( localize(9726, "Whether the active resource has changes"))));
-        const activeResourceRepositoryContextKey = ( new RawContextKey('scmActiveResourceRepository', undefined, ( localize(9727, "The active resource's repository"))));
+        const activeResourceHasChangesContextKey = ( new RawContextKey('scmActiveResourceHasChanges', false, ( localize(9888, "Whether the active resource has changes"))));
+        const activeResourceRepositoryContextKey = ( new RawContextKey('scmActiveResourceRepository', undefined, ( localize(9889, "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) => {
             for (const repository of this._repositories.read(reader)) {

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

@@ -45,6 +45,10 @@
 	display: none;
 }
 
+.scm-view .scm-provider .monaco-icon-label-container {
+	display: flex;
+}
+
 .scm-view .scm-provider > .monaco-icon-label {
 	flex: 1;
 }
@@ -494,6 +498,10 @@
 	font-weight: normal;
 }
 
+.scm-view.scm-repositories-view .scm-provider .monaco-icon-label-container {
+	display: flex;
+}
+
 /* History item hover */
 
 .monaco-hover.history-item-hover p:first-child {

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

@@ -278,7 +278,7 @@ SCMMenus = ( __decorate([
     ( __param(1, IInstantiationService))
 ], SCMMenus));
 MenuRegistry.appendMenuItem(MenuId.SCMResourceContext, {
-    title: ( localize(9728, "Share")),
+    title: ( localize(9890, "Share")),
     submenu: MenuId.SCMResourceContextShare,
     group: '45_share',
     order: 3,

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(9729, 'Added lines'));
+        const diffAdded = ( localize(9891, 'Added lines'));
         const diffAddedOptions = {
             gutter,
             overview: { active: overview, color: overviewRulerAddedForeground },
@@ -72,7 +72,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(9730, 'Changed lines'));
+        const diffModified = ( localize(9892, 'Changed lines'));
         const diffModifiedOptions = {
             gutter,
             overview: { active: overview, color: overviewRulerModifiedForeground },
@@ -83,7 +83,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(9731, 'Removed lines'));
+        const diffDeleted = ( localize(9893, 'Removed lines'));
         const diffDeletedOptions = {
             gutter,
             overview: { active: overview, color: overviewRulerDeletedForeground },

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

@@ -88,7 +88,7 @@ let QuickDiffModel = class QuickDiffModel extends Disposable {
         this._originalEditorModelsDisposables = this._register(( new DisposableStore()));
         this._disposed = false;
         this._quickDiffs = [];
-        this._diffDelayer = ( new ThrottledDelayer(200));
+        this._diffDelayer = this._register(( new ThrottledDelayer(200)));
         this._onDidChange = ( new Emitter());
         this.onDidChange = this._onDidChange.event;
         this._allChanges = [];
@@ -279,7 +279,7 @@ let QuickDiffModel = class QuickDiffModel extends Disposable {
                         return [];
                     }
                     this._originalEditorModels.set(quickDiff.originalResource, ref.object);
-                    if (isTextFileEditorModel(ref.object)) {
+                    if (isTextFileEditorModel(ref.object) && !ref.object.isDirty()) {
                         const encoding = this._model.getEncoding();
                         if (encoding) {
                             ref.object.setEncoding(encoding, EncodingMode.Decode);

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

@@ -68,7 +68,7 @@ let QuickDiffPickerViewItem = class QuickDiffPickerViewItem extends SelectAction
         const peekTitleColor = theme.getColor(peekViewTitleBackground);
         const opaqueTitleColor = peekTitleColor?.makeOpaque(editorBackgroundColor) ?? editorBackgroundColor;
         styles.selectBackground = ( ( opaqueTitleColor.lighten(.6)).toString());
-        super(null, action, [], 0, contextViewService, styles, { ariaLabel: ( localize(9732, 'Switch quick diff base')), useCustomDrawn: !hasNativeContextMenu(configurationService) });
+        super(null, action, [], 0, contextViewService, styles, { ariaLabel: ( localize(9894, 'Switch quick diff base')), useCustomDrawn: !hasNativeContextMenu(configurationService) });
         this.optionsItems = [];
     }
     setSelection(quickDiffs, providerId) {
@@ -91,7 +91,7 @@ QuickDiffPickerViewItem = ( __decorate([
 ], QuickDiffPickerViewItem));
 class QuickDiffPickerBaseAction extends Action {
     static { this.ID = 'quickDiff.base.switch'; }
-    static { this.LABEL = ( localize(9733, "Switch Quick Diff Base")); }
+    static { this.LABEL = ( localize(9895, "Switch Quick Diff Base")); }
     constructor(callback) {
         super(QuickDiffPickerBaseAction.ID, QuickDiffPickerBaseAction.LABEL, undefined, undefined);
         this.callback = callback;
@@ -218,14 +218,14 @@ let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
                 .find(quickDiff => quickDiff.id === this._providerId)?.label ?? '';
             detail = this.model.changes.length > 1
                 ? ( localize(
-                9734,
+                9896,
                 "{0} - {1} of {2} changes",
                 label,
                 providerIndex + 1,
                 providerChanges.length
             ))
                 : ( localize(
-                9735,
+                9897,
                 "{0} - {1} of {2} change",
                 label,
                 providerIndex + 1,
@@ -235,8 +235,8 @@ let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
         }
         else {
             detail = this.model.changes.length > 1
-                ? ( localize(9736, "{0} of {1} changes", providerIndex + 1, providerChanges.length))
-                : ( localize(9737, "{0} of {1} change", providerIndex + 1, providerChanges.length));
+                ? ( localize(9898, "{0} of {1} changes", providerIndex + 1, providerChanges.length))
+                : ( localize(9899, "{0} of {1} change", providerIndex + 1, providerChanges.length));
             this.dropdownContainer.style.display = 'inherit';
         }
         this.setTitle(this.title, detail);
@@ -285,7 +285,7 @@ let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
         this._actionbarWidget.clear();
         this._actionbarWidget.push(actions.reverse(), { label: false, icon: true });
         this._actionbarWidget.push([next, previous], { label: false, icon: true });
-        this._actionbarWidget.push(this._disposables.add(( new Action('peekview.close', ( localize(9738, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => this.dispose()))), { label: false, icon: true });
+        this._actionbarWidget.push(this._disposables.add(( new Action('peekview.close', ( localize(9900, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => this.dispose()))), { label: false, icon: true });
     }
     updateDropdown() {
         const quickDiffs = this.getQuickDiffsContainingChange();
@@ -636,7 +636,7 @@ class ShowPreviousChangeAction extends EditorAction {
     constructor(outerEditor) {
         super({
             id: 'editor.action.dirtydiff.previous',
-            label: ( localize2(9739, "Show Previous Change")),
+            label: ( localize2(9901, "Show Previous Change")),
             precondition: ( TextCompareEditorActiveContext.toNegated()),
             kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod.Shift | KeyMod.Alt | KeyCode.F3, weight: KeybindingWeight.EditorContrib }
         });
@@ -662,7 +662,7 @@ class ShowNextChangeAction extends EditorAction {
     constructor(outerEditor) {
         super({
             id: 'editor.action.dirtydiff.next',
-            label: ( localize2(9740, "Show Next Change")),
+            label: ( localize2(9902, "Show Next Change")),
             precondition: ( TextCompareEditorActiveContext.toNegated()),
             kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod.Alt | KeyCode.F3, weight: KeybindingWeight.EditorContrib }
         });
@@ -688,7 +688,7 @@ class GotoPreviousChangeAction extends EditorAction {
     constructor() {
         super({
             id: 'workbench.action.editor.previousChange',
-            label: ( localize2(9741, "Go to Previous Change")),
+            label: ( localize2(9903, "Go to Previous Change")),
             precondition: ( ContextKeyExpr.and(( TextCompareEditorActiveContext.toNegated()), ( quickDiffDecorationCount.notEqualsTo(0)))),
             kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod.Shift | KeyMod.Alt | KeyCode.F5, weight: KeybindingWeight.EditorContrib }
         });
@@ -723,7 +723,7 @@ class GotoNextChangeAction extends EditorAction {
     constructor() {
         super({
             id: 'workbench.action.editor.nextChange',
-            label: ( localize2(9742, "Go to Next Change")),
+            label: ( localize2(9904, "Go to Next Change")),
             precondition: ( ContextKeyExpr.and(( TextCompareEditorActiveContext.toNegated()), ( quickDiffDecorationCount.notEqualsTo(0)))),
             kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod.Alt | KeyCode.F5, weight: KeybindingWeight.EditorContrib }
         });
@@ -758,7 +758,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
     group: '7_change_nav',
     command: {
         id: 'editor.action.dirtydiff.next',
-        title: ( localize(9743, "Next &&Change"))
+        title: ( localize(9905, "Next &&Change"))
     },
     order: 1
 });
@@ -766,7 +766,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
     group: '7_change_nav',
     command: {
         id: 'editor.action.dirtydiff.previous',
-        title: ( localize(9744, "Previous &&Change"))
+        title: ( localize(9906, "Previous &&Change"))
     },
     order: 2
 });