@codingame/monaco-vscode-scm-service-override 26.2.2 → 28.0.0

package/index.js

@@ -5,17 +5,21 @@ import { SCMService } from './vscode/src/vs/workbench/contrib/scm/common/scmServ
 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 './vscode/src/vs/workbench/contrib/scm/browser/scm.contribution.js';
 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/scm.contribution.js';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
 
 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)
+        [IQuickDiffModelService.toString()]: new SyncDescriptor(QuickDiffModelService, [], true),
+        [IGitService.toString()]: new SyncDescriptor(GitService, [], true)
     };
 }
 

package/package.json

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

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

@@ -127,7 +127,7 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
         if (count === 0) {
             return;
         }
-        const badge = ( new NumberBadge(count, num => ( localize(10944, "{0} pending changes", num))));
+        const badge = ( new NumberBadge(count, num => ( localize(11895, "{0} pending changes", num))));
         store.add(this.activityService.showViewActivity(VIEW_PANE_ID, {
             badge
         }));
@@ -142,7 +142,7 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
             const tooltip = `${label}${command.tooltip ? ` - ${command.tooltip}` : ""}`;
             const genericCommandName = getStatusBarCommandGenericName(command);
             const statusbarEntry = {
-                name: ( localize(10945, "Source Control")) + (genericCommandName ? ` ${genericCommandName}` : ""),
+                name: ( localize(11896, "Source Control")) + (genericCommandName ? ` ${genericCommandName}` : ""),
                 text: command.title,
                 ariaLabel: tooltip,
                 tooltip,
@@ -170,7 +170,7 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
         if (this.scmViewService.repositories.length > 1) {
             const icon = getSCMRepositoryIcon(activeRepository, activeRepository.repository);
             const repositoryStatusbarEntry = {
-                name: ( localize(10946, "Source Control Provider")),
+                name: ( localize(11897, "Source Control Provider")),
                 text: `$(${icon.id}) ${activeRepository.repository.provider.name}`,
                 ariaLabel: label,
                 tooltip: label,
@@ -203,8 +203,8 @@ let SCMActiveResourceContextKeyController = class SCMActiveResourceContextKeyCon
         this.scmService = scmService;
         this.uriIdentityService = uriIdentityService;
         this._onDidRepositoryChange = ( new Emitter());
-        const activeResourceHasChangesContextKey = ( new RawContextKey("scmActiveResourceHasChanges", false, ( localize(10947, "Whether the active resource has changes"))));
-        const activeResourceRepositoryContextKey = ( new RawContextKey("scmActiveResourceRepository", undefined, ( localize(10948, "The active resource's repository"))));
+        const activeResourceHasChangesContextKey = ( new RawContextKey("scmActiveResourceHasChanges", false, ( localize(11898, "Whether the active resource has changes"))));
+        const activeResourceRepositoryContextKey = ( new RawContextKey("scmActiveResourceRepository", undefined, ( localize(11899, "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

@@ -38,6 +38,7 @@
 	height: 100%;
 	align-items: center;
 	flex-flow: nowrap;
+	box-shadow: var(--vscode-shadow-sm);
 }
 
 .scm-view.hide-provider-counts .scm-provider > .count,

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

@@ -12,10 +12,10 @@ export declare class SCMTitleMenu implements IDisposable {
     get actions(): IAction[];
     private _secondaryActions;
     get secondaryActions(): IAction[];
-    private readonly _onDidChangeTitle;
-    readonly onDidChangeTitle: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
     readonly menu: IMenu;
     private readonly disposables;
+    private readonly _onDidChangeTitle;
+    readonly onDidChangeTitle: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
     constructor(menuService: IMenuService, contextKeyService: IContextKeyService);
     private updateTitleActions;
     dispose(): void;

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

@@ -28,9 +28,9 @@ let SCMTitleMenu = class SCMTitleMenu {
     constructor(menuService, contextKeyService) {
         this._actions = [];
         this._secondaryActions = [];
-        this._onDidChangeTitle = ( new Emitter());
-        this.onDidChangeTitle = this._onDidChangeTitle.event;
         this.disposables = ( new DisposableStore());
+        this._onDidChangeTitle = this.disposables.add(( new Emitter()));
+        this.onDidChangeTitle = this._onDidChangeTitle.event;
         this.menu = menuService.createMenu(MenuId.SCMTitle, contextKeyService);
         this.disposables.add(this.menu);
         this.menu.onDidChange(this.updateTitleActions, this, this.disposables);
@@ -313,7 +313,7 @@ let SCMMenus = class SCMMenus {
 };
 SCMMenus = ( __decorate([( __param(0, ISCMService)), ( __param(1, IInstantiationService))], SCMMenus));
 MenuRegistry.appendMenuItem(MenuId.SCMResourceContext, {
-    title: ( localize(10949, "Share")),
+    title: ( localize(11900, "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(10950, "Added lines"));
+        const diffAdded = ( localize(11901, "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(10951, "Changed lines"));
+        const diffModified = ( localize(11902, "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(10952, "Removed lines"));
+        const diffDeleted = ( localize(11903, "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(10953, "Switch quick diff base")),
+            ariaLabel: ( localize(11904, "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(10954, "Switch Quick Diff Base"));
+        this.LABEL = ( localize(11905, "Switch Quick Diff Base"));
     }
     constructor(callback) {
         super(
@@ -245,13 +245,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(
-                10955,
+                11906,
                 "{0} - {1} of {2} changes",
                 label,
                 providerIndex + 1,
                 providerChanges.length
             )) : ( localize(
-                10956,
+                11907,
                 "{0} - {1} of {2} change",
                 label,
                 providerIndex + 1,
@@ -259,7 +259,7 @@ let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
             ));
             this.dropdownContainer.style.display = "none";
         } else {
-            detail = this.model.changes.length > 1 ? ( localize(10957, "{0} of {1} changes", providerIndex + 1, providerChanges.length)) : ( localize(10958, "{0} of {1} change", providerIndex + 1, providerChanges.length));
+            detail = this.model.changes.length > 1 ? ( localize(11908, "{0} of {1} changes", providerIndex + 1, providerChanges.length)) : ( localize(11909, "{0} of {1} change", providerIndex + 1, providerChanges.length));
             this.dropdownContainer.style.display = "inherit";
         }
         this.setTitle(this.title, detail);
@@ -318,7 +318,7 @@ let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
             label: false,
             icon: true
         });
-        this._actionbarWidget.push(this._disposables.add(( new Action("peekview.close", ( localize(10959, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => this.dispose()))), {
+        this._actionbarWidget.push(this._disposables.add(( new Action("peekview.close", ( localize(11910, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => this.dispose()))), {
             label: false,
             icon: true
         });
@@ -700,7 +700,7 @@ class ShowPreviousChangeAction extends EditorAction {
     constructor(outerEditor) {
         super({
             id: "editor.action.dirtydiff.previous",
-            label: ( localize2(10960, "Show Previous Change")),
+            label: ( localize2(11911, "Show Previous Change")),
             precondition: ( TextCompareEditorActiveContext.toNegated()),
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -730,7 +730,7 @@ class ShowNextChangeAction extends EditorAction {
     constructor(outerEditor) {
         super({
             id: "editor.action.dirtydiff.next",
-            label: ( localize2(10961, "Show Next Change")),
+            label: ( localize2(11912, "Show Next Change")),
             precondition: ( TextCompareEditorActiveContext.toNegated()),
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -760,7 +760,7 @@ class GotoPreviousChangeAction extends EditorAction {
     constructor() {
         super({
             id: "workbench.action.editor.previousChange",
-            label: ( localize2(10962, "Go to Previous Change")),
+            label: ( localize2(11913, "Go to Previous Change")),
             precondition: ( ContextKeyExpr.and(( TextCompareEditorActiveContext.toNegated()), ( quickDiffDecorationCount.notEqualsTo(0)))),
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -798,7 +798,7 @@ class GotoNextChangeAction extends EditorAction {
     constructor() {
         super({
             id: "workbench.action.editor.nextChange",
-            label: ( localize2(10963, "Go to Next Change")),
+            label: ( localize2(11914, "Go to Next Change")),
             precondition: ( ContextKeyExpr.and(( TextCompareEditorActiveContext.toNegated()), ( quickDiffDecorationCount.notEqualsTo(0)))),
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -836,7 +836,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
     group: "7_change_nav",
     command: {
         id: "editor.action.dirtydiff.next",
-        title: ( localize(10964, "Next &&Change"))
+        title: ( localize(11915, "Next &&Change"))
     },
     order: 1
 });
@@ -844,7 +844,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
     group: "7_change_nav",
     command: {
         id: "editor.action.dirtydiff.previous",
-        title: ( localize(10965, "Previous &&Change"))
+        title: ( localize(11916, "Previous &&Change"))
     },
     order: 2
 });
@@ -867,7 +867,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
     }
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
-    id: "togglePeekWidgetFocus",
+    id: "toggleQuickDiffWidgetFocus",
     weight: KeybindingWeight.EditorContrib,
     primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyCode.F2),
     when: isQuickDiffVisible,