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
This commit is contained in:
bors 2023-01-10 17:07:06 +00:00
commit 6e89e7787c

View file

@ -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[],