From 7a135a6acd758a101edf537e6d96b2ad75e72f1f Mon Sep 17 00:00:00 2001
From: Tomer Chachamu <tomer.chachamu@gmail.com>
Date: Sat, 13 May 2023 11:57:55 +0100
Subject: [PATCH] Prevent ligatures between inlay hints and editor contents
 (Fix #170449)

https://www.w3.org/TR/2023/CRD-css-text-3-20230213/#boundary-shaping
---
 src/vs/editor/browser/editorDom.ts                               | 1 +
 src/vs/editor/contrib/inlayHints/browser/inlayHintsController.ts | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/vs/editor/browser/editorDom.ts b/src/vs/editor/browser/editorDom.ts
index 817f1296d57..4af00e67b13 100644
--- a/src/vs/editor/browser/editorDom.ts
+++ b/src/vs/editor/browser/editorDom.ts
@@ -342,6 +342,7 @@ export interface CssProperties {
 	fontWeight?: string;
 	fontSize?: string;
 	fontFamily?: string;
+	unicodeBidi?: string;
 	textDecoration?: string;
 	color?: string | ThemeColor;
 	backgroundColor?: string | ThemeColor;
diff --git a/src/vs/editor/contrib/inlayHints/browser/inlayHintsController.ts b/src/vs/editor/contrib/inlayHints/browser/inlayHintsController.ts
index dc40d34872c..fab60b557e3 100644
--- a/src/vs/editor/contrib/inlayHints/browser/inlayHintsController.ts
+++ b/src/vs/editor/contrib/inlayHints/browser/inlayHintsController.ts
@@ -495,6 +495,7 @@ export class InlayHintsController implements IEditorContribution {
 					fontSize: `${fontSize}px`,
 					fontFamily: `var(${fontFamilyVar}), ${EDITOR_FONT_DEFAULTS.fontFamily}`,
 					verticalAlign: isUniform ? 'baseline' : 'middle',
+					unicodeBidi: 'isolate'
 				};
 
 				if (isNonEmptyArray(item.hint.textEdits)) {