about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-01-10 17:07:06 +0000
committerbors <bors@rust-lang.org>2023-01-10 17:07:06 +0000
commit6e89e7787cd891dd87b9d0fb1a511fd3e53a9403 (patch)
tree16d48ed672fe38bd3701d1996392fb3f11eef3a4
parent8eb75220b02269190771c38bc8bd389999ca895f (diff)
parent4267b11c4097b52ec59323c29709a8d06ed7b4cd (diff)
downloadrust-6e89e7787cd891dd87b9d0fb1a511fd3e53a9403.tar.gz
rust-6e89e7787cd891dd87b9d0fb1a511fd3e53a9403.zip
Auto merge of #13923 - rust-lang:revert-13886-inlay-ligatures, r=lnicola
Revert "Use ZWNJ to prevent VSCode from forming ligatures between hints and code"

Doesn't actually seem to fix the bug, it seems to be theme dependent and I am not sure what causes it
Reverts rust-lang/rust-analyzer#13886
-rw-r--r--editors/code/src/client.ts18
1 files changed, 0 insertions, 18 deletions
diff --git a/editors/code/src/client.ts b/editors/code/src/client.ts
index 82cdf0390ac..1fbe9d4ea03 100644
--- a/editors/code/src/client.ts
+++ b/editors/code/src/client.ts
@@ -102,24 +102,6 @@ export async function createClient(
                     }
                 },
             },
-            async provideInlayHints(document, viewPort, token, next) {
-                const inlays = await next(document, viewPort, token);
-                if (!inlays) {
-                    return inlays;
-                }
-                // U+200C is a zero-width non-joiner to prevent the editor from forming a ligature
-                // between code and hints
-                for (const inlay of inlays) {
-                    if (typeof inlay.label === "string") {
-                        inlay.label = `\u{200c}${inlay.label}\u{200c}`;
-                    } else if (Array.isArray(inlay.label)) {
-                        for (const it of inlay.label) {
-                            it.value = `\u{200c}${it.value}\u{200c}`;
-                        }
-                    }
-                }
-                return inlays;
-            },
             async handleDiagnostics(
                 uri: vscode.Uri,
                 diagnosticList: vscode.Diagnostic[],