@codingame/monaco-vscode-api 4.5.1 → 5.0.0

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

@@ -59,7 +59,11 @@ import { IAccessibilitySignalService } from '../../../../platform/accessibilityS
 import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.service.js';
 import { IQuickDiffService } from '../common/quickDiff.service.js';
 import { SwitchQuickDiffViewItem, SwitchQuickDiffBaseAction } from './dirtyDiffSwitcher.js';
+import { TextDiffEditor } from '../../../browser/parts/editor/textDiffEditor.js';
+import { TextFileEditor } from '../../files/browser/editors/textFileEditor.js';
+import { SideBySideEditor } from '../../../browser/parts/editor/sideBySideEditor.js';
 var DirtyDiffController_1, DirtyDiffDecorator_1;
+const _moduleId = "vs/workbench/contrib/scm/browser/dirtydiffDecorator";
 class DiffActionRunner extends ActionRunner {
     runAction(action, context) {
         if (action instanceof MenuItemAction) {
@@ -68,7 +72,7 @@ class DiffActionRunner extends ActionRunner {
         return super.runAction(action, context);
     }
 }
-const isDirtyDiffVisible = ( new RawContextKey('dirtyDiffVisible', false));
+const isDirtyDiffVisible = ( (new RawContextKey('dirtyDiffVisible', false)));
 function getChangeHeight(change) {
     const modified = change.modifiedEndLineNumber - change.modifiedStartLineNumber + 1;
     const original = change.originalEndLineNumber - change.originalStartLineNumber + 1;
@@ -109,16 +113,16 @@ let UIEditorAction = class UIEditorAction extends Action {
         return Promise.resolve(this.instantiationService.invokeFunction(accessor => this.action.run(accessor, this.editor, null)));
     }
 };
-UIEditorAction = ( __decorate([
-    ( __param(3, IKeybindingService)),
-    ( __param(4, IInstantiationService))
-], UIEditorAction));
+UIEditorAction = ( (__decorate([
+    ( (__param(3, IKeybindingService))),
+    ( (__param(4, IInstantiationService)))
+], UIEditorAction)));
 var ChangeType;
-( (function(ChangeType) {
+( ((function(ChangeType) {
     ChangeType[ChangeType["Modify"] = 0] = "Modify";
     ChangeType[ChangeType["Add"] = 1] = "Add";
     ChangeType[ChangeType["Delete"] = 2] = "Delete";
-})(ChangeType || (ChangeType = {})));
+})(ChangeType || (ChangeType = {}))));
 function getChangeType(change) {
     if (change.originalEndLineNumber === 0) {
         return ChangeType.Add;
@@ -159,7 +163,7 @@ let DirtyDiffWidget = class DirtyDiffWidget extends PeekViewWidget {
         this._disposables.add(themeService.onDidColorThemeChange(this._applyTheme, this));
         this._applyTheme(themeService.getColorTheme());
         if (this.model.original.length > 0) {
-            contextKeyService = contextKeyService.createOverlay([['originalResourceScheme', this.model.original[0].uri.scheme], ['originalResourceSchemes', ( this.model.original.map(original => original.uri.scheme))]]);
+            contextKeyService = contextKeyService.createOverlay([['originalResourceScheme', this.model.original[0].uri.scheme], ['originalResourceSchemes', ( (this.model.original.map(original => original.uri.scheme)))]]);
         }
         this.create();
         if (editor.hasModel()) {
@@ -194,13 +198,13 @@ let DirtyDiffWidget = class DirtyDiffWidget extends PeekViewWidget {
         }
         const onFirstDiffUpdate = Event.once(this.diffEditor.onDidUpdateDiff);
         onFirstDiffUpdate(() => setTimeout(() => this.revealChange(change), 0));
-        const diffEditorModel = this.model.getDiffEditorModel(( labeledChange.uri.toString()));
+        const diffEditorModel = this.model.getDiffEditorModel(( (labeledChange.uri.toString())));
         if (!diffEditorModel) {
             return;
         }
         this.diffEditor.setModel(diffEditorModel);
         this.dropdown?.setSelection(labeledChange.label);
-        const position = ( new Position(getModifiedEndLineNumber(change), 1));
+        const position = ( (new Position(getModifiedEndLineNumber(change), 1)));
         const lineHeight = this.editor.getOption(67 );
         const editorHeight = this.editor.getLayoutInfo().height;
         const editorHeightInLines = Math.floor(editorHeight / lineHeight);
@@ -233,16 +237,16 @@ let DirtyDiffWidget = class DirtyDiffWidget extends PeekViewWidget {
         if (!this.shouldUseDropdown()) {
             detail = this.model.changes.length > 1
                 ? ( localizeWithPath(
-                'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
-                'changes',
+                _moduleId,
+                0,
                 "{0} - {1} of {2} changes",
                 label,
                 providerIndex + 1,
                 providerChanges.length
             ))
                 : ( localizeWithPath(
-                'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
-                'change',
+                _moduleId,
+                1,
                 "{0} - {1} of {2} change",
                 label,
                 providerIndex + 1,
@@ -253,15 +257,15 @@ let DirtyDiffWidget = class DirtyDiffWidget extends PeekViewWidget {
         else {
             detail = this.model.changes.length > 1
                 ? ( localizeWithPath(
-                'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
-                'multiChanges',
+                _moduleId,
+                2,
                 "{0} of {1} changes",
                 providerIndex + 1,
                 providerChanges.length
             ))
                 : ( localizeWithPath(
-                'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
-                'multiChange',
+                _moduleId,
+                3,
                 "{0} of {1} change",
                 providerIndex + 1,
                 providerChanges.length
@@ -297,7 +301,7 @@ let DirtyDiffWidget = class DirtyDiffWidget extends PeekViewWidget {
     shouldUseDropdown() {
         let providersWithChangesCount = 0;
         if (this.model.mapChanges.size > 1) {
-            const keys = Array.from(( this.model.mapChanges.keys()));
+            const keys = Array.from(( (this.model.mapChanges.keys())));
             for (let i = 0; (i < keys.length) && (providersWithChangesCount <= 1); i++) {
                 if (this.model.mapChanges.get(keys[i]).length > 0) {
                     providersWithChangesCount++;
@@ -310,8 +314,8 @@ let DirtyDiffWidget = class DirtyDiffWidget extends PeekViewWidget {
         if (!this._actionbarWidget) {
             return;
         }
-        const previous = this.instantiationService.createInstance(UIEditorAction, this.editor, ( new ShowPreviousChangeAction(this.editor)), ThemeIcon.asClassName(gotoPreviousLocation));
-        const next = this.instantiationService.createInstance(UIEditorAction, this.editor, ( new ShowNextChangeAction(this.editor)), ThemeIcon.asClassName(gotoNextLocation));
+        const previous = this.instantiationService.createInstance(UIEditorAction, this.editor, ( (new ShowPreviousChangeAction(this.editor))), ThemeIcon.asClassName(gotoPreviousLocation));
+        const next = this.instantiationService.createInstance(UIEditorAction, this.editor, ( (new ShowNextChangeAction(this.editor))), ThemeIcon.asClassName(gotoNextLocation));
         this._disposables.add(previous);
         this._disposables.add(next);
         const actions = [];
@@ -323,21 +327,17 @@ let DirtyDiffWidget = class DirtyDiffWidget 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(( new Action('peekview.close', ( localizeWithPath(
-            'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
-            'label.close',
-            "Close"
-        )), ThemeIcon.asClassName(Codicon.close), true, () => this.dispose())), { label: false, icon: true });
+        this._actionbarWidget.push(( (new Action('peekview.close', ( localizeWithPath(_moduleId, 4, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => this.dispose()))), { label: false, icon: true });
     }
     _fillHead(container) {
         super._fillHead(container, true);
         this.dropdownContainer = prepend(this._titleElement, $('.dropdown'));
-        this.dropdown = this.instantiationService.createInstance(SwitchQuickDiffViewItem, ( new SwitchQuickDiffBaseAction((event) => this.switchQuickDiff(event))), ( this.model.quickDiffs.map(quickDiffer => quickDiffer.label)), this.model.changes[this._index].label);
+        this.dropdown = this.instantiationService.createInstance(SwitchQuickDiffViewItem, ( (new SwitchQuickDiffBaseAction((event) => this.switchQuickDiff(event)))), ( (this.model.quickDiffs.map(quickDiffer => quickDiffer.label))), this.model.changes[this._index].label);
         this.dropdown.render(this.dropdownContainer);
         this.updateActions();
     }
     _getActionBarOptions() {
-        const actionRunner = ( new DiffActionRunner());
+        const actionRunner = ( (new DiffActionRunner()));
         actionRunner.onDidRun(e => {
             if (!(e.action instanceof UIEditorAction) && !e.error) {
                 this.dispose();
@@ -422,23 +422,19 @@ let DirtyDiffWidget = class DirtyDiffWidget extends PeekViewWidget {
         this.menu?.dispose();
     }
 };
-DirtyDiffWidget = ( __decorate([
-    ( __param(2, IThemeService)),
-    ( __param(3, IInstantiationService)),
-    ( __param(4, IMenuService)),
-    ( __param(5, IContextKeyService))
-], DirtyDiffWidget));
+DirtyDiffWidget = ( (__decorate([
+    ( (__param(2, IThemeService))),
+    ( (__param(3, IInstantiationService))),
+    ( (__param(4, IMenuService))),
+    ( (__param(5, IContextKeyService)))
+], DirtyDiffWidget)));
 class ShowPreviousChangeAction extends EditorAction {
     constructor(outerEditor) {
         super({
             id: 'editor.action.dirtydiff.previous',
-            label: ( localizeWithPath(
-                'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
-                'show previous change',
-                "Show Previous Change"
-            )),
+            label: ( localizeWithPath(_moduleId, 5, "Show Previous Change")),
             alias: 'Show Previous Change',
-            precondition: ( TextCompareEditorActiveContext.toNegated()),
+            precondition: ( (TextCompareEditorActiveContext.toNegated())),
             kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: 1024  | 512  | 61 , weight: 100  }
         });
         this.outerEditor = outerEditor;
@@ -463,13 +459,9 @@ class ShowNextChangeAction extends EditorAction {
     constructor(outerEditor) {
         super({
             id: 'editor.action.dirtydiff.next',
-            label: ( localizeWithPath(
-                'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
-                'show next change',
-                "Show Next Change"
-            )),
+            label: ( localizeWithPath(_moduleId, 6, "Show Next Change")),
             alias: 'Show Next Change',
-            precondition: ( TextCompareEditorActiveContext.toNegated()),
+            precondition: ( (TextCompareEditorActiveContext.toNegated())),
             kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: 512  | 61 , weight: 100  }
         });
         this.outerEditor = outerEditor;
@@ -494,11 +486,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
     group: '7_change_nav',
     command: {
         id: 'editor.action.dirtydiff.next',
-        title: ( localizeWithPath(
-            'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
-            { key: 'miGotoNextChange', comment: ['&& denotes a mnemonic'] },
-            "Next &&Change"
-        ))
+        title: ( localizeWithPath(_moduleId, 7, "Next &&Change"))
     },
     order: 1
 });
@@ -506,11 +494,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
     group: '7_change_nav',
     command: {
         id: 'editor.action.dirtydiff.previous',
-        title: ( localizeWithPath(
-            'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
-            { key: 'miGotoPreviousChange', comment: ['&& denotes a mnemonic'] },
-            "Previous &&Change"
-        ))
+        title: ( localizeWithPath(_moduleId, 8, "Previous &&Change"))
     },
     order: 2
 });
@@ -518,13 +502,9 @@ class GotoPreviousChangeAction extends EditorAction {
     constructor() {
         super({
             id: 'workbench.action.editor.previousChange',
-            label: ( localizeWithPath(
-                'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
-                'move to previous change',
-                "Go to Previous Change"
-            )),
+            label: ( localizeWithPath(_moduleId, 9, "Go to Previous Change")),
             alias: 'Go to Previous Change',
-            precondition: ( TextCompareEditorActiveContext.toNegated()),
+            precondition: ( (TextCompareEditorActiveContext.toNegated())),
             kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: 1024  | 512  | 63 , weight: 100  }
         });
     }
@@ -556,13 +536,9 @@ class GotoNextChangeAction extends EditorAction {
     constructor() {
         super({
             id: 'workbench.action.editor.nextChange',
-            label: ( localizeWithPath(
-                'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
-                'move to next change',
-                "Go to Next Change"
-            )),
+            label: ( localizeWithPath(_moduleId, 10, "Go to Next Change")),
             alias: 'Go to Next Change',
-            precondition: ( TextCompareEditorActiveContext.toNegated()),
+            precondition: ( (TextCompareEditorActiveContext.toNegated())),
             kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: 512  | 63 , weight: 100  }
         });
     }
@@ -590,7 +566,7 @@ class GotoNextChangeAction extends EditorAction {
     }
 }
 function setPositionAndSelection(change, editor, accessibilityService, codeEditorService) {
-    const position = ( new Position(change.modifiedStartLineNumber, 1));
+    const position = ( (new Position(change.modifiedStartLineNumber, 1)));
     editor.setPosition(position);
     editor.revealPositionInCenter(position);
     if (accessibilityService.isScreenReaderOptimized()) {
@@ -618,7 +594,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
     weight: 100  + 50,
     primary: 9 ,
     secondary: [1024  | 9 ],
-    when: ( ContextKeyExpr.and(isDirtyDiffVisible)),
+    when: ( (ContextKeyExpr.and(isDirtyDiffVisible))),
     handler: (accessor) => {
         const outerEditor = getOuterEditorFromDiffEditor(accessor);
         if (!outerEditor) {
@@ -648,7 +624,7 @@ let DirtyDiffController = class DirtyDiffController extends Disposable {
         this.session = Disposable.None;
         this.mouseDownInfo = null;
         this.enabled = false;
-        this.gutterActionDisposables = ( new DisposableStore());
+        this.gutterActionDisposables = ( (new DisposableStore()));
         this.enabled = !contextKeyService.getContextKeyValue('isInDiffEditor');
         this.stylesheet = createStyleSheet(undefined, undefined, this._store);
         if (this.enabled) {
@@ -705,7 +681,7 @@ let DirtyDiffController = class DirtyDiffController extends Disposable {
             index = this.model.findNextClosestChange(typeof lineNumber === 'number' ? lineNumber : this.editor.getPosition().lineNumber, true, this.widget.provider);
         }
         else {
-            const providerChanges = this.model.mapChanges.get(this.widget.provider) ?? ( this.model.mapChanges.values()).next().value;
+            const providerChanges = this.model.mapChanges.get(this.widget.provider) ?? ( (this.model.mapChanges.values())).next().value;
             const mapIndex = providerChanges.findIndex(value => value === this.widget.index);
             index = providerChanges[rot(mapIndex + 1, providerChanges.length)];
         }
@@ -723,7 +699,7 @@ let DirtyDiffController = class DirtyDiffController extends Disposable {
             index = this.model.findPreviousClosestChange(typeof lineNumber === 'number' ? lineNumber : this.editor.getPosition().lineNumber, true, this.widget.provider);
         }
         else {
-            const providerChanges = this.model.mapChanges.get(this.widget.provider) ?? ( this.model.mapChanges.values()).next().value;
+            const providerChanges = this.model.mapChanges.get(this.widget.provider) ?? ( (this.model.mapChanges.values())).next().value;
             const mapIndex = providerChanges.findIndex(value => value === this.widget.index);
             index = providerChanges[rot(mapIndex - 1, providerChanges.length)];
         }
@@ -761,10 +737,10 @@ let DirtyDiffController = class DirtyDiffController extends Disposable {
         this.model = model;
         this.widget = this.instantiationService.createInstance(DirtyDiffWidget, this.editor, model);
         this.isDirtyDiffVisible.set(true);
-        const disposables = ( new DisposableStore());
+        const disposables = ( (new DisposableStore()));
         disposables.add(Event.once(this.widget.onDidClose)(this.close, this));
-        const onDidModelChange = Event.chain(model.onDidChange, $ => ( $.filter(e => e.diff.length > 0)
-            .map(e => e.diff)));
+        const onDidModelChange = Event.chain(model.onDidChange, $ => ( ($.filter(e => e.diff.length > 0)
+            .map(e => e.diff))));
         onDidModelChange(this.onDidModelChange, this, disposables);
         disposables.add(this.widget);
         disposables.add(toDisposable(() => {
@@ -860,26 +836,28 @@ let DirtyDiffController = class DirtyDiffController extends Disposable {
         if (!model) {
             return [];
         }
-        return ( model.changes.map(change => change.change));
+        return (
+             (model.changes.map(change => change.change))
+        );
     }
     dispose() {
         this.gutterActionDisposables.dispose();
         super.dispose();
     }
 };
-DirtyDiffController = DirtyDiffController_1 = ( __decorate([
-    ( __param(1, IContextKeyService)),
-    ( __param(2, IConfigurationService)),
-    ( __param(3, IInstantiationService))
-], DirtyDiffController));
+DirtyDiffController = DirtyDiffController_1 = ( (__decorate([
+    ( (__param(1, IContextKeyService))),
+    ( (__param(2, IConfigurationService))),
+    ( (__param(3, IInstantiationService)))
+], DirtyDiffController)));
 const editorGutterModifiedBackground = registerColor('editorGutter.modifiedBackground', {
     dark: '#1B81A8',
     light: '#2090D3',
     hcDark: '#1B81A8',
     hcLight: '#2090D3'
 }, ( localizeWithPath(
-    'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
-    'editorGutterModifiedBackground',
+    _moduleId,
+    11,
     "Editor gutter background color for lines that are modified."
 )));
 const editorGutterAddedBackground = registerColor('editorGutter.addedBackground', {
@@ -887,19 +865,15 @@ const editorGutterAddedBackground = registerColor('editorGutter.addedBackground'
     light: '#48985D',
     hcDark: '#487E02',
     hcLight: '#48985D'
-}, ( localizeWithPath(
-    'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
-    'editorGutterAddedBackground',
-    "Editor gutter background color for lines that are added."
-)));
+}, ( localizeWithPath(_moduleId, 12, "Editor gutter background color for lines that are added.")));
 const editorGutterDeletedBackground = registerColor('editorGutter.deletedBackground', {
     dark: editorErrorForeground,
     light: editorErrorForeground,
     hcDark: editorErrorForeground,
     hcLight: editorErrorForeground
 }, ( localizeWithPath(
-    'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
-    'editorGutterDeletedBackground',
+    _moduleId,
+    13,
     "Editor gutter background color for lines that are deleted."
 )));
 const minimapGutterModifiedBackground = registerColor('minimapGutter.modifiedBackground', {
@@ -908,8 +882,8 @@ const minimapGutterModifiedBackground = registerColor('minimapGutter.modifiedBac
     hcDark: editorGutterModifiedBackground,
     hcLight: editorGutterModifiedBackground
 }, ( localizeWithPath(
-    'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
-    'minimapGutterModifiedBackground',
+    _moduleId,
+    14,
     "Minimap gutter background color for lines that are modified."
 )));
 const minimapGutterAddedBackground = registerColor('minimapGutter.addedBackground', {
@@ -917,36 +891,20 @@ const minimapGutterAddedBackground = registerColor('minimapGutter.addedBackgroun
     light: editorGutterAddedBackground,
     hcDark: editorGutterAddedBackground,
     hcLight: editorGutterAddedBackground
-}, ( localizeWithPath(
-    'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
-    'minimapGutterAddedBackground',
-    "Minimap gutter background color for lines that are added."
-)));
+}, ( localizeWithPath(_moduleId, 15, "Minimap gutter background color for lines that are added.")));
 const minimapGutterDeletedBackground = registerColor('minimapGutter.deletedBackground', {
     dark: editorGutterDeletedBackground,
     light: editorGutterDeletedBackground,
     hcDark: editorGutterDeletedBackground,
     hcLight: editorGutterDeletedBackground
 }, ( localizeWithPath(
-    'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
-    'minimapGutterDeletedBackground',
+    _moduleId,
+    16,
     "Minimap gutter background color for lines that are deleted."
 )));
-const overviewRulerModifiedForeground = registerColor('editorOverviewRuler.modifiedForeground', { dark: ( transparent(editorGutterModifiedBackground, 0.6)), light: ( transparent(editorGutterModifiedBackground, 0.6)), hcDark: ( transparent(editorGutterModifiedBackground, 0.6)), hcLight: ( transparent(editorGutterModifiedBackground, 0.6)) }, ( localizeWithPath(
-    'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
-    'overviewRulerModifiedForeground',
-    'Overview ruler marker color for modified content.'
-)));
-const overviewRulerAddedForeground = registerColor('editorOverviewRuler.addedForeground', { dark: ( transparent(editorGutterAddedBackground, 0.6)), light: ( transparent(editorGutterAddedBackground, 0.6)), hcDark: ( transparent(editorGutterAddedBackground, 0.6)), hcLight: ( transparent(editorGutterAddedBackground, 0.6)) }, ( localizeWithPath(
-    'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
-    'overviewRulerAddedForeground',
-    'Overview ruler marker color for added content.'
-)));
-const overviewRulerDeletedForeground = registerColor('editorOverviewRuler.deletedForeground', { dark: ( transparent(editorGutterDeletedBackground, 0.6)), light: ( transparent(editorGutterDeletedBackground, 0.6)), hcDark: ( transparent(editorGutterDeletedBackground, 0.6)), hcLight: ( transparent(editorGutterDeletedBackground, 0.6)) }, ( localizeWithPath(
-    'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
-    'overviewRulerDeletedForeground',
-    'Overview ruler marker color for deleted content.'
-)));
+const overviewRulerModifiedForeground = registerColor('editorOverviewRuler.modifiedForeground', { dark: ( (transparent(editorGutterModifiedBackground, 0.6))), light: ( (transparent(editorGutterModifiedBackground, 0.6))), hcDark: ( (transparent(editorGutterModifiedBackground, 0.6))), hcLight: ( (transparent(editorGutterModifiedBackground, 0.6))) }, ( localizeWithPath(_moduleId, 17, 'Overview ruler marker color for modified content.')));
+const overviewRulerAddedForeground = registerColor('editorOverviewRuler.addedForeground', { dark: ( (transparent(editorGutterAddedBackground, 0.6))), light: ( (transparent(editorGutterAddedBackground, 0.6))), hcDark: ( (transparent(editorGutterAddedBackground, 0.6))), hcLight: ( (transparent(editorGutterAddedBackground, 0.6))) }, ( localizeWithPath(_moduleId, 18, 'Overview ruler marker color for added content.')));
+const overviewRulerDeletedForeground = registerColor('editorOverviewRuler.deletedForeground', { dark: ( (transparent(editorGutterDeletedBackground, 0.6))), light: ( (transparent(editorGutterDeletedBackground, 0.6))), hcDark: ( (transparent(editorGutterDeletedBackground, 0.6))), hcLight: ( (transparent(editorGutterDeletedBackground, 0.6))) }, ( localizeWithPath(_moduleId, 19, 'Overview ruler marker color for deleted content.')));
 let DirtyDiffDecorator = DirtyDiffDecorator_1 = class DirtyDiffDecorator extends Disposable {
     static createDecoration(className, tooltip, options) {
         const decorationOptions = {
@@ -981,11 +939,7 @@ let DirtyDiffDecorator = DirtyDiffDecorator_1 = class DirtyDiffDecorator extends
         const gutter = decorations === 'all' || decorations === 'gutter';
         const overview = decorations === 'all' || decorations === 'overview';
         const minimap = decorations === 'all' || decorations === 'minimap';
-        const diffAdded = ( localizeWithPath(
-            'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
-            'diffAdded',
-            'Added lines'
-        ));
+        const diffAdded = ( localizeWithPath(_moduleId, 20, 'Added lines'));
         this.addedOptions = DirtyDiffDecorator_1.createDecoration('dirty-diff-added', diffAdded, {
             gutter,
             overview: { active: overview, color: overviewRulerAddedForeground },
@@ -998,11 +952,7 @@ let DirtyDiffDecorator = DirtyDiffDecorator_1 = class DirtyDiffDecorator extends
             minimap: { active: minimap, color: minimapGutterAddedBackground },
             isWholeLine: true
         });
-        const diffModified = ( localizeWithPath(
-            'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
-            'diffModified',
-            'Changed lines'
-        ));
+        const diffModified = ( localizeWithPath(_moduleId, 21, 'Changed lines'));
         this.modifiedOptions = DirtyDiffDecorator_1.createDecoration('dirty-diff-modified', diffModified, {
             gutter,
             overview: { active: overview, color: overviewRulerModifiedForeground },
@@ -1015,11 +965,7 @@ let DirtyDiffDecorator = DirtyDiffDecorator_1 = class DirtyDiffDecorator extends
             minimap: { active: minimap, color: minimapGutterModifiedBackground },
             isWholeLine: true
         });
-        this.deletedOptions = DirtyDiffDecorator_1.createDecoration('dirty-diff-deleted', ( localizeWithPath(
-            'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
-            'diffDeleted',
-            'Removed lines'
-        )), {
+        this.deletedOptions = DirtyDiffDecorator_1.createDecoration('dirty-diff-deleted', ( localizeWithPath(_moduleId, 22, 'Removed lines')), {
             gutter,
             overview: { active: overview, color: overviewRulerDeletedForeground },
             minimap: { active: minimap, color: minimapGutterDeletedBackground },
@@ -1037,7 +983,7 @@ let DirtyDiffDecorator = DirtyDiffDecorator_1 = class DirtyDiffDecorator extends
             return;
         }
         const pattern = this.configurationService.getValue('scm.diffDecorationsGutterPattern');
-        const decorations = ( this.model.changes.map((labeledChange) => {
+        const decorations = ( (this.model.changes.map((labeledChange) => {
             const change = labeledChange.change;
             const changeType = getChangeType(change);
             const startLineNumber = change.modifiedStartLineNumber;
@@ -1068,7 +1014,7 @@ let DirtyDiffDecorator = DirtyDiffDecorator_1 = class DirtyDiffDecorator extends
                         options: pattern.modified ? this.modifiedPatternOptions : this.modifiedOptions
                     };
             }
-        }));
+        })));
         if (!this.decorationsCollection) {
             this.decorationsCollection = this.codeEditor.createDecorationsCollection(decorations);
         }
@@ -1085,9 +1031,9 @@ let DirtyDiffDecorator = DirtyDiffDecorator_1 = class DirtyDiffDecorator extends
         this.decorationsCollection = undefined;
     }
 };
-DirtyDiffDecorator = DirtyDiffDecorator_1 = ( __decorate([
-    ( __param(3, IConfigurationService))
-], DirtyDiffDecorator));
+DirtyDiffDecorator = DirtyDiffDecorator_1 = ( (__decorate([
+    ( (__param(3, IConfigurationService)))
+], DirtyDiffDecorator)));
 function compareChanges(a, b) {
     let result = a.modifiedStartLineNumber - b.modifiedStartLineNumber;
     if (result !== 0) {
@@ -1120,16 +1066,16 @@ let DirtyDiffModel = class DirtyDiffModel extends Disposable {
         this.textModelResolverService = textModelResolverService;
         this.progressService = progressService;
         this._quickDiffs = [];
-        this._originalModels = ( new Map());
+        this._originalModels = ( (new Map()));
         this._originalTextModels = [];
-        this.diffDelayer = ( new ThrottledDelayer(200));
-        this.repositoryDisposables = ( new Set());
-        this.originalModelDisposables = this._register(( new DisposableStore()));
+        this.diffDelayer = ( (new ThrottledDelayer(200)));
+        this.repositoryDisposables = ( (new Set()));
+        this.originalModelDisposables = this._register(( (new DisposableStore())));
         this._disposed = false;
-        this._onDidChange = ( new Emitter());
+        this._onDidChange = ( (new Emitter()));
         this.onDidChange = this._onDidChange.event;
         this._changes = [];
-        this._mapChanges = ( new Map());
+        this._mapChanges = ( (new Map()));
         this._model = textFileModel;
         this._register(textFileModel.textEditorModel.onDidChangeContent(() => this.triggerDiff()));
         this._register(Event.filter(configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('scm.diffDecorationsIgnoreTrimWhitespace') || e.affectsConfiguration('diffEditor.ignoreTrimWhitespace'))(this.triggerDiff, this));
@@ -1143,7 +1089,7 @@ let DirtyDiffModel = class DirtyDiffModel extends Disposable {
             this._originalModels.clear();
             this._originalTextModels = [];
             this._quickDiffsPromise = undefined;
-            this.setChanges([], ( new Map()));
+            this.setChanges([], ( (new Map())));
             this.triggerDiff();
         }));
         this._register(this.quickDiffService.onDidChangeQuickDiffProviders(() => this.triggerDiff()));
@@ -1153,7 +1099,7 @@ let DirtyDiffModel = class DirtyDiffModel extends Disposable {
         return this._quickDiffs;
     }
     getDiffEditorModel(originalUri) {
-        if (!( this._originalModels.has(originalUri))) {
+        if (!( (this._originalModels.has(originalUri)))) {
             return;
         }
         const original = this._originalModels.get(originalUri);
@@ -1163,7 +1109,7 @@ let DirtyDiffModel = class DirtyDiffModel extends Disposable {
         };
     }
     onDidAddRepository(repository) {
-        const disposables = ( new DisposableStore());
+        const disposables = ( (new DisposableStore()));
         this.repositoryDisposables.add(disposables);
         disposables.add(toDisposable(() => this.repositoryDisposables.delete(disposables)));
         const onDidChange = Event.any(repository.provider.onDidChange, repository.provider.onDidChangeResources);
@@ -1179,8 +1125,8 @@ let DirtyDiffModel = class DirtyDiffModel extends Disposable {
         return this.diffDelayer
             .trigger(() => this.diff())
             .then((result) => {
-            const originalModels = Array.from(( this._originalModels.values()));
-            if (!result || this._disposed || this._model.isDisposed() || ( originalModels.some(originalModel => originalModel.isDisposed()))) {
+            const originalModels = Array.from(( (this._originalModels.values())));
+            if (!result || this._disposed || this._model.isDisposed() || ( (originalModels.some(originalModel => originalModel.isDisposed())))) {
                 return;
             }
             if (originalModels.every(originalModel => originalModel.textEditorModel.getValueLength() === 0)) {
@@ -1202,11 +1148,11 @@ let DirtyDiffModel = class DirtyDiffModel extends Disposable {
         return this.progressService.withProgress({ location: 3 , delay: 250 }, async () => {
             const originalURIs = await this.getQuickDiffsPromise();
             if (this._disposed || this._model.isDisposed() || (originalURIs.length === 0)) {
-                return Promise.resolve({ changes: [], mapChanges: ( new Map()) });
+                return Promise.resolve({ changes: [], mapChanges: ( (new Map())) });
             }
             const filteredToDiffable = originalURIs.filter(quickDiff => this.editorWorkerService.canComputeDirtyDiff(quickDiff.originalResource, this._model.resource));
             if (filteredToDiffable.length === 0) {
-                return Promise.resolve({ changes: [], mapChanges: ( new Map()) });
+                return Promise.resolve({ changes: [], mapChanges: ( (new Map())) });
             }
             const ignoreTrimWhitespaceSetting = this.configurationService.getValue('scm.diffDecorationsIgnoreTrimWhitespace');
             const ignoreTrimWhitespace = ignoreTrimWhitespaceSetting === 'inherit'
@@ -1224,10 +1170,10 @@ let DirtyDiffModel = class DirtyDiffModel extends Disposable {
                 }
             }
             const sorted = allDiffs.sort((a, b) => compareChanges(a.change, b.change));
-            const map = ( new Map());
+            const map = ( (new Map()));
             for (let i = 0; i < sorted.length; i++) {
                 const label = sorted[i].label;
-                if (!( map.has(label))) {
+                if (!( (map.has(label)))) {
                     map.set(label, []);
                 }
                 map.get(label).push(i);
@@ -1249,21 +1195,21 @@ let DirtyDiffModel = class DirtyDiffModel extends Disposable {
                 this._originalTextModels = [];
                 return [];
             }
-            if (equals(this._quickDiffs, quickDiffs, (a, b) => ( a.originalResource.toString()) === ( b.originalResource.toString()) && a.label === b.label)) {
+            if (equals(this._quickDiffs, quickDiffs, (a, b) => ( (a.originalResource.toString())) === ( (b.originalResource.toString())) && a.label === b.label)) {
                 return quickDiffs;
             }
             this.originalModelDisposables.clear();
             this._originalModels.clear();
             this._originalTextModels = [];
             this._quickDiffs = quickDiffs;
-            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) {
                         ref.dispose();
                         return [];
                     }
-                    this._originalModels.set(( quickDiff.originalResource.toString()), ref.object);
+                    this._originalModels.set(( (quickDiff.originalResource.toString())), ref.object);
                     this._originalTextModels.push(ref.object.textEditorModel);
                     if (isTextFileEditorModel(ref.object)) {
                         const encoding = this._model.getEncoding();
@@ -1278,7 +1224,7 @@ let DirtyDiffModel = class DirtyDiffModel extends Disposable {
                 catch (error) {
                     return [];
                 }
-            })))).flat();
+            }))))).flat();
         });
         return this._quickDiffsPromise.finally(() => {
             this._quickDiffsPromise = undefined;
@@ -1354,14 +1300,14 @@ let DirtyDiffModel = class DirtyDiffModel extends Disposable {
         this.repositoryDisposables.clear();
     }
 };
-DirtyDiffModel = ( __decorate([
-    ( __param(1, ISCMService)),
-    ( __param(2, IQuickDiffService)),
-    ( __param(3, IEditorWorkerService)),
-    ( __param(4, IConfigurationService)),
-    ( __param(5, ITextModelService)),
-    ( __param(6, IProgressService))
-], DirtyDiffModel));
+DirtyDiffModel = ( (__decorate([
+    ( (__param(1, ISCMService))),
+    ( (__param(2, IQuickDiffService))),
+    ( (__param(3, IEditorWorkerService))),
+    ( (__param(4, IConfigurationService))),
+    ( (__param(5, ITextModelService))),
+    ( (__param(6, IProgressService)))
+], DirtyDiffModel)));
 class DirtyDiffItem {
     constructor(model, decorator) {
         this.model = model;
@@ -1381,8 +1327,8 @@ let DirtyDiffWorkbenchController = class DirtyDiffWorkbenchController extends Di
         this.textFileService = textFileService;
         this.enabled = false;
         this.viewState = { width: 3, visibility: 'always' };
-        this.items = ( new ResourceMap());
-        this.transientDisposables = this._register(( new DisposableStore()));
+        this.items = ( (new ResourceMap()));
+        this.transientDisposables = this._register(( (new DisposableStore())));
         this.stylesheet = createStyleSheet(undefined, undefined, this._store);
         const onDidChangeConfiguration = Event.filter(configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('scm.diffDecorations'));
         this._register(onDidChangeConfiguration(this.onDidChangeConfiguration, this));
@@ -1450,41 +1396,60 @@ let DirtyDiffWorkbenchController = class DirtyDiffWorkbenchController extends Di
         }
         this.transientDisposables.clear();
         for (const [, dirtyDiff] of this.items) {
-            dispose(( dirtyDiff.values()));
+            dispose(( (dirtyDiff.values())));
         }
         this.items.clear();
         this.enabled = false;
     }
+    getVisibleEditorControls() {
+        const controls = [];
+        const addControl = (control) => {
+            if (control) {
+                controls.push(control);
+            }
+        };
+        for (const editorPane of this.editorService.visibleEditorPanes) {
+            if (editorPane instanceof TextDiffEditor || editorPane instanceof TextFileEditor) {
+                addControl(editorPane.getControl());
+            }
+            else if (editorPane instanceof SideBySideEditor) {
+                addControl(editorPane.getPrimaryEditorPane()?.getControl());
+                addControl(editorPane.getSecondaryEditorPane()?.getControl());
+            }
+        }
+        return controls;
+    }
     onEditorsChanged() {
-        for (const editor of this.editorService.visibleTextEditorControls) {
+        const visibleControls = this.getVisibleEditorControls();
+        for (const editor of visibleControls) {
             if (isCodeEditor(editor)) {
                 const textModel = editor.getModel();
                 const controller = DirtyDiffController.get(editor);
                 if (controller) {
                     controller.modelRegistry = this;
                 }
-                if (textModel && (!( this.items.has(textModel.uri)) || !( this.items.get(textModel.uri).has(editor.getId())))) {
+                if (textModel && (!( (this.items.has(textModel.uri))) || !( (this.items.get(textModel.uri).has(editor.getId()))))) {
                     const textFileModel = this.textFileService.files.get(textModel.uri);
                     if (textFileModel?.isResolved()) {
                         const dirtyDiffModel = this.instantiationService.createInstance(DirtyDiffModel, textFileModel);
-                        const decorator = ( new DirtyDiffDecorator(
+                        const decorator = ( (new DirtyDiffDecorator(
                             textFileModel.textEditorModel,
                             editor,
                             dirtyDiffModel,
                             this.configurationService
-                        ));
-                        if (!( this.items.has(textModel.uri))) {
-                            this.items.set(textModel.uri, ( new Map()));
+                        )));
+                        if (!( (this.items.has(textModel.uri)))) {
+                            this.items.set(textModel.uri, ( (new Map())));
                         }
-                        this.items.get(textModel.uri)?.set(editor.getId(), ( new DirtyDiffItem(dirtyDiffModel, decorator)));
+                        this.items.get(textModel.uri)?.set(editor.getId(), ( (new DirtyDiffItem(dirtyDiffModel, decorator))));
                     }
                 }
             }
         }
         for (const [uri, item] of this.items) {
-            for (const editorId of ( item.keys())) {
-                if (!this.editorService.visibleTextEditorControls.find(editor => isCodeEditor(editor) && editor.getModel()?.uri.toString() === ( uri.toString()) && editor.getId() === editorId)) {
-                    if (( item.has(editorId))) {
+            for (const editorId of ( (item.keys()))) {
+                if (!this.getVisibleEditorControls().find(editor => isCodeEditor(editor) && editor.getModel()?.uri.toString() === ( (uri.toString())) && editor.getId() === editorId)) {
+                    if (( (item.has(editorId)))) {
                         const dirtyDiffItem = item.get(editorId);
                         dirtyDiffItem?.dispose();
                         item.delete(editorId);
@@ -1504,11 +1469,11 @@ let DirtyDiffWorkbenchController = class DirtyDiffWorkbenchController extends Di
         super.dispose();
     }
 };
-DirtyDiffWorkbenchController = ( __decorate([
-    ( __param(0, IEditorService)),
-    ( __param(1, IInstantiationService)),
-    ( __param(2, IConfigurationService)),
-    ( __param(3, ITextFileService))
-], DirtyDiffWorkbenchController));
+DirtyDiffWorkbenchController = ( (__decorate([
+    ( (__param(0, IEditorService))),
+    ( (__param(1, IInstantiationService))),
+    ( (__param(2, IConfigurationService))),
+    ( (__param(3, ITextFileService)))
+], DirtyDiffWorkbenchController)));
 registerEditorContribution(DirtyDiffController.ID, DirtyDiffController, 1 );
 export { DirtyDiffController, DirtyDiffModel, DirtyDiffWorkbenchController, GotoNextChangeAction, GotoPreviousChangeAction, ShowNextChangeAction, ShowPreviousChangeAction, getOriginalResource, isDirtyDiffVisible };