Skip to content

Commit 37e08ec

Browse files
authored
Merge pull request microsoft#182542 from jairbubbles/fix-context-menu-for-deleted-lines-in-diff-inline
Fix context menu for deleted lines in diff inline mode
2 parents aaadde5 + f5272fb commit 37e08ec

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

src/vs/editor/browser/widget/inlineDiffMargin.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import { EditorOption } from 'vs/editor/common/config/editorOptions';
1616
import { Codicon } from 'vs/base/common/codicons';
1717
import { ThemeIcon } from 'vs/base/common/themables';
1818
import { EndOfLineSequence, ITextModel } from 'vs/editor/common/model';
19+
import { isIOS } from 'vs/base/common/platform';
1920

2021
export interface IDiffLinesChange {
2122
readonly originalStartLineNumber: number;
@@ -145,8 +146,11 @@ export class InlineDiffMargin extends Disposable {
145146
}));
146147
}
147148

149+
const useShadowDOM = editor.getOption(EditorOption.useShadowDOM) && !isIOS; // Do not use shadow dom on IOS #122035
150+
148151
const showContextMenu = (x: number, y: number) => {
149152
this._contextMenuService.showContextMenu({
153+
domForShadowRoot: useShadowDOM ? editor.getDomNode() ?? undefined : undefined,
150154
getAnchor: () => {
151155
return {
152156
x,

0 commit comments

Comments
 (0)