From 43adfa4fa6311d42424b72fd4306ac0eaee27648 Mon Sep 17 00:00:00 2001 From: Julien Richard Date: Mon, 15 May 2023 21:14:16 +0200 Subject: [PATCH] Fix context menu for deleted lines in diff inline mode --- src/vs/editor/browser/widget/inlineDiffMargin.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/vs/editor/browser/widget/inlineDiffMargin.ts b/src/vs/editor/browser/widget/inlineDiffMargin.ts index 69dfd17560c..1388f64a8f0 100644 --- a/src/vs/editor/browser/widget/inlineDiffMargin.ts +++ b/src/vs/editor/browser/widget/inlineDiffMargin.ts @@ -16,6 +16,7 @@ import { EditorOption } from 'vs/editor/common/config/editorOptions'; import { Codicon } from 'vs/base/common/codicons'; import { ThemeIcon } from 'vs/base/common/themables'; import { EndOfLineSequence, ITextModel } from 'vs/editor/common/model'; +import { isIOS } from 'vs/base/common/platform'; export interface IDiffLinesChange { readonly originalStartLineNumber: number; @@ -145,8 +146,11 @@ export class InlineDiffMargin extends Disposable { })); } + const useShadowDOM = editor.getOption(EditorOption.useShadowDOM) && !isIOS; // Do not use shadow dom on IOS #122035 + const showContextMenu = (x: number, y: number) => { this._contextMenuService.showContextMenu({ + domForShadowRoot: useShadowDOM ? editor.getDomNode() ?? undefined : undefined, getAnchor: () => { return { x,