@codingame/monaco-vscode-api 4.5.1 → 4.5.2

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

@@ -6,73 +6,58 @@ import { registerAction2, MenuRegistry, MenuId } from '../../../../platform/acti
 import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
 import { ContextKeyExpr, ContextKeyEqualsExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import './registrations.contribution.js';
+const _moduleId = "vs/editor/browser/widget/diffEditor/diffEditor.contribution";
 registerAction2(ToggleCollapseUnchangedRegions);
 registerAction2(ToggleShowMovedCodeBlocks);
 registerAction2(ToggleUseInlineViewWhenSpaceIsLimited);
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
     command: {
-        id: ( new ToggleUseInlineViewWhenSpaceIsLimited()).desc.id,
-        title: ( localizeWithPath(
-            'vs/editor/browser/widget/diffEditor/diffEditor.contribution',
-            'useInlineViewWhenSpaceIsLimited',
-            "Use Inline View When Space Is Limited"
-        )),
-        toggled: ( ContextKeyExpr.has('config.diffEditor.useInlineViewWhenSpaceIsLimited')),
-        precondition: ( ContextKeyExpr.has('isInDiffEditor')),
+        id: ( (new ToggleUseInlineViewWhenSpaceIsLimited())).desc.id,
+        title: ( localizeWithPath(_moduleId, 0, "Use Inline View When Space Is Limited")),
+        toggled: ( (ContextKeyExpr.has('config.diffEditor.useInlineViewWhenSpaceIsLimited'))),
+        precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
     },
     order: 11,
     group: '1_diff',
-    when: ( ContextKeyExpr.and(
+    when: ( (ContextKeyExpr.and(
         EditorContextKeys.diffEditorRenderSideBySideInlineBreakpointReached,
-        ( ContextKeyExpr.has('isInDiffEditor'))
-    )),
+         (ContextKeyExpr.has('isInDiffEditor'))
+    ))),
 });
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
     command: {
-        id: ( new ToggleShowMovedCodeBlocks()).desc.id,
-        title: ( localizeWithPath(
-            'vs/editor/browser/widget/diffEditor/diffEditor.contribution',
-            'showMoves',
-            "Show Moved Code Blocks"
-        )),
+        id: ( (new ToggleShowMovedCodeBlocks())).desc.id,
+        title: ( localizeWithPath(_moduleId, 1, "Show Moved Code Blocks")),
         icon: Codicon.move,
         toggled: ContextKeyEqualsExpr.create('config.diffEditor.experimental.showMoves', true),
-        precondition: ( ContextKeyExpr.has('isInDiffEditor')),
+        precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
     },
     order: 10,
     group: '1_diff',
-    when: ( ContextKeyExpr.has('isInDiffEditor')),
+    when: ( (ContextKeyExpr.has('isInDiffEditor'))),
 });
 registerAction2(RevertHunkOrSelection);
 for (const ctx of [
-    { icon: Codicon.arrowRight, key: ( EditorContextKeys.diffEditorInlineMode.toNegated()) },
+    { icon: Codicon.arrowRight, key: ( (EditorContextKeys.diffEditorInlineMode.toNegated())) },
     { icon: Codicon.discard, key: EditorContextKeys.diffEditorInlineMode }
 ]) {
     MenuRegistry.appendMenuItem(MenuId.DiffEditorHunkToolbar, {
         command: {
-            id: ( new RevertHunkOrSelection()).desc.id,
-            title: ( localizeWithPath(
-                'vs/editor/browser/widget/diffEditor/diffEditor.contribution',
-                'revertHunk',
-                "Revert Block"
-            )),
+            id: ( (new RevertHunkOrSelection())).desc.id,
+            title: ( localizeWithPath(_moduleId, 2, "Revert Block")),
             icon: ctx.icon,
         },
-        when: ( ContextKeyExpr.and(EditorContextKeys.diffEditorModifiedWritable, ctx.key)),
+        when: ( (ContextKeyExpr.and(EditorContextKeys.diffEditorModifiedWritable, ctx.key))),
         order: 5,
         group: 'primary',
     });
     MenuRegistry.appendMenuItem(MenuId.DiffEditorSelectionToolbar, {
         command: {
-            id: ( new RevertHunkOrSelection()).desc.id,
-            title: ( localizeWithPath(
-                'vs/editor/browser/widget/diffEditor/diffEditor.contribution',
-                'revertSelection',
-                "Revert Selection"
-            )),
+            id: ( (new RevertHunkOrSelection())).desc.id,
+            title: ( localizeWithPath(_moduleId, 3, "Revert Selection")),
             icon: ctx.icon,
         },
-        when: ( ContextKeyExpr.and(EditorContextKeys.diffEditorModifiedWritable, ctx.key)),
+        when: ( (ContextKeyExpr.and(EditorContextKeys.diffEditorModifiedWritable, ctx.key))),
         order: 5,
         group: 'primary',
     });
@@ -84,16 +69,15 @@ registerAction2(ShowAllUnchangedRegions);
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
     command: {
         id: AccessibleDiffViewerNext.id,
-        title: ( localizeWithPath(
-            'vs/editor/browser/widget/diffEditor/diffEditor.contribution',
-            'Open Accessible Diff Viewer',
-            "Open Accessible Diff Viewer"
-        )),
-        precondition: ( ContextKeyExpr.has('isInDiffEditor')),
+        title: ( localizeWithPath(_moduleId, 4, "Open Accessible Diff Viewer")),
+        precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
     },
     order: 10,
     group: '2_diff',
-    when: ( ContextKeyExpr.and(( EditorContextKeys.accessibleDiffViewerVisible.negate()), ( ContextKeyExpr.has('isInDiffEditor')))),
+    when: ( (ContextKeyExpr.and(
+         (EditorContextKeys.accessibleDiffViewerVisible.negate()),
+         (ContextKeyExpr.has('isInDiffEditor'))
+    ))),
 });
 CommandsRegistry.registerCommandAlias('editor.action.diffReview.next', AccessibleDiffViewerNext.id);
 registerAction2(AccessibleDiffViewerNext);

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

@@ -83,7 +83,7 @@ let WorkerBasedDocumentDiffProvider = class WorkerBasedDocumentDiffProvider {
             };
         }
         if (!result) {
-            throw new Error('no diff result available');
+            throw ( new Error('no diff result available'));
         }
         if (WorkerBasedDocumentDiffProvider_1.diffCache.size > 10) {
             WorkerBasedDocumentDiffProvider_1.diffCache.delete(( WorkerBasedDocumentDiffProvider_1.diffCache.keys()).next().value);

package/vscode/src/vs/editor/browser/widget/diffEditor/features/hideUnchangedRegionsFeature.js

@@ -19,6 +19,7 @@ import { SymbolKinds } from '../../../../common/languages.js';
 import { localizeWithPath } from '../../../../../nls.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 var HideUnchangedRegionsFeature_1;
+const _moduleId = "vs/editor/browser/widget/diffEditor/features/hideUnchangedRegionsFeature";
 let HideUnchangedRegionsFeature = class HideUnchangedRegionsFeature extends Disposable {
     static { HideUnchangedRegionsFeature_1 = this; }
     static { this._breadcrumbsSourceFactory = observableValue('breadcrumbsSourceFactory', undefined); }
@@ -62,13 +63,13 @@ let HideUnchangedRegionsFeature = class HideUnchangedRegionsFeature extends Disp
                 }
             });
         }));
-        const unchangedRegions = ( this._diffModel.map((m, reader) => {
+        const unchangedRegions = ( (this._diffModel.map((m, reader) => {
             const regions = m?.unchangedRegions.read(reader) ?? [];
             if (regions.length === 1 && regions[0].modifiedLineNumber === 1 && regions[0].lineCount === this._editors.modifiedModel.read(reader)?.getLineCount()) {
                 return [];
             }
             return regions;
-        }));
+        })));
         this.viewZones = derivedWithStore(this, (reader, store) => {
             const modifiedOutlineSource = this._modifiedOutlineSource.read(reader);
             if (!modifiedOutlineSource) {
@@ -84,9 +85,9 @@ let HideUnchangedRegionsFeature = class HideUnchangedRegionsFeature extends Disp
                 }
                 {
                     const d = derived(this, reader =>  r.getHiddenOriginalRange(reader).startLineNumber - 1);
-                    const origVz = ( new PlaceholderViewZone(d, 24));
+                    const origVz = ( (new PlaceholderViewZone(d, 24)));
                     origViewZones.push(origVz);
-                    store.add(( new CollapsedCodeOverlayWidget(
+                    store.add(( (new CollapsedCodeOverlayWidget(
                         this._editors.original,
                         origVz,
                         r,
@@ -95,13 +96,13 @@ let HideUnchangedRegionsFeature = class HideUnchangedRegionsFeature extends Disp
                         modifiedOutlineSource,
                         l => this._diffModel.get().ensureModifiedLineIsVisible(l, 2 , undefined),
                         this._options
-                    )));
+                    ))));
                 }
                 {
                     const d = derived(this, reader =>  r.getHiddenModifiedRange(reader).startLineNumber - 1);
-                    const modViewZone = ( new PlaceholderViewZone(d, 24));
+                    const modViewZone = ( (new PlaceholderViewZone(d, 24)));
                     modViewZones.push(modViewZone);
-                    store.add(( new CollapsedCodeOverlayWidget(
+                    store.add(( (new CollapsedCodeOverlayWidget(
                         this._editors.modified,
                         modViewZone,
                         r,
@@ -110,7 +111,7 @@ let HideUnchangedRegionsFeature = class HideUnchangedRegionsFeature extends Disp
                         modifiedOutlineSource,
                         l => this._diffModel.get().ensureModifiedLineIsVisible(l, 2 , undefined),
                         this._options
-                    )));
+                    ))));
                 }
             }
             return { origViewZones, modViewZones, };
@@ -122,25 +123,21 @@ let HideUnchangedRegionsFeature = class HideUnchangedRegionsFeature extends Disp
         };
         const unchangedLinesDecorationShow = {
             description: 'Fold Unchanged',
-            glyphMarginHoverMessage: ( new MarkdownString(undefined, { isTrusted: true, supportThemeIcons: true }))
-                .appendMarkdown(( localizeWithPath(
-                'vs/editor/browser/widget/diffEditor/features/hideUnchangedRegionsFeature',
-                'foldUnchanged',
-                'Fold Unchanged Region'
-            ))),
+            glyphMarginHoverMessage: ( (new MarkdownString(undefined, { isTrusted: true, supportThemeIcons: true })))
+                .appendMarkdown(( localizeWithPath(_moduleId, 0, 'Fold Unchanged Region'))),
             glyphMarginClassName: 'fold-unchanged ' + ThemeIcon.asClassName(Codicon.fold),
             zIndex: 10001,
         };
         this._register(applyObservableDecorations(this._editors.original, derived(this, reader => {
             const curUnchangedRegions = unchangedRegions.read(reader);
-            const result = ( curUnchangedRegions.map(r => ({
+            const result = ( (curUnchangedRegions.map(r => ({
                 range: r.originalUnchangedRange.toInclusiveRange(),
                 options: unchangedLinesDecoration,
-            })));
+            }))));
             for (const r of curUnchangedRegions) {
                 if (r.shouldHideControls(reader)) {
                     result.push({
-                        range: Range.fromPositions(( new Position(r.originalLineNumber, 1))),
+                        range: Range.fromPositions(( (new Position(r.originalLineNumber, 1)))),
                         options: unchangedLinesDecorationShow,
                     });
                 }
@@ -149,10 +146,10 @@ let HideUnchangedRegionsFeature = class HideUnchangedRegionsFeature extends Disp
         })));
         this._register(applyObservableDecorations(this._editors.modified, derived(this, reader => {
             const curUnchangedRegions = unchangedRegions.read(reader);
-            const result = ( curUnchangedRegions.map(r => ({
+            const result = ( (curUnchangedRegions.map(r => ({
                 range: r.modifiedUnchangedRange.toInclusiveRange(),
                 options: unchangedLinesDecoration,
-            })));
+            }))));
             for (const r of curUnchangedRegions) {
                 if (r.shouldHideControls(reader)) {
                     result.push({
@@ -167,8 +164,8 @@ let HideUnchangedRegionsFeature = class HideUnchangedRegionsFeature extends Disp
             const curUnchangedRegions = unchangedRegions.read(reader);
             this._isUpdatingHiddenAreas = true;
             try {
-                this._editors.original.setHiddenAreas(( curUnchangedRegions.map(r => r.getHiddenOriginalRange(reader).toInclusiveRange())).filter(isDefined));
-                this._editors.modified.setHiddenAreas(( curUnchangedRegions.map(r => r.getHiddenModifiedRange(reader).toInclusiveRange())).filter(isDefined));
+                this._editors.original.setHiddenAreas(( (curUnchangedRegions.map(r => r.getHiddenOriginalRange(reader).toInclusiveRange()))).filter(isDefined));
+                this._editors.modified.setHiddenAreas(( (curUnchangedRegions.map(r => r.getHiddenModifiedRange(reader).toInclusiveRange()))).filter(isDefined));
             }
             finally {
                 this._isUpdatingHiddenAreas = false;
@@ -208,9 +205,9 @@ let HideUnchangedRegionsFeature = class HideUnchangedRegionsFeature extends Disp
         }));
     }
 };
-HideUnchangedRegionsFeature = HideUnchangedRegionsFeature_1 = ( __decorate([
-    ( __param(3, IInstantiationService))
-], HideUnchangedRegionsFeature));
+HideUnchangedRegionsFeature = HideUnchangedRegionsFeature_1 = ( (__decorate([
+    ( (__param(3, IInstantiationService)))
+], HideUnchangedRegionsFeature)));
 class CollapsedCodeOverlayWidget extends ViewZoneOverlayWidget {
     constructor(_editor, _viewZone, _unchangedRegion, _unchangedRegionRange, _hide, _modifiedOutlineSource, _revealModifiedHiddenLine, _options) {
         const root = h('div.diff-hidden-lines-widget');
@@ -223,29 +220,17 @@ class CollapsedCodeOverlayWidget extends ViewZoneOverlayWidget {
         this._revealModifiedHiddenLine = _revealModifiedHiddenLine;
         this._options = _options;
         this._nodes = h('div.diff-hidden-lines', [
-            h('div.top@top', { title: ( localizeWithPath(
-                'vs/editor/browser/widget/diffEditor/features/hideUnchangedRegionsFeature',
-                'diff.hiddenLines.top',
-                'Click or drag to show more above'
-            )) }),
+            h('div.top@top', { title: ( localizeWithPath(_moduleId, 1, 'Click or drag to show more above')) }),
             h('div.center@content', { style: { display: 'flex' } }, [
-                h('div@first', { style: { display: 'flex', justifyContent: 'center', alignItems: 'center', flexShrink: '0' } }, [$('a', { title: ( localizeWithPath(
-                    'vs/editor/browser/widget/diffEditor/features/hideUnchangedRegionsFeature',
-                    'showUnchangedRegion',
-                    'Show Unchanged Region'
-                )), role: 'button', onclick: () => { this._unchangedRegion.showAll(undefined); } }, ...renderLabelWithIcons('$(unfold)'))]),
+                h('div@first', { style: { display: 'flex', justifyContent: 'center', alignItems: 'center', flexShrink: '0' } }, [$('a', { title: ( localizeWithPath(_moduleId, 2, 'Show Unchanged Region')), role: 'button', onclick: () => { this._unchangedRegion.showAll(undefined); } }, ...renderLabelWithIcons('$(unfold)'))]),
                 h('div@others', { style: { display: 'flex', justifyContent: 'center', alignItems: 'center' } }),
             ]),
-            h('div.bottom@bottom', { title: ( localizeWithPath(
-                'vs/editor/browser/widget/diffEditor/features/hideUnchangedRegionsFeature',
-                'diff.bottom',
-                'Click or drag to show more below'
-            )), role: 'button' }),
+            h('div.bottom@bottom', { title: ( localizeWithPath(_moduleId, 3, 'Click or drag to show more below')), role: 'button' }),
         ]);
         root.root.appendChild(this._nodes.root);
         const layoutInfo = observableFromEvent(this._editor.onDidLayoutChange, () => this._editor.getLayoutInfo());
         if (!this._hide) {
-            this._register(applyStyle(this._nodes.first, { width: ( layoutInfo.map((l) => l.contentLeft)) }));
+            this._register(applyStyle(this._nodes.first, { width: ( (layoutInfo.map((l) => l.contentLeft))) }));
         }
         else {
             reset(this._nodes.first);
@@ -351,17 +336,8 @@ class CollapsedCodeOverlayWidget extends ViewZoneOverlayWidget {
             const children = [];
             if (!this._hide) {
                 const lineCount = _unchangedRegion.getHiddenModifiedRange(reader).length;
-                const linesHiddenText = ( localizeWithPath(
-                    'vs/editor/browser/widget/diffEditor/features/hideUnchangedRegionsFeature',
-                    'hiddenLines',
-                    '{0} hidden lines',
-                    lineCount
-                ));
-                const span = $('span', { title: ( localizeWithPath(
-                    'vs/editor/browser/widget/diffEditor/features/hideUnchangedRegionsFeature',
-                    'diff.hiddenLines.expandAll',
-                    'Double click to unfold'
-                )) }, linesHiddenText);
+                const linesHiddenText = ( localizeWithPath(_moduleId, 4, '{0} hidden lines', lineCount));
+                const span = $('span', { title: ( localizeWithPath(_moduleId, 5, 'Double click to unfold')) }, linesHiddenText);
                 span.addEventListener('dblclick', e => {
                     if (e.button !== 0) {
                         return;

package/vscode/src/vs/editor/browser/widget/diffEditor/features/movedBlocksLinesFeature.js

@@ -14,6 +14,7 @@ import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { applyViewZones, ViewZoneOverlayWidget, applyStyle, PlaceholderViewZone } from '../utils.js';
 import { OffsetRangeSet, OffsetRange } from '../../../../common/core/offsetRange.js';
 import { localizeWithPath } from '../../../../../nls.js';
+const _moduleId = "vs/editor/browser/widget/diffEditor/features/movedBlocksLinesFeature";
 class MovedBlocksLinesFeature extends Disposable {
     static { this.movedCodeBlockPadding = 4; }
     constructor(_rootElement, _diffModel, _originalEditorLayoutInfo, _modifiedEditorLayoutInfo, _editors) {
@@ -46,7 +47,7 @@ class MovedBlocksLinesFeature extends Disposable {
             }
             this._modifiedViewZonesChangedSignal.read(reader);
             this._originalViewZonesChangedSignal.read(reader);
-            const lines = ( moves.map((move) => {
+            const lines = ( (moves.map((move) => {
                 function computeLineStart(range, editor) {
                     const t1 = editor.getTopForLineNumber(range.startLineNumber, true);
                     const t2 = editor.getTopForLineNumber(range.endLineNumberExclusive, true);
@@ -60,10 +61,10 @@ class MovedBlocksLinesFeature extends Disposable {
                 const to = end - endOffset;
                 const top = Math.min(start, end);
                 const bottom = Math.max(start, end);
-                return { range: ( new OffsetRange(top, bottom)), from, to, fromWithoutScroll: start, toWithoutScroll: end, move };
-            }));
+                return { range: ( (new OffsetRange(top, bottom))), from, to, fromWithoutScroll: start, toWithoutScroll: end, move };
+            })));
             lines.sort(tieBreakComparators(compareBy(l => l.fromWithoutScroll > l.toWithoutScroll, booleanComparator), compareBy(l => l.fromWithoutScroll > l.toWithoutScroll ? l.fromWithoutScroll : -l.toWithoutScroll, numberComparator)));
-            const layout = LinesLayout.compute(( lines.map(l => l.range)));
+            const layout = LinesLayout.compute(( (lines.map(l => l.range))));
             const padding = 10;
             const lineAreaLeft = infoOrig.verticalScrollbarWidth;
             const lineAreaWidth = (layout.getTrackCount() - 1) * 10 + padding * 2;
@@ -123,31 +124,37 @@ class MovedBlocksLinesFeature extends Disposable {
             if (!d) {
                 return [];
             }
-            return ( d.movedTexts.map(move => ({
-                move,
-                original: ( new PlaceholderViewZone(constObservable(move.lineRangeMapping.original.startLineNumber - 1), 18)),
-                modified: ( new PlaceholderViewZone(constObservable(move.lineRangeMapping.modified.startLineNumber - 1), 18)),
-            })));
+            return (
+                 (d.movedTexts.map(move => ({
+                    move,
+                    original: ( (new PlaceholderViewZone(constObservable(move.lineRangeMapping.original.startLineNumber - 1), 18))),
+                    modified: ( (new PlaceholderViewZone(constObservable(move.lineRangeMapping.modified.startLineNumber - 1), 18))),
+                })))
+            );
         });
-        this._register(applyViewZones(this._editors.original, ( movedBlockViewZones.map(zones => (  zones.map(z => z.original))))));
-        this._register(applyViewZones(this._editors.modified, ( movedBlockViewZones.map(zones => (  zones.map(z => z.modified))))));
+        this._register(applyViewZones(this._editors.original, ( (movedBlockViewZones.map(
+            zones => (  (zones.map(z => z.original)))
+        )))));
+        this._register(applyViewZones(this._editors.modified, ( (movedBlockViewZones.map(
+            zones => (  (zones.map(z => z.modified)))
+        )))));
         this._register(autorunWithStore((reader, store) => {
             const blocks = movedBlockViewZones.read(reader);
             for (const b of blocks) {
-                store.add(( new MovedBlockOverlayWidget(
+                store.add(( (new MovedBlockOverlayWidget(
                     this._editors.original,
                     b.original,
                     b.move,
                     'original',
                     this._diffModel.get()
-                )));
-                store.add(( new MovedBlockOverlayWidget(
+                ))));
+                store.add(( (new MovedBlockOverlayWidget(
                     this._editors.modified,
                     b.modified,
                     b.move,
                     'modified',
                     this._diffModel.get()
-                )));
+                ))));
             }
         }));
         const originalHasFocus = observableSignalFromEvent('original.onDidFocusEditorWidget', e => this._editors.original.onDidFocusEditorWidget(() => setTimeout(() => e(undefined), 0)));
@@ -205,13 +212,15 @@ class LinesLayout {
                 }
                 else {
                     trackIdx = setsPerTrack.length;
-                    setsPerTrack.push(( new OffsetRangeSet()));
+                    setsPerTrack.push(( (new OffsetRangeSet())));
                 }
             }
             setsPerTrack[trackIdx].addRange(line);
             trackPerLineIdx.push(trackIdx);
         }
-        return ( new LinesLayout(setsPerTrack.length, trackPerLineIdx));
+        return (
+             (new LinesLayout(setsPerTrack.length, trackPerLineIdx))
+        );
     }
     constructor(_trackCount, trackPerLineIdx) {
         this._trackCount = _trackCount;
@@ -239,19 +248,19 @@ class MovedBlockOverlayWidget extends ViewZoneOverlayWidget {
         root.root.appendChild(this._nodes.root);
         const editorLayout = observableFromEvent(this._editor.onDidLayoutChange, () => this._editor.getLayoutInfo());
         this._register(applyStyle(this._nodes.root, {
-            paddingRight: ( editorLayout.map(l => l.verticalScrollbarWidth))
+            paddingRight: ( (editorLayout.map(l => l.verticalScrollbarWidth)))
         }));
         let text;
         if (_move.changes.length > 0) {
             text = this._kind === 'original' ? ( localizeWithPath(
-                'vs/editor/browser/widget/diffEditor/features/movedBlocksLinesFeature',
-                'codeMovedToWithChanges',
+                _moduleId,
+                0,
                 'Code moved with changes to line {0}-{1}',
                 this._move.lineRangeMapping.modified.startLineNumber,
                 this._move.lineRangeMapping.modified.endLineNumberExclusive - 1
             )) : ( localizeWithPath(
-                'vs/editor/browser/widget/diffEditor/features/movedBlocksLinesFeature',
-                'codeMovedFromWithChanges',
+                _moduleId,
+                1,
                 'Code moved with changes from line {0}-{1}',
                 this._move.lineRangeMapping.original.startLineNumber,
                 this._move.lineRangeMapping.original.endLineNumberExclusive - 1
@@ -259,25 +268,25 @@ class MovedBlockOverlayWidget extends ViewZoneOverlayWidget {
         }
         else {
             text = this._kind === 'original' ? ( localizeWithPath(
-                'vs/editor/browser/widget/diffEditor/features/movedBlocksLinesFeature',
-                'codeMovedTo',
+                _moduleId,
+                2,
                 'Code moved to line {0}-{1}',
                 this._move.lineRangeMapping.modified.startLineNumber,
                 this._move.lineRangeMapping.modified.endLineNumberExclusive - 1
             )) : ( localizeWithPath(
-                'vs/editor/browser/widget/diffEditor/features/movedBlocksLinesFeature',
-                'codeMovedFrom',
+                _moduleId,
+                3,
                 'Code moved from line {0}-{1}',
                 this._move.lineRangeMapping.original.startLineNumber,
                 this._move.lineRangeMapping.original.endLineNumberExclusive - 1
             ));
         }
-        const actionBar = this._register(( new ActionBar(this._nodes.actionBar, {
+        const actionBar = this._register(( (new ActionBar(this._nodes.actionBar, {
             highlightToggledItems: true,
-        })));
-        const caption = ( new Action('', text, '', false));
+        }))));
+        const caption = ( (new Action('', text, '', false)));
         actionBar.push(caption, { icon: false, label: true });
-        const actionCompare = ( new Action(
+        const actionCompare = ( (new Action(
             '',
             'Compare',
             ThemeIcon.asClassName(Codicon.compareChanges),
@@ -286,7 +295,7 @@ class MovedBlockOverlayWidget extends ViewZoneOverlayWidget {
                 this._editor.focus();
                 this._diffModel.movedTextToCompare.set(this._diffModel.movedTextToCompare.get() === _move ? undefined : this._move, undefined);
             }
-        ));
+        )));
         this._register(autorun(reader => {
             const isActive = this._diffModel.movedTextToCompare.read(reader) === _move;
             actionCompare.checked = isActive;

package/vscode/src/vs/editor/browser/widget/diffEditor/features/revertButtonsFeature.js

@@ -11,6 +11,7 @@ import { Range } from '../../../../common/core/range.js';
 import { LineRangeMapping } from '../../../../common/diff/rangeMapping.js';
 import { GlyphMarginLane } from '../../../../common/model.js';
 import { localizeWithPath } from '../../../../../nls.js';
+const _moduleId = "vs/editor/browser/widget/diffEditor/features/revertButtonsFeature";
 const emptyArr = [];
 class RevertButtonsFeature extends Disposable {
     constructor(_editors, _diffModel, _options, _widget) {
@@ -29,12 +30,12 @@ class RevertButtonsFeature extends Disposable {
             if (selections.every(s => s.isEmpty())) {
                 return emptyArr;
             }
-            const selectedLineNumbers = ( new LineRangeSet(( selections.map(s => LineRange.fromRangeInclusive(s)))));
+            const selectedLineNumbers = ( (new LineRangeSet( (selections.map(s => LineRange.fromRangeInclusive(s))))));
             const selectedMappings = diff.mappings.filter(m => m.lineRangeMapping.innerChanges && selectedLineNumbers.intersects(m.lineRangeMapping.modified));
-            const result = ( selectedMappings.map(mapping => ({
+            const result = ( (selectedMappings.map(mapping => ({
                 mapping,
-                rangeMappings: mapping.lineRangeMapping.innerChanges.filter(c => ( selections.some(s => Range.areIntersecting(c.modifiedRange, s))))
-            })));
+                rangeMappings: mapping.lineRangeMapping.innerChanges.filter(c => ( (selections.some(s => Range.areIntersecting(c.modifiedRange, s)))))
+            }))));
             if (result.length === 0 || result.every(r => r.rangeMappings.length === 0)) {
                 return emptyArr;
             }
@@ -54,29 +55,29 @@ class RevertButtonsFeature extends Disposable {
             }
             const glyphWidgetsModified = [];
             const selectedDiffs = this._selectedDiffs.read(reader);
-            const selectedDiffsSet = ( new Set(( selectedDiffs.map(d => d.mapping))));
+            const selectedDiffsSet = ( (new Set( (selectedDiffs.map(d => d.mapping)))));
             if (selectedDiffs.length > 0) {
                 const selections = this._editors.modifiedSelections.read(reader);
-                const btn = store.add(( new RevertButton(
+                const btn = store.add(( (new RevertButton(
                     selections[selections.length - 1].positionLineNumber,
                     this._widget,
                     selectedDiffs.flatMap(d => d.rangeMappings),
                     true
-                )));
+                ))));
                 this._editors.modified.addGlyphMarginWidget(btn);
                 glyphWidgetsModified.push(btn);
             }
             for (const m of diff.mappings) {
-                if (( selectedDiffsSet.has(m))) {
+                if (( (selectedDiffsSet.has(m)))) {
                     continue;
                 }
                 if (!m.lineRangeMapping.modified.isEmpty && m.lineRangeMapping.innerChanges) {
-                    const btn = store.add(( new RevertButton(
+                    const btn = store.add(( (new RevertButton(
                         m.lineRangeMapping.modified.startLineNumber,
                         this._widget,
                         m.lineRangeMapping,
                         false
-                    )));
+                    ))));
                     this._editors.modified.addGlyphMarginWidget(btn);
                     glyphWidgetsModified.push(btn);
                 }
@@ -101,16 +102,8 @@ class RevertButton extends Disposable {
         this._id = `revertButton${RevertButton.counter++}`;
         this._domNode = h('div.revertButton', {
             title: this._revertSelection
-                ? ( localizeWithPath(
-                'vs/editor/browser/widget/diffEditor/features/revertButtonsFeature',
-                'revertSelectedChanges',
-                'Revert Selected Changes'
-            ))
-                : ( localizeWithPath(
-                'vs/editor/browser/widget/diffEditor/features/revertButtonsFeature',
-                'revertChange',
-                'Revert Change'
-            ))
+                ? ( localizeWithPath(_moduleId, 0, 'Revert Selected Changes'))
+                : ( localizeWithPath(_moduleId, 1, 'Revert Change'))
         }, [renderIcon(Codicon.arrowRight)]).root;
         this._register(addDisposableListener(this._domNode, EventType.MOUSE_DOWN, e => {
             if (e.button !== 2) {

package/vscode/src/vs/editor/browser/widget/diffEditor/registrations.contribution.js

@@ -14,31 +14,20 @@ import '../../../../platform/theme/common/colors/miscColors.js';
 import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
+const _moduleId = "vs/editor/browser/widget/diffEditor/registrations.contribution";
 registerColor('diffEditor.move.border', { dark: '#8b8b8b9c', light: '#8b8b8b9c', hcDark: '#8b8b8b9c', hcLight: '#8b8b8b9c', }, ( localizeWithPath(
-    'vs/editor/browser/widget/diffEditor/registrations.contribution',
-    'diffEditor.move.border',
+    _moduleId,
+    0,
     'The border color for text that got moved in the diff editor.'
 )));
 registerColor('diffEditor.moveActive.border', { dark: '#FFA500', light: '#FFA500', hcDark: '#FFA500', hcLight: '#FFA500', }, ( localizeWithPath(
-    'vs/editor/browser/widget/diffEditor/registrations.contribution',
-    'diffEditor.moveActive.border',
+    _moduleId,
+    1,
     'The active border color for text that got moved in the diff editor.'
 )));
-registerColor('diffEditor.unchangedRegionShadow', { dark: '#000000', light: '#737373BF', hcDark: '#000000', hcLight: '#737373BF', }, ( localizeWithPath(
-    'vs/editor/browser/widget/diffEditor/registrations.contribution',
-    'diffEditor.unchangedRegionShadow',
-    'The color of the shadow around unchanged region widgets.'
-)));
-const diffInsertIcon = registerIcon('diff-insert', Codicon.add, ( localizeWithPath(
-    'vs/editor/browser/widget/diffEditor/registrations.contribution',
-    'diffInsertIcon',
-    'Line decoration for inserts in the diff editor.'
-)));
-const diffRemoveIcon = registerIcon('diff-remove', Codicon.remove, ( localizeWithPath(
-    'vs/editor/browser/widget/diffEditor/registrations.contribution',
-    'diffRemoveIcon',
-    'Line decoration for removals in the diff editor.'
-)));
+registerColor('diffEditor.unchangedRegionShadow', { dark: '#000000', light: '#737373BF', hcDark: '#000000', hcLight: '#737373BF', }, ( localizeWithPath(_moduleId, 2, 'The color of the shadow around unchanged region widgets.')));
+const diffInsertIcon = registerIcon('diff-insert', Codicon.add, ( localizeWithPath(_moduleId, 3, 'Line decoration for inserts in the diff editor.')));
+const diffRemoveIcon = registerIcon('diff-remove', Codicon.remove, ( localizeWithPath(_moduleId, 4, 'Line decoration for removals in the diff editor.')));
 const diffLineAddDecorationBackgroundWithIndicator = ModelDecorationOptions.register({
     className: 'line-insert',
     description: 'line-insert',

package/vscode/src/vs/editor/browser/widget/multiDiffEditor/colors.js

@@ -10,18 +10,7 @@ import '../../../../platform/theme/common/colors/minimapColors.js';
 import '../../../../platform/theme/common/colors/miscColors.js';
 import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
-registerColor('multiDiffEditor.headerBackground', { dark: '#262626', light: 'tab.inactiveBackground', hcDark: 'tab.inactiveBackground', hcLight: 'tab.inactiveBackground', }, ( localizeWithPath(
- 'vs/editor/browser/widget/multiDiffEditor/colors',
- 'multiDiffEditor.headerBackground',
- 'The background color of the diff editor\'s header'
-)));
-registerColor('multiDiffEditor.background', { dark: 'editorBackground', light: 'editorBackground', hcDark: 'editorBackground', hcLight: 'editorBackground', }, ( localizeWithPath(
- 'vs/editor/browser/widget/multiDiffEditor/colors',
- 'multiDiffEditor.background',
- 'The background color of the multi file diff editor'
-)));
-registerColor('multiDiffEditor.border', { dark: 'sideBarSectionHeader.border', light: '#cccccc', hcDark: 'sideBarSectionHeader.border', hcLight: '#cccccc', }, ( localizeWithPath(
- 'vs/editor/browser/widget/multiDiffEditor/colors',
- 'multiDiffEditor.border',
- 'The border color of the multi file diff editor'
-)));
+const _moduleId = "vs/editor/browser/widget/multiDiffEditor/colors";
+registerColor('multiDiffEditor.headerBackground', { dark: '#262626', light: 'tab.inactiveBackground', hcDark: 'tab.inactiveBackground', hcLight: 'tab.inactiveBackground', }, ( localizeWithPath(_moduleId, 0, 'The background color of the diff editor\'s header')));
+registerColor('multiDiffEditor.background', { dark: 'editorBackground', light: 'editorBackground', hcDark: 'editorBackground', hcLight: 'editorBackground', }, ( localizeWithPath(_moduleId, 1, 'The background color of the multi file diff editor')));
+registerColor('multiDiffEditor.border', { dark: 'sideBarSectionHeader.border', light: '#cccccc', hcDark: 'sideBarSectionHeader.border', hcLight: '#cccccc', }, ( localizeWithPath(_moduleId, 2, 'The border color of the multi file diff editor')));

package/vscode/src/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidgetImpl.js

@@ -153,7 +153,7 @@ let MultiDiffEditorWidgetImpl = class MultiDiffEditorWidgetImpl extends Disposab
         const index = viewItems.findIndex((item) => item.viewModel.originalUri?.toString() === resource.original?.toString()
             && item.viewModel.modifiedUri?.toString() === resource.modified?.toString());
         if (index === -1) {
-            throw new BugIndicatingError('Resource not found in diff editor');
+            throw ( new BugIndicatingError('Resource not found in diff editor'));
         }
         let scrollTop = 0;
         for (let i = 0; i < index; i++) {