@codingame/monaco-vscode-scm-service-override 22.1.9 → 23.0.0

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

@@ -12,7 +12,7 @@ import { isCodeEditor } from '@codingame/monaco-vscode-api/vscode/vs/editor/brow
 import { OverviewRulerLane, MinimapPosition } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
 import { createStyleSheet } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/domStylesheets';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
-import { minimapGutterAddedBackground, overviewRulerAddedForeground, minimapGutterModifiedBackground, overviewRulerModifiedForeground, minimapGutterDeletedBackground, overviewRulerDeletedForeground, getChangeType, ChangeType } from '@codingame/monaco-vscode-ef4149eb-cc74-500f-a75b-c54539f01afa-common/vscode/vs/workbench/contrib/scm/common/quickDiff';
+import { minimapGutterAddedBackground, overviewRulerAddedForeground, minimapGutterModifiedBackground, overviewRulerModifiedForeground, minimapGutterDeletedBackground, overviewRulerDeletedForeground, getChangeType, ChangeType } from '@codingame/monaco-vscode-bc6f260d-ec63-5c95-9446-1ca7d0872719-common/vscode/vs/workbench/contrib/scm/common/quickDiff';
 import { IQuickDiffService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/quickDiff.service';
 import { IQuickDiffModelService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/browser/quickDiffModel.service';
 import { ResourceMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
@@ -22,7 +22,7 @@ import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platf
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { registerAction2, Action2, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
-import { autorunWithStore, autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 var QuickDiffDecorator_1;
 registerCss(dirtydiffDecorator);
@@ -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(10005, 'Added lines'));
+        const diffAdded = ( localize(10254, '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(10006, 'Changed lines'));
+        const diffModified = ( localize(10255, '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(10007, 'Removed lines'));
+        const diffDeleted = ( localize(10256, 'Removed lines'));
         const diffDeletedOptions = {
             gutter,
             overview: { active: overview, color: overviewRulerDeletedForeground },
@@ -264,7 +264,7 @@ let QuickDiffWorkbenchController = class QuickDiffWorkbenchController extends Di
         this.enabled = false;
     }
     onDidActiveEditorChange() {
-        this.transientDisposables.add(autorunWithStore((reader, store) => {
+        this.transientDisposables.add(autorun(reader => {
             const activeEditor = this.activeEditor.read(reader);
             const activeTextEditorControl = this.editorService.activeTextEditorControl;
             if (!isCodeEditor(activeTextEditorControl) || !activeEditor?.resource) {
@@ -276,19 +276,19 @@ let QuickDiffWorkbenchController = class QuickDiffWorkbenchController extends Di
                 this.quickDiffDecorationCount.set(0);
                 return;
             }
-            store.add(quickDiffModelRef);
+            reader.store.add(quickDiffModelRef);
             const visibleDecorationCount = observableFromEvent(this, quickDiffModelRef.object.onDidChange, () => {
                 const visibleQuickDiffs = quickDiffModelRef.object.quickDiffs.filter(quickDiff => this.quickDiffService.isQuickDiffProviderVisible(quickDiff.id));
                 return quickDiffModelRef.object.changes.filter(change => ( visibleQuickDiffs.some(quickDiff => quickDiff.id === change.providerId))).length;
             });
-            store.add(autorun(reader => {
+            reader.store.add(autorun(reader => {
                 const count = visibleDecorationCount.read(reader);
                 this.quickDiffDecorationCount.set(count);
             }));
         }));
     }
     onDidChangeQuickDiffProviders() {
-        this.transientDisposables.add(autorunWithStore((reader, store) => {
+        this.transientDisposables.add(autorun(reader => {
             const providers = this.quickDiffProviders.read(reader);
             const labels = [];
             for (let index = 0; index < providers.length; index++) {
@@ -299,7 +299,7 @@ let QuickDiffWorkbenchController = class QuickDiffWorkbenchController extends Di
                 const visible = this.quickDiffService.isQuickDiffProviderVisible(provider.id);
                 const group = provider.kind !== 'contributed' ? '0_scm' : '1_contributed';
                 const order = index + 1;
-                store.add(registerAction2(class extends Action2 {
+                reader.store.add(registerAction2(class extends Action2 {
                     constructor() {
                         super({
                             id: `workbench.scm.action.toggleQuickDiffVisibility.${provider.id}`,

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

@@ -8,7 +8,7 @@ import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/plat
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service";
 import { ITextModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/model";
-import { QuickDiff, QuickDiffChange, QuickDiffResult } from "@codingame/monaco-vscode-ef4149eb-cc74-500f-a75b-c54539f01afa-common/vscode/vs/workbench/contrib/scm/common/quickDiff";
+import { QuickDiff, QuickDiffChange, QuickDiffResult } from "@codingame/monaco-vscode-bc6f260d-ec63-5c95-9446-1ca7d0872719-common/vscode/vs/workbench/contrib/scm/common/quickDiff";
 import { IQuickDiffService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/quickDiff.service";
 import { ISCMService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service";
 import { ISplice } from "@codingame/monaco-vscode-api/vscode/vs/base/common/sequence";

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

@@ -9,7 +9,7 @@ import { IEditorWorkerService } from '@codingame/monaco-vscode-api/vscode/vs/edi
 import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
 import { shouldSynchronizeModel } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
-import { compareChanges, getModifiedEndLineNumber } from '@codingame/monaco-vscode-ef4149eb-cc74-500f-a75b-c54539f01afa-common/vscode/vs/workbench/contrib/scm/common/quickDiff';
+import { compareChanges, getModifiedEndLineNumber } from '@codingame/monaco-vscode-bc6f260d-ec63-5c95-9446-1ca7d0872719-common/vscode/vs/workbench/contrib/scm/common/quickDiff';
 import { IQuickDiffService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/quickDiff.service';
 import { ThrottledDelayer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { ISCMService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service';
@@ -25,7 +25,7 @@ import { ModifiedFileEntryState } from '@codingame/monaco-vscode-api/vscode/vs/w
 import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService.service';
 import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
-import { autorunWithStore, autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 const decoratorQuickDiffModelOptions = {
     algorithm: 'advanced',
@@ -111,9 +111,9 @@ let QuickDiffModel = class QuickDiffModel extends Disposable {
             this.triggerDiff();
         }));
         this._register(this.quickDiffService.onDidChangeQuickDiffProviders(() => this.triggerDiff()));
-        this._register(autorunWithStore((r, store) => {
-            for (const session of this._chatEditingService.editingSessionsObs.read(r)) {
-                store.add(autorun(r => {
+        this._register(autorun(reader => {
+            for (const session of this._chatEditingService.editingSessionsObs.read(reader)) {
+                reader.store.add(autorun(r => {
                     for (const entry of session.entries.read(r)) {
                         entry.state.read(r);
                     }

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

@@ -12,7 +12,7 @@ import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/l
 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";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
-import { QuickDiff } from "@codingame/monaco-vscode-ef4149eb-cc74-500f-a75b-c54539f01afa-common/vscode/vs/workbench/contrib/scm/common/quickDiff";
+import { QuickDiff } from "@codingame/monaco-vscode-bc6f260d-ec63-5c95-9446-1ca7d0872719-common/vscode/vs/workbench/contrib/scm/common/quickDiff";
 export declare const isQuickDiffVisible: RawContextKey<boolean>;
 export interface IQuickDiffSelectItem extends ISelectOptionItem {
     providerId: string;

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

@@ -35,7 +35,7 @@ import { RawContextKey, ContextKeyExpr } from '@codingame/monaco-vscode-api/vsco
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { rot } from '@codingame/monaco-vscode-api/vscode/vs/base/common/numbers';
-import { getModifiedEndLineNumber, getChangeHeight, getChangeType, getChangeTypeColor, lineIntersectsChange, ChangeType } from '@codingame/monaco-vscode-ef4149eb-cc74-500f-a75b-c54539f01afa-common/vscode/vs/workbench/contrib/scm/common/quickDiff';
+import { getModifiedEndLineNumber, getChangeHeight, getChangeType, getChangeTypeColor, lineIntersectsChange, ChangeType } from '@codingame/monaco-vscode-bc6f260d-ec63-5c95-9446-1ca7d0872719-common/vscode/vs/workbench/contrib/scm/common/quickDiff';
 import { IQuickDiffService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/quickDiff.service';
 import { ICodeEditorService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService.service';
 import { TextCompareEditorActiveContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
@@ -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(10008, 'Switch quick diff base')), useCustomDrawn: !hasNativeContextMenu(configurationService) });
+        super(null, action, [], 0, contextViewService, styles, { ariaLabel: ( localize(10257, '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(10009, "Switch Quick Diff Base")); }
+    static { this.LABEL = ( localize(10258, "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(
-                10010,
+                10259,
                 "{0} - {1} of {2} changes",
                 label,
                 providerIndex + 1,
                 providerChanges.length
             ))
                 : ( localize(
-                10011,
+                10260,
                 "{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(10012, "{0} of {1} changes", providerIndex + 1, providerChanges.length))
-                : ( localize(10013, "{0} of {1} change", providerIndex + 1, providerChanges.length));
+                ? ( localize(10261, "{0} of {1} changes", providerIndex + 1, providerChanges.length))
+                : ( localize(10262, "{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(10014, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => this.dispose()))), { label: false, icon: true });
+        this._actionbarWidget.push(this._disposables.add(( new Action('peekview.close', ( localize(10263, "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(10015, "Show Previous Change")),
+            label: ( localize2(10264, "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(10016, "Show Next Change")),
+            label: ( localize2(10265, "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(10017, "Go to Previous Change")),
+            label: ( localize2(10266, "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(10018, "Go to Next Change")),
+            label: ( localize2(10267, "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(10019, "Next &&Change"))
+        title: ( localize(10268, "Next &&Change"))
     },
     order: 1
 });
@@ -766,7 +766,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
     group: '7_change_nav',
     command: {
         id: 'editor.action.dirtydiff.previous',
-        title: ( localize(10020, "Previous &&Change"))
+        title: ( localize(10269, "Previous &&Change"))
     },
     order: 2
 });