@codingame/monaco-vscode-api 10.1.3 → 11.0.0

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

@@ -2,13 +2,14 @@ import { createFastDomNode } from '../../../../base/browser/fastDomNode.js';
 import { onUnexpectedError } from '../../../../base/common/errors.js';
 import { ViewPart } from '../../view/viewPart.js';
 import { Position } from '../../../common/core/position.js';
+
 const invalidFunc = () => { throw ( new Error(`Invalid change accessor`)); };
 class ViewZones extends ViewPart {
     constructor(context) {
         super(context);
         const options = this._context.configuration.options;
         const layoutInfo = options.get(148 );
-        this._lineHeight = options.get(69 );
+        this._lineHeight = options.get(68 );
         this._contentWidth = layoutInfo.contentWidth;
         this._contentLeft = layoutInfo.contentLeft;
         this.domNode = createFastDomNode(document.createElement('div'));
@@ -54,10 +55,10 @@ class ViewZones extends ViewPart {
     onConfigurationChanged(e) {
         const options = this._context.configuration.options;
         const layoutInfo = options.get(148 );
-        this._lineHeight = options.get(69 );
+        this._lineHeight = options.get(68 );
         this._contentWidth = layoutInfo.contentWidth;
         this._contentLeft = layoutInfo.contentLeft;
-        if (e.hasChanged(69 )) {
+        if (e.hasChanged(68 )) {
             this._recomputeWhitespacesProps();
         }
         return true;
@@ -316,4 +317,5 @@ function safeInvoke1Arg(func, arg1) {
         onUnexpectedError(e);
     }
 }
+
 export { ViewZones };

package/vscode/src/vs/editor/browser/viewParts/whitespace/whitespace.css.js

@@ -1,4 +1,6 @@
 import n from '../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
+
 var css = ".monaco-editor .mwh{color:var(--vscode-editorWhitespace-foreground)!important;position:absolute}";
 n(css,{});
+
 export { css, css as default };

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

@@ -4,6 +4,7 @@ import { firstNonWhitespaceIndex, lastNonWhitespaceIndex } from '../../../../bas
 import { LineRange } from '../../../common/viewLayout/viewLineRenderer.js';
 import { Position } from '../../../common/core/position.js';
 import { editorWhitespaces } from '../../../common/core/editorColorRegistry.js';
+
 class WhitespaceOverlay extends DynamicViewOverlay {
     constructor(context) {
         super();
@@ -239,7 +240,7 @@ class WhitespaceOptions {
         this.middotWidth = fontInfo.middotWidth;
         this.wsmiddotWidth = fontInfo.wsmiddotWidth;
         this.canUseHalfwidthRightwardsArrow = fontInfo.canUseHalfwidthRightwardsArrow;
-        this.lineHeight = options.get(69 );
+        this.lineHeight = options.get(68 );
         this.stopRenderingLineAfter = options.get(120 );
     }
     equals(other) {
@@ -253,4 +254,5 @@ class WhitespaceOptions {
             && this.stopRenderingLineAfter === other.stopRenderingLineAfter);
     }
 }
+
 export { WhitespaceOverlay };

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

@@ -1,6 +1,7 @@
 import { runWhenWindowIdle, getWindow } from '../../../../base/browser/dom.js';
 import { onUnexpectedError } from '../../../../base/common/errors.js';
 import { Disposable, DisposableMap } from '../../../../base/common/lifecycle.js';
+
 class CodeEditorContributions extends Disposable {
     constructor() {
         super();
@@ -106,4 +107,5 @@ class CodeEditorContributions extends Disposable {
         }
     }
 }
+
 export { CodeEditorContributions };

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

@@ -54,6 +54,7 @@ import { registerThemingParticipant } from '../../../../platform/theme/common/th
 import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
 import { MenuId } from '../../../../platform/actions/common/actions.js';
 import Severity$1 from '../../../../base/common/severity.js';
+
 var CodeEditorWidget_1;
 let CodeEditorWidget = class CodeEditorWidget extends Disposable {
     static { CodeEditorWidget_1 = this; }
@@ -1208,7 +1209,7 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
         return {
             top: top,
             left: left,
-            height: options.get(69 )
+            height: options.get(68 )
         };
     }
     getOffsetForColumn(lineNumber, column) {
@@ -1299,9 +1300,9 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
                     break;
                 case 6 : {
                     if (e.reachedMaxCursorCount) {
-                        const multiCursorLimit = this.getOption(82 );
+                        const multiCursorLimit = this.getOption(81 );
                         const message = ( localize(
-                            1368,
+                            1355,
                             "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
                         ));
@@ -1313,7 +1314,7 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
                                 }
                             },
                             {
-                                label: ( localize(1369, 'Increase Multi Cursor Limit')),
+                                label: ( localize(1356, 'Increase Multi Cursor Limit')),
                                 run: () => {
                                     this._commandService.executeCommand('workbench.action.openSettings2', {
                                         query: 'editor.multiCursorLimit'
@@ -1912,4 +1913,5 @@ registerThemingParticipant((theme, collector) => {
         collector.addRule(`.monaco-editor.showUnused .${"squiggly-inline-unnecessary" } { opacity: ${unnecessaryForeground.rgba.a}; }`);
     }
 });
+
 export { BooleanEventEmitter, CodeEditorWidget, EditorModeContext };

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

@@ -1,4 +1,6 @@
 import n from '../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
+
 var css = "::-ms-clear{display:none}.monaco-editor .editor-widget input{color:inherit}.monaco-editor{-webkit-text-size-adjust:100%;color:var(--vscode-editor-foreground);overflow:visible;overflow-wrap:normal;position:relative}.monaco-editor,.monaco-editor-background{background-color:var(--vscode-editor-background)}.monaco-editor .rangeHighlight{background-color:var(--vscode-editor-rangeHighlightBackground);border:1px solid var(--vscode-editor-rangeHighlightBorder);box-sizing:border-box}.monaco-editor.hc-black .rangeHighlight,.monaco-editor.hc-light .rangeHighlight{border-style:dotted}.monaco-editor .symbolHighlight{background-color:var(--vscode-editor-symbolHighlightBackground);border:1px solid var(--vscode-editor-symbolHighlightBorder);box-sizing:border-box}.monaco-editor.hc-black .symbolHighlight,.monaco-editor.hc-light .symbolHighlight{border-style:dotted}.monaco-editor .editorCanvas{height:100%;pointer-events:none;position:absolute;width:100%;z-index:0}.monaco-editor .overflow-guard{overflow:hidden;position:relative}.monaco-editor .view-overlays{position:absolute;top:0}.monaco-editor .margin-view-overlays>div,.monaco-editor .view-overlays>div{position:absolute;width:100%}.monaco-editor .squiggly-error{border-bottom:4px double var(--vscode-editorError-border)}.monaco-editor .squiggly-error:before{background:var(--vscode-editorError-background);content:\"\";display:block;height:100%;width:100%}.monaco-editor .squiggly-warning{border-bottom:4px double var(--vscode-editorWarning-border)}.monaco-editor .squiggly-warning:before{background:var(--vscode-editorWarning-background);content:\"\";display:block;height:100%;width:100%}.monaco-editor .squiggly-info{border-bottom:4px double var(--vscode-editorInfo-border)}.monaco-editor .squiggly-info:before{background:var(--vscode-editorInfo-background);content:\"\";display:block;height:100%;width:100%}.monaco-editor .squiggly-hint{border-bottom:2px dotted var(--vscode-editorHint-border)}.monaco-editor.showUnused .squiggly-unnecessary{border-bottom:2px dashed var(--vscode-editorUnnecessaryCode-border)}.monaco-editor.showDeprecated .squiggly-inline-deprecated{text-decoration:line-through;text-decoration-color:var(--vscode-editor-foreground,inherit)}";
 n(css,{});
+
 export { css, css as default };

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

@@ -10,6 +10,7 @@ import { IContextKeyService } from '../../../../platform/contextkey/common/conte
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.service.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
+
 let EmbeddedCodeEditorWidget = class EmbeddedCodeEditorWidget extends CodeEditorWidget {
     constructor(domElement, options, codeEditorWidgetOptions, parentEditor, instantiationService, codeEditorService, commandService, contextKeyService, themeService, notificationService, accessibilityService, languageConfigurationService, languageFeaturesService) {
         super(domElement, { ...parentEditor.getRawOptions(), overflowWidgetsDomNode: parentEditor.getOverflowWidgetsDomNode() }, codeEditorWidgetOptions, instantiationService, codeEditorService, commandService, contextKeyService, themeService, notificationService, accessibilityService, languageConfigurationService, languageFeaturesService);
@@ -41,4 +42,5 @@ EmbeddedCodeEditorWidget = ( __decorate([
     ( __param(11, ILanguageConfigurationService)),
     ( __param(12, ILanguageFeaturesService))
 ], EmbeddedCodeEditorWidget));
+
 export { EmbeddedCodeEditorWidget };

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

@@ -9,11 +9,12 @@ 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';
+
 class ToggleCollapseUnchangedRegions extends Action2 {
     constructor() {
         super({
             id: 'diffEditor.toggleCollapseUnchangedRegions',
-            title: ( localize2(4963, 'Toggle Collapse Unchanged Regions')),
+            title: ( localize2(4994, 'Toggle Collapse Unchanged Regions')),
             icon: Codicon.map,
             toggled: ( (ContextKeyExpr.has('config.diffEditor.hideUnchangedRegions.enabled'))),
             precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
@@ -35,7 +36,7 @@ class ToggleShowMovedCodeBlocks extends Action2 {
     constructor() {
         super({
             id: 'diffEditor.toggleShowMovedCodeBlocks',
-            title: ( localize2(4964, 'Toggle Show Moved Code Blocks')),
+            title: ( localize2(4995, 'Toggle Show Moved Code Blocks')),
             precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
         });
     }
@@ -49,7 +50,7 @@ class ToggleUseInlineViewWhenSpaceIsLimited extends Action2 {
     constructor() {
         super({
             id: 'diffEditor.toggleUseInlineViewWhenSpaceIsLimited',
-            title: ( localize2(4965, 'Toggle Use Inline View When Space Is Limited')),
+            title: ( localize2(4996, 'Toggle Use Inline View When Space Is Limited')),
             precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
         });
     }
@@ -59,12 +60,12 @@ class ToggleUseInlineViewWhenSpaceIsLimited extends Action2 {
         configurationService.updateValue('diffEditor.useInlineViewWhenSpaceIsLimited', newValue);
     }
 }
-const diffEditorCategory = ( localize2(4966, "Diff Editor"));
+const diffEditorCategory = ( localize2(4997, "Diff Editor"));
 class SwitchSide extends EditorAction2 {
     constructor() {
         super({
             id: 'diffEditor.switchSide',
-            title: ( localize2(4967, 'Switch Side')),
+            title: ( localize2(4998, 'Switch Side')),
             icon: Codicon.arrowSwap,
             precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
             f1: true,
@@ -88,7 +89,7 @@ class ExitCompareMove extends EditorAction2 {
     constructor() {
         super({
             id: 'diffEditor.exitCompareMove',
-            title: ( localize2(4968, 'Exit Compare Move')),
+            title: ( localize2(4999, 'Exit Compare Move')),
             icon: Codicon.close,
             precondition: EditorContextKeys.comparingMovedCode,
             f1: false,
@@ -110,7 +111,7 @@ class CollapseAllUnchangedRegions extends EditorAction2 {
     constructor() {
         super({
             id: 'diffEditor.collapseAllUnchangedRegions',
-            title: ( localize2(4969, 'Collapse All Unchanged Regions')),
+            title: ( localize2(5000, 'Collapse All Unchanged Regions')),
             icon: Codicon.fold,
             precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
             f1: true,
@@ -128,7 +129,7 @@ class ShowAllUnchangedRegions extends EditorAction2 {
     constructor() {
         super({
             id: 'diffEditor.showAllUnchangedRegions',
-            title: ( localize2(4970, 'Show All Unchanged Regions')),
+            title: ( localize2(5001, 'Show All Unchanged Regions')),
             icon: Codicon.unfold,
             precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
             f1: true,
@@ -146,7 +147,7 @@ class RevertHunkOrSelection extends Action2 {
     constructor() {
         super({
             id: 'diffEditor.revert',
-            title: ( localize2(4971, 'Revert')),
+            title: ( localize2(5002, 'Revert')),
             f1: false,
             category: diffEditorCategory,
         });
@@ -159,13 +160,13 @@ class RevertHunkOrSelection extends Action2 {
         return undefined;
     }
 }
-const accessibleDiffViewerCategory = ( localize2(4972, "Accessible Diff Viewer"));
+const accessibleDiffViewerCategory = ( localize2(5003, "Accessible Diff Viewer"));
 class AccessibleDiffViewerNext extends Action2 {
     static { this.id = 'editor.action.accessibleDiffViewer.next'; }
     constructor() {
         super({
             id: AccessibleDiffViewerNext.id,
-            title: ( localize2(4973, 'Go to Next Difference')),
+            title: ( localize2(5004, 'Go to Next Difference')),
             category: accessibleDiffViewerCategory,
             precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
             keybinding: {
@@ -185,7 +186,7 @@ class AccessibleDiffViewerPrev extends Action2 {
     constructor() {
         super({
             id: AccessibleDiffViewerPrev.id,
-            title: ( localize2(4974, 'Go to Previous Difference')),
+            title: ( localize2(5005, 'Go to Previous Difference')),
             category: accessibleDiffViewerCategory,
             precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
             keybinding: {
@@ -234,4 +235,5 @@ function isElementOrParentOf(elementOrParent, element) {
     }
     return false;
 }
+
 export { AccessibleDiffViewerNext, AccessibleDiffViewerPrev, CollapseAllUnchangedRegions, ExitCompareMove, RevertHunkOrSelection, ShowAllUnchangedRegions, SwitchSide, ToggleCollapseUnchangedRegions, ToggleShowMovedCodeBlocks, ToggleUseInlineViewWhenSpaceIsLimited, findDiffEditor, findFocusedDiffEditor };

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

@@ -1,4 +1,6 @@
 import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
+
 var css = ".monaco-component.diff-review{user-select:none;-webkit-user-select:none;z-index:99}.monaco-diff-editor .diff-review{position:absolute}.monaco-component.diff-review .diff-review-line-number{color:var(--vscode-editorLineNumber-foreground);display:inline-block;text-align:right}.monaco-component.diff-review .diff-review-summary{padding-left:10px}.monaco-component.diff-review .diff-review-shadow{box-shadow:var(--vscode-scrollbar-shadow) 0 -6px 6px -6px inset;position:absolute}.monaco-component.diff-review .diff-review-row{white-space:pre}.monaco-component.diff-review .diff-review-table{display:table;min-width:100%}.monaco-component.diff-review .diff-review-row{display:table-row;width:100%}.monaco-component.diff-review .diff-review-spacer{display:inline-block;vertical-align:middle;width:10px}.monaco-component.diff-review .diff-review-spacer>.codicon{font-size:9px!important}.monaco-component.diff-review .diff-review-actions{display:inline-block;position:absolute;right:10px;top:2px;z-index:100}.monaco-component.diff-review .diff-review-actions .action-label{height:16px;margin:2px 0;width:16px}.monaco-component.diff-review .revertButton{cursor:pointer}";
 n(css,{});
+
 export { css, css as default };

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

@@ -32,9 +32,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, ( localize(5241, 'Icon for \'Insert\' in accessible diff viewer.')));
-const accessibleDiffViewerRemoveIcon = registerIcon('diff-review-remove', Codicon.remove, ( localize(5242, 'Icon for \'Remove\' in accessible diff viewer.')));
-const accessibleDiffViewerCloseIcon = registerIcon('diff-review-close', Codicon.close, ( localize(5243, 'Icon for \'Close\' in accessible diff viewer.')));
+
+const accessibleDiffViewerInsertIcon = registerIcon('diff-review-insert', Codicon.add, ( localize(9504, 'Icon for \'Insert\' in accessible diff viewer.')));
+const accessibleDiffViewerRemoveIcon = registerIcon('diff-review-remove', Codicon.remove, ( localize(9505, 'Icon for \'Remove\' in accessible diff viewer.')));
+const accessibleDiffViewerCloseIcon = registerIcon('diff-review-close', Codicon.close, ( localize(9506, '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 +303,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(5244, "Close")), 'close-diff-review ' + ThemeIcon.asClassName(accessibleDiffViewerCloseIcon), true, async () => _model.close()))), { label: false, icon: true });
+                this._actionBar.push(( (new Action('diffreview.close', ( localize(9507, "Close")), 'close-diff-review ' + ThemeIcon.asClassName(accessibleDiffViewerCloseIcon), true, async () => _model.close()))), { label: false, icon: true });
             }
         }));
         this._content = document.createElement('div');
@@ -355,7 +356,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(5245, 'Accessible Diff Viewer. Use arrow up and down to navigate.')));
+        container.setAttribute('aria-label', ( localize(9508, 'Accessible Diff Viewer. Use arrow up and down to navigate.')));
         applyFontInfo(container, modifiedOptions.get(52 ));
         reset(this._content, container);
         const originalModel = this._models.getOriginalModel();
@@ -365,7 +366,7 @@ let View = class View extends Disposable {
         }
         const originalModelOpts = originalModel.getOptions();
         const modifiedModelOpts = modifiedModel.getOptions();
-        const lineHeight = modifiedOptions.get(69 );
+        const lineHeight = modifiedOptions.get(68 );
         const group = this._model.currentGroup.get();
         for (const viewItem of group?.lines || []) {
             if (!group) {
@@ -379,13 +380,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(5246, "no lines changed"))
-                    : lines === 1 ? ( localize(5247, "1 line changed"))
-                        : ( localize(5248, "{0} lines changed", lines));
+                const getAriaLines = (lines) => lines === 0 ? ( localize(9509, "no lines changed"))
+                    : lines === 1 ? ( localize(9510, "1 line changed"))
+                        : ( localize(9511, "{0} lines changed", lines));
                 const originalChangedLinesCntAria = getAriaLines(r.original.length);
                 const modifiedChangedLinesCntAria = getAriaLines(r.modified.length);
                 header.setAttribute('aria-label', ( localize(
-                    5249,
+                    9512,
                     "Difference {0} of {1}: original line {2}, {3}, modified line {4}, {5}",
                     (diffIndex + 1),
                     diffsLength,
@@ -501,17 +502,17 @@ let View = class View extends Disposable {
             lineContent = originalModel.getLineContent(item.originalLineNumber);
         }
         if (lineContent.length === 0) {
-            lineContent = ( localize(5250, "blank"));
+            lineContent = ( localize(9513, "blank"));
         }
         let ariaLabel = '';
         switch (item.type) {
             case LineType.Unchanged:
                 if (item.originalLineNumber === item.modifiedLineNumber) {
-                    ariaLabel = ( localize(5251, "{0} unchanged line {1}", lineContent, item.originalLineNumber));
+                    ariaLabel = ( localize(9514, "{0} unchanged line {1}", lineContent, item.originalLineNumber));
                 }
                 else {
                     ariaLabel = ( localize(
-                        5252,
+                        9515,
                         "{0} original line {1} modified line {2}",
                         lineContent,
                         item.originalLineNumber,
@@ -520,10 +521,10 @@ let View = class View extends Disposable {
                 }
                 break;
             case LineType.Added:
-                ariaLabel = ( localize(5253, "+ {0} modified line {1}", lineContent, item.modifiedLineNumber));
+                ariaLabel = ( localize(9516, "+ {0} modified line {1}", lineContent, item.modifiedLineNumber));
                 break;
             case LineType.Deleted:
-                ariaLabel = ( localize(5254, "- {0} original line {1}", lineContent, item.originalLineNumber));
+                ariaLabel = ( localize(9517, "- {0} original line {1}", lineContent, item.originalLineNumber));
                 break;
         }
         row.setAttribute('aria-label', ariaLabel);
@@ -600,4 +601,5 @@ class AccessibleDiffViewerModelFromEditors {
         return this.editors.modified.getPosition() ?? undefined;
     }
 }
+
 export { AccessibleDiffViewer, AccessibleDiffViewerModelFromEditors };

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

@@ -9,6 +9,7 @@ import { allowsTrueInlineDiffRendering } from './diffEditorViewZones/diffEditorV
 import { MovedBlocksLinesFeature } from '../features/movedBlocksLinesFeature.js';
 import { diffLineDeleteDecorationBackgroundWithIndicator, diffLineDeleteDecorationBackground, diffLineAddDecorationBackgroundWithIndicator, diffLineAddDecorationBackground, diffWholeLineDeleteDecoration, diffWholeLineAddDecoration, diffDeleteDecorationEmpty, diffDeleteDecoration, diffAddDecorationEmpty, diffAddDecoration } from '../registrations.contribution.js';
 import { applyObservableDecorations } from '../utils.js';
+
 class DiffEditorDecorations extends Disposable {
     constructor(_editors, _diffModel, _options, widget) {
         super();
@@ -109,4 +110,5 @@ class DiffEditorDecorations extends Disposable {
         this._register(applyObservableDecorations(this._editors.modified, ( this._decorations.map(d => d?.modifiedDecorations || []))));
     }
 }
+
 export { DiffEditorDecorations };

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

@@ -13,6 +13,7 @@ import { Position } from '../../../../common/core/position.js';
 import { localize } from '../../../../../nls.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.service.js';
+
 let DiffEditorEditors = class DiffEditorEditors extends Disposable {
     get onDidContentSizeChange() { return this._onDidContentSizeChange.event; }
     constructor(originalEditorElement, modifiedEditorElement, _options, _argCodeEditorWidgetOptions, _createInnerEditor, _instantiationService, _keybindingService) {
@@ -143,7 +144,7 @@ let DiffEditorEditors = class DiffEditorEditors extends Disposable {
             ariaLabel = '';
         }
         const ariaNavigationTip = ( localize(
-            5255,
+            9518,
             ' use {0} to open the accessibility help.',
             this._keybindingService.lookupKeybinding('editor.action.accessibilityHelp')?.getAriaLabel()
         ));
@@ -160,4 +161,5 @@ DiffEditorEditors = ( (__decorate([
     ( (__param(5, IInstantiationService))),
     ( (__param(6, IKeybindingService)))
 ], DiffEditorEditors)));
+
 export { DiffEditorEditors };

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

@@ -7,6 +7,7 @@ import { autorun } from '../../../../../base/common/observableInternal/autorun.j
 import { derivedWithSetter } from '../../../../../base/common/observableInternal/derived.js';
 import '../../../../../base/common/cancellation.js';
 import '../../../../../base/common/observableInternal/utils.js';
+
 class SashLayout {
     resetSash() {
         this._sashRatio.set(undefined, undefined);
@@ -78,4 +79,5 @@ class DiffEditorSash extends Disposable {
         }));
     }
 }
+
 export { DiffEditorSash, SashLayout };

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

@@ -7,7 +7,7 @@ import { Disposable, DisposableStore } from '../../../../../../base/common/lifec
 import { observableValue } from '../../../../../../base/common/observableInternal/base.js';
 import '../../../../../../base/common/event.js';
 import { autorun } from '../../../../../../base/common/observableInternal/autorun.js';
-import { derivedWithStore, derived } from '../../../../../../base/common/observableInternal/derived.js';
+import { derived, derivedWithStore } from '../../../../../../base/common/observableInternal/derived.js';
 import '../../../../../../base/common/cancellation.js';
 import { observableFromEvent } from '../../../../../../base/common/observableInternal/utils.js';
 import { ThemeIcon } from '../../../../../../base/common/themables.js';
@@ -24,6 +24,7 @@ import { InlineDecoration } 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();
@@ -54,12 +55,12 @@ let DiffEditorViewZones = class DiffEditorViewZones extends Disposable {
             updateImmediately.schedule();
         } }));
         this._register(this._editors.original.onDidChangeConfiguration((args) => {
-            if (args.hasChanged(149 ) || args.hasChanged(69 )) {
+            if (args.hasChanged(149 ) || args.hasChanged(68 )) {
                 updateImmediately.schedule();
             }
         }));
         this._register(this._editors.modified.onDidChangeConfiguration((args) => {
-            if (args.hasChanged(149 ) || args.hasChanged(69 )) {
+            if (args.hasChanged(149 ) || args.hasChanged(68 )) {
                 updateImmediately.schedule();
             }
         }));
@@ -134,7 +135,7 @@ let DiffEditorViewZones = class DiffEditorViewZones extends Disposable {
             }
             const lineBreakData = deletedCodeLineBreaksComputer?.finalize() ?? [];
             let lineBreakDataIdx = 0;
-            const modLineHeight = this._editors.modified.getOption(69 );
+            const modLineHeight = this._editors.modified.getOption(68 );
             const syncedMovedText = this._diffModel.read(reader)?.movedTextToCompare.read(reader);
             const mightContainNonBasicASCII = this._editors.original.getModel()?.mightContainNonBasicASCII() ?? false;
             const mightContainRTL = this._editors.original.getModel()?.mightContainRTL() ?? false;
@@ -362,8 +363,8 @@ DiffEditorViewZones = ( __decorate([
 function computeRangeAlignment(originalEditor, modifiedEditor, diffs, originalEditorAlignmentViewZones, modifiedEditorAlignmentViewZones, innerHunkAlignment) {
     const originalLineHeightOverrides = ( new ArrayQueue(getAdditionalLineHeights(originalEditor, originalEditorAlignmentViewZones)));
     const modifiedLineHeightOverrides = ( new ArrayQueue(getAdditionalLineHeights(modifiedEditor, modifiedEditorAlignmentViewZones)));
-    const origLineHeight = originalEditor.getOption(69 );
-    const modLineHeight = modifiedEditor.getOption(69 );
+    const origLineHeight = originalEditor.getOption(68 );
+    const modLineHeight = modifiedEditor.getOption(68 );
     const result = [];
     let lastOriginalLineNumber = 0;
     let lastModifiedLineNumber = 0;
@@ -470,7 +471,7 @@ function getAdditionalLineHeights(editor, viewZonesToIgnore) {
     const wrappingZoneHeights = [];
     const hasWrapping = editor.getOption(149 ).wrappingColumn !== -1;
     const coordinatesConverter = editor._getViewModel().coordinatesConverter;
-    const editorLineHeight = editor.getOption(69 );
+    const editorLineHeight = editor.getOption(68 );
     if (hasWrapping) {
         for (let i = 1; i <= editor.getModel().getLineCount(); i++) {
             const lineCount = coordinatesConverter.getModelLineViewLineCount(i);
@@ -499,4 +500,5 @@ function allowsTrueInlineDiffRendering(mapping) {
 function rangeIsSingleLine(range) {
     return range.startLineNumber === range.endLineNumber;
 }
-export { DiffEditorViewZones, allowsTrueInlineDiffRendering };
+
+export { DiffEditorViewZones, allowsTrueInlineDiffRendering, rangeIsSingleLine };

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

@@ -5,6 +5,7 @@ import { Disposable } from '../../../../../../base/common/lifecycle.js';
 import { isIOS } from '../../../../../../base/common/platform.js';
 import { ThemeIcon } from '../../../../../../base/common/themables.js';
 import { localize } from '../../../../../../nls.js';
+
 class InlineDiffDeletedCodeMargin extends Disposable {
     get visibility() {
         return this._visibility;
@@ -31,7 +32,7 @@ class InlineDiffDeletedCodeMargin extends Disposable {
         this._diffActions = document.createElement('div');
         this._diffActions.className = ThemeIcon.asClassName(Codicon.lightBulb) + ' lightbulb-glyph';
         this._diffActions.style.position = 'absolute';
-        const lineHeight = this._modifiedEditor.getOption(69 );
+        const lineHeight = this._modifiedEditor.getOption(68 );
         this._diffActions.style.right = '0px';
         this._diffActions.style.visibility = 'hidden';
         this._diffActions.style.height = `${lineHeight}px`;
@@ -48,23 +49,23 @@ class InlineDiffDeletedCodeMargin extends Disposable {
                     const isDeletion = _diff.modified.isEmpty;
                     actions.push(( (new Action('diff.clipboard.copyDeletedContent', isDeletion
                         ? (_diff.original.length > 1
-                            ? ( localize(10079, "Copy deleted lines"))
-                            : ( localize(10080, "Copy deleted line")))
+                            ? ( localize(11381, "Copy deleted lines"))
+                            : ( localize(11382, "Copy deleted line")))
                         : (_diff.original.length > 1
-                            ? ( localize(10081, "Copy changed lines"))
-                            : ( localize(10082, "Copy changed line"))), undefined, true, async () => {
+                            ? ( localize(11383, "Copy changed lines"))
+                            : ( localize(11384, "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(
-                            10083,
+                            11385,
                             "Copy deleted line ({0})",
                             _diff.original.startLineNumber + currentLineNumberOffset
                         ))
                             : ( localize(
-                            10084,
+                            11386,
                             "Copy changed line ({0})",
                             _diff.original.startLineNumber + currentLineNumberOffset
                         )), undefined, true, async () => {
@@ -78,7 +79,7 @@ class InlineDiffDeletedCodeMargin extends Disposable {
                     }
                     const readOnly = _modifiedEditor.getOption(94 );
                     if (!readOnly) {
-                        actions.push(( (new Action('diff.inline.revertChange', ( localize(10085, "Revert this change")), undefined, true, async () => {
+                        actions.push(( (new Action('diff.inline.revertChange', ( localize(11387, "Revert this change")), undefined, true, async () => {
                             this._editor.revert(this._diff);
                         }))));
                     }
@@ -137,4 +138,5 @@ class InlineDiffDeletedCodeMargin extends Disposable {
         return lineNumberOffset;
     }
 }
+
 export { InlineDiffDeletedCodeMargin };

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

@@ -5,6 +5,7 @@ import { StringBuilder } from '../../../../../common/core/stringBuilder.js';
 import { LineDecoration } from '../../../../../common/viewLayout/lineDecorations.js';
 import { renderViewLine, RenderLineInput } from '../../../../../common/viewLayout/viewLineRenderer.js';
 import { ViewLineRenderingData } from '../../../../../common/viewModel.js';
+
 const ttPolicy = createTrustedTypesPolicy('diffEditorWidget', { createHTML: value => value });
 function renderLines(source, options, decorations, domNode) {
     applyFontInfo(domNode, options.fontInfo);
@@ -64,7 +65,7 @@ class RenderOptions {
             modifiedEditorOptions.get(33 ),
             fontInfo.typicalHalfwidthCharacterWidth,
             modifiedEditorOptions.get(107 ),
-            modifiedEditorOptions.get(69 ),
+            modifiedEditorOptions.get(68 ),
             layoutInfo.decorationsWidth,
             modifiedEditorOptions.get(120 ),
             modifiedEditorOptions.get(102 ),
@@ -121,4 +122,5 @@ function renderOriginalLine(viewLineIdx, lineTokens, decorations, hasCharChanges
     sb.appendString('</div>');
     return output.characterMapping.getHorizontalOffset(output.characterMapping.length);
 }
+
 export { LineSource, RenderOptions, renderLines };

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

@@ -1,5 +1,6 @@
 import { Emitter } from '../../../../base/common/event.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
+
 class DelegatingEditor extends Disposable {
     constructor() {
         super(...arguments);
@@ -103,4 +104,5 @@ class DelegatingEditor extends Disposable {
         return this._targetEditor.changeDecorations(callback);
     }
 }
+
 export { DelegatingEditor };