@codingame/monaco-vscode-api 7.1.0 → 8.0.0

package/vscode/src/vs/editor/browser/controller/pointerHandler.js

@@ -31,7 +31,7 @@ class PointerEventHandler extends MouseHandler {
             }
         }));
         const pointerEvents = ( new EditorPointerEventFactory(this.viewHelper.viewDomNode));
-        this._register(pointerEvents.onPointerMove(this.viewHelper.viewDomNode, (e) => this._onMouseMove(e)));
+        this._register(pointerEvents.onPointerMove(this.viewHelper.viewDomNode, (e) => this._onMouseMoveOverView(e)));
         this._register(pointerEvents.onPointerUp(this.viewHelper.viewDomNode, (e) => this._onMouseUp(e)));
         this._register(pointerEvents.onPointerLeave(this.viewHelper.viewDomNode, (e) => this._onMouseLeave(e)));
         this._register(pointerEvents.onPointerDown(this.viewHelper.viewDomNode, (e, pointerId) => this._onMouseDown(e, pointerId)));
@@ -53,7 +53,7 @@ class PointerEventHandler extends MouseHandler {
         }
     }
     _dispatchGesture(event, inSelectionMode) {
-        const target = this._createMouseTarget(( new EditorMouseEvent(event, false, this.viewHelper.viewDomNode)), false);
+        const target = this._createMouseTargetForView(( new EditorMouseEvent(event, false, this.viewHelper.viewDomNode)), false);
         if (target.position) {
             this.viewController.dispatchMouse({
                 position: target.position,
@@ -90,7 +90,7 @@ class TouchHandler extends MouseHandler {
     onTap(event) {
         event.preventDefault();
         this.viewHelper.focusTextArea();
-        const target = this._createMouseTarget(( new EditorMouseEvent(event, false, this.viewHelper.viewDomNode)), false);
+        const target = this._createMouseTargetForView(( new EditorMouseEvent(event, false, this.viewHelper.viewDomNode)), false);
         if (target.position) {
             const event = document.createEvent('CustomEvent');
             event.initEvent(TextAreaSyntethicEvents.Tap, false, true);

package/vscode/src/vs/editor/browser/controller/textAreaHandler.js

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
 import './textAreaHandler.css.js';
-import { localizeWithPath } from '../../../nls.js';
+import { localize } from '../../../nls.js';
 import { isAndroid, isChrome, isFirefox, isSafari } from '../../../base/browser/browser.js';
 import { createFastDomNode } from '../../../base/browser/fastDomNode.js';
 import { OS, isMacintosh, isWindows } from '../../../base/common/platform.js';
@@ -27,7 +27,6 @@ import { Color } from '../../../base/common/color.js';
 import { IME } from '../../../base/common/ime.js';
 import { IKeybindingService } from '../../../platform/keybinding/common/keybinding.service.js';
 import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
-const _moduleId = "vs/editor/browser/controller/textAreaHandler";
 class VisibleTextAreaData {
     constructor(_context, modelLineNumber, distanceToModelLineStart, widthOfHiddenLineTextBefore, distanceToModelLineEnd) {
         this._context = _context;
@@ -117,7 +116,7 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
         this.textArea.setAttribute('aria-required', options.get(EditorOption.ariaRequired) ? 'true' : 'false');
         this.textArea.setAttribute('tabindex', String(options.get(EditorOption.tabIndex)));
         this.textArea.setAttribute('role', 'textbox');
-        this.textArea.setAttribute('aria-roledescription', ( localizeWithPath(_moduleId, 0, "editor")));
+        this.textArea.setAttribute('aria-roledescription', ( localize(9806, "editor")));
         this.textArea.setAttribute('aria-multiline', 'true');
         this.textArea.setAttribute('aria-autocomplete', options.get(EditorOption.readOnly) ? 'none' : 'both');
         this._ensureReadOnlyAttribute();
@@ -409,29 +408,26 @@ let TextAreaHandler = class TextAreaHandler extends ViewPart {
             const toggleKeybindingLabel = this._keybindingService.lookupKeybinding('editor.action.toggleScreenReaderAccessibilityMode')?.getAriaLabel();
             const runCommandKeybindingLabel = this._keybindingService.lookupKeybinding('workbench.action.showCommands')?.getAriaLabel();
             const keybindingEditorKeybindingLabel = this._keybindingService.lookupKeybinding('workbench.action.openGlobalKeybindings')?.getAriaLabel();
-            const editorNotAccessibleMessage = ( localizeWithPath(_moduleId, 1, "The editor is not accessible at this time."));
+            const editorNotAccessibleMessage = ( localize(9807, "The editor is not accessible at this time."));
             if (toggleKeybindingLabel) {
-                return ( localizeWithPath(
-                    _moduleId,
-                    2,
+                return ( localize(
+                    9808,
                     "{0} To enable screen reader optimized mode, use {1}",
                     editorNotAccessibleMessage,
                     toggleKeybindingLabel
                 ));
             }
             else if (runCommandKeybindingLabel) {
-                return ( localizeWithPath(
-                    _moduleId,
-                    3,
+                return ( localize(
+                    9809,
                     "{0} To enable screen reader optimized mode, open the quick pick with {1} and run the command Toggle Screen Reader Accessibility Mode, which is currently not triggerable via keyboard.",
                     editorNotAccessibleMessage,
                     runCommandKeybindingLabel
                 ));
             }
             else if (keybindingEditorKeybindingLabel) {
-                return ( localizeWithPath(
-                    _moduleId,
-                    4,
+                return ( localize(
+                    9810,
                     "{0} Please assign a keybinding for the command Toggle Screen Reader Accessibility Mode by accessing the keybindings editor with {1} and run it.",
                     editorNotAccessibleMessage,
                     keybindingEditorKeybindingLabel

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

@@ -1,4 +1,4 @@
-import { localizeWithPath } from '../../nls.js';
+import { localize } from '../../nls.js';
 import { isFirefox } from '../../base/browser/browser.js';
 import { KeyMod as KeyMod$1, KeyCode } from '../../base/common/keyCodes.js';
 import { isObject, isString, isUndefined, isNumber, isBoolean } from '../../base/common/types.js';
@@ -21,7 +21,6 @@ import { KeybindingsRegistry, KeybindingWeight } from '../../platform/keybinding
 import { EditorOption } from '../common/config/editorOptions.js';
 import { getActiveElement } from '../../base/browser/dom.js';
 import { EnterOperation } from '../common/cursor/cursorTypeEditOperations.js';
-const _moduleId = "vs/editor/browser/coreCommands";
 const CORE_WEIGHT = KeybindingWeight.EditorCore;
 class CoreEditorCommand extends EditorCommand {
     runEditorCommand(accessor, editor, args) {
@@ -862,7 +861,7 @@ var CoreNavigationCommands;
                         type: 'object',
                         properties: {
                             'sticky': {
-                                description: ( localizeWithPath(_moduleId, 0, "Stick to the end even when going to longer lines")),
+                                description: ( localize(1279, "Stick to the end even when going to longer lines")),
                                 type: 'boolean',
                                 default: false
                             }
@@ -890,7 +889,7 @@ var CoreNavigationCommands;
                         type: 'object',
                         properties: {
                             'sticky': {
-                                description: ( localizeWithPath(_moduleId, 0, "Stick to the end even when going to longer lines")),
+                                description: ( localize(1279, "Stick to the end even when going to longer lines")),
                                 type: 'boolean',
                                 default: false
                             }
@@ -1432,7 +1431,7 @@ var CoreNavigationCommands;
                 viewModel.getPrimaryCursorState()
             ]);
             viewModel.revealAllCursors(args.source, true);
-            status(( localizeWithPath(_moduleId, 1, "Removed secondary cursors")));
+            status(( localize(1280, "Removed secondary cursors")));
         }
     }));
     CoreNavigationCommands.RevealLine = registerEditorCommand(new (class extends CoreEditorCommand {

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

@@ -1,4 +1,4 @@
-import { localizeWithPath } from '../../nls.js';
+import { localize } from '../../nls.js';
 import { URI } from '../../base/common/uri.js';
 import { ICodeEditorService } from './services/codeEditorService.js';
 import { Position } from '../common/core/position.js';
@@ -16,7 +16,6 @@ import { assertType } from '../../base/common/types.js';
 import { KeyMod as KeyMod$1, KeyCode } from '../../base/common/keyCodes.js';
 import { ILogService } from '../../platform/log/common/log.service.js';
 import { getActiveElement } from '../../base/browser/dom.js';
-const _moduleId = "vs/editor/browser/editorExtensions";
 var EditorContributionInstantiation;
 ( ((function(EditorContributionInstantiation) {
     EditorContributionInstantiation[EditorContributionInstantiation["Eager"] = 0] = "Eager";
@@ -389,12 +388,12 @@ const UndoCommand = registerCommand(( (new MultiCommand({
     menuOpts: [{
             menuId: MenuId.MenubarEditMenu,
             group: '1_do',
-            title: ( localizeWithPath(_moduleId, 0, "&&Undo")),
+            title: ( localize(561, "&&Undo")),
             order: 1
         }, {
             menuId: MenuId.CommandPalette,
             group: '',
-            title: ( localizeWithPath(_moduleId, 1, "Undo")),
+            title: ( localize(562, "Undo")),
             order: 1
         }]
 }))));
@@ -411,12 +410,12 @@ const RedoCommand = registerCommand(( (new MultiCommand({
     menuOpts: [{
             menuId: MenuId.MenubarEditMenu,
             group: '1_do',
-            title: ( localizeWithPath(_moduleId, 2, "&&Redo")),
+            title: ( localize(563, "&&Redo")),
             order: 2
         }, {
             menuId: MenuId.CommandPalette,
             group: '',
-            title: ( localizeWithPath(_moduleId, 3, "Redo")),
+            title: ( localize(564, "Redo")),
             order: 1
         }]
 }))));
@@ -432,12 +431,12 @@ const SelectAllCommand = registerCommand(( (new MultiCommand({
     menuOpts: [{
             menuId: MenuId.MenubarSelectionMenu,
             group: '1_basic',
-            title: ( localizeWithPath(_moduleId, 4, "&&Select All")),
+            title: ( localize(565, "&&Select All")),
             order: 1
         }, {
             menuId: MenuId.CommandPalette,
             group: '',
-            title: ( localizeWithPath(_moduleId, 5, "Select All")),
+            title: ( localize(566, "Select All")),
             order: 1
         }]
 }))));

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

@@ -83,6 +83,8 @@ class ObservableCodeEditor extends Disposable {
         this.scrollTop = observableFromEvent(this.editor.onDidScrollChange, () => this.editor.getScrollTop());
         this.scrollLeft = observableFromEvent(this.editor.onDidScrollChange, () => this.editor.getScrollLeft());
         this.layoutInfo = observableFromEvent(this.editor.onDidLayoutChange, () => this.editor.getLayoutInfo());
+        this.layoutInfoContentLeft = ( this.layoutInfo.map(l => l.contentLeft));
+        this.layoutInfoDecorationsLeft = ( this.layoutInfo.map(l => l.decorationsLeft));
         this.contentWidth = observableFromEvent(this.editor.onDidContentSizeChange, () => this.editor.getContentWidth());
         this._overlayWidgetCounter = 0;
         this._register(this.editor.onBeginUpdate(() => this._beginUpdate()));

package/vscode/src/vs/editor/browser/services/hoverService/hoverWidget.js

@@ -14,11 +14,10 @@ import { IOpenerService } from '../../../../platform/opener/common/opener.servic
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { openLinkFromMarkdown, MarkdownRenderer } from '../../widget/markdownRenderer/browser/markdownRenderer.js';
 import { isMarkdownString } from '../../../../base/common/htmlContent.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { isMacintosh } from '../../../../base/common/platform.js';
 import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.service.js';
 import { status } from '../../../../base/browser/ui/aria/aria.js';
-const _moduleId = "vs/editor/browser/services/hoverService/hoverWidget";
 const $ = $$1;
 var Constants;
 ( ((function(Constants) {
@@ -155,7 +154,7 @@ let HoverWidget = class HoverWidget extends Widget {
         if (hideOnHover && options.appearance?.showHoverHint) {
             const statusBarElement = $('div.hover-row.status-bar');
             const infoElement = $('div.info');
-            infoElement.textContent = ( localizeWithPath(_moduleId, 0, 'Hold {0} key to mouse over', isMacintosh ? 'Option' : 'Alt'));
+            infoElement.textContent = ( localize(4785, 'Hold {0} key to mouse over', isMacintosh ? 'Option' : 'Alt'));
             statusBarElement.appendChild(infoElement);
             this._hover.containerDomNode.appendChild(statusBarElement);
         }

package/vscode/src/vs/editor/browser/services/hoverService/updatableHoverWidget.js

@@ -3,8 +3,7 @@ import { HoverPosition } from '../../../../base/browser/ui/hover/hoverWidget.js'
 import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
 import { isMarkdownString } from '../../../../base/common/htmlContent.js';
 import { isString, isFunction } from '../../../../base/common/types.js';
-import { localizeWithPath } from '../../../../nls.js';
-const _moduleId = "vs/editor/browser/services/hoverService/updatableHoverWidget";
+import { localize } from '../../../../nls.js';
 class ManagedHoverWidget {
     constructor(hoverDelegate, target, fadeInAnimation) {
         this.hoverDelegate = hoverDelegate;
@@ -28,7 +27,7 @@ class ManagedHoverWidget {
         }
         else {
             if (!this._hoverWidget) {
-                this.show(( localizeWithPath(_moduleId, 0, "Loading...")), focus, options);
+                this.show(( localize(4786, "Loading...")), focus, options);
             }
             this._cancellationTokenSource = ( (new CancellationTokenSource()));
             const token = this._cancellationTokenSource.token;

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../external/tslib/tslib.es6.js';
-import { runAtThisOrScheduleAtNextAnimationFrame, getWindow } from '../../base/browser/dom.js';
+import { getWindow, runAtThisOrScheduleAtNextAnimationFrame } from '../../base/browser/dom.js';
 import { createFastDomNode } from '../../base/browser/fastDomNode.js';
 import { inputLatency } from '../../base/browser/performance.js';
 import { BugIndicatingError, onUnexpectedError } from '../../base/common/errors.js';
@@ -51,6 +51,7 @@ 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);
@@ -167,6 +168,7 @@ 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: () => {

package/vscode/src/vs/editor/browser/viewParts/overviewRuler/decorationsOverviewRuler.js

@@ -403,8 +403,7 @@ class DecorationsOverviewRuler extends ViewPart {
             canvasCtx.strokeStyle = this._settings.borderColor;
             canvasCtx.moveTo(0, 0);
             canvasCtx.lineTo(0, canvasHeight);
-            canvasCtx.stroke();
-            canvasCtx.moveTo(0, 0);
+            canvasCtx.moveTo(1, 0);
             canvasCtx.lineTo(canvasWidth, 0);
             canvasCtx.stroke();
         }

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

@@ -36,7 +36,7 @@ import { VerticalRevealType } from '../../../common/viewEvents.js';
 import { MonospaceLineBreaksComputerFactory } from '../../../common/viewModel/monospaceLineBreaksComputer.js';
 import { ViewModel } from '../../../common/viewModel/viewModelImpl.js';
 import { OutgoingViewModelEventKind } from '../../../common/viewModelEventDispatcher.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.service.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.service.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
@@ -60,7 +60,6 @@ import { IThemeService } from '../../../../platform/theme/common/themeService.se
 import { MenuId } from '../../../../platform/actions/common/actions.js';
 import Severity$1 from '../../../../base/common/severity.js';
 var CodeEditorWidget_1;
-const _moduleId = "vs/editor/browser/widget/codeEditor/codeEditorWidget";
 let CodeEditorWidget = class CodeEditorWidget extends Disposable {
     static { CodeEditorWidget_1 = this; }
     static { this.dropIntoEditorDecorationOptions = ModelDecorationOptions.register({
@@ -1302,9 +1301,8 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
                 case OutgoingViewModelEventKind.CursorStateChanged: {
                     if (e.reachedMaxCursorCount) {
                         const multiCursorLimit = this.getOption(EditorOption.multiCursorLimit);
-                        const message = ( localizeWithPath(
-                            _moduleId,
-                            0,
+                        const message = ( localize(
+                            1281,
                             "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
                         ));
@@ -1316,7 +1314,7 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
                                 }
                             },
                             {
-                                label: ( localizeWithPath(_moduleId, 1, 'Increase Multi Cursor Limit')),
+                                label: ( localize(1282, 'Increase Multi Cursor Limit')),
                                 run: () => {
                                     this._commandService.executeCommand('workbench.action.openSettings2', {
                                         query: 'editor.multiCursorLimit'

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

@@ -1,4 +1,4 @@
 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;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 .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)}";
+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 .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/diffEditor/commands.js

@@ -5,18 +5,17 @@ import { EditorAction2 } from '../../editorExtensions.js';
 import { ICodeEditorService } from '../../services/codeEditorService.js';
 import { DiffEditorWidget } from './diffEditorWidget.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
-import { localize2WithPath } from '../../../../nls.js';
+import { localize2 } from '../../../../nls.js';
 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 { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import './registrations.contribution.js';
-const _moduleId = "vs/editor/browser/widget/diffEditor/commands";
 class ToggleCollapseUnchangedRegions extends Action2 {
     constructor() {
         super({
             id: 'diffEditor.toggleCollapseUnchangedRegions',
-            title: ( localize2WithPath(_moduleId, 0, 'Toggle Collapse Unchanged Regions')),
+            title: ( localize2(4882, 'Toggle Collapse Unchanged Regions')),
             icon: Codicon.map,
             toggled: ( (ContextKeyExpr.has('config.diffEditor.hideUnchangedRegions.enabled'))),
             precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
@@ -38,7 +37,7 @@ class ToggleShowMovedCodeBlocks extends Action2 {
     constructor() {
         super({
             id: 'diffEditor.toggleShowMovedCodeBlocks',
-            title: ( localize2WithPath(_moduleId, 1, 'Toggle Show Moved Code Blocks')),
+            title: ( localize2(4883, 'Toggle Show Moved Code Blocks')),
             precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
         });
     }
@@ -52,7 +51,7 @@ class ToggleUseInlineViewWhenSpaceIsLimited extends Action2 {
     constructor() {
         super({
             id: 'diffEditor.toggleUseInlineViewWhenSpaceIsLimited',
-            title: ( localize2WithPath(_moduleId, 2, 'Toggle Use Inline View When Space Is Limited')),
+            title: ( localize2(4884, 'Toggle Use Inline View When Space Is Limited')),
             precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
         });
     }
@@ -62,12 +61,12 @@ class ToggleUseInlineViewWhenSpaceIsLimited extends Action2 {
         configurationService.updateValue('diffEditor.useInlineViewWhenSpaceIsLimited', newValue);
     }
 }
-const diffEditorCategory = ( localize2WithPath(_moduleId, 3, "Diff Editor"));
+const diffEditorCategory = ( localize2(4885, "Diff Editor"));
 class SwitchSide extends EditorAction2 {
     constructor() {
         super({
             id: 'diffEditor.switchSide',
-            title: ( localize2WithPath(_moduleId, 4, 'Switch Side')),
+            title: ( localize2(4886, 'Switch Side')),
             icon: Codicon.arrowSwap,
             precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
             f1: true,
@@ -91,7 +90,7 @@ class ExitCompareMove extends EditorAction2 {
     constructor() {
         super({
             id: 'diffEditor.exitCompareMove',
-            title: ( localize2WithPath(_moduleId, 5, 'Exit Compare Move')),
+            title: ( localize2(4887, 'Exit Compare Move')),
             icon: Codicon.close,
             precondition: EditorContextKeys.comparingMovedCode,
             f1: false,
@@ -113,7 +112,7 @@ class CollapseAllUnchangedRegions extends EditorAction2 {
     constructor() {
         super({
             id: 'diffEditor.collapseAllUnchangedRegions',
-            title: ( localize2WithPath(_moduleId, 6, 'Collapse All Unchanged Regions')),
+            title: ( localize2(4888, 'Collapse All Unchanged Regions')),
             icon: Codicon.fold,
             precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
             f1: true,
@@ -131,7 +130,7 @@ class ShowAllUnchangedRegions extends EditorAction2 {
     constructor() {
         super({
             id: 'diffEditor.showAllUnchangedRegions',
-            title: ( localize2WithPath(_moduleId, 7, 'Show All Unchanged Regions')),
+            title: ( localize2(4889, 'Show All Unchanged Regions')),
             icon: Codicon.unfold,
             precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
             f1: true,
@@ -149,7 +148,7 @@ class RevertHunkOrSelection extends Action2 {
     constructor() {
         super({
             id: 'diffEditor.revert',
-            title: ( localize2WithPath(_moduleId, 8, 'Revert')),
+            title: ( localize2(4890, 'Revert')),
             f1: false,
             category: diffEditorCategory,
         });
@@ -162,13 +161,13 @@ class RevertHunkOrSelection extends Action2 {
         return undefined;
     }
 }
-const accessibleDiffViewerCategory = ( localize2WithPath(_moduleId, 9, "Accessible Diff Viewer"));
+const accessibleDiffViewerCategory = ( localize2(4891, "Accessible Diff Viewer"));
 class AccessibleDiffViewerNext extends Action2 {
     static { this.id = 'editor.action.accessibleDiffViewer.next'; }
     constructor() {
         super({
             id: AccessibleDiffViewerNext.id,
-            title: ( localize2WithPath(_moduleId, 10, 'Go to Next Difference')),
+            title: ( localize2(4892, 'Go to Next Difference')),
             category: accessibleDiffViewerCategory,
             precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
             keybinding: {
@@ -188,7 +187,7 @@ class AccessibleDiffViewerPrev extends Action2 {
     constructor() {
         super({
             id: AccessibleDiffViewerPrev.id,
-            title: ( localize2WithPath(_moduleId, 11, 'Go to Previous Difference')),
+            title: ( localize2(4893, 'Go to Previous Difference')),
             category: accessibleDiffViewerCategory,
             precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
             keybinding: {

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

@@ -26,16 +26,15 @@ import { ILanguageService } from '../../../../common/languages/language.js';
 import { LineTokens } from '../../../../common/tokens/lineTokens.js';
 import { renderViewLine2, RenderLineInput } from '../../../../common/viewLayout/viewLineRenderer.js';
 import { ViewLineRenderingData } from '../../../../common/viewModel.js';
-import { localizeWithPath } from '../../../../../nls.js';
+import { localize } from '../../../../../nls.js';
 import { AccessibilitySignal } from '../../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
 import { IAccessibilitySignalService } from '../../../../../platform/accessibilitySignal/browser/accessibilitySignalService.service.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { registerIcon } from '../../../../../platform/theme/common/iconRegistry.js';
 import './accessibleDiffViewer.css.js';
-const _moduleId = "vs/editor/browser/widget/diffEditor/components/accessibleDiffViewer";
-const accessibleDiffViewerInsertIcon = registerIcon('diff-review-insert', Codicon.add, ( localizeWithPath(_moduleId, 0, 'Icon for \'Insert\' in accessible diff viewer.')));
-const accessibleDiffViewerRemoveIcon = registerIcon('diff-review-remove', Codicon.remove, ( localizeWithPath(_moduleId, 1, 'Icon for \'Remove\' in accessible diff viewer.')));
-const accessibleDiffViewerCloseIcon = registerIcon('diff-review-close', Codicon.close, ( localizeWithPath(_moduleId, 2, 'Icon for \'Close\' in accessible diff viewer.')));
+const accessibleDiffViewerInsertIcon = registerIcon('diff-review-insert', Codicon.add, ( localize(9324, 'Icon for \'Insert\' in accessible diff viewer.')));
+const accessibleDiffViewerRemoveIcon = registerIcon('diff-review-remove', Codicon.remove, ( localize(9325, 'Icon for \'Remove\' in accessible diff viewer.')));
+const accessibleDiffViewerCloseIcon = registerIcon('diff-review-close', Codicon.close, ( localize(9326, '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) {
@@ -303,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', ( localizeWithPath(_moduleId, 3, "Close")), 'close-diff-review ' + ThemeIcon.asClassName(accessibleDiffViewerCloseIcon), true, async () => _model.close()))), { label: false, icon: true });
+                this._actionBar.push(( (new Action('diffreview.close', ( localize(9327, "Close")), 'close-diff-review ' + ThemeIcon.asClassName(accessibleDiffViewerCloseIcon), true, async () => _model.close()))), { label: false, icon: true });
             }
         }));
         this._content = document.createElement('div');
@@ -356,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', ( localizeWithPath(_moduleId, 4, 'Accessible Diff Viewer. Use arrow up and down to navigate.')));
+        container.setAttribute('aria-label', ( localize(9328, '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();
@@ -380,14 +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 ? ( localizeWithPath(_moduleId, 5, "no lines changed"))
-                    : lines === 1 ? ( localizeWithPath(_moduleId, 6, "1 line changed"))
-                        : ( localizeWithPath(_moduleId, 7, "{0} lines changed", lines));
+                const getAriaLines = (lines) => lines === 0 ? ( localize(9329, "no lines changed"))
+                    : lines === 1 ? ( localize(9330, "1 line changed"))
+                        : ( localize(9331, "{0} lines changed", lines));
                 const originalChangedLinesCntAria = getAriaLines(r.original.length);
                 const modifiedChangedLinesCntAria = getAriaLines(r.modified.length);
-                header.setAttribute('aria-label', ( localizeWithPath(
-                    _moduleId,
-                    8,
+                header.setAttribute('aria-label', ( localize(
+                    9332,
                     "Difference {0} of {1}: original line {2}, {3}, modified line {4}, {5}",
                     (diffIndex + 1),
                     diffsLength,
@@ -503,24 +501,17 @@ let View = class View extends Disposable {
             lineContent = originalModel.getLineContent(item.originalLineNumber);
         }
         if (lineContent.length === 0) {
-            lineContent = ( localizeWithPath(_moduleId, 9, "blank"));
+            lineContent = ( localize(9333, "blank"));
         }
         let ariaLabel = '';
         switch (item.type) {
             case LineType.Unchanged:
                 if (item.originalLineNumber === item.modifiedLineNumber) {
-                    ariaLabel = ( localizeWithPath(
-                        _moduleId,
-                        10,
-                        "{0} unchanged line {1}",
-                        lineContent,
-                        item.originalLineNumber
-                    ));
+                    ariaLabel = ( localize(9334, "{0} unchanged line {1}", lineContent, item.originalLineNumber));
                 }
                 else {
-                    ariaLabel = ( localizeWithPath(
-                        _moduleId,
-                        11,
+                    ariaLabel = ( localize(
+                        9335,
                         "{0} original line {1} modified line {2}",
                         lineContent,
                         item.originalLineNumber,
@@ -529,22 +520,10 @@ let View = class View extends Disposable {
                 }
                 break;
             case LineType.Added:
-                ariaLabel = ( localizeWithPath(
-                    _moduleId,
-                    12,
-                    "+ {0} modified line {1}",
-                    lineContent,
-                    item.modifiedLineNumber
-                ));
+                ariaLabel = ( localize(9336, "+ {0} modified line {1}", lineContent, item.modifiedLineNumber));
                 break;
             case LineType.Deleted:
-                ariaLabel = ( localizeWithPath(
-                    _moduleId,
-                    13,
-                    "- {0} original line {1}",
-                    lineContent,
-                    item.originalLineNumber
-                ));
+                ariaLabel = ( localize(9337, "- {0} original line {1}", lineContent, item.originalLineNumber));
                 break;
         }
         row.setAttribute('aria-label', ariaLabel);

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

@@ -4,6 +4,7 @@ import { derived } from '../../../../../base/common/observableInternal/derived.j
 import '../../../../../base/common/observableInternal/autorun.js';
 import '../../../../../base/common/observableInternal/utils.js';
 import '../../../../../base/common/cancellation.js';
+import { allowsTrueInlineDiffRendering } from './diffEditorViewZones/diffEditorViewZones.js';
 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';
@@ -14,7 +15,8 @@ class DiffEditorDecorations extends Disposable {
         this._diffModel = _diffModel;
         this._options = _options;
         this._decorations = derived(this, (reader) => {
-            const diff = this._diffModel.read(reader)?.diff.read(reader);
+            const diffModel = this._diffModel.read(reader);
+            const diff = diffModel?.diff.read(reader);
             if (!diff) {
                 return null;
             }
@@ -40,12 +42,28 @@ class DiffEditorDecorations extends Disposable {
                         }
                     }
                     else {
+                        const useInlineDiff = this._options.useTrueInlineDiffRendering.read(reader) && allowsTrueInlineDiffRendering(m.lineRangeMapping);
                         for (const i of m.lineRangeMapping.innerChanges || []) {
                             if (m.lineRangeMapping.original.contains(i.originalRange.startLineNumber)) {
                                 originalDecorations.push({ range: i.originalRange, options: (i.originalRange.isEmpty() && showEmptyDecorations) ? diffDeleteDecorationEmpty : diffDeleteDecoration });
                             }
                             if (m.lineRangeMapping.modified.contains(i.modifiedRange.startLineNumber)) {
-                                modifiedDecorations.push({ range: i.modifiedRange, options: (i.modifiedRange.isEmpty() && showEmptyDecorations) ? diffAddDecorationEmpty : diffAddDecoration });
+                                modifiedDecorations.push({ range: i.modifiedRange, options: (i.modifiedRange.isEmpty() && showEmptyDecorations && !useInlineDiff) ? diffAddDecorationEmpty : diffAddDecoration });
+                            }
+                            if (useInlineDiff) {
+                                const deletedText = diffModel.model.original.getValueInRange(i.originalRange);
+                                modifiedDecorations.push({
+                                    range: i.modifiedRange,
+                                    options: {
+                                        description: 'deleted-text',
+                                        before: {
+                                            content: deletedText,
+                                            inlineClassName: 'inline-deleted-text',
+                                        },
+                                        zIndex: 100000,
+                                        showIfCollapsed: true,
+                                    }
+                                });
                             }
                         }
                     }