@codingame/monaco-vscode-scm-service-override 37.2.0 → 37.3.0

package/common.d.ts

@@ -0,0 +1,2 @@
+import { type IEditorOverrideServices } from "@codingame/monaco-vscode-api/vscode/vs/editor/standalone/browser/standaloneServices";
+export default function getServiceOverride(): IEditorOverrideServices;

package/common.js

@@ -0,0 +1,25 @@
+
+import '@codingame/monaco-vscode-api/vscode/vs/editor/standalone/browser/standaloneServices';
+import { ISCMViewService, ISCMService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service';
+import { SCMService } from './vscode/src/vs/workbench/contrib/scm/common/scmService.js';
+import { SCMViewService } from './vscode/src/vs/workbench/contrib/scm/browser/scmViewService.js';
+import { IQuickDiffService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/quickDiff.service';
+import { QuickDiffService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/quickDiffService';
+import { SyncDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/descriptors';
+import { IQuickDiffModelService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/browser/quickDiffModel.service';
+import { QuickDiffModelService } from './vscode/src/vs/workbench/contrib/scm/browser/quickDiffModel.js';
+import { IGitService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/git/common/gitService.service';
+import { GitService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/git/browser/gitService';
+import './vscode/src/vs/workbench/contrib/scm/browser/quickDiff.contribution.js';
+
+function getServiceOverride() {
+    return {
+        [ISCMService.toString()]: new SyncDescriptor(SCMService, [], true),
+        [ISCMViewService.toString()]: new SyncDescriptor(SCMViewService, [], true),
+        [IQuickDiffService.toString()]: new SyncDescriptor(QuickDiffService, [], true),
+        [IQuickDiffModelService.toString()]: new SyncDescriptor(QuickDiffModelService, [], true),
+        [IGitService.toString()]: new SyncDescriptor(GitService, [], true)
+    };
+}
+
+export { getServiceOverride as default };

package/index.d.ts

@@ -1,2 +1,2 @@
-import { type IEditorOverrideServices } from "@codingame/monaco-vscode-api/vscode/vs/editor/standalone/browser/standaloneServices";
-export default function getServiceOverride(): IEditorOverrideServices;
+export { default } from "./common.js";
+export * from "./common.js";

package/index.js

@@ -1,26 +1,3 @@
 
-import '@codingame/monaco-vscode-api/vscode/vs/editor/standalone/browser/standaloneServices';
-import { ISCMViewService, ISCMService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service';
-import { SCMService } from './vscode/src/vs/workbench/contrib/scm/common/scmService.js';
-import { SCMViewService } from './vscode/src/vs/workbench/contrib/scm/browser/scmViewService.js';
-import { IQuickDiffService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/quickDiff.service';
-import { QuickDiffService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/quickDiffService';
-import { SyncDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/descriptors';
-import { IQuickDiffModelService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/browser/quickDiffModel.service';
-import { QuickDiffModelService } from './vscode/src/vs/workbench/contrib/scm/browser/quickDiffModel.js';
-import { IGitService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/git/common/gitService.service';
-import { GitService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/git/browser/gitService';
+export { default } from './common.js';
 import './vscode/src/vs/workbench/contrib/scm/browser/scm.contribution.js';
-import './vscode/src/vs/workbench/contrib/scm/browser/quickDiff.contribution.js';
-
-function getServiceOverride() {
-    return {
-        [ISCMService.toString()]: new SyncDescriptor(SCMService, [], true),
-        [ISCMViewService.toString()]: new SyncDescriptor(SCMViewService, [], true),
-        [IQuickDiffService.toString()]: new SyncDescriptor(QuickDiffService, [], true),
-        [IQuickDiffModelService.toString()]: new SyncDescriptor(QuickDiffModelService, [], true),
-        [IGitService.toString()]: new SyncDescriptor(GitService, [], true)
-    };
-}
-
-export { getServiceOverride as default };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-scm-service-override",
-  "version": "37.2.0",
+  "version": "37.3.0",
   "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.2.0"
+    "@codingame/monaco-vscode-api": "37.3.0"
   },
   "main": "index.js",
   "module": "index.js",
@@ -31,6 +31,14 @@
       "types": "./vscode/src/*.d.ts",
       "default": "./vscode/src/*.js"
     },
+    "./session": {
+      "types": "./session.d.ts",
+      "default": "./session.js"
+    },
+    "./common": {
+      "types": "./common.d.ts",
+      "default": "./common.js"
+    },
     "./*": {
       "types": "./*.d.ts",
       "default": "./*.js"

package/session.d.ts

@@ -0,0 +1,2 @@
+export { default } from "./common.js";
+export * from "./common.js";

package/session.js

@@ -0,0 +1,2 @@
+
+export { default } from './common.js';

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

@@ -25,8 +25,8 @@ import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/obse
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 const ActiveRepositoryContextKeys = {
-    ActiveRepositoryName: ( new RawContextKey("scmActiveRepositoryName", "")),
-    ActiveRepositoryBranchName: ( new RawContextKey("scmActiveRepositoryBranchName", ""))
+    ActiveRepositoryName: new RawContextKey("scmActiveRepositoryName", ""),
+    ActiveRepositoryBranchName: new RawContextKey("scmActiveRepositoryBranchName", "")
 };
 let SCMActiveRepositoryController = class SCMActiveRepositoryController extends Disposable {
     constructor(
@@ -72,10 +72,10 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
             case "all":
                 {
                     const repositories = this._visibleRepositories.read(reader);
-                    return ( repositories.map(r => ({
+                    return repositories.map(r => ({
                         provider: r.provider,
                         resourceCount: this._getRepositoryResourceCount(r)
-                    })));
+                    }));
                 }
             case "focused":
                 {
@@ -126,7 +126,7 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
         if (count === 0) {
             return;
         }
-        const badge = ( new NumberBadge(count, num => ( localize(15622, "{0} pending changes", num))));
+        const badge = ( new NumberBadge(count, num => ( localize(17761, "{0} pending changes", num))));
         store.add(this.activityService.showViewActivity(VIEW_PANE_ID, {
             badge
         }));
@@ -141,7 +141,7 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
             const tooltip = `${label}${command.tooltip ? ` - ${command.tooltip}` : ""}`;
             const genericCommandName = getStatusBarCommandGenericName(command);
             const statusbarEntry = {
-                name: ( localize(15623, "Source Control")) + (genericCommandName ? ` ${genericCommandName}` : ""),
+                name: ( localize(17762, "Source Control")) + (genericCommandName ? ` ${genericCommandName}` : ""),
                 text: command.title,
                 ariaLabel: tooltip,
                 tooltip,
@@ -169,7 +169,7 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
         if (this.scmViewService.repositories.length > 1) {
             const icon = getSCMRepositoryIcon(activeRepository, activeRepository.repository);
             const repositoryStatusbarEntry = {
-                name: ( localize(15624, "Source Control Provider")),
+                name: ( localize(17763, "Source Control Provider")),
                 text: `$(${icon.id}) ${activeRepository.repository.provider.name}`,
                 ariaLabel: label,
                 tooltip: label,
@@ -202,8 +202,8 @@ let SCMActiveResourceContextKeyController = class SCMActiveResourceContextKeyCon
         this.scmService = scmService;
         this.uriIdentityService = uriIdentityService;
         this._onDidRepositoryChange = ( new Emitter());
-        const activeResourceHasChangesContextKey = ( new RawContextKey("scmActiveResourceHasChanges", false, ( localize(15625, "Whether the active resource has changes"))));
-        const activeResourceRepositoryContextKey = ( new RawContextKey("scmActiveResourceRepository", undefined, ( localize(15626, "The active resource's repository"))));
+        const activeResourceHasChangesContextKey = new RawContextKey("scmActiveResourceHasChanges", false, ( localize(17764, "Whether the active resource has changes")));
+        const activeResourceRepositoryContextKey = new RawContextKey("scmActiveResourceRepository", undefined, ( localize(17765, "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/menus.js

@@ -14,7 +14,7 @@ import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { ServiceCollection } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/serviceCollection';
 import { ISCMService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service';
 
-registerCss(scm);
+registerCss(scm, 1);
 function actionEquals(a, b) {
     return a.id === b.id;
 }
@@ -313,7 +313,7 @@ let SCMMenus = class SCMMenus {
 };
 SCMMenus = ( __decorate([( __param(0, ISCMService)), ( __param(1, IInstantiationService))], SCMMenus));
 MenuRegistry.appendMenuItem(MenuId.SCMResourceContext, {
-    title: ( localize(15627, "Share")),
+    title: ( localize(17766, "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(15628, "Diff Decorations")),
+    title: ( localize(17767, "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(15629, "Source Control")),
+    title: ( localize(17768, "Source Control")),
     type: "object",
     scope: ConfigurationScope.RESOURCE,
     properties: {
         "scm.diffDecorations": {
             type: "string",
             enum: ["all", "gutter", "overview", "minimap", "none"],
-            enumDescriptions: [( localize(15630, "Show the diff decorations in all available locations.")), ( localize(15631, "Show the diff decorations only in the editor gutter.")), ( localize(15632, "Show the diff decorations only in the overview ruler.")), ( localize(15633, "Show the diff decorations only in the minimap.")), ( localize(15634, "Do not show the diff decorations."))],
+            enumDescriptions: [( localize(17769, "Show the diff decorations in all available locations.")), ( localize(17770, "Show the diff decorations only in the editor gutter.")), ( localize(17771, "Show the diff decorations only in the overview ruler.")), ( localize(17772, "Show the diff decorations only in the minimap.")), ( localize(17773, "Do not show the diff decorations."))],
             default: "all",
-            description: ( localize(15635, "Controls diff decorations in the editor."))
+            description: ( localize(17774, "Controls diff decorations in the editor."))
         },
         "scm.diffDecorationsGutterWidth": {
             type: "number",
             enum: [1, 2, 3, 4, 5],
             default: 3,
             description: ( localize(
-                15636,
+                17775,
                 "Controls the width(px) of diff decorations in gutter (added & modified)."
             ))
         },
         "scm.diffDecorationsGutterVisibility": {
             type: "string",
             enum: ["always", "hover"],
-            enumDescriptions: [( localize(15637, "Show the diff decorator in the gutter at all times.")), ( localize(15638, "Show the diff decorator in the gutter only on hover."))],
+            enumDescriptions: [( localize(17776, "Show the diff decorator in the gutter at all times.")), ( localize(17777, "Show the diff decorator in the gutter only on hover."))],
             description: ( localize(
-                15639,
+                17778,
                 "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(15640, "Show the inline diff Peek view on click.")), ( localize(15641, "Do nothing."))],
-            description: ( localize(15642, "Controls the behavior of Source Control diff gutter decorations.")),
+            enumDescriptions: [( localize(17779, "Show the inline diff Peek view on click.")), ( localize(17780, "Do nothing."))],
+            description: ( localize(17781, "Controls the behavior of Source Control diff gutter decorations.")),
             default: "diff"
         },
         "scm.diffDecorationsGutterPattern": {
             type: "object",
             description: ( localize(
-                15643,
+                17782,
                 "Controls whether a pattern is used for the diff decorations in gutter."
             )),
             additionalProperties: false,
             properties: {
                 "added": {
                     type: "boolean",
-                    description: ( localize(15644, "Use pattern for the diff decorations in gutter for added lines."))
+                    description: ( localize(17783, "Use pattern for the diff decorations in gutter for added lines."))
                 },
                 "modified": {
                     type: "boolean",
                     description: ( localize(
-                        15645,
+                        17784,
                         "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(15646, "Ignore leading and trailing whitespace.")), ( localize(15647, "Do not ignore leading and trailing whitespace.")), ( localize(15648, "Inherit from `diffEditor.ignoreTrimWhitespace`."))],
+            enumDescriptions: [( localize(17785, "Ignore leading and trailing whitespace.")), ( localize(17786, "Do not ignore leading and trailing whitespace.")), ( localize(17787, "Inherit from `diffEditor.ignoreTrimWhitespace`."))],
             description: ( localize(
-                15649,
+                17788,
                 "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

@@ -25,8 +25,8 @@ import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 var QuickDiffDecorator_1;
-registerCss(dirtydiffDecorator);
-const quickDiffDecorationCount = ( new RawContextKey("quickDiffDecorationCount", 0));
+registerCss(dirtydiffDecorator, 1);
+const quickDiffDecorationCount = new RawContextKey("quickDiffDecorationCount", 0);
 let QuickDiffDecorator = QuickDiffDecorator_1 = class QuickDiffDecorator extends Disposable {
     static createDecoration(className, tooltip, options) {
         const decorationOptions = {
@@ -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(15650, "Added lines"));
+        const diffAdded = ( localize(17789, "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(15651, "Changed lines"));
+        const diffModified = ( localize(17790, "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(15652, "Removed lines"));
+        const diffDeleted = ( localize(17791, "Removed lines"));
         const diffDeletedOptions = {
             gutter,
             overview: {

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

@@ -66,7 +66,7 @@ let QuickDiffModelService = class QuickDiffModelService {
 QuickDiffModelService = ( __decorate([( __param(0, IInstantiationService)), ( __param(1, ITextFileService)), ( __param(2, IUriIdentityService))], QuickDiffModelService));
 let QuickDiffModel = class QuickDiffModel extends Disposable {
     get originalTextModels() {
-        return ( Iterable.map(( this._originalEditorModels.values()), editorModel => editorModel.textEditorModel));
+        return Iterable.map(( this._originalEditorModels.values()), editorModel => editorModel.textEditorModel);
     }
     get allChanges() {
         return this._allChanges;
@@ -152,17 +152,17 @@ let QuickDiffModel = class QuickDiffModel extends Disposable {
         return this._quickDiffs;
     }
     getQuickDiffResults() {
-        return ( this._quickDiffs.map(quickDiff => {
+        return this._quickDiffs.map(quickDiff => {
             const changes = this.allChanges.filter(change => change.providerId === quickDiff.id);
             return {
                 providerId: quickDiff.id,
                 providerKind: quickDiff.kind,
                 original: quickDiff.originalResource,
                 modified: this._model.resource,
-                changes: ( changes.map(change => change.change)),
-                changes2: ( changes.map(change => change.change2))
+                changes: changes.map(change => change.change),
+                changes2: changes.map(change => change.change2)
             };
-        }));
+        });
     }
     getDiffEditorModel(originalUri) {
         const editorModel = this._originalEditorModels.get(originalUri);
@@ -325,7 +325,7 @@ let QuickDiffModel = class QuickDiffModel extends Disposable {
             this._quickDiffs = quickDiffs;
             this._originalEditorModels.clear();
             this._originalEditorModelsDisposables.clear();
-            return (await Promise.all(( quickDiffs.map(async quickDiff => {
+            return (await Promise.all(quickDiffs.map(async quickDiff => {
                 try {
                     const ref = await this.textModelResolverService.createModelReference(quickDiff.originalResource);
                     if (this._disposed) {
@@ -345,7 +345,7 @@ let QuickDiffModel = class QuickDiffModel extends Disposable {
                 } catch (error) {
                     return [];
                 }
-            })))).flat();
+            }))).flat();
         });
         return this._quickDiffsPromise.finally(() => {
             this._quickDiffsPromise = undefined;
@@ -366,9 +366,9 @@ let QuickDiffModel = class QuickDiffModel extends Disposable {
         return this.quickDiffService.getQuickDiffs(uri, this._model.getLanguageId(), isSynchronized);
     }
     findNextClosestChange(lineNumber, inclusive = true, providerId) {
-        const visibleQuickDiffIds = ( new Set(( this.quickDiffs.filter(
+        const visibleQuickDiffIds = ( new Set(this.quickDiffs.filter(
             quickDiff => this.quickDiffService.isQuickDiffProviderVisible(quickDiff.id)
-        ).map(quickDiff => quickDiff.id))));
+        ).map(quickDiff => quickDiff.id)));
         for (let i = 0; i < this.changes.length; i++) {
             if (providerId && this.changes[i].providerId !== providerId) {
                 continue;
@@ -390,9 +390,9 @@ let QuickDiffModel = class QuickDiffModel extends Disposable {
         return 0;
     }
     findPreviousClosestChange(lineNumber, inclusive = true, providerId) {
-        const visibleQuickDiffIds = ( new Set(( this.quickDiffs.filter(
+        const visibleQuickDiffIds = ( new Set(this.quickDiffs.filter(
             quickDiff => this.quickDiffService.isQuickDiffProviderVisible(quickDiff.id)
-        ).map(quickDiff => quickDiff.id))));
+        ).map(quickDiff => quickDiff.id)));
         for (let i = this.changes.length - 1; i >= 0; i--) {
             if (providerId && this.changes[i].providerId !== providerId) {
                 continue;

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

@@ -59,7 +59,7 @@ import { quickDiffDecorationCount } from './quickDiffDecorator.js';
 import { hasNativeContextMenu } from '@codingame/monaco-vscode-api/vscode/vs/platform/window/common/window';
 
 var QuickDiffEditorController_1;
-const isQuickDiffVisible = ( new RawContextKey("dirtyDiffVisible", false));
+const isQuickDiffVisible = new RawContextKey("dirtyDiffVisible", false);
 let QuickDiffPickerViewItem = class QuickDiffPickerViewItem extends SelectActionViewItem {
     constructor(action, contextViewService, themeService, configurationService) {
         const styles = {
@@ -71,16 +71,16 @@ 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(15653, "Switch quick diff base")),
+            ariaLabel: ( localize(17792, "Switch quick diff base")),
             useCustomDrawn: !hasNativeContextMenu(configurationService)
         });
         this.optionsItems = [];
     }
     setSelection(quickDiffs, providerId) {
-        this.optionsItems = ( quickDiffs.map(quickDiff => ({
+        this.optionsItems = quickDiffs.map(quickDiff => ({
             providerId: quickDiff.id,
             text: quickDiff.label
-        })));
+        }));
         const index = this.optionsItems.findIndex(item => item.providerId === providerId);
         this.setOptions(this.optionsItems, index);
     }
@@ -98,7 +98,7 @@ class QuickDiffPickerBaseAction extends Action {
         this.ID = "quickDiff.base.switch";
     }
     static {
-        this.LABEL = ( localize(15654, "Switch Quick Diff Base"));
+        this.LABEL = ( localize(17793, "Switch Quick Diff Base"));
     }
     constructor(callback) {
         super(
@@ -166,7 +166,10 @@ let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
             contextKeyService = contextKeyService.createOverlay([[
                 "originalResourceScheme",
                 Iterable.first(this.model.originalTextModels)?.uri.scheme
-            ], ["originalResourceSchemes", ( Iterable.map(this.model.originalTextModels, textModel => textModel.uri.scheme))]]);
+            ], [
+                "originalResourceSchemes",
+                Iterable.map(this.model.originalTextModels, textModel => textModel.uri.scheme)
+            ]]);
         }
         this.create();
         if (editor.hasModel()) {
@@ -245,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(
-                15655,
+                17794,
                 "{0} - {1} of {2} changes",
                 label,
                 providerIndex + 1,
                 providerChanges.length
             )) : ( localize(
-                15656,
+                17795,
                 "{0} - {1} of {2} change",
                 label,
                 providerIndex + 1,
@@ -259,7 +262,7 @@ let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
             ));
             this.dropdownContainer.style.display = "none";
         } else {
-            detail = this.model.changes.length > 1 ? ( localize(15657, "{0} of {1} changes", providerIndex + 1, providerChanges.length)) : ( localize(15658, "{0} of {1} change", providerIndex + 1, providerChanges.length));
+            detail = this.model.changes.length > 1 ? ( localize(17796, "{0} of {1} changes", providerIndex + 1, providerChanges.length)) : ( localize(17797, "{0} of {1} change", providerIndex + 1, providerChanges.length));
             this.dropdownContainer.style.display = "inherit";
         }
         this.setTitle(this.title, detail);
@@ -318,7 +321,7 @@ let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
             label: false,
             icon: true
         });
-        this._actionbarWidget.push(this._disposables.add(( new Action("peekview.close", ( localize(15659, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => this.dispose()))), {
+        this._actionbarWidget.push(this._disposables.add(( new Action("peekview.close", ( localize(17798, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => this.dispose()))), {
             label: false,
             icon: true
         });
@@ -329,7 +332,7 @@ let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
     }
     getQuickDiffsContainingChange() {
         const change = this.model.changes[this._index];
-        const quickDiffsWithChange = ( this.model.changes.filter(c => change.change2.modified.intersectsOrTouches(c.change2.modified)).map(c => c.providerId));
+        const quickDiffsWithChange = this.model.changes.filter(c => change.change2.modified.intersectsOrTouches(c.change2.modified)).map(c => c.providerId);
         return this.model.quickDiffs.filter(
             quickDiff => quickDiffsWithChange.includes(quickDiff.id) && this.quickDiffService.isQuickDiffProviderVisible(quickDiff.id)
         );
@@ -600,7 +603,10 @@ let QuickDiffEditorController = class QuickDiffEditorController extends Disposab
         this.isQuickDiffVisible.set(true);
         const disposables = ( new DisposableStore());
         disposables.add(Event.once(this.widget.onDidClose)(this.close, this));
-        const onDidModelChange = Event.chain(this.model.onDidChange, $ => ( $.filter(e => e.diff.length > 0).map(e => e.diff)));
+        const onDidModelChange = Event.chain(
+            this.model.onDidChange,
+            $ => $.filter(e => e.diff.length > 0).map(e => e.diff)
+        );
         onDidModelChange(this.onDidModelChange, this, disposables);
         disposables.add(modelRef);
         disposables.add(this.widget);
@@ -700,7 +706,7 @@ class ShowPreviousChangeAction extends EditorAction {
     constructor(outerEditor) {
         super({
             id: "editor.action.dirtydiff.previous",
-            label: ( localize2(15660, "Show Previous Change")),
+            label: ( localize2(17799, "Show Previous Change")),
             precondition: ( TextCompareEditorActiveContext.toNegated()),
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -730,7 +736,7 @@ class ShowNextChangeAction extends EditorAction {
     constructor(outerEditor) {
         super({
             id: "editor.action.dirtydiff.next",
-            label: ( localize2(15661, "Show Next Change")),
+            label: ( localize2(17800, "Show Next Change")),
             precondition: ( TextCompareEditorActiveContext.toNegated()),
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -760,7 +766,7 @@ class GotoPreviousChangeAction extends EditorAction {
     constructor() {
         super({
             id: "workbench.action.editor.previousChange",
-            label: ( localize2(15662, "Go to Previous Change")),
+            label: ( localize2(17801, "Go to Previous Change")),
             precondition: ( ContextKeyExpr.and(( TextCompareEditorActiveContext.toNegated()), ( quickDiffDecorationCount.notEqualsTo(0)))),
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -798,7 +804,7 @@ class GotoNextChangeAction extends EditorAction {
     constructor() {
         super({
             id: "workbench.action.editor.nextChange",
-            label: ( localize2(15663, "Go to Next Change")),
+            label: ( localize2(17802, "Go to Next Change")),
             precondition: ( ContextKeyExpr.and(( TextCompareEditorActiveContext.toNegated()), ( quickDiffDecorationCount.notEqualsTo(0)))),
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -836,7 +842,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
     group: "7_change_nav",
     command: {
         id: "editor.action.dirtydiff.next",
-        title: ( localize(15664, "Next &&Change"))
+        title: ( localize(17803, "Next &&Change"))
     },
     order: 1
 });
@@ -844,7 +850,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
     group: "7_change_nav",
     command: {
         id: "editor.action.dirtydiff.previous",
-        title: ( localize(15665, "Previous &&Change"))
+        title: ( localize(17804, "Previous &&Change"))
     },
     order: 2
 });