@codingame/monaco-vscode-scm-service-override 31.0.1 → 32.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-scm-service-override",
-  "version": "31.0.1",
+  "version": "32.0.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": "31.0.1"
+    "@codingame/monaco-vscode-api": "32.0.0"
   },
   "main": "index.js",
   "module": "index.js",

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

@@ -126,7 +126,7 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
         if (count === 0) {
             return;
         }
-        const badge = ( new NumberBadge(count, num => ( localize(12343, "{0} pending changes", num))));
+        const badge = ( new NumberBadge(count, num => ( localize(12648, "{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(12344, "Source Control")) + (genericCommandName ? ` ${genericCommandName}` : ""),
+                name: ( localize(12649, "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(12345, "Source Control Provider")),
+                name: ( localize(12650, "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(12346, "Whether the active resource has changes"))));
-        const activeResourceRepositoryContextKey = ( new RawContextKey("scmActiveResourceRepository", undefined, ( localize(12347, "The active resource's repository"))));
+        const activeResourceHasChangesContextKey = ( new RawContextKey("scmActiveResourceHasChanges", false, ( localize(12651, "Whether the active resource has changes"))));
+        const activeResourceRepositoryContextKey = ( new RawContextKey("scmActiveResourceRepository", undefined, ( localize(12652, "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

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

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

@@ -1,8 +1,7 @@
 
 import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
-import { Extensions, registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
-import { QuickDiffWorkbenchController } from './quickDiffDecorator.js';
+import { Extensions as Extensions$1, registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
 import { VIEWLET_ID, VIEW_PANE_ID, HISTORY_VIEW_PANE_ID, REPOSITORIES_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 { KeyMod, KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
@@ -15,9 +14,7 @@ import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platf
 import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { KeybindingsRegistry, KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
-import '../common/scmService.js';
-import { Extensions as Extensions$1, ViewContainerLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views';
+import { Extensions, ViewContainerLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views';
 import { SCMViewPaneContainer } from './scmViewPaneContainer.js';
 import { SyncDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/descriptors';
 import { ModesRegistry } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/modesRegistry';
@@ -30,7 +27,6 @@ import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { Context } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/suggest/browser/suggest';
 import { InlineCompletionContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionContextKeys';
 import { WorkspaceTrustContext, MANAGE_TRUST_COMMAND_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/workspace/common/workspace';
-import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/quickDiffService';
 import { getActiveElement, isActiveElement } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { SCMWorkingSetController } from './workingSet.js';
 import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
@@ -38,9 +34,6 @@ import { WorkbenchList } from '@codingame/monaco-vscode-api/vscode/vs/platform/l
 import { IListService } from '@codingame/monaco-vscode-api/vscode/vs/platform/list/browser/listService.service';
 import { isSCMRepository } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/browser/util';
 import { SCMHistoryViewPane } from './scmHistoryViewPane.js';
-import './quickDiffModel.js';
-import { QuickDiffEditorController } from './quickDiffWidget.js';
-import { registerEditorContribution, EditorContributionInstantiation } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions';
 import { RemoteNameContext, ResourceContextKey } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
 import { AccessibleViewRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleViewRegistry';
 import { SCMAccessibilityHelp } from './scmAccessibilityHelp.js';
@@ -57,16 +50,10 @@ ModesRegistry.registerLanguage({
     aliases: [],
     mimetypes: ["text/x-scm-input"]
 });
-( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(QuickDiffWorkbenchController, LifecyclePhase.Restored);
-registerEditorContribution(
-    QuickDiffEditorController.ID,
-    QuickDiffEditorController,
-    EditorContributionInstantiation.AfterFirstRender
-);
-const sourceControlViewIcon = registerIcon("source-control-view-icon", Codicon.sourceControl, ( localize(12365, "View icon of the Source Control view.")));
-const viewContainer = ( Registry.as(Extensions$1.ViewContainersRegistry)).registerViewContainer({
+const sourceControlViewIcon = registerIcon("source-control-view-icon", Codicon.sourceControl, ( localize(12654, "View icon of the Source Control view.")));
+const viewContainer = ( Registry.as(Extensions.ViewContainersRegistry)).registerViewContainer({
     id: VIEWLET_ID,
-    title: ( localize2(12366, "Source Control")),
+    title: ( localize2(12655, "Source Control")),
     ctorDescriptor: ( new SyncDescriptor(SCMViewPaneContainer)),
     storageId: "workbench.scm.views.state",
     icon: sourceControlViewIcon,
@@ -76,26 +63,26 @@ const viewContainer = ( Registry.as(Extensions$1.ViewContainersRegistry)).regist
 }, ViewContainerLocation.Sidebar, {
     doNotRegisterOpenCommand: true
 });
-const viewsRegistry = ( Registry.as(Extensions$1.ViewsRegistry));
-const containerTitle = ( localize(12367, "Source Control"));
+const viewsRegistry = ( Registry.as(Extensions.ViewsRegistry));
+const containerTitle = ( localize(12656, "Source Control"));
 viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
-    content: ( localize(12368, "No source control providers registered.")),
+    content: ( localize(12657, "No source control providers registered.")),
     when: "default"
 });
 viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
     content: ( localize(
-        12369,
+        12658,
         "None of the registered source control providers work in Restricted Mode."
     )),
     when: ( ContextKeyExpr.and(( ContextKeyExpr.equals("scm.providerCount", 0)), WorkspaceTrustContext.IsEnabled, ( WorkspaceTrustContext.IsTrusted.toNegated())))
 });
 viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
-    content: `[${( localize(12370, "Manage Workspace Trust"))}](command:${MANAGE_TRUST_COMMAND_ID})`,
+    content: `[${( localize(12659, "Manage Workspace Trust"))}](command:${MANAGE_TRUST_COMMAND_ID})`,
     when: ( ContextKeyExpr.and(( ContextKeyExpr.equals("scm.providerCount", 0)), WorkspaceTrustContext.IsEnabled, ( WorkspaceTrustContext.IsTrusted.toNegated())))
 });
 viewsRegistry.registerViewWelcomeContent(HISTORY_VIEW_PANE_ID, {
     content: ( localize(
-        12371,
+        12660,
         "The selected source control provider does not have any source control history items."
     )),
     when: ( ContextKeys.SCMHistoryItemCount.isEqualTo(0))
@@ -103,8 +90,8 @@ viewsRegistry.registerViewWelcomeContent(HISTORY_VIEW_PANE_ID, {
 viewsRegistry.registerViews([{
     id: REPOSITORIES_VIEW_PANE_ID,
     containerTitle,
-    name: ( localize2(12372, "Repositories")),
-    singleViewPaneContainerTitle: ( localize(12373, "Source Control Repositories")),
+    name: ( localize2(12661, "Repositories")),
+    singleViewPaneContainerTitle: ( localize(12662, "Source Control Repositories")),
     ctorDescriptor: ( new SyncDescriptor(SCMRepositoriesViewPane)),
     canToggleVisibility: true,
     hideByDefault: true,
@@ -117,7 +104,7 @@ viewsRegistry.registerViews([{
 viewsRegistry.registerViews([{
     id: VIEW_PANE_ID,
     containerTitle,
-    name: ( localize2(12374, "Changes")),
+    name: ( localize2(12663, "Changes")),
     singleViewPaneContainerTitle: containerTitle,
     ctorDescriptor: ( new SyncDescriptor(SCMViewPane)),
     canToggleVisibility: true,
@@ -127,7 +114,7 @@ viewsRegistry.registerViews([{
     containerIcon: sourceControlViewIcon,
     openCommandActionDescriptor: {
         id: viewContainer.id,
-        mnemonicTitle: ( localize(12375, "Source &&Control")),
+        mnemonicTitle: ( localize(12664, "Source &&Control")),
         keybindings: {
             primary: 0,
             win: {
@@ -146,8 +133,8 @@ viewsRegistry.registerViews([{
 viewsRegistry.registerViews([{
     id: HISTORY_VIEW_PANE_ID,
     containerTitle,
-    name: ( localize2(12376, "Graph")),
-    singleViewPaneContainerTitle: ( localize(12377, "Source Control Graph")),
+    name: ( localize2(12665, "Graph")),
+    singleViewPaneContainerTitle: ( localize(12666, "Source Control Graph")),
     ctorDescriptor: ( new SyncDescriptor(SCMHistoryViewPane)),
     canToggleVisibility: true,
     canMoveView: true,
@@ -156,8 +143,8 @@ viewsRegistry.registerViews([{
     when: ( ContextKeyExpr.and(( ContextKeyExpr.has("scm.historyProviderCount")), ( ContextKeyExpr.notEquals("scm.historyProviderCount", 0)))),
     containerIcon: sourceControlViewIcon
 }], viewContainer);
-( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(SCMActiveRepositoryController, LifecyclePhase.Restored);
-( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(SCMActiveResourceContextKeyController, LifecyclePhase.Restored);
+( Registry.as(Extensions$1.Workbench)).registerWorkbenchContribution(SCMActiveRepositoryController, LifecyclePhase.Restored);
+( Registry.as(Extensions$1.Workbench)).registerWorkbenchContribution(SCMActiveResourceContextKeyController, LifecyclePhase.Restored);
 registerWorkbenchContribution2(
     SCMWorkingSetController.ID,
     SCMWorkingSetController,
@@ -171,32 +158,32 @@ registerWorkbenchContribution2(
 ( Registry.as(Extensions$2.Configuration)).registerConfiguration({
     id: "scm",
     order: 5,
-    title: ( localize(12378, "Source Control")),
+    title: ( localize(12667, "Source Control")),
     type: "object",
     scope: ConfigurationScope.RESOURCE,
     properties: {
         "scm.diffDecorations": {
             type: "string",
             enum: ["all", "gutter", "overview", "minimap", "none"],
-            enumDescriptions: [( localize(12379, "Show the diff decorations in all available locations.")), ( localize(12380, "Show the diff decorations only in the editor gutter.")), ( localize(12381, "Show the diff decorations only in the overview ruler.")), ( localize(12382, "Show the diff decorations only in the minimap.")), ( localize(12383, "Do not show the diff decorations."))],
+            enumDescriptions: [( localize(12668, "Show the diff decorations in all available locations.")), ( localize(12669, "Show the diff decorations only in the editor gutter.")), ( localize(12670, "Show the diff decorations only in the overview ruler.")), ( localize(12671, "Show the diff decorations only in the minimap.")), ( localize(12672, "Do not show the diff decorations."))],
             default: "all",
-            description: ( localize(12384, "Controls diff decorations in the editor."))
+            description: ( localize(12673, "Controls diff decorations in the editor."))
         },
         "scm.diffDecorationsGutterWidth": {
             type: "number",
             enum: [1, 2, 3, 4, 5],
             default: 3,
             description: ( localize(
-                12385,
+                12674,
                 "Controls the width(px) of diff decorations in gutter (added & modified)."
             ))
         },
         "scm.diffDecorationsGutterVisibility": {
             type: "string",
             enum: ["always", "hover"],
-            enumDescriptions: [( localize(12386, "Show the diff decorator in the gutter at all times.")), ( localize(12387, "Show the diff decorator in the gutter only on hover."))],
+            enumDescriptions: [( localize(12675, "Show the diff decorator in the gutter at all times.")), ( localize(12676, "Show the diff decorator in the gutter only on hover."))],
             description: ( localize(
-                12388,
+                12677,
                 "Controls the visibility of the Source Control diff decorator in the gutter."
             )),
             default: "always"
@@ -204,26 +191,26 @@ registerWorkbenchContribution2(
         "scm.diffDecorationsGutterAction": {
             type: "string",
             enum: ["diff", "none"],
-            enumDescriptions: [( localize(12389, "Show the inline diff Peek view on click.")), ( localize(12390, "Do nothing."))],
-            description: ( localize(12391, "Controls the behavior of Source Control diff gutter decorations.")),
+            enumDescriptions: [( localize(12678, "Show the inline diff Peek view on click.")), ( localize(12679, "Do nothing."))],
+            description: ( localize(12680, "Controls the behavior of Source Control diff gutter decorations.")),
             default: "diff"
         },
         "scm.diffDecorationsGutterPattern": {
             type: "object",
             description: ( localize(
-                12392,
+                12681,
                 "Controls whether a pattern is used for the diff decorations in gutter."
             )),
             additionalProperties: false,
             properties: {
                 "added": {
                     type: "boolean",
-                    description: ( localize(12393, "Use pattern for the diff decorations in gutter for added lines."))
+                    description: ( localize(12682, "Use pattern for the diff decorations in gutter for added lines."))
                 },
                 "modified": {
                     type: "boolean",
                     description: ( localize(
-                        12394,
+                        12683,
                         "Use pattern for the diff decorations in gutter for modified lines."
                     ))
                 }
@@ -236,9 +223,9 @@ registerWorkbenchContribution2(
         "scm.diffDecorationsIgnoreTrimWhitespace": {
             type: "string",
             enum: ["true", "false", "inherit"],
-            enumDescriptions: [( localize(12395, "Ignore leading and trailing whitespace.")), ( localize(12396, "Do not ignore leading and trailing whitespace.")), ( localize(12397, "Inherit from `diffEditor.ignoreTrimWhitespace`."))],
+            enumDescriptions: [( localize(12684, "Ignore leading and trailing whitespace.")), ( localize(12685, "Do not ignore leading and trailing whitespace.")), ( localize(12686, "Inherit from `diffEditor.ignoreTrimWhitespace`."))],
             description: ( localize(
-                12398,
+                12687,
                 "Controls whether leading and trailing whitespace is ignored in Source Control diff gutter decorations."
             )),
             default: "false"
@@ -246,7 +233,7 @@ registerWorkbenchContribution2(
         "scm.alwaysShowActions": {
             type: "boolean",
             description: ( localize(
-                12399,
+                12688,
                 "Controls whether inline actions are always visible in the Source Control view."
             )),
             default: false
@@ -254,9 +241,9 @@ registerWorkbenchContribution2(
         "scm.countBadge": {
             type: "string",
             enum: ["all", "focused", "off"],
-            enumDescriptions: [( localize(12400, "Show the sum of all Source Control Provider count badges.")), ( localize(12401, "Show the count badge of the focused Source Control Provider.")), ( localize(12402, "Disable the Source Control count badge."))],
+            enumDescriptions: [( localize(12689, "Show the sum of all Source Control Provider count badges.")), ( localize(12690, "Show the count badge of the focused Source Control Provider.")), ( localize(12691, "Disable the Source Control count badge."))],
             description: ( localize(
-                12403,
+                12692,
                 "Controls the count badge on the Source Control icon on the Activity Bar."
             )),
             default: "all"
@@ -264,9 +251,9 @@ registerWorkbenchContribution2(
         "scm.providerCountBadge": {
             type: "string",
             enum: ["hidden", "auto", "visible"],
-            enumDescriptions: [( localize(12404, "Hide Source Control Provider count badges.")), ( localize(12405, "Only show count badge for Source Control Provider when non-zero.")), ( localize(12406, "Show Source Control Provider count badges."))],
+            enumDescriptions: [( localize(12693, "Hide Source Control Provider count badges.")), ( localize(12694, "Only show count badge for Source Control Provider when non-zero.")), ( localize(12695, "Show Source Control Provider count badges."))],
             markdownDescription: ( localize(
-                12407,
+                12696,
                 "Controls the count badges on Source Control Provider headers. These headers appear in the Source Control view when there is more than one provider or when the {0} setting is enabled, and in the Source Control Repositories view.",
                 "`#scm.alwaysShowRepositories#`"
             )),
@@ -275,16 +262,16 @@ registerWorkbenchContribution2(
         "scm.defaultViewMode": {
             type: "string",
             enum: ["tree", "list"],
-            enumDescriptions: [( localize(12408, "Show the repository changes as a tree.")), ( localize(12409, "Show the repository changes as a list."))],
-            description: ( localize(12410, "Controls the default Source Control repository view mode.")),
+            enumDescriptions: [( localize(12697, "Show the repository changes as a tree.")), ( localize(12698, "Show the repository changes as a list."))],
+            description: ( localize(12699, "Controls the default Source Control repository view mode.")),
             default: "list"
         },
         "scm.defaultViewSortKey": {
             type: "string",
             enum: ["name", "path", "status"],
-            enumDescriptions: [( localize(12411, "Sort the repository changes by file name.")), ( localize(12412, "Sort the repository changes by path.")), ( localize(12413, "Sort the repository changes by Source Control status."))],
+            enumDescriptions: [( localize(12700, "Sort the repository changes by file name.")), ( localize(12701, "Sort the repository changes by path.")), ( localize(12702, "Sort the repository changes by Source Control status."))],
             description: ( localize(
-                12414,
+                12703,
                 "Controls the default Source Control repository changes sort order when viewed as a list."
             )),
             default: "path"
@@ -292,7 +279,7 @@ registerWorkbenchContribution2(
         "scm.autoReveal": {
             type: "boolean",
             description: ( localize(
-                12415,
+                12704,
                 "Controls whether the Source Control view should automatically reveal and select files when opening them."
             )),
             default: true
@@ -300,20 +287,20 @@ registerWorkbenchContribution2(
         "scm.inputFontFamily": {
             type: "string",
             markdownDescription: ( localize(
-                12416,
+                12705,
                 "Controls the font for the input message. Use `default` for the workbench user interface font family, `editor` for the `#editor.fontFamily#`'s value, or a custom font family."
             )),
             default: "default"
         },
         "scm.inputFontSize": {
             type: "number",
-            markdownDescription: ( localize(12417, "Controls the font size for the input message in pixels.")),
+            markdownDescription: ( localize(12706, "Controls the font size for the input message in pixels.")),
             default: 13
         },
         "scm.inputMaxLineCount": {
             type: "number",
             markdownDescription: ( localize(
-                12418,
+                12707,
                 "Controls the maximum number of lines that the input will auto-grow to."
             )),
             minimum: 1,
@@ -323,7 +310,7 @@ registerWorkbenchContribution2(
         "scm.inputMinLineCount": {
             type: "number",
             markdownDescription: ( localize(
-                12419,
+                12708,
                 "Controls the minimum number of lines that the input will auto-grow from."
             )),
             minimum: 1,
@@ -333,7 +320,7 @@ registerWorkbenchContribution2(
         "scm.alwaysShowRepositories": {
             type: "boolean",
             markdownDescription: ( localize(
-                12420,
+                12709,
                 "Controls whether repositories should always be visible in the Source Control view."
             )),
             default: false
@@ -342,17 +329,17 @@ registerWorkbenchContribution2(
             type: "string",
             enum: ["discovery time", "name", "path"],
             enumDescriptions: [( localize(
-                12421,
+                12710,
                 "Repositories in the Source Control Repositories view are sorted by discovery time. Repositories in the Source Control view are sorted in the order that they were selected."
             )), ( localize(
-                12422,
+                12711,
                 "Repositories in the Source Control Repositories and Source Control views are sorted by repository name."
             )), ( localize(
-                12423,
+                12712,
                 "Repositories in the Source Control Repositories and Source Control views are sorted by repository path."
             ))],
             description: ( localize(
-                12424,
+                12713,
                 "Controls the sort order of the repositories in the source control repositories view."
             )),
             default: "discovery time"
@@ -360,7 +347,7 @@ registerWorkbenchContribution2(
         "scm.repositories.visible": {
             type: "number",
             description: ( localize(
-                12425,
+                12714,
                 "Controls how many repositories are visible in the Source Control Repositories section. Set to 0, to be able to manually resize the view."
             )),
             default: 10
@@ -368,9 +355,9 @@ registerWorkbenchContribution2(
         "scm.repositories.selectionMode": {
             type: "string",
             enum: ["multiple", "single"],
-            enumDescriptions: [( localize(12426, "Multiple repositories can be selected at the same time.")), ( localize(12427, "Only one repository can be selected at a time."))],
+            enumDescriptions: [( localize(12715, "Multiple repositories can be selected at the same time.")), ( localize(12716, "Only one repository can be selected at a time."))],
             description: ( localize(
-                12428,
+                12717,
                 "Controls the selection mode of the repositories in the Source Control Repositories view."
             )),
             default: "multiple"
@@ -378,7 +365,7 @@ registerWorkbenchContribution2(
         "scm.repositories.explorer": {
             type: "boolean",
             markdownDescription: ( localize(
-                12429,
+                12718,
                 "Controls whether to show repository artifacts in the Source Control Repositories view. This feature is experimental and only works when {0} is set to `{1}`.",
                 "`#scm.repositories.selectionMode#`",
                 "single"
@@ -389,7 +376,7 @@ registerWorkbenchContribution2(
         "scm.showActionButton": {
             type: "boolean",
             markdownDescription: ( localize(
-                12430,
+                12719,
                 "Controls whether an action button can be shown in the Source Control view."
             )),
             default: true
@@ -397,7 +384,7 @@ registerWorkbenchContribution2(
         "scm.showInputActionButton": {
             type: "boolean",
             markdownDescription: ( localize(
-                12431,
+                12720,
                 "Controls whether an action button can be shown in the Source Control input."
             )),
             default: true
@@ -405,7 +392,7 @@ registerWorkbenchContribution2(
         "scm.workingSets.enabled": {
             type: "boolean",
             description: ( localize(
-                12432,
+                12721,
                 "Controls whether to store editor working sets when switching between source control history item groups."
             )),
             default: false
@@ -414,14 +401,14 @@ registerWorkbenchContribution2(
             type: "string",
             enum: ["empty", "current"],
             enumDescriptions: [( localize(
-                12433,
+                12722,
                 "Use an empty working set when switching to a source control history item group that does not have a working set."
             )), ( localize(
-                12434,
+                12723,
                 "Use the current working set when switching to a source control history item group that does not have a working set."
             ))],
             description: ( localize(
-                12435,
+                12724,
                 "Controls the default working set to use when switching to a source control history item group that does not have a working set."
             )),
             default: "current"
@@ -429,7 +416,7 @@ registerWorkbenchContribution2(
         "scm.compactFolders": {
             type: "boolean",
             description: ( localize(
-                12436,
+                12725,
                 "Controls whether the Source Control view should render folders in a compact form. In such a form, single child folders will be compressed in a combined tree element."
             )),
             default: true
@@ -437,7 +424,7 @@ registerWorkbenchContribution2(
         "scm.graph.pageOnScroll": {
             type: "boolean",
             description: ( localize(
-                12437,
+                12726,
                 "Controls whether the Source Control Graph view will load the next page of items when you scroll to the end of the list."
             )),
             default: true
@@ -445,7 +432,7 @@ registerWorkbenchContribution2(
         "scm.graph.pageSize": {
             type: "number",
             description: ( localize(
-                12438,
+                12727,
                 "The number of items to show in the Source Control Graph view by default and when loading more items."
             )),
             minimum: 1,
@@ -456,14 +443,14 @@ registerWorkbenchContribution2(
             type: "string",
             enum: ["all", "filter"],
             enumDescriptions: [( localize(
-                12439,
+                12728,
                 "Show badges of all history item groups in the Source Control Graph view."
             )), ( localize(
-                12440,
+                12729,
                 "Show only the badges of history item groups used as a filter in the Source Control Graph view."
             ))],
             description: ( localize(
-                12441,
+                12730,
                 "Controls which badges are shown in the Source Control Graph view. The badges are shown on the right side of the graph indicating the names of history item groups."
             )),
             default: "filter"
@@ -471,7 +458,7 @@ registerWorkbenchContribution2(
         "scm.graph.showIncomingChanges": {
             type: "boolean",
             description: ( localize(
-                12442,
+                12731,
                 "Controls whether to show incoming changes in the Source Control Graph view."
             )),
             default: true
@@ -479,7 +466,7 @@ registerWorkbenchContribution2(
         "scm.graph.showOutgoingChanges": {
             type: "boolean",
             description: ( localize(
-                12443,
+                12732,
                 "Controls whether to show outgoing changes in the Source Control Graph view."
             )),
             default: true
@@ -489,7 +476,7 @@ registerWorkbenchContribution2(
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: "scm.acceptInput",
     metadata: {
-        description: ( localize(12444, "Source Control: Accept Input")),
+        description: ( localize(12733, "Source Control: Accept Input")),
         args: []
     },
     weight: KeybindingWeight.WorkbenchContrib,
@@ -539,7 +526,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 const viewNextCommitCommand = {
     description: {
-        description: ( localize(12445, "Source Control: View Next Commit")),
+        description: ( localize(12734, "Source Control: View Next Commit")),
         args: []
     },
     weight: KeybindingWeight.WorkbenchContrib,
@@ -554,7 +541,7 @@ const viewNextCommitCommand = {
 };
 const viewPreviousCommitCommand = {
     description: {
-        description: ( localize(12446, "Source Control: View Previous Commit")),
+        description: ( localize(12735, "Source Control: View Previous Commit")),
         args: []
     },
     weight: KeybindingWeight.WorkbenchContrib,
@@ -624,8 +611,8 @@ CommandsRegistry.registerCommand("scm.openInTerminal", async (accessor, provider
 CommandsRegistry.registerCommand("scm.setActiveProvider", async accessor => {
     const instantiationService = accessor.get(IInstantiationService);
     const scmViewService = accessor.get(ISCMViewService);
-    const placeHolder = ( localize(12447, "Select the active repository, type to filter all repositories"));
-    const autoQuickItemDescription = ( localize(12448, "The active repository is updated based on active editor"));
+    const placeHolder = ( localize(12736, "Select the active repository, type to filter all repositories"));
+    const autoQuickItemDescription = ( localize(12737, "The active repository is updated based on active editor"));
     const repositoryPicker = instantiationService.createInstance(RepositoryPicker, placeHolder, autoQuickItemDescription);
     const result = await repositoryPicker.pickRepository();
     if (result?.repository) {
@@ -637,7 +624,7 @@ MenuRegistry.appendMenuItem(MenuId.SCMSourceControl, {
     group: "99_terminal",
     command: {
         id: "scm.openInTerminal",
-        title: ( localize(12449, "Open in External Terminal"))
+        title: ( localize(12738, "Open in External Terminal"))
     },
     when: ( ContextKeyExpr.and(( RemoteNameContext.isEqualTo("")), ( ContextKeyExpr.equals("scmProviderHasRootUri", true)), ( ContextKeyExpr.or(( ContextKeyExpr.equals("config.terminal.sourceControlRepositoriesKind", "external")), ( ContextKeyExpr.equals("config.terminal.sourceControlRepositoriesKind", "both"))))))
 });
@@ -645,7 +632,7 @@ MenuRegistry.appendMenuItem(MenuId.SCMSourceControl, {
     group: "99_terminal",
     command: {
         id: "scm.openInIntegratedTerminal",
-        title: ( localize(12450, "Open in Integrated Terminal"))
+        title: ( localize(12739, "Open in Integrated Terminal"))
     },
     when: ( ContextKeyExpr.and(( ContextKeyExpr.equals("scmProviderHasRootUri", true)), ( ContextKeyExpr.or(( ContextKeyExpr.equals("config.terminal.sourceControlRepositoriesKind", "integrated")), ( ContextKeyExpr.equals("config.terminal.sourceControlRepositoriesKind", "both"))))))
 });
@@ -695,17 +682,11 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
         }
     }
 });
-MenuRegistry.appendMenuItem(MenuId.EditorLineNumberContext, {
-    title: ( localize(12451, "Diff Decorations")),
-    submenu: MenuId.SCMQuickDiffDecorations,
-    when: ( ContextKeyExpr.or(( ContextKeyExpr.equals("config.scm.diffDecorations", "all")), ( ContextKeyExpr.equals("config.scm.diffDecorations", "gutter")))),
-    group: "9_quickDiffDecorations"
-});
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: "scm.editor.triggerSetup",
-            title: ( localize(12452, "Resolve Conflicts with AI")),
+            title: ( localize(12740, "Resolve Conflicts with AI")),
             icon: Codicon.chatSparkle,
             f1: false,
             menu: {