@codingame/monaco-vscode-api 22.1.8 → 23.0.0

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

@@ -18,7 +18,7 @@ class ToggleCollapseUnchangedRegions extends Action2 {
     constructor() {
         super({
             id: 'diffEditor.toggleCollapseUnchangedRegions',
-            title: ( localize2(153, 'Toggle Collapse Unchanged Regions')),
+            title: ( localize2(151, 'Toggle Collapse Unchanged Regions')),
             icon: Codicon.map,
             toggled: ( ContextKeyExpr.has('config.diffEditor.hideUnchangedRegions.enabled')),
             precondition: ( ContextKeyExpr.has('isInDiffEditor')),
@@ -40,7 +40,7 @@ class ToggleShowMovedCodeBlocks extends Action2 {
     constructor() {
         super({
             id: 'diffEditor.toggleShowMovedCodeBlocks',
-            title: ( localize2(154, 'Toggle Show Moved Code Blocks')),
+            title: ( localize2(152, 'Toggle Show Moved Code Blocks')),
             precondition: ( ContextKeyExpr.has('isInDiffEditor')),
         });
     }
@@ -54,7 +54,7 @@ class ToggleUseInlineViewWhenSpaceIsLimited extends Action2 {
     constructor() {
         super({
             id: 'diffEditor.toggleUseInlineViewWhenSpaceIsLimited',
-            title: ( localize2(155, 'Toggle Use Inline View When Space Is Limited')),
+            title: ( localize2(153, 'Toggle Use Inline View When Space Is Limited')),
             precondition: ( ContextKeyExpr.has('isInDiffEditor')),
         });
     }
@@ -64,12 +64,12 @@ class ToggleUseInlineViewWhenSpaceIsLimited extends Action2 {
         configurationService.updateValue('diffEditor.useInlineViewWhenSpaceIsLimited', newValue);
     }
 }
-const diffEditorCategory = ( localize2(156, "Diff Editor"));
+const diffEditorCategory = ( localize2(154, "Diff Editor"));
 class SwitchSide extends EditorAction2 {
     constructor() {
         super({
             id: 'diffEditor.switchSide',
-            title: ( localize2(157, 'Switch Side')),
+            title: ( localize2(155, 'Switch Side')),
             icon: Codicon.arrowSwap,
             precondition: ( ContextKeyExpr.has('isInDiffEditor')),
             f1: true,
@@ -93,7 +93,7 @@ class ExitCompareMove extends EditorAction2 {
     constructor() {
         super({
             id: 'diffEditor.exitCompareMove',
-            title: ( localize2(158, 'Exit Compare Move')),
+            title: ( localize2(156, 'Exit Compare Move')),
             icon: Codicon.close,
             precondition: EditorContextKeys.comparingMovedCode,
             f1: false,
@@ -115,7 +115,7 @@ class CollapseAllUnchangedRegions extends EditorAction2 {
     constructor() {
         super({
             id: 'diffEditor.collapseAllUnchangedRegions',
-            title: ( localize2(159, 'Collapse All Unchanged Regions')),
+            title: ( localize2(157, 'Collapse All Unchanged Regions')),
             icon: Codicon.fold,
             precondition: ( ContextKeyExpr.has('isInDiffEditor')),
             f1: true,
@@ -133,7 +133,7 @@ class ShowAllUnchangedRegions extends EditorAction2 {
     constructor() {
         super({
             id: 'diffEditor.showAllUnchangedRegions',
-            title: ( localize2(160, 'Show All Unchanged Regions')),
+            title: ( localize2(158, 'Show All Unchanged Regions')),
             icon: Codicon.unfold,
             precondition: ( ContextKeyExpr.has('isInDiffEditor')),
             f1: true,
@@ -151,7 +151,7 @@ class RevertHunkOrSelection extends Action2 {
     constructor() {
         super({
             id: 'diffEditor.revert',
-            title: ( localize2(161, 'Revert')),
+            title: ( localize2(159, 'Revert')),
             f1: true,
             category: diffEditorCategory,
             precondition: ( ContextKeyExpr.has('isInDiffEditor')),
@@ -175,13 +175,13 @@ class RevertHunkOrSelection extends Action2 {
         return undefined;
     }
 }
-const accessibleDiffViewerCategory = ( localize2(162, "Accessible Diff Viewer"));
+const accessibleDiffViewerCategory = ( localize2(160, "Accessible Diff Viewer"));
 class AccessibleDiffViewerNext extends Action2 {
     static { this.id = 'editor.action.accessibleDiffViewer.next'; }
     constructor() {
         super({
             id: AccessibleDiffViewerNext.id,
-            title: ( localize2(163, 'Go to Next Difference')),
+            title: ( localize2(161, 'Go to Next Difference')),
             category: accessibleDiffViewerCategory,
             precondition: ( ContextKeyExpr.has('isInDiffEditor')),
             keybinding: {
@@ -201,7 +201,7 @@ class AccessibleDiffViewerPrev extends Action2 {
     constructor() {
         super({
             id: AccessibleDiffViewerPrev.id,
-            title: ( localize2(164, 'Go to Previous Difference')),
+            title: ( localize2(162, 'Go to Previous Difference')),
             category: accessibleDiffViewerCategory,
             precondition: ( ContextKeyExpr.has('isInDiffEditor')),
             keybinding: {

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

@@ -34,9 +34,7 @@ export declare class AccessibleDiffViewer extends Disposable {
     private readonly _diffs;
     private readonly _models;
     private readonly _instantiationService;
-    static _ttPolicy: Pick<TrustedTypePolicy<{
-        createHTML: (value: string) => string;
-    }>, "name" | "createHTML"> | undefined;
+    static _ttPolicy: Pick<TrustedTypePolicy, "name" | "createHTML"> | undefined;
     constructor(_parentNode: HTMLElement, _visible: IObservable<boolean>, _setVisible: (visible: boolean, tx: ITransaction | undefined) => void, _canClose: IObservable<boolean>, _width: IObservable<number>, _height: IObservable<number>, _diffs: IObservable<DetailedLineRangeMapping[] | undefined>, _models: IAccessibleDiffViewerModel, _instantiationService: IInstantiationService);
     private readonly _state;
     next(): void;

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

@@ -1,7 +1,7 @@
 
 import { registerCss } from '@codingame/monaco-vscode-api/css';
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
-import { createElement, reset, addStandardDisposableListener, addDisposableListener } from '../../../../../base/browser/dom.js';
+import { createElement, reset, addStandardDisposableListener, createTextNode, addDisposableListener } from '../../../../../base/browser/dom.js';
 import { createTrustedTypesPolicy } from '../../../../../base/browser/trustedTypes.js';
 import { ActionBar } from '../../../../../base/browser/ui/actionbar/actionbar.js';
 import { DomScrollableElement } from '../../../../../base/browser/ui/scrollbar/scrollableElement.js';
@@ -36,9 +36,9 @@ import { observableValue } from '../../../../../base/common/observableInternal/o
 import { autorun, autorunWithStore } from '../../../../../base/common/observableInternal/reactions/autorun.js';
 
 registerCss(accessibleDiffViewer);
-const accessibleDiffViewerInsertIcon = registerIcon('diff-review-insert', Codicon.add, ( localize(165, 'Icon for \'Insert\' in accessible diff viewer.')));
-const accessibleDiffViewerRemoveIcon = registerIcon('diff-review-remove', Codicon.remove, ( localize(166, 'Icon for \'Remove\' in accessible diff viewer.')));
-const accessibleDiffViewerCloseIcon = registerIcon('diff-review-close', Codicon.close, ( localize(167, 'Icon for \'Close\' in accessible diff viewer.')));
+const accessibleDiffViewerInsertIcon = registerIcon('diff-review-insert', Codicon.add, ( localize(163, 'Icon for \'Insert\' in accessible diff viewer.')));
+const accessibleDiffViewerRemoveIcon = registerIcon('diff-review-remove', Codicon.remove, ( localize(164, 'Icon for \'Remove\' in accessible diff viewer.')));
+const accessibleDiffViewerCloseIcon = registerIcon('diff-review-close', Codicon.close, ( localize(165, '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) {
@@ -305,7 +305,7 @@ let View = class View extends Disposable {
             if (this._model.canClose.read(reader)) {
                 this._actionBar.push(toAction({
                     id: 'diffreview.close',
-                    label: ( localize(168, "Close")),
+                    label: ( localize(166, "Close")),
                     class: 'close-diff-review ' + ThemeIcon.asClassName(accessibleDiffViewerCloseIcon),
                     enabled: true,
                     run: async () => _model.close()
@@ -362,7 +362,7 @@ let View = class View extends Disposable {
         const container = createElement('div');
         container.className = 'diff-review-table';
         container.setAttribute('role', 'list');
-        container.setAttribute('aria-label', ( localize(169, 'Accessible Diff Viewer. Use arrow up and down to navigate.')));
+        container.setAttribute('aria-label', ( localize(167, '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();
@@ -386,13 +386,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(170, "no lines changed"))
-                    : lines === 1 ? ( localize(171, "1 line changed"))
-                        : ( localize(172, "{0} lines changed", lines));
+                const getAriaLines = (lines) => lines === 0 ? ( localize(168, "no lines changed"))
+                    : lines === 1 ? ( localize(169, "1 line changed"))
+                        : ( localize(170, "{0} lines changed", lines));
                 const originalChangedLinesCntAria = getAriaLines(r.original.length);
                 const modifiedChangedLinesCntAria = getAriaLines(r.modified.length);
                 header.setAttribute('aria-label', ( localize(
-                    173,
+                    171,
                     "Difference {0} of {1}: original line {2}, {3}, modified line {4}, {5}",
                     (diffIndex + 1),
                     diffsLength,
@@ -403,7 +403,7 @@ let View = class View extends Disposable {
                 )));
                 const cell = createElement('div');
                 cell.className = 'diff-review-cell diff-review-summary';
-                cell.appendChild(document.createTextNode(`${diffIndex + 1}/${diffsLength}: @@ -${r.original.startLineNumber},${r.original.length} +${r.modified.startLineNumber},${r.modified.length} @@`));
+                cell.appendChild(createTextNode(`${diffIndex + 1}/${diffsLength}: @@ -${r.original.startLineNumber},${r.original.length} +${r.modified.startLineNumber},${r.modified.length} @@`));
                 header.appendChild(cell);
                 row = header;
             }
@@ -460,7 +460,7 @@ let View = class View extends Disposable {
         originalLineNumber.style.minWidth = (originalLineNumbersWidth + 'px');
         originalLineNumber.className = 'diff-review-line-number' + lineNumbersExtraClassName;
         if (item.originalLineNumber !== undefined) {
-            originalLineNumber.appendChild(document.createTextNode(String(item.originalLineNumber)));
+            originalLineNumber.appendChild(createTextNode(String(item.originalLineNumber)));
         }
         else {
             originalLineNumber.innerText = '\u00a0';
@@ -472,7 +472,7 @@ let View = class View extends Disposable {
         modifiedLineNumber.style.paddingRight = '10px';
         modifiedLineNumber.className = 'diff-review-line-number' + lineNumbersExtraClassName;
         if (item.modifiedLineNumber !== undefined) {
-            modifiedLineNumber.appendChild(document.createTextNode(String(item.modifiedLineNumber)));
+            modifiedLineNumber.appendChild(createTextNode(String(item.modifiedLineNumber)));
         }
         else {
             modifiedLineNumber.innerText = '\u00a0';
@@ -508,17 +508,17 @@ let View = class View extends Disposable {
             lineContent = originalModel.getLineContent(item.originalLineNumber);
         }
         if (lineContent.length === 0) {
-            lineContent = ( localize(174, "blank"));
+            lineContent = ( localize(172, "blank"));
         }
         let ariaLabel = '';
         switch (item.type) {
             case LineType.Unchanged:
                 if (item.originalLineNumber === item.modifiedLineNumber) {
-                    ariaLabel = ( localize(175, "{0} unchanged line {1}", lineContent, item.originalLineNumber));
+                    ariaLabel = ( localize(173, "{0} unchanged line {1}", lineContent, item.originalLineNumber));
                 }
                 else {
                     ariaLabel = ( localize(
-                        176,
+                        174,
                         "{0} original line {1} modified line {2}",
                         lineContent,
                         item.originalLineNumber,
@@ -527,10 +527,10 @@ let View = class View extends Disposable {
                 }
                 break;
             case LineType.Added:
-                ariaLabel = ( localize(177, "+ {0} modified line {1}", lineContent, item.modifiedLineNumber));
+                ariaLabel = ( localize(175, "+ {0} modified line {1}", lineContent, item.modifiedLineNumber));
                 break;
             case LineType.Deleted:
-                ariaLabel = ( localize(178, "- {0} original line {1}", lineContent, item.originalLineNumber));
+                ariaLabel = ( localize(176, "- {0} original line {1}", lineContent, item.originalLineNumber));
                 break;
         }
         row.setAttribute('aria-label', ariaLabel);

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

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

package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/copySelection.d.ts

@@ -0,0 +1,18 @@
+import { DisposableStore } from "../../../../../../base/common/lifecycle.js";
+import { DetailedLineRangeMapping } from "../../../../../common/diff/rangeMapping.js";
+import { ITextModel } from "../../../../../common/model.js";
+import { IClipboardService } from "../../../../../../platform/clipboard/common/clipboardService.service.js";
+import { RenderLinesResult } from "./renderLines.js";
+export interface IEnableViewZoneCopySelectionOptions {
+    /** The view zone HTML element that contains the deleted codes. */
+    domNode: HTMLElement;
+    /** The diff entry for the current view zone. */
+    diffEntry: DetailedLineRangeMapping;
+    /** The original text model, to get the original text based on selection. */
+    originalModel: ITextModel;
+    /** The render lines result that can translate DOM positions to model positions. */
+    renderLinesResult: RenderLinesResult;
+    /** The clipboard service to write the selected text to. */
+    clipboardService: IClipboardService;
+}
+export declare function enableCopySelection(options: IEnableViewZoneCopySelectionOptions): DisposableStore;

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

@@ -0,0 +1,44 @@
+
+import { addDisposableListener } from '../../../../../../base/browser/dom.js';
+import { DisposableStore } from '../../../../../../base/common/lifecycle.js';
+import { Range } from '../../../../../common/core/range.js';
+
+function enableCopySelection(options) {
+    const { domNode, renderLinesResult, diffEntry, originalModel, clipboardService } = options;
+    const viewZoneDisposable = ( new DisposableStore());
+    viewZoneDisposable.add(addDisposableListener(domNode, 'copy', (e) => {
+        e.preventDefault();
+        const selection = domNode.ownerDocument.getSelection();
+        if (!selection || selection.rangeCount === 0) {
+            return;
+        }
+        const domRange = selection.getRangeAt(0);
+        if (!domRange || domRange.collapsed) {
+            return;
+        }
+        const startElement = domRange.startContainer.nodeType === Node.TEXT_NODE
+            ? domRange.startContainer.parentElement
+            : domRange.startContainer;
+        const endElement = domRange.endContainer.nodeType === Node.TEXT_NODE
+            ? domRange.endContainer.parentElement
+            : domRange.endContainer;
+        if (!startElement || !endElement) {
+            return;
+        }
+        const startPosition = renderLinesResult.getModelPositionAt(startElement, domRange.startOffset);
+        const endPosition = renderLinesResult.getModelPositionAt(endElement, domRange.endOffset);
+        if (!startPosition || !endPosition) {
+            return;
+        }
+        const adjustedStart = startPosition.delta(diffEntry.original.startLineNumber - 1);
+        const adjustedEnd = endPosition.delta(diffEntry.original.startLineNumber - 1);
+        const range = adjustedEnd.isBefore(adjustedStart) ?
+            Range.fromPositions(adjustedEnd, adjustedStart) :
+            Range.fromPositions(adjustedStart, adjustedEnd);
+        const selectedText = originalModel.getValueInRange(range);
+        clipboardService.writeText(selectedText);
+    }));
+    return viewZoneDisposable;
+}
+
+export { enableCopySelection };

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

@@ -148,7 +148,7 @@ let DiffEditorViewZones = class DiffEditorViewZones extends Disposable {
                     if (!a.originalRange.isEmpty) {
                         originalModelTokenizationCompleted.read(reader);
                         const deletedCodeDomNode = createElement('div');
-                        deletedCodeDomNode.classList.add('view-lines', 'line-delete', 'monaco-mouse-cursor-text');
+                        deletedCodeDomNode.classList.add('view-lines', 'line-delete', 'line-delete-selectable', 'monaco-mouse-cursor-text');
                         const originalModel = this._editors.original.getModel();
                         if (a.originalRange.endLineNumberExclusive - 1 > originalModel.getLineCount()) {
                             return { orig: origViewZones, mod: modViewZones };
@@ -183,10 +183,11 @@ let DiffEditorViewZones = class DiffEditorViewZones extends Disposable {
                         alignmentViewZonesDisposables.add(( new InlineDiffDeletedCodeMargin(
                             () => assertReturnsDefined(zoneId),
                             marginDomNode,
+                            deletedCodeDomNode,
                             this._editors.modified,
                             a.diff,
                             this._diffEditorWidget,
-                            result.viewLineCounts,
+                            result,
                             this._editors.original.getModel(),
                             this._contextMenuService,
                             this._clipboardService
@@ -211,7 +212,7 @@ let DiffEditorViewZones = class DiffEditorViewZones extends Disposable {
                             marginDomNode,
                             setZoneId(id) { zoneId = id; },
                             showInHiddenAreas: true,
-                            suppressMouseDown: true,
+                            suppressMouseDown: false,
                         });
                     }
                     const marginDomNode = createElement('div');

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

@@ -5,13 +5,15 @@ import { DetailedLineRangeMapping } from "../../../../../common/diff/rangeMappin
 import { ITextModel } from "../../../../../common/model.js";
 import { IClipboardService } from "../../../../../../platform/clipboard/common/clipboardService.service.js";
 import { IContextMenuService } from "../../../../../../platform/contextview/browser/contextView.service.js";
+import { RenderLinesResult } from "./renderLines.js";
 export declare class InlineDiffDeletedCodeMargin extends Disposable {
     private readonly _getViewZoneId;
     private readonly _marginDomNode;
+    private readonly _deletedCodeDomNode;
     private readonly _modifiedEditor;
     private readonly _diff;
     private readonly _editor;
-    private readonly _viewLineCounts;
+    private readonly _renderLinesResult;
     private readonly _originalTextModel;
     private readonly _contextMenuService;
     private readonly _clipboardService;
@@ -19,6 +21,6 @@ export declare class InlineDiffDeletedCodeMargin extends Disposable {
     private _visibility;
     get visibility(): boolean;
     set visibility(_visibility: boolean);
-    constructor(_getViewZoneId: () => string, _marginDomNode: HTMLElement, _modifiedEditor: CodeEditorWidget, _diff: DetailedLineRangeMapping, _editor: DiffEditorWidget, _viewLineCounts: number[], _originalTextModel: ITextModel, _contextMenuService: IContextMenuService, _clipboardService: IClipboardService);
+    constructor(_getViewZoneId: () => string, _marginDomNode: HTMLElement, _deletedCodeDomNode: HTMLElement, _modifiedEditor: CodeEditorWidget, _diff: DetailedLineRangeMapping, _editor: DiffEditorWidget, _renderLinesResult: RenderLinesResult, _originalTextModel: ITextModel, _contextMenuService: IContextMenuService, _clipboardService: IClipboardService);
     private _updateLightBulbPosition;
 }

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

@@ -9,6 +9,7 @@ import { MouseTargetType } from '../../../../editorBrowser.js';
 import { EditorOption } from '../../../../../common/config/editorOptions.js';
 import { EndOfLineSequence } from '../../../../../common/model.js';
 import { localize } from '../../../../../../nls.js';
+import { enableCopySelection } from './copySelection.js';
 
 class InlineDiffDeletedCodeMargin extends Disposable {
     get visibility() {
@@ -20,14 +21,15 @@ class InlineDiffDeletedCodeMargin extends Disposable {
             this._diffActions.style.visibility = _visibility ? 'visible' : 'hidden';
         }
     }
-    constructor(_getViewZoneId, _marginDomNode, _modifiedEditor, _diff, _editor, _viewLineCounts, _originalTextModel, _contextMenuService, _clipboardService) {
+    constructor(_getViewZoneId, _marginDomNode, _deletedCodeDomNode, _modifiedEditor, _diff, _editor, _renderLinesResult, _originalTextModel, _contextMenuService, _clipboardService) {
         super();
         this._getViewZoneId = _getViewZoneId;
         this._marginDomNode = _marginDomNode;
+        this._deletedCodeDomNode = _deletedCodeDomNode;
         this._modifiedEditor = _modifiedEditor;
         this._diff = _diff;
         this._editor = _editor;
-        this._viewLineCounts = _viewLineCounts;
+        this._renderLinesResult = _renderLinesResult;
         this._originalTextModel = _originalTextModel;
         this._contextMenuService = _contextMenuService;
         this._clipboardService = _clipboardService;
@@ -44,32 +46,33 @@ class InlineDiffDeletedCodeMargin extends Disposable {
         this._marginDomNode.appendChild(this._diffActions);
         let currentLineNumberOffset = 0;
         const useShadowDOM = _modifiedEditor.getOption(EditorOption.useShadowDOM) && !isIOS;
-        const showContextMenu = (x, y) => {
+        const showContextMenu = (anchor, baseActions, onHide) => {
             this._contextMenuService.showContextMenu({
                 domForShadowRoot: useShadowDOM ? _modifiedEditor.getDomNode() ?? undefined : undefined,
-                getAnchor: () => ({ x, y }),
+                getAnchor: () => anchor,
+                onHide,
                 getActions: () => {
                     const actions = [];
                     const isDeletion = _diff.modified.isEmpty;
                     actions.push(( new Action('diff.clipboard.copyDeletedContent', isDeletion
                         ? (_diff.original.length > 1
-                            ? ( localize(180, "Copy deleted lines"))
-                            : ( localize(181, "Copy deleted line")))
+                            ? ( localize(178, "Copy deleted lines"))
+                            : ( localize(179, "Copy deleted line")))
                         : (_diff.original.length > 1
-                            ? ( localize(182, "Copy changed lines"))
-                            : ( localize(183, "Copy changed line"))), undefined, true, async () => {
+                            ? ( localize(180, "Copy changed lines"))
+                            : ( localize(181, "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(
-                            184,
+                            182,
                             "Copy deleted line ({0})",
                             _diff.original.startLineNumber + currentLineNumberOffset
                         ))
                             : ( localize(
-                            185,
+                            183,
                             "Copy changed line ({0})",
                             _diff.original.startLineNumber + currentLineNumberOffset
                         )), undefined, true, async () => {
@@ -83,7 +86,7 @@ class InlineDiffDeletedCodeMargin extends Disposable {
                     }
                     const readOnly = _modifiedEditor.getOption(EditorOption.readOnly);
                     if (!readOnly) {
-                        actions.push(( new Action('diff.inline.revertChange', ( localize(186, "Revert this change")), undefined, true, async () => {
+                        actions.push(( new Action('diff.inline.revertChange', ( localize(184, "Revert this change")), undefined, true, async () => {
                             this._editor.revert(this._diff);
                         })));
                     }
@@ -99,7 +102,7 @@ class InlineDiffDeletedCodeMargin extends Disposable {
             const { top, height } = getDomNodePagePosition(this._diffActions);
             const pad = Math.floor(lineHeight / 3);
             e.preventDefault();
-            showContextMenu(e.posx, top + height + pad);
+            showContextMenu({ x: e.posx, y: top + height + pad });
         }));
         this._register(_modifiedEditor.onMouseMove((e) => {
             if ((e.target.type === MouseTargetType.CONTENT_VIEW_ZONE || e.target.type === MouseTargetType.GUTTER_VIEW_ZONE) && e.target.detail.viewZoneId === this._getViewZoneId()) {
@@ -110,18 +113,12 @@ class InlineDiffDeletedCodeMargin extends Disposable {
                 this.visibility = false;
             }
         }));
-        this._register(_modifiedEditor.onMouseDown((e) => {
-            if (!e.event.leftButton) {
-                return;
-            }
-            if (e.target.type === MouseTargetType.CONTENT_VIEW_ZONE || e.target.type === MouseTargetType.GUTTER_VIEW_ZONE) {
-                const viewZoneId = e.target.detail.viewZoneId;
-                if (viewZoneId === this._getViewZoneId()) {
-                    e.event.preventDefault();
-                    currentLineNumberOffset = this._updateLightBulbPosition(this._marginDomNode, e.event.browserEvent.y, lineHeight);
-                    showContextMenu(e.event.posx, e.event.posy + lineHeight);
-                }
-            }
+        this._register(enableCopySelection({
+            domNode: this._deletedCodeDomNode,
+            diffEntry: _diff,
+            originalModel: this._originalTextModel,
+            renderLinesResult: this._renderLinesResult,
+            clipboardService: _clipboardService,
         }));
     }
     _updateLightBulbPosition(marginDomNode, y, lineHeight) {
@@ -130,10 +127,10 @@ class InlineDiffDeletedCodeMargin extends Disposable {
         const lineNumberOffset = Math.floor(offset / lineHeight);
         const newTop = lineNumberOffset * lineHeight;
         this._diffActions.style.top = `${newTop}px`;
-        if (this._viewLineCounts) {
+        if (this._renderLinesResult.viewLineCounts) {
             let acc = 0;
-            for (let i = 0; i < this._viewLineCounts.length; i++) {
-                acc += this._viewLineCounts[i];
+            for (let i = 0; i < this._renderLinesResult.viewLineCounts.length; i++) {
+                acc += this._renderLinesResult.viewLineCounts[i];
                 if (lineNumberOffset < acc) {
                     return i;
                 }

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

@@ -1,8 +1,10 @@
 import { ICodeEditor } from "../../../../editorBrowser.js";
 import { EditorOption, FindComputedEditorOptionValueById } from "../../../../../common/config/editorOptions.js";
 import { FontInfo } from "../../../../../common/config/fontInfo.js";
+import { Position } from "../../../../../common/core/position.js";
 import { ModelLineProjectionData } from "../../../../../common/modelLineProjectionData.js";
 import { LineTokens } from "../../../../../common/tokens/lineTokens.js";
+import { CharacterMapping, ForeignElementType, RenderLineOutput } from "../../../../../common/viewLayout/viewLineRenderer.js";
 import { InlineDecoration } from "../../../../../common/viewModel/inlineDecorations.js";
 export declare function renderLines(source: LineSource, options: RenderOptions, decorations: InlineDecoration[], domNode: HTMLElement, noExtra?: boolean): RenderLinesResult;
 export declare class LineSource {
@@ -31,8 +33,23 @@ export declare class RenderOptions {
     withSetWidth(setWidth: boolean): RenderOptions;
     withScrollBeyondLastColumn(scrollBeyondLastColumn: number): RenderOptions;
 }
-export interface RenderLinesResult {
-    minWidthInPx: number;
-    heightInLines: number;
-    viewLineCounts: number[];
+export declare class RenderLinesResult {
+    readonly heightInLines: number;
+    readonly minWidthInPx: number;
+    readonly viewLineCounts: number[];
+    private readonly _renderOutputs;
+    private readonly _source;
+    constructor(heightInLines: number, minWidthInPx: number, viewLineCounts: number[], _renderOutputs: RenderLineOutputWithOffset[], _source: LineSource);
+    /**
+     * Returns the model position for a given DOM node and offset within that node.
+     * @param domNode The span node within a view-line where the offset is located
+     * @param offset The offset within the span node
+     * @returns The Position in the model, or undefined if the position cannot be determined
+     */
+    getModelPositionAt(domNode: HTMLElement, offset: number): Position | undefined;
 }
+declare class RenderLineOutputWithOffset extends RenderLineOutput {
+    readonly offset: number;
+    constructor(characterMapping: CharacterMapping, containsForeignElements: ForeignElementType, offset: number);
+}
+export {};