@codingame/monaco-vscode-api 8.0.4 → 9.0.0

package/vscode/src/vs/editor/browser/view/viewLayer.js

@@ -4,8 +4,8 @@ import { BugIndicatingError } from '../../../base/common/errors.js';
 import { EditorOption } from '../../common/config/editorOptions.js';
 import { StringBuilder } from '../../common/core/stringBuilder.js';
 class RenderedLinesCollection {
-    constructor(createLine) {
-        this._createLine = createLine;
+    constructor(_lineFactory) {
+        this._lineFactory = _lineFactory;
         this._set(1, []);
     }
     flush() {
@@ -114,7 +114,7 @@ class RenderedLinesCollection {
         }
         const newLines = [];
         for (let i = 0; i < insertCnt; i++) {
-            newLines[i] = this._createLine();
+            newLines[i] = this._lineFactory.createLine();
         }
         const insertIndex = insertFromLineNumber - this._rendLineNumberStart;
         const beforeLines = this._lines.slice(0, insertIndex);
@@ -147,10 +147,10 @@ class RenderedLinesCollection {
     }
 }
 class VisibleLinesCollection {
-    constructor(host) {
-        this._host = host;
+    constructor(_lineFactory) {
+        this._lineFactory = _lineFactory;
         this.domNode = this._createDomNode();
-        this._linesCollection = ( new RenderedLinesCollection(() => this._host.createVisibleLine()));
+        this._linesCollection = ( new RenderedLinesCollection(this._lineFactory));
     }
     _createDomNode() {
         const domNode = createFastDomNode(document.createElement('div'));
@@ -213,7 +213,7 @@ class VisibleLinesCollection {
     }
     renderLines(viewportData) {
         const inp = this._linesCollection._get();
-        const renderer = ( new ViewLayerRenderer(this.domNode.domNode, this._host, viewportData));
+        const renderer = ( new ViewLayerRenderer(this.domNode.domNode, this._lineFactory, viewportData));
         const ctx = {
             rendLineNumberStart: inp.rendLineNumberStart,
             lines: inp.lines,
@@ -225,10 +225,10 @@ class VisibleLinesCollection {
 }
 class ViewLayerRenderer {
     static { this._ttPolicy = createTrustedTypesPolicy('editorViewLayer', { createHTML: value => value }); }
-    constructor(domNode, host, viewportData) {
-        this.domNode = domNode;
-        this.host = host;
-        this.viewportData = viewportData;
+    constructor(_domNode, _lineFactory, _viewportData) {
+        this._domNode = _domNode;
+        this._lineFactory = _lineFactory;
+        this._viewportData = _viewportData;
     }
     render(inContext, startLineNumber, stopLineNumber, deltaTop) {
         const ctx = {
@@ -241,7 +241,7 @@ class ViewLayerRenderer {
             ctx.linesLength = stopLineNumber - startLineNumber + 1;
             ctx.lines = [];
             for (let x = startLineNumber; x <= stopLineNumber; x++) {
-                ctx.lines[x - startLineNumber] = this.host.createVisibleLine();
+                ctx.lines[x - startLineNumber] = this._lineFactory.createLine();
             }
             this._finishRendering(ctx, true, deltaTop);
             return ctx;
@@ -288,14 +288,14 @@ class ViewLayerRenderer {
         const lines = ctx.lines;
         for (let i = startIndex; i <= endIndex; i++) {
             const lineNumber = rendLineNumberStart + i;
-            lines[i].layoutLine(lineNumber, deltaTop[lineNumber - deltaLN], this.viewportData.lineHeight);
+            lines[i].layoutLine(lineNumber, deltaTop[lineNumber - deltaLN], this._viewportData.lineHeight);
         }
     }
     _insertLinesBefore(ctx, fromLineNumber, toLineNumber, deltaTop, deltaLN) {
         const newLines = [];
         let newLinesLen = 0;
         for (let lineNumber = fromLineNumber; lineNumber <= toLineNumber; lineNumber++) {
-            newLines[newLinesLen++] = this.host.createVisibleLine();
+            newLines[newLinesLen++] = this._lineFactory.createLine();
         }
         ctx.lines = newLines.concat(ctx.lines);
     }
@@ -310,7 +310,7 @@ class ViewLayerRenderer {
         const newLines = [];
         let newLinesLen = 0;
         for (let lineNumber = fromLineNumber; lineNumber <= toLineNumber; lineNumber++) {
-            newLines[newLinesLen++] = this.host.createVisibleLine();
+            newLines[newLinesLen++] = this._lineFactory.createLine();
         }
         ctx.lines = ctx.lines.concat(newLines);
     }
@@ -326,14 +326,14 @@ class ViewLayerRenderer {
         if (ViewLayerRenderer._ttPolicy) {
             newLinesHTML = ViewLayerRenderer._ttPolicy.createHTML(newLinesHTML);
         }
-        const lastChild = this.domNode.lastChild;
+        const lastChild = this._domNode.lastChild;
         if (domNodeIsEmpty || !lastChild) {
-            this.domNode.innerHTML = newLinesHTML;
+            this._domNode.innerHTML = newLinesHTML;
         }
         else {
             lastChild.insertAdjacentHTML('afterend', newLinesHTML);
         }
-        let currChild = this.domNode.lastChild;
+        let currChild = this._domNode.lastChild;
         for (let i = ctx.linesLength - 1; i >= 0; i--) {
             const line = ctx.lines[i];
             if (wasNew[i]) {
@@ -375,7 +375,7 @@ class ViewLayerRenderer {
                 if (lineDomNode) {
                     continue;
                 }
-                const renderResult = line.renderLine(i + rendLineNumberStart, deltaTop[i], this.viewportData.lineHeight, this.viewportData, sb);
+                const renderResult = line.renderLine(i + rendLineNumberStart, deltaTop[i], this._viewportData.lineHeight, this._viewportData, sb);
                 if (!renderResult) {
                     continue;
                 }
@@ -396,7 +396,7 @@ class ViewLayerRenderer {
                 if (wasNew[i]) {
                     continue;
                 }
-                const renderResult = line.renderLine(i + rendLineNumberStart, deltaTop[i], this.viewportData.lineHeight, this.viewportData, sb);
+                const renderResult = line.renderLine(i + rendLineNumberStart, deltaTop[i], this._viewportData.lineHeight, this._viewportData, sb);
                 if (!renderResult) {
                     continue;
                 }

package/vscode/src/vs/editor/browser/view/viewOverlays.js

@@ -6,13 +6,15 @@ import { EditorOption } from '../../common/config/editorOptions.js';
 class ViewOverlays extends ViewPart {
     constructor(context) {
         super(context);
-        this._visibleLines = ( new VisibleLinesCollection(this));
+        this._dynamicOverlays = [];
+        this._isFocused = false;
+        this._visibleLines = ( new VisibleLinesCollection({
+            createLine: () => ( new ViewOverlayLine(this._dynamicOverlays))
+        }));
         this.domNode = this._visibleLines.domNode;
         const options = this._context.configuration.options;
         const fontInfo = options.get(EditorOption.fontInfo);
         applyFontInfo(this.domNode, fontInfo);
-        this._dynamicOverlays = [];
-        this._isFocused = false;
         this.domNode.setClassName('view-overlays');
     }
     shouldRender() {
@@ -38,9 +40,6 @@ class ViewOverlays extends ViewPart {
     getDomNode() {
         return this.domNode;
     }
-    createVisibleLine() {
-        return ( new ViewOverlayLine(this._dynamicOverlays));
-    }
     addDynamicOverlay(overlay) {
         this._dynamicOverlays.push(overlay);
     }

package/vscode/src/vs/editor/browser/view.js

@@ -51,7 +51,6 @@ let View = class View extends ViewEventHandler {
         this._shouldRecomputeGlyphMarginLanes = false;
         this._selections = [( new Selection(1, 1, 1, 1))];
         this._renderAnimationFrame = null;
-        this._overflowWidgetsDomNode = overflowWidgetsDomNode ?? null;
         const viewController = ( new ViewController(configuration, model, userInputEvents, commandDelegate));
         this._context = ( new ViewContext(configuration, colorTheme, model));
         this._context.addEventHandler(this);
@@ -168,7 +167,6 @@ let View = class View extends ViewEventHandler {
     _createPointerHandlerHelper() {
         return {
             viewDomNode: this.domNode.domNode,
-            overflowWidgetsDomNode: this._overflowWidgetsDomNode,
             linesContentDomNode: this._linesContent.domNode,
             viewLinesDomNode: this._viewLines.getDomNode().domNode,
             focusTextArea: () => {
@@ -275,7 +273,7 @@ let View = class View extends ViewEventHandler {
         if (this._renderAnimationFrame === null) {
             const rendering = this._createCoordinatedRendering();
             this._renderAnimationFrame = EditorRenderingCoordinator.INSTANCE.scheduleCoordinatedRendering({
-                window: getWindow(this.domNode.domNode),
+                window: getWindow(this.domNode?.domNode),
                 prepareRenderText: () => {
                     if (this._store.isDisposed) {
                         throw ( new BugIndicatingError());

package/vscode/src/vs/editor/browser/viewParts/lines/viewLines.js

@@ -62,10 +62,6 @@ class ViewLines extends ViewPart {
     static { this.HORIZONTAL_EXTRA_PX = 30; }
     constructor(context, linesContent) {
         super(context);
-        this._linesContent = linesContent;
-        this._textRangeRestingSpot = document.createElement('div');
-        this._visibleLines = ( new VisibleLinesCollection(this));
-        this.domNode = this._visibleLines.domNode;
         const conf = this._context.configuration;
         const options = this._context.configuration.options;
         const fontInfo = options.get(EditorOption.fontInfo);
@@ -78,6 +74,12 @@ class ViewLines extends ViewPart {
         this._cursorSurroundingLinesStyle = options.get(EditorOption.cursorSurroundingLinesStyle);
         this._canUseLayerHinting = !options.get(EditorOption.disableLayerHinting);
         this._viewLineOptions = ( new ViewLineOptions(conf, this._context.theme.type));
+        this._linesContent = linesContent;
+        this._textRangeRestingSpot = document.createElement('div');
+        this._visibleLines = ( new VisibleLinesCollection({
+            createLine: () => ( new ViewLine(this._viewLineOptions)),
+        }));
+        this.domNode = this._visibleLines.domNode;
         PartFingerprints.write(this.domNode, PartFingerprint.ViewLines);
         this.domNode.setClassName(`view-lines ${MOUSE_CURSOR_TEXT_CSS_CLASS_NAME}`);
         applyFontInfo(this.domNode, fontInfo);
@@ -101,9 +103,6 @@ class ViewLines extends ViewPart {
     getDomNode() {
         return this.domNode;
     }
-    createVisibleLine() {
-        return ( new ViewLine(this._viewLineOptions));
-    }
     onConfigurationChanged(e) {
         this._visibleLines.onConfigurationChanged(e);
         if (e.hasChanged(EditorOption.wrappingInfo)) {
@@ -519,13 +518,10 @@ class ViewLines extends ViewPart {
         let paddingTop = 0;
         let paddingBottom = 0;
         if (!shouldIgnoreScrollOff) {
-            const context = Math.min((viewportHeight / this._lineHeight) / 2, this._cursorSurroundingLines);
-            if (this._stickyScrollEnabled) {
-                paddingTop = Math.max(context, this._maxNumberStickyLines) * this._lineHeight;
-            }
-            else {
-                paddingTop = context * this._lineHeight;
-            }
+            const maxLinesInViewport = (viewportHeight / this._lineHeight);
+            const surroundingLines = Math.max(this._cursorSurroundingLines, this._stickyScrollEnabled ? this._maxNumberStickyLines : 0);
+            const context = Math.min(maxLinesInViewport / 2, surroundingLines);
+            paddingTop = context * this._lineHeight;
             paddingBottom = Math.max(0, (context - 1)) * this._lineHeight;
         }
         else {

package/vscode/src/vs/editor/browser/viewParts/minimap/minimap.js

@@ -313,7 +313,9 @@ class RenderData {
     constructor(renderedLayout, imageData, lines) {
         this.renderedLayout = renderedLayout;
         this._imageData = imageData;
-        this._renderedLines = ( new RenderedLinesCollection(() => MinimapLine.INVALID));
+        this._renderedLines = ( new RenderedLinesCollection({
+            createLine: () => MinimapLine.INVALID
+        }));
         this._renderedLines._set(renderedLayout.startLineNumber, lines);
     }
     linesEquals(layout) {

package/vscode/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.js

@@ -440,7 +440,8 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
         if (!this._modelData) {
             return -1;
         }
-        return CodeEditorWidget_1._getVerticalOffsetAfterPosition(this._modelData, lineNumber, 1, includeViewZones);
+        const maxCol = this._modelData.model.getLineMaxColumn(lineNumber);
+        return CodeEditorWidget_1._getVerticalOffsetAfterPosition(this._modelData, lineNumber, maxCol, includeViewZones);
     }
     setHiddenAreas(ranges, source) {
         this._modelData?.viewModel.setHiddenAreas(( (ranges.map(r => Range.lift(r)))), source);
@@ -1302,7 +1303,7 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
                     if (e.reachedMaxCursorCount) {
                         const multiCursorLimit = this.getOption(EditorOption.multiCursorLimit);
                         const message = ( localize(
-                            1335,
+                            1333,
                             "The number of cursors has been limited to {0}. Consider using [find and replace](https://code.visualstudio.com/docs/editor/codebasics#_find-and-replace) for larger changes or increase the editor multi cursor limit setting.",
                             multiCursorLimit
                         ));
@@ -1314,7 +1315,7 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
                                 }
                             },
                             {
-                                label: ( localize(1336, 'Increase Multi Cursor Limit')),
+                                label: ( localize(1334, 'Increase Multi Cursor Limit')),
                                 run: () => {
                                     this._commandService.executeCommand('workbench.action.openSettings2', {
                                         query: 'editor.multiCursorLimit'

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

@@ -15,7 +15,7 @@ class ToggleCollapseUnchangedRegions extends Action2 {
     constructor() {
         super({
             id: 'diffEditor.toggleCollapseUnchangedRegions',
-            title: ( localize2(4976, 'Toggle Collapse Unchanged Regions')),
+            title: ( localize2(4956, 'Toggle Collapse Unchanged Regions')),
             icon: Codicon.map,
             toggled: ( (ContextKeyExpr.has('config.diffEditor.hideUnchangedRegions.enabled'))),
             precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
@@ -37,7 +37,7 @@ class ToggleShowMovedCodeBlocks extends Action2 {
     constructor() {
         super({
             id: 'diffEditor.toggleShowMovedCodeBlocks',
-            title: ( localize2(4977, 'Toggle Show Moved Code Blocks')),
+            title: ( localize2(4957, 'Toggle Show Moved Code Blocks')),
             precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
         });
     }
@@ -51,7 +51,7 @@ class ToggleUseInlineViewWhenSpaceIsLimited extends Action2 {
     constructor() {
         super({
             id: 'diffEditor.toggleUseInlineViewWhenSpaceIsLimited',
-            title: ( localize2(4978, 'Toggle Use Inline View When Space Is Limited')),
+            title: ( localize2(4958, 'Toggle Use Inline View When Space Is Limited')),
             precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
         });
     }
@@ -61,12 +61,12 @@ class ToggleUseInlineViewWhenSpaceIsLimited extends Action2 {
         configurationService.updateValue('diffEditor.useInlineViewWhenSpaceIsLimited', newValue);
     }
 }
-const diffEditorCategory = ( localize2(4979, "Diff Editor"));
+const diffEditorCategory = ( localize2(4959, "Diff Editor"));
 class SwitchSide extends EditorAction2 {
     constructor() {
         super({
             id: 'diffEditor.switchSide',
-            title: ( localize2(4980, 'Switch Side')),
+            title: ( localize2(4960, 'Switch Side')),
             icon: Codicon.arrowSwap,
             precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
             f1: true,
@@ -90,7 +90,7 @@ class ExitCompareMove extends EditorAction2 {
     constructor() {
         super({
             id: 'diffEditor.exitCompareMove',
-            title: ( localize2(4981, 'Exit Compare Move')),
+            title: ( localize2(4961, 'Exit Compare Move')),
             icon: Codicon.close,
             precondition: EditorContextKeys.comparingMovedCode,
             f1: false,
@@ -112,7 +112,7 @@ class CollapseAllUnchangedRegions extends EditorAction2 {
     constructor() {
         super({
             id: 'diffEditor.collapseAllUnchangedRegions',
-            title: ( localize2(4982, 'Collapse All Unchanged Regions')),
+            title: ( localize2(4962, 'Collapse All Unchanged Regions')),
             icon: Codicon.fold,
             precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
             f1: true,
@@ -130,7 +130,7 @@ class ShowAllUnchangedRegions extends EditorAction2 {
     constructor() {
         super({
             id: 'diffEditor.showAllUnchangedRegions',
-            title: ( localize2(4983, 'Show All Unchanged Regions')),
+            title: ( localize2(4963, 'Show All Unchanged Regions')),
             icon: Codicon.unfold,
             precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
             f1: true,
@@ -148,7 +148,7 @@ class RevertHunkOrSelection extends Action2 {
     constructor() {
         super({
             id: 'diffEditor.revert',
-            title: ( localize2(4984, 'Revert')),
+            title: ( localize2(4964, 'Revert')),
             f1: false,
             category: diffEditorCategory,
         });
@@ -161,13 +161,13 @@ class RevertHunkOrSelection extends Action2 {
         return undefined;
     }
 }
-const accessibleDiffViewerCategory = ( localize2(4985, "Accessible Diff Viewer"));
+const accessibleDiffViewerCategory = ( localize2(4965, "Accessible Diff Viewer"));
 class AccessibleDiffViewerNext extends Action2 {
     static { this.id = 'editor.action.accessibleDiffViewer.next'; }
     constructor() {
         super({
             id: AccessibleDiffViewerNext.id,
-            title: ( localize2(4986, 'Go to Next Difference')),
+            title: ( localize2(4966, 'Go to Next Difference')),
             category: accessibleDiffViewerCategory,
             precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
             keybinding: {
@@ -187,7 +187,7 @@ class AccessibleDiffViewerPrev extends Action2 {
     constructor() {
         super({
             id: AccessibleDiffViewerPrev.id,
-            title: ( localize2(4987, 'Go to Previous Difference')),
+            title: ( localize2(4967, 'Go to Previous Difference')),
             category: accessibleDiffViewerCategory,
             precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
             keybinding: {

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

@@ -32,9 +32,9 @@ 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, ( localize(5250, 'Icon for \'Insert\' in accessible diff viewer.')));
-const accessibleDiffViewerRemoveIcon = registerIcon('diff-review-remove', Codicon.remove, ( localize(5251, 'Icon for \'Remove\' in accessible diff viewer.')));
-const accessibleDiffViewerCloseIcon = registerIcon('diff-review-close', Codicon.close, ( localize(5252, 'Icon for \'Close\' in accessible diff viewer.')));
+const accessibleDiffViewerInsertIcon = registerIcon('diff-review-insert', Codicon.add, ( localize(9349, 'Icon for \'Insert\' in accessible diff viewer.')));
+const accessibleDiffViewerRemoveIcon = registerIcon('diff-review-remove', Codicon.remove, ( localize(9350, 'Icon for \'Remove\' in accessible diff viewer.')));
+const accessibleDiffViewerCloseIcon = registerIcon('diff-review-close', Codicon.close, ( localize(9351, '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) {
@@ -302,7 +302,7 @@ let View = class View extends Disposable {
         this._register(autorun(reader => {
             this._actionBar.clear();
             if (this._model.canClose.read(reader)) {
-                this._actionBar.push(( (new Action('diffreview.close', ( localize(5253, "Close")), 'close-diff-review ' + ThemeIcon.asClassName(accessibleDiffViewerCloseIcon), true, async () => _model.close()))), { label: false, icon: true });
+                this._actionBar.push(( (new Action('diffreview.close', ( localize(9352, "Close")), 'close-diff-review ' + ThemeIcon.asClassName(accessibleDiffViewerCloseIcon), true, async () => _model.close()))), { label: false, icon: true });
             }
         }));
         this._content = document.createElement('div');
@@ -355,7 +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', ( localize(5254, 'Accessible Diff Viewer. Use arrow up and down to navigate.')));
+        container.setAttribute('aria-label', ( localize(9353, 'Accessible Diff Viewer. Use arrow up and down to navigate.')));
         applyFontInfo(container, modifiedOptions.get(EditorOption.fontInfo));
         reset(this._content, container);
         const originalModel = this._models.getOriginalModel();
@@ -379,13 +379,13 @@ 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 ? ( localize(5255, "no lines changed"))
-                    : lines === 1 ? ( localize(5256, "1 line changed"))
-                        : ( localize(5257, "{0} lines changed", lines));
+                const getAriaLines = (lines) => lines === 0 ? ( localize(9354, "no lines changed"))
+                    : lines === 1 ? ( localize(9355, "1 line changed"))
+                        : ( localize(9356, "{0} lines changed", lines));
                 const originalChangedLinesCntAria = getAriaLines(r.original.length);
                 const modifiedChangedLinesCntAria = getAriaLines(r.modified.length);
                 header.setAttribute('aria-label', ( localize(
-                    5258,
+                    9357,
                     "Difference {0} of {1}: original line {2}, {3}, modified line {4}, {5}",
                     (diffIndex + 1),
                     diffsLength,
@@ -501,17 +501,17 @@ let View = class View extends Disposable {
             lineContent = originalModel.getLineContent(item.originalLineNumber);
         }
         if (lineContent.length === 0) {
-            lineContent = ( localize(5259, "blank"));
+            lineContent = ( localize(9358, "blank"));
         }
         let ariaLabel = '';
         switch (item.type) {
             case LineType.Unchanged:
                 if (item.originalLineNumber === item.modifiedLineNumber) {
-                    ariaLabel = ( localize(5260, "{0} unchanged line {1}", lineContent, item.originalLineNumber));
+                    ariaLabel = ( localize(9359, "{0} unchanged line {1}", lineContent, item.originalLineNumber));
                 }
                 else {
                     ariaLabel = ( localize(
-                        5261,
+                        9360,
                         "{0} original line {1} modified line {2}",
                         lineContent,
                         item.originalLineNumber,
@@ -520,10 +520,10 @@ let View = class View extends Disposable {
                 }
                 break;
             case LineType.Added:
-                ariaLabel = ( localize(5262, "+ {0} modified line {1}", lineContent, item.modifiedLineNumber));
+                ariaLabel = ( localize(9361, "+ {0} modified line {1}", lineContent, item.modifiedLineNumber));
                 break;
             case LineType.Deleted:
-                ariaLabel = ( localize(5263, "- {0} original line {1}", lineContent, item.originalLineNumber));
+                ariaLabel = ( localize(9362, "- {0} original line {1}", lineContent, item.originalLineNumber));
                 break;
         }
         row.setAttribute('aria-label', ariaLabel);

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

@@ -143,7 +143,7 @@ let DiffEditorEditors = class DiffEditorEditors extends Disposable {
             ariaLabel = '';
         }
         const ariaNavigationTip = ( localize(
-            5270,
+            9369,
             ' use {0} to open the accessibility help.',
             this._keybindingService.lookupKeybinding('editor.action.accessibilityHelp')?.getAriaLabel()
         ));

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

@@ -25,6 +25,7 @@ import { BackgroundTokenizationState } from '../../../../../common/tokenizationT
 import { InlineDecoration, InlineDecorationType } from '../../../../../common/viewModel.js';
 import { IClipboardService } from '../../../../../../platform/clipboard/common/clipboardService.service.js';
 import { IContextMenuService } from '../../../../../../platform/contextview/browser/contextView.service.js';
+import { Range } from '../../../../../common/core/range.js';
 let DiffEditorViewZones = class DiffEditorViewZones extends Disposable {
     constructor(_targetWindow, _editors, _diffModel, _options, _diffEditorWidget, _canIgnoreViewZoneUpdateEvent, _origViewZonesToIgnore, _modViewZonesToIgnore, _clipboardService, _contextMenuService) {
         super();
@@ -494,7 +495,8 @@ function allowsTrueInlineDiffRendering(mapping) {
     if (!mapping.innerChanges) {
         return false;
     }
-    return mapping.innerChanges.every(c => rangeIsSingleLine(c.modifiedRange) && rangeIsSingleLine(c.originalRange));
+    return mapping.innerChanges.every(c => (rangeIsSingleLine(c.modifiedRange) && rangeIsSingleLine(c.originalRange))
+        || c.originalRange.equalsRange(( new Range(1, 1, 1, 1))));
 }
 function rangeIsSingleLine(range) {
     return range.startLineNumber === range.endLineNumber;

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

@@ -51,23 +51,23 @@ class InlineDiffDeletedCodeMargin extends Disposable {
                     const isDeletion = _diff.modified.isEmpty;
                     actions.push(( (new Action('diff.clipboard.copyDeletedContent', isDeletion
                         ? (_diff.original.length > 1
-                            ? ( localize(9956, "Copy deleted lines"))
-                            : ( localize(9957, "Copy deleted line")))
+                            ? ( localize(11151, "Copy deleted lines"))
+                            : ( localize(11152, "Copy deleted line")))
                         : (_diff.original.length > 1
-                            ? ( localize(9958, "Copy changed lines"))
-                            : ( localize(9959, "Copy changed line"))), undefined, true, async () => {
+                            ? ( localize(11153, "Copy changed lines"))
+                            : ( localize(11154, "Copy changed line"))), undefined, true, async () => {
                         const originalText = this._originalTextModel.getValueInRange(_diff.original.toExclusiveRange());
                         await this._clipboardService.writeText(originalText);
                     }))));
                     if (_diff.original.length > 1) {
                         actions.push(( (new Action('diff.clipboard.copyDeletedLineContent', isDeletion
                             ? ( localize(
-                            9960,
+                            11155,
                             "Copy deleted line ({0})",
                             _diff.original.startLineNumber + currentLineNumberOffset
                         ))
                             : ( localize(
-                            9961,
+                            11156,
                             "Copy changed line ({0})",
                             _diff.original.startLineNumber + currentLineNumberOffset
                         )), undefined, true, async () => {
@@ -81,7 +81,7 @@ class InlineDiffDeletedCodeMargin extends Disposable {
                     }
                     const readOnly = _modifiedEditor.getOption(EditorOption.readOnly);
                     if (!readOnly) {
-                        actions.push(( (new Action('diff.inline.revertChange', ( localize(9962, "Revert this change")), undefined, true, async () => {
+                        actions.push(( (new Action('diff.inline.revertChange', ( localize(11157, "Revert this change")), undefined, true, async () => {
                             this._editor.revert(this._diff);
                         }))));
                     }

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

@@ -12,7 +12,7 @@ registerAction2(ToggleUseInlineViewWhenSpaceIsLimited);
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
     command: {
         id: ( (new ToggleUseInlineViewWhenSpaceIsLimited())).desc.id,
-        title: ( localize(1324, "Use Inline View When Space Is Limited")),
+        title: ( localize(1335, "Use Inline View When Space Is Limited")),
         toggled: ( (ContextKeyExpr.has('config.diffEditor.useInlineViewWhenSpaceIsLimited'))),
         precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
     },
@@ -26,7 +26,7 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
     command: {
         id: ( (new ToggleShowMovedCodeBlocks())).desc.id,
-        title: ( localize(1325, "Show Moved Code Blocks")),
+        title: ( localize(1336, "Show Moved Code Blocks")),
         icon: Codicon.move,
         toggled: ContextKeyEqualsExpr.create('config.diffEditor.experimental.showMoves', true),
         precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
@@ -43,7 +43,7 @@ for (const ctx of [
     MenuRegistry.appendMenuItem(MenuId.DiffEditorHunkToolbar, {
         command: {
             id: ( (new RevertHunkOrSelection())).desc.id,
-            title: ( localize(1326, "Revert Block")),
+            title: ( localize(1337, "Revert Block")),
             icon: ctx.icon,
         },
         when: ( (ContextKeyExpr.and(EditorContextKeys.diffEditorModifiedWritable, ctx.key))),
@@ -53,7 +53,7 @@ for (const ctx of [
     MenuRegistry.appendMenuItem(MenuId.DiffEditorSelectionToolbar, {
         command: {
             id: ( (new RevertHunkOrSelection())).desc.id,
-            title: ( localize(1327, "Revert Selection")),
+            title: ( localize(1338, "Revert Selection")),
             icon: ctx.icon,
         },
         when: ( (ContextKeyExpr.and(EditorContextKeys.diffEditorModifiedWritable, ctx.key))),
@@ -68,7 +68,7 @@ registerAction2(ShowAllUnchangedRegions);
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
     command: {
         id: AccessibleDiffViewerNext.id,
-        title: ( localize(1328, "Open Accessible Diff Viewer")),
+        title: ( localize(1339, "Open Accessible Diff Viewer")),
         precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
     },
     order: 10,

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

@@ -155,7 +155,7 @@ let HideUnchangedRegionsFeature = class HideUnchangedRegionsFeature extends Disp
         const unchangedLinesDecorationShow = {
             description: 'Fold Unchanged',
             glyphMarginHoverMessage: ( (new MarkdownString(undefined, { isTrusted: true, supportThemeIcons: true })))
-                .appendMarkdown(( localize(5244, 'Fold Unchanged Region'))),
+                .appendMarkdown(( localize(5224, 'Fold Unchanged Region'))),
             glyphMarginClassName: 'fold-unchanged ' + ThemeIcon.asClassName(Codicon.fold),
             zIndex: 10001,
         };
@@ -257,7 +257,7 @@ class CompactCollapsedCodeOverlayWidget extends ViewZoneOverlayWidget {
         this._register(autorun(reader => {
             if (!this._hide) {
                 const lineCount = this._unchangedRegion.getHiddenModifiedRange(reader).length;
-                const linesHiddenText = ( localize(5245, '{0} hidden lines', lineCount));
+                const linesHiddenText = ( localize(5225, '{0} hidden lines', lineCount));
                 this._nodes.text.innerText = linesHiddenText;
             }
         }));
@@ -275,12 +275,12 @@ class CollapsedCodeOverlayWidget extends ViewZoneOverlayWidget {
         this._revealModifiedHiddenLine = _revealModifiedHiddenLine;
         this._options = _options;
         this._nodes = h('div.diff-hidden-lines', [
-            h('div.top@top', { title: ( localize(5246, 'Click or drag to show more above')) }),
+            h('div.top@top', { title: ( localize(5226, '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: ( localize(5247, '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: ( localize(5227, '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: ( localize(5248, 'Click or drag to show more below')), role: 'button' }),
+            h('div.bottom@bottom', { title: ( localize(5228, 'Click or drag to show more below')), role: 'button' }),
         ]);
         root.root.appendChild(this._nodes.root);
         if (!this._hide) {
@@ -390,8 +390,8 @@ class CollapsedCodeOverlayWidget extends ViewZoneOverlayWidget {
             const children = [];
             if (!this._hide) {
                 const lineCount = _unchangedRegion.getHiddenModifiedRange(reader).length;
-                const linesHiddenText = ( localize(5245, '{0} hidden lines', lineCount));
-                const span = $('span', { title: ( localize(5249, 'Double click to unfold')) }, linesHiddenText);
+                const linesHiddenText = ( localize(5225, '{0} hidden lines', lineCount));
+                const span = $('span', { title: ( localize(5229, 'Double click to unfold')) }, linesHiddenText);
                 span.addEventListener('dblclick', e => {
                     if (e.button !== 0) {
                         return;