@codingame/monaco-vscode-api 4.5.1 → 5.0.0

package/vscode/src/vs/editor/browser/widget/diffEditor/commands.js

@@ -9,20 +9,17 @@ import { Action2, MenuId } from '../../../../platform/actions/common/actions.js'
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import './registrations.contribution.js';
+const _moduleId = "vs/editor/browser/widget/diffEditor/commands";
 class ToggleCollapseUnchangedRegions extends Action2 {
     constructor() {
         super({
             id: 'diffEditor.toggleCollapseUnchangedRegions',
-            title: ( localize2WithPath(
-                'vs/editor/browser/widget/diffEditor/commands',
-                'toggleCollapseUnchangedRegions',
-                'Toggle Collapse Unchanged Regions'
-            )),
+            title: ( localize2WithPath(_moduleId, 0, 'Toggle Collapse Unchanged Regions')),
             icon: Codicon.map,
-            toggled: ( ContextKeyExpr.has('config.diffEditor.hideUnchangedRegions.enabled')),
-            precondition: ( ContextKeyExpr.has('isInDiffEditor')),
+            toggled: ( (ContextKeyExpr.has('config.diffEditor.hideUnchangedRegions.enabled'))),
+            precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
             menu: {
-                when: ( ContextKeyExpr.has('isInDiffEditor')),
+                when: ( (ContextKeyExpr.has('isInDiffEditor'))),
                 id: MenuId.EditorTitle,
                 order: 22,
                 group: 'navigation',
@@ -39,12 +36,8 @@ class ToggleShowMovedCodeBlocks extends Action2 {
     constructor() {
         super({
             id: 'diffEditor.toggleShowMovedCodeBlocks',
-            title: ( localize2WithPath(
-                'vs/editor/browser/widget/diffEditor/commands',
-                'toggleShowMovedCodeBlocks',
-                'Toggle Show Moved Code Blocks'
-            )),
-            precondition: ( ContextKeyExpr.has('isInDiffEditor')),
+            title: ( localize2WithPath(_moduleId, 1, 'Toggle Show Moved Code Blocks')),
+            precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
         });
     }
     run(accessor, ...args) {
@@ -57,12 +50,8 @@ class ToggleUseInlineViewWhenSpaceIsLimited extends Action2 {
     constructor() {
         super({
             id: 'diffEditor.toggleUseInlineViewWhenSpaceIsLimited',
-            title: ( localize2WithPath(
-                'vs/editor/browser/widget/diffEditor/commands',
-                'toggleUseInlineViewWhenSpaceIsLimited',
-                'Toggle Use Inline View When Space Is Limited'
-            )),
-            precondition: ( ContextKeyExpr.has('isInDiffEditor')),
+            title: ( localize2WithPath(_moduleId, 2, 'Toggle Use Inline View When Space Is Limited')),
+            precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
         });
     }
     run(accessor, ...args) {
@@ -71,22 +60,14 @@ class ToggleUseInlineViewWhenSpaceIsLimited extends Action2 {
         configurationService.updateValue('diffEditor.useInlineViewWhenSpaceIsLimited', newValue);
     }
 }
-const diffEditorCategory = ( localize2WithPath(
-    'vs/editor/browser/widget/diffEditor/commands',
-    'diffEditor',
-    "Diff Editor"
-));
+const diffEditorCategory = ( localize2WithPath(_moduleId, 3, "Diff Editor"));
 class SwitchSide extends EditorAction2 {
     constructor() {
         super({
             id: 'diffEditor.switchSide',
-            title: ( localize2WithPath(
-                'vs/editor/browser/widget/diffEditor/commands',
-                'switchSide',
-                'Switch Side'
-            )),
+            title: ( localize2WithPath(_moduleId, 4, 'Switch Side')),
             icon: Codicon.arrowSwap,
-            precondition: ( ContextKeyExpr.has('isInDiffEditor')),
+            precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
             f1: true,
             category: diffEditorCategory,
         });
@@ -108,11 +89,7 @@ class ExitCompareMove extends EditorAction2 {
     constructor() {
         super({
             id: 'diffEditor.exitCompareMove',
-            title: ( localize2WithPath(
-                'vs/editor/browser/widget/diffEditor/commands',
-                'exitCompareMove',
-                'Exit Compare Move'
-            )),
+            title: ( localize2WithPath(_moduleId, 5, 'Exit Compare Move')),
             icon: Codicon.close,
             precondition: EditorContextKeys.comparingMovedCode,
             f1: false,
@@ -134,13 +111,9 @@ class CollapseAllUnchangedRegions extends EditorAction2 {
     constructor() {
         super({
             id: 'diffEditor.collapseAllUnchangedRegions',
-            title: ( localize2WithPath(
-                'vs/editor/browser/widget/diffEditor/commands',
-                'collapseAllUnchangedRegions',
-                'Collapse All Unchanged Regions'
-            )),
+            title: ( localize2WithPath(_moduleId, 6, 'Collapse All Unchanged Regions')),
             icon: Codicon.fold,
-            precondition: ( ContextKeyExpr.has('isInDiffEditor')),
+            precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
             f1: true,
             category: diffEditorCategory,
         });
@@ -156,13 +129,9 @@ class ShowAllUnchangedRegions extends EditorAction2 {
     constructor() {
         super({
             id: 'diffEditor.showAllUnchangedRegions',
-            title: ( localize2WithPath(
-                'vs/editor/browser/widget/diffEditor/commands',
-                'showAllUnchangedRegions',
-                'Show All Unchanged Regions'
-            )),
+            title: ( localize2WithPath(_moduleId, 7, 'Show All Unchanged Regions')),
             icon: Codicon.unfold,
-            precondition: ( ContextKeyExpr.has('isInDiffEditor')),
+            precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
             f1: true,
             category: diffEditorCategory,
         });
@@ -178,7 +147,7 @@ class RevertHunkOrSelection extends Action2 {
     constructor() {
         super({
             id: 'diffEditor.revert',
-            title: ( localize2WithPath('vs/editor/browser/widget/diffEditor/commands', 'revert', 'Revert')),
+            title: ( localize2WithPath(_moduleId, 8, 'Revert')),
             f1: false,
             category: diffEditorCategory,
         });
@@ -191,23 +160,15 @@ class RevertHunkOrSelection extends Action2 {
         return undefined;
     }
 }
-const accessibleDiffViewerCategory = ( localize2WithPath(
-    'vs/editor/browser/widget/diffEditor/commands',
-    'accessibleDiffViewer',
-    "Accessible Diff Viewer"
-));
+const accessibleDiffViewerCategory = ( localize2WithPath(_moduleId, 9, "Accessible Diff Viewer"));
 class AccessibleDiffViewerNext extends Action2 {
     static { this.id = 'editor.action.accessibleDiffViewer.next'; }
     constructor() {
         super({
             id: AccessibleDiffViewerNext.id,
-            title: ( localize2WithPath(
-                'vs/editor/browser/widget/diffEditor/commands',
-                'editor.action.accessibleDiffViewer.next',
-                'Go to Next Difference'
-            )),
+            title: ( localize2WithPath(_moduleId, 10, 'Go to Next Difference')),
             category: accessibleDiffViewerCategory,
-            precondition: ( ContextKeyExpr.has('isInDiffEditor')),
+            precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
             keybinding: {
                 primary: 65 ,
                 weight: 100
@@ -225,13 +186,9 @@ class AccessibleDiffViewerPrev extends Action2 {
     constructor() {
         super({
             id: AccessibleDiffViewerPrev.id,
-            title: ( localize2WithPath(
-                'vs/editor/browser/widget/diffEditor/commands',
-                'editor.action.accessibleDiffViewer.prev',
-                'Go to Previous Difference'
-            )),
+            title: ( localize2WithPath(_moduleId, 11, 'Go to Previous Difference')),
             category: accessibleDiffViewerCategory,
-            precondition: ( ContextKeyExpr.has('isInDiffEditor')),
+            precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
             keybinding: {
                 primary: 1024  | 65 ,
                 weight: 100
@@ -250,8 +207,8 @@ function findDiffEditor(accessor, originalUri, modifiedUri) {
     return diffEditors.find(diffEditor => {
         const modified = diffEditor.getModifiedEditor();
         const original = diffEditor.getOriginalEditor();
-        return modified && modified.getModel()?.uri.toString() === ( modifiedUri.toString())
-            && original && original.getModel()?.uri.toString() === ( originalUri.toString());
+        return modified && modified.getModel()?.uri.toString() === ( (modifiedUri.toString()))
+            && original && original.getModel()?.uri.toString() === ( (originalUri.toString()));
     }) || null;
 }
 function findFocusedDiffEditor(accessor) {

package/vscode/src/vs/editor/browser/widget/diffEditor/components/accessibleDiffViewer.js

@@ -31,21 +31,10 @@ import { IAccessibilitySignalService } from '../../../../../platform/accessibili
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { registerIcon } from '../../../../../platform/theme/common/iconRegistry.js';
 import './accessibleDiffViewer.css.js';
-const accessibleDiffViewerInsertIcon = registerIcon('diff-review-insert', Codicon.add, ( localizeWithPath(
-    'vs/editor/browser/widget/diffEditor/components/accessibleDiffViewer',
-    'accessibleDiffViewerInsertIcon',
-    'Icon for \'Insert\' in accessible diff viewer.'
-)));
-const accessibleDiffViewerRemoveIcon = registerIcon('diff-review-remove', Codicon.remove, ( localizeWithPath(
-    'vs/editor/browser/widget/diffEditor/components/accessibleDiffViewer',
-    'accessibleDiffViewerRemoveIcon',
-    'Icon for \'Remove\' in accessible diff viewer.'
-)));
-const accessibleDiffViewerCloseIcon = registerIcon('diff-review-close', Codicon.close, ( localizeWithPath(
-    'vs/editor/browser/widget/diffEditor/components/accessibleDiffViewer',
-    'accessibleDiffViewerCloseIcon',
-    'Icon for \'Close\' in accessible diff viewer.'
-)));
+const _moduleId = "vs/editor/browser/widget/diffEditor/components/accessibleDiffViewer";
+const accessibleDiffViewerInsertIcon = registerIcon('diff-review-insert', Codicon.add, ( localizeWithPath(_moduleId, 0, 'Icon for \'Insert\' in accessible diff viewer.')));
+const accessibleDiffViewerRemoveIcon = registerIcon('diff-review-remove', Codicon.remove, ( localizeWithPath(_moduleId, 1, 'Icon for \'Remove\' in accessible diff viewer.')));
+const accessibleDiffViewerCloseIcon = registerIcon('diff-review-close', Codicon.close, ( localizeWithPath(_moduleId, 2, 'Icon for \'Close\' in accessible diff viewer.')));
 let AccessibleDiffViewer = class AccessibleDiffViewer extends Disposable {
     static { this._ttPolicy = createTrustedTypesPolicy('diffReview', { createHTML: value => value }); }
     constructor(_parentNode, _visible, _setVisible, _canClose, _width, _height, _diffs, _models, _instantiationService) {
@@ -91,9 +80,9 @@ let AccessibleDiffViewer = class AccessibleDiffViewer extends Disposable {
         });
     }
 };
-AccessibleDiffViewer = ( __decorate([
-    ( __param(8, IInstantiationService))
-], AccessibleDiffViewer));
+AccessibleDiffViewer = ( (__decorate([
+    ( (__param(8, IInstantiationService)))
+], AccessibleDiffViewer)));
 let ViewModel = class ViewModel extends Disposable {
     constructor(_diffs, _models, _setVisible, canClose, _accessibilitySignalService) {
         super();
@@ -106,9 +95,9 @@ let ViewModel = class ViewModel extends Disposable {
         this._currentGroupIdx = observableValue(this, 0);
         this._currentElementIdx = observableValue(this, 0);
         this.groups = this._groups;
-        this.currentGroup = ( this._currentGroupIdx.map((idx, r) => this._groups.read(r)[idx]));
+        this.currentGroup = ( (this._currentGroupIdx.map((idx, r) => this._groups.read(r)[idx])));
         this.currentGroupIndex = this._currentGroupIdx;
-        this.currentElement = ( this._currentElementIdx.map((idx, r) => this.currentGroup.read(r)?.lines[idx]));
+        this.currentElement = ( (this._currentElementIdx.map((idx, r) => this.currentGroup.read(r)?.lines[idx])));
         this._register(autorun(reader => {
             const diffs = this._diffs.read(reader);
             if (!diffs) {
@@ -140,7 +129,7 @@ let ViewModel = class ViewModel extends Disposable {
             const currentViewItem = this.currentElement.read(reader);
             if (currentViewItem && currentViewItem.type !== LineType.Header) {
                 const lineNumber = currentViewItem.modifiedLineNumber ?? currentViewItem.diff.modified.startLineNumber;
-                this._models.modifiedSetSelection(Range.fromPositions(( new Position(lineNumber, 1))));
+                this._models.modifiedSetSelection(Range.fromPositions(( (new Position(lineNumber, 1)))));
             }
         }));
     }
@@ -188,11 +177,11 @@ let ViewModel = class ViewModel extends Disposable {
         const curElem = this.currentElement.get();
         if (curElem) {
             if (curElem.type === LineType.Deleted) {
-                this._models.originalReveal(Range.fromPositions(( new Position(curElem.originalLineNumber, 1))));
+                this._models.originalReveal(Range.fromPositions(( (new Position(curElem.originalLineNumber, 1)))));
             }
             else {
                 this._models.modifiedReveal(curElem.type !== LineType.Header
-                    ? Range.fromPositions(( new Position(curElem.modifiedLineNumber, 1)))
+                    ? Range.fromPositions(( (new Position(curElem.modifiedLineNumber, 1))))
                     : undefined);
             }
         }
@@ -205,60 +194,63 @@ let ViewModel = class ViewModel extends Disposable {
         this._models.modifiedFocus();
     }
 };
-ViewModel = ( __decorate([
-    ( __param(4, IAccessibilitySignalService))
-], ViewModel));
+ViewModel = ( (__decorate([
+    ( (__param(4, IAccessibilitySignalService)))
+], ViewModel)));
 const viewElementGroupLineMargin = 3;
 function computeViewElementGroups(diffs, originalLineCount, modifiedLineCount) {
     const result = [];
     for (const g of groupAdjacentBy(diffs, (a, b) => (b.modified.startLineNumber - a.modified.endLineNumberExclusive < 2 * viewElementGroupLineMargin))) {
         const viewElements = [];
-        viewElements.push(( new HeaderViewElement()));
-        const origFullRange = ( new LineRange(
+        viewElements.push(( (new HeaderViewElement())));
+        const origFullRange = ( (new LineRange(
             Math.max(1, g[0].original.startLineNumber - viewElementGroupLineMargin),
             Math.min(g[g.length - 1].original.endLineNumberExclusive + viewElementGroupLineMargin, originalLineCount + 1)
-        ));
-        const modifiedFullRange = ( new LineRange(
+        )));
+        const modifiedFullRange = ( (new LineRange(
             Math.max(1, g[0].modified.startLineNumber - viewElementGroupLineMargin),
             Math.min(g[g.length - 1].modified.endLineNumberExclusive + viewElementGroupLineMargin, modifiedLineCount + 1)
-        ));
+        )));
         forEachAdjacent(g, (a, b) => {
-            const origRange = ( new LineRange(
+            const origRange = ( (new LineRange(
                 a ? a.original.endLineNumberExclusive : origFullRange.startLineNumber,
                 b ? b.original.startLineNumber : origFullRange.endLineNumberExclusive
-            ));
-            const modifiedRange = ( new LineRange(
+            )));
+            const modifiedRange = ( (new LineRange(
                 a ? a.modified.endLineNumberExclusive : modifiedFullRange.startLineNumber,
                 b ? b.modified.startLineNumber : modifiedFullRange.endLineNumberExclusive
-            ));
+            )));
             origRange.forEach(origLineNumber => {
-                viewElements.push(( new UnchangedLineViewElement(
+                viewElements.push(( (new UnchangedLineViewElement(
                     origLineNumber,
                     modifiedRange.startLineNumber + (origLineNumber - origRange.startLineNumber)
-                )));
+                ))));
             });
             if (b) {
                 b.original.forEach(origLineNumber => {
-                    viewElements.push(( new DeletedLineViewElement(b, origLineNumber)));
+                    viewElements.push(( (new DeletedLineViewElement(b, origLineNumber))));
                 });
                 b.modified.forEach(modifiedLineNumber => {
-                    viewElements.push(( new AddedLineViewElement(b, modifiedLineNumber)));
+                    viewElements.push(( (new AddedLineViewElement(b, modifiedLineNumber))));
                 });
             }
         });
         const modifiedRange = g[0].modified.join(g[g.length - 1].modified);
         const originalRange = g[0].original.join(g[g.length - 1].original);
-        result.push(( new ViewElementGroup(( new LineRangeMapping(modifiedRange, originalRange)), viewElements)));
+        result.push(( (new ViewElementGroup(
+             (new LineRangeMapping(modifiedRange, originalRange)),
+            viewElements
+        ))));
     }
     return result;
 }
 var LineType;
-( (function(LineType) {
+( ((function(LineType) {
     LineType[LineType["Header"] = 0] = "Header";
     LineType[LineType["Unchanged"] = 1] = "Unchanged";
     LineType[LineType["Deleted"] = 2] = "Deleted";
     LineType[LineType["Added"] = 3] = "Added";
-})(LineType || (LineType = {})));
+})(LineType || (LineType = {}))));
 class ViewElementGroup {
     constructor(range, lines) {
         this.range = range;
@@ -306,21 +298,17 @@ let View = class View extends Disposable {
         this.domNode.className = 'monaco-component diff-review monaco-editor-background';
         const actionBarContainer = document.createElement('div');
         actionBarContainer.className = 'diff-review-actions';
-        this._actionBar = this._register(( new ActionBar(actionBarContainer)));
+        this._actionBar = this._register(( (new ActionBar(actionBarContainer))));
         this._register(autorun(reader => {
             this._actionBar.clear();
             if (this._model.canClose.read(reader)) {
-                this._actionBar.push(( new Action('diffreview.close', ( localizeWithPath(
-                    'vs/editor/browser/widget/diffEditor/components/accessibleDiffViewer',
-                    'label.close',
-                    "Close"
-                )), 'close-diff-review ' + ThemeIcon.asClassName(accessibleDiffViewerCloseIcon), true, async () => _model.close())), { label: false, icon: true });
+                this._actionBar.push(( (new Action('diffreview.close', ( localizeWithPath(_moduleId, 3, "Close")), 'close-diff-review ' + ThemeIcon.asClassName(accessibleDiffViewerCloseIcon), true, async () => _model.close()))), { label: false, icon: true });
             }
         }));
         this._content = document.createElement('div');
         this._content.className = 'diff-review-content';
         this._content.setAttribute('role', 'code');
-        this._scrollbar = this._register(( new DomScrollableElement(this._content, {})));
+        this._scrollbar = this._register(( (new DomScrollableElement(this._content, {}))));
         reset(this.domNode, this._scrollbar.getDomNode(), actionBarContainer);
         this._register(autorun(r => {
             this._height.read(r);
@@ -367,11 +355,7 @@ let View = class View extends Disposable {
         const container = document.createElement('div');
         container.className = 'diff-review-table';
         container.setAttribute('role', 'list');
-        container.setAttribute('aria-label', ( localizeWithPath(
-            'vs/editor/browser/widget/diffEditor/components/accessibleDiffViewer',
-            'ariaLabel',
-            'Accessible Diff Viewer. Use arrow up and down to navigate.'
-        )));
+        container.setAttribute('aria-label', ( localizeWithPath(_moduleId, 4, 'Accessible Diff Viewer. Use arrow up and down to navigate.')));
         applyFontInfo(container, modifiedOptions.get(50 ));
         reset(this._content, container);
         const originalModel = this._models.getOriginalModel();
@@ -395,35 +379,22 @@ let View = class View extends Disposable {
                 const r = group.range;
                 const diffIndex = this._model.currentGroupIndex.get();
                 const diffsLength = this._model.groups.get().length;
-                const getAriaLines = (lines) => lines === 0 ? ( localizeWithPath(
-                    'vs/editor/browser/widget/diffEditor/components/accessibleDiffViewer',
-                    'no_lines_changed',
-                    "no lines changed"
-                ))
-                    : lines === 1 ? ( localizeWithPath(
-                    'vs/editor/browser/widget/diffEditor/components/accessibleDiffViewer',
-                    'one_line_changed',
-                    "1 line changed"
-                ))
-                        : ( localizeWithPath(
-                    'vs/editor/browser/widget/diffEditor/components/accessibleDiffViewer',
-                    'more_lines_changed',
-                    "{0} lines changed",
-                    lines
-                ));
+                const getAriaLines = (lines) => lines === 0 ? ( localizeWithPath(_moduleId, 5, "no lines changed"))
+                    : lines === 1 ? ( localizeWithPath(_moduleId, 6, "1 line changed"))
+                        : ( localizeWithPath(_moduleId, 7, "{0} lines changed", lines));
                 const originalChangedLinesCntAria = getAriaLines(r.original.length);
                 const modifiedChangedLinesCntAria = getAriaLines(r.modified.length);
-                header.setAttribute('aria-label', ( localizeWithPath('vs/editor/browser/widget/diffEditor/components/accessibleDiffViewer', {
-                    key: 'header',
-                    comment: [
-                        'This is the ARIA label for a git diff header.',
-                        'A git diff header looks like this: @@ -154,12 +159,39 @@.',
-                        'That encodes that at original line 154 (which is now line 159), 12 lines were removed/changed with 39 lines.',
-                        'Variables 0 and 1 refer to the diff index out of total number of diffs.',
-                        'Variables 2 and 4 will be numbers (a line number).',
-                        'Variables 3 and 5 will be "no lines changed", "1 line changed" or "X lines changed", localized separately.'
-                    ]
-                }, "Difference {0} of {1}: original line {2}, {3}, modified line {4}, {5}", (diffIndex + 1), diffsLength, r.original.startLineNumber, originalChangedLinesCntAria, r.modified.startLineNumber, modifiedChangedLinesCntAria)));
+                header.setAttribute('aria-label', ( localizeWithPath(
+                    _moduleId,
+                    8,
+                    "Difference {0} of {1}: original line {2}, {3}, modified line {4}, {5}",
+                    (diffIndex + 1),
+                    diffsLength,
+                    r.original.startLineNumber,
+                    originalChangedLinesCntAria,
+                    r.modified.startLineNumber,
+                    modifiedChangedLinesCntAria
+                )));
                 const cell = document.createElement('div');
                 cell.className = 'diff-review-cell diff-review-summary';
                 cell.appendChild(document.createTextNode(`${diffIndex + 1}/${diffsLength}: @@ -${r.original.startLineNumber},${r.original.length} +${r.modified.startLineNumber},${r.modified.length} @@`));
@@ -531,19 +502,15 @@ let View = class View extends Disposable {
             lineContent = originalModel.getLineContent(item.originalLineNumber);
         }
         if (lineContent.length === 0) {
-            lineContent = ( localizeWithPath(
-                'vs/editor/browser/widget/diffEditor/components/accessibleDiffViewer',
-                'blankLine',
-                "blank"
-            ));
+            lineContent = ( localizeWithPath(_moduleId, 9, "blank"));
         }
         let ariaLabel = '';
         switch (item.type) {
             case LineType.Unchanged:
                 if (item.originalLineNumber === item.modifiedLineNumber) {
                     ariaLabel = ( localizeWithPath(
-                        'vs/editor/browser/widget/diffEditor/components/accessibleDiffViewer',
-                        { key: 'unchangedLine', comment: ['The placeholders are contents of the line and should not be translated.'] },
+                        _moduleId,
+                        10,
                         "{0} unchanged line {1}",
                         lineContent,
                         item.originalLineNumber
@@ -551,8 +518,8 @@ let View = class View extends Disposable {
                 }
                 else {
                     ariaLabel = ( localizeWithPath(
-                        'vs/editor/browser/widget/diffEditor/components/accessibleDiffViewer',
-                        'equalLine',
+                        _moduleId,
+                        11,
                         "{0} original line {1} modified line {2}",
                         lineContent,
                         item.originalLineNumber,
@@ -562,8 +529,8 @@ let View = class View extends Disposable {
                 break;
             case LineType.Added:
                 ariaLabel = ( localizeWithPath(
-                    'vs/editor/browser/widget/diffEditor/components/accessibleDiffViewer',
-                    'insertLine',
+                    _moduleId,
+                    12,
                     "+ {0} modified line {1}",
                     lineContent,
                     item.modifiedLineNumber
@@ -571,8 +538,8 @@ let View = class View extends Disposable {
                 break;
             case LineType.Deleted:
                 ariaLabel = ( localizeWithPath(
-                    'vs/editor/browser/widget/diffEditor/components/accessibleDiffViewer',
-                    'deleteLine',
+                    _moduleId,
+                    13,
                     "- {0} original line {1}",
                     lineContent,
                     item.originalLineNumber
@@ -588,7 +555,7 @@ let View = class View extends Disposable {
         const lineTokens = LineTokens.createEmpty(lineContent, languageIdCodec);
         const isBasicASCII = ViewLineRenderingData.isBasicASCII(lineContent, model.mightContainNonBasicASCII());
         const containsRTL = ViewLineRenderingData.containsRTL(lineContent, isBasicASCII, model.mightContainRTL());
-        const r = renderViewLine2(( new RenderLineInput(
+        const r = renderViewLine2(( (new RenderLineInput(
             (fontInfo.isMonospace && !options.get(33 )),
             fontInfo.canUseHalfwidthRightwardsArrow,
             lineContent,
@@ -608,13 +575,13 @@ let View = class View extends Disposable {
             options.get(94 ),
             options.get(51 ) !== EditorFontLigatures.OFF,
             null
-        )));
+        ))));
         return r.html;
     }
 };
-View = ( __decorate([
-    ( __param(5, ILanguageService))
-], View));
+View = ( (__decorate([
+    ( (__param(5, ILanguageService)))
+], View)));
 class AccessibleDiffViewerModelFromEditors {
     constructor(editors) {
         this.editors = editors;

package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorDecorations.js

@@ -1,4 +1,5 @@
 import { Disposable } from '../../../../../base/common/lifecycle.js';
+import '../../../../../base/common/arrays.js';
 import { derived } from '../../../../../base/common/observableInternal/derived.js';
 import '../../../../../base/common/observableInternal/autorun.js';
 import '../../../../../base/common/observableInternal/utils.js';

package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorEditors.js

@@ -1,16 +1,19 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
-import { Emitter, Event } from '../../../../../base/common/event.js';
+import { Emitter } from '../../../../../base/common/event.js';
 import { Disposable } from '../../../../../base/common/lifecycle.js';
+import '../../../../../base/common/arrays.js';
 import { derivedOpts, derived } from '../../../../../base/common/observableInternal/derived.js';
 import { autorunHandleChanges } from '../../../../../base/common/observableInternal/autorun.js';
 import { observableFromEvent } from '../../../../../base/common/observableInternal/utils.js';
 import '../../../../../base/common/cancellation.js';
+import { obsCodeEditor } from '../../../observableUtilities.js';
 import { OverviewRulerFeature } from '../features/overviewRulerFeature.js';
 import { EditorOptions } from '../../../../common/config/editorOptions.js';
 import { Position } from '../../../../common/core/position.js';
 import { localizeWithPath } from '../../../../../nls.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.service.js';
+const _moduleId = "vs/editor/browser/widget/diffEditor/components/diffEditorEditors";
 let DiffEditorEditors = class DiffEditorEditors extends Disposable {
     get onDidContentSizeChange() { return this._onDidContentSizeChange.event; }
     constructor(originalEditorElement, modifiedEditorElement, _options, _argCodeEditorWidgetOptions, _createInnerEditor, _instantiationService, _keybindingService) {
@@ -24,15 +27,15 @@ let DiffEditorEditors = class DiffEditorEditors extends Disposable {
         this._keybindingService = _keybindingService;
         this.original = this._register(this._createLeftHandSideEditor(this._options.editorOptions.get(), this._argCodeEditorWidgetOptions.originalEditor || {}));
         this.modified = this._register(this._createRightHandSideEditor(this._options.editorOptions.get(), this._argCodeEditorWidgetOptions.modifiedEditor || {}));
-        this._onDidContentSizeChange = this._register(( new Emitter()));
+        this._onDidContentSizeChange = this._register(( (new Emitter())));
         this.modifiedScrollTop = observableFromEvent(this.modified.onDidScrollChange, () =>  this.modified.getScrollTop());
         this.modifiedScrollHeight = observableFromEvent(this.modified.onDidScrollChange, () =>  this.modified.getScrollHeight());
-        this.modifiedModel = observableFromEvent(this.modified.onDidChangeModel, () =>  this.modified.getModel());
+        this.modifiedModel = obsCodeEditor(this.modified).model;
         this.modifiedSelections = observableFromEvent(this.modified.onDidChangeCursorSelection, () => this.modified.getSelections() ?? []);
-        this.modifiedCursor = derivedOpts({ owner: this, equalityComparer: Position.equals }, reader => this.modifiedSelections.read(reader)[0]?.getPosition() ?? ( new Position(1, 1)));
-        this.originalCursor = observableFromEvent(this.original.onDidChangeCursorPosition, () => this.original.getPosition() ?? ( new Position(1, 1)));
-        this.isOriginalFocused = observableFromEvent(Event.any(this.original.onDidFocusEditorWidget, this.original.onDidBlurEditorWidget), () => this.original.hasWidgetFocus());
-        this.isModifiedFocused = observableFromEvent(Event.any(this.modified.onDidFocusEditorWidget, this.modified.onDidBlurEditorWidget), () => this.modified.hasWidgetFocus());
+        this.modifiedCursor = derivedOpts({ owner: this, equalsFn: Position.equals }, reader => this.modifiedSelections.read(reader)[0]?.getPosition() ?? ( (new Position(1, 1))));
+        this.originalCursor = observableFromEvent(this.original.onDidChangeCursorPosition, () => this.original.getPosition() ?? ( (new Position(1, 1))));
+        this.isOriginalFocused = obsCodeEditor(this.original).isFocused;
+        this.isModifiedFocused = obsCodeEditor(this.modified).isFocused;
         this.isFocused = derived(this, reader => this.isOriginalFocused.read(reader) || this.isModifiedFocused.read(reader));
         this._argCodeEditorWidgetOptions = null;
         this._register(autorunHandleChanges({
@@ -139,8 +142,8 @@ let DiffEditorEditors = class DiffEditorEditors extends Disposable {
             ariaLabel = '';
         }
         const ariaNavigationTip = ( localizeWithPath(
-            'vs/editor/browser/widget/diffEditor/components/diffEditorEditors',
-            'diff-aria-navigation-tip',
+            _moduleId,
+            0,
             ' use {0} to open the accessibility help.',
             this._keybindingService.lookupKeybinding('editor.action.accessibilityHelp')?.getAriaLabel()
         ));
@@ -153,8 +156,8 @@ let DiffEditorEditors = class DiffEditorEditors extends Disposable {
         return '';
     }
 };
-DiffEditorEditors = ( __decorate([
-    ( __param(5, IInstantiationService)),
-    ( __param(6, IKeybindingService))
-], DiffEditorEditors));
+DiffEditorEditors = ( (__decorate([
+    ( (__param(5, IInstantiationService))),
+    ( (__param(6, IKeybindingService)))
+], DiffEditorEditors)));
 export { DiffEditorEditors };

package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorSash.js

@@ -5,6 +5,7 @@ import { derived } from '../../../../../base/common/observableInternal/derived.j
 import { autorun } from '../../../../../base/common/observableInternal/autorun.js';
 import '../../../../../base/common/observableInternal/utils.js';
 import '../../../../../base/common/cancellation.js';
+import '../../../../../base/common/arrays.js';
 class DiffEditorSash extends Disposable {
     constructor(_options, _domNode, _dimensions, _sashes) {
         super();