rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix how and when old inlay hint decorations are disposed

Browse Source
This commit is contained in:
Jorge Mederos Alvarado
2021-04-26 20:26:36 -04:00
parent c4dba4077f
commit 0230f22d2a
1 changed files with 33 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
editors/code/src/inlay_hints.ts
View File

@@ -10,6 +10,12 @@ interface InlayHintStyle {
toDecoration(hint: ra.InlayHint, conv: lc.Protocol2CodeConverter): vscode.DecorationOptions; toDecoration(hint: ra.InlayHint, conv: lc.Protocol2CodeConverter): vscode.DecorationOptions;
}; };
interface InlayHintsStyles {
typeHints: InlayHintStyle;
paramHints: InlayHintStyle;
chainingHints: InlayHintStyle;
}
export function activateInlayHints(ctx: Ctx) { export function activateInlayHints(ctx: Ctx) {
const maybeUpdater = { const maybeUpdater = {
@@ -45,7 +51,7 @@ export function activateInlayHints(ctx: Ctx) {
maybeUpdater.onConfigChange().catch(console.error); maybeUpdater.onConfigChange().catch(console.error);
} }
function createHintStyle(ctx: Ctx, hintKind: "type" | "parameter" | "chaining"): InlayHintStyle { function createHintStyle(hintKind: "type" | "parameter" | "chaining", smallerHints: boolean): InlayHintStyle {
// U+200C is a zero-width non-joiner to prevent the editor from forming a ligature // U+200C is a zero-width non-joiner to prevent the editor from forming a ligature
// between code and type hints // between code and type hints
const [pos, render] = ({ const [pos, render] = ({
@@ -54,8 +60,6 @@ function createHintStyle(ctx: Ctx, hintKind: "type" | "parameter" | "chaining"):
chaining: ["after", (label: string) => `\u{200c}: ${label}`], chaining: ["after", (label: string) => `\u{200c}: ${label}`],
} as const)[hintKind]; } as const)[hintKind];
const smallerHints = ctx.config.inlayHints.smallerHints;
const fg = new vscode.ThemeColor(`rust_analyzer.inlayHints.foreground.${hintKind}Hints`); const fg = new vscode.ThemeColor(`rust_analyzer.inlayHints.foreground.${hintKind}Hints`);
const bg = new vscode.ThemeColor(`rust_analyzer.inlayHints.background.${hintKind}Hints`); const bg = new vscode.ThemeColor(`rust_analyzer.inlayHints.background.${hintKind}Hints`);
return { return {
@@ -77,14 +81,23 @@ function createHintStyle(ctx: Ctx, hintKind: "type" | "parameter" | "chaining"):
}; };
} }
const smallHintsStyles = {
typeHints: createHintStyle("type", true),
paramHints: createHintStyle("parameter", true),
chainingHints: createHintStyle("chaining", true),
};
const biggerHintsStyles = {
typeHints: createHintStyle("type", false),
paramHints: createHintStyle("parameter", false),
chainingHints: createHintStyle("chaining", false),
};
class HintsUpdater implements Disposable { class HintsUpdater implements Disposable {
private sourceFiles = new Map<string, RustSourceFile>(); // map Uri -> RustSourceFile private sourceFiles = new Map<string, RustSourceFile>(); // map Uri -> RustSourceFile
private readonly disposables: Disposable[] = []; private readonly disposables: Disposable[] = [];
private inlayHintsStyles!: { private pendingDisposeDecorations: undefined | InlayHintsStyles = undefined;
typeHints: InlayHintStyle; private inlayHintsStyles!: InlayHintsStyles;
paramHints: InlayHintStyle;
chainingHints: InlayHintStyle;
};
constructor(private readonly ctx: Ctx) { constructor(private readonly ctx: Ctx) {
vscode.window.onDidChangeVisibleTextEditors( vscode.window.onDidChangeVisibleTextEditors(
@@ -125,14 +138,12 @@ class HintsUpdater implements Disposable {
} }
updateInlayHintsStyles() { updateInlayHintsStyles() {
this.inlayHintsStyles?.typeHints.decorationType.dispose(); const inlayHintsStyles = this.ctx.config.inlayHints.smallerHints ? smallHintsStyles : biggerHintsStyles;
this.inlayHintsStyles?.paramHints.decorationType.dispose();
this.inlayHintsStyles?.chainingHints.decorationType.dispose(); if (inlayHintsStyles !== this.inlayHintsStyles) {
this.inlayHintsStyles = { this.pendingDisposeDecorations = this.inlayHintsStyles;
typeHints: createHintStyle(this.ctx, "type"), this.inlayHintsStyles = inlayHintsStyles;
paramHints: createHintStyle(this.ctx, "parameter"), }
chainingHints: createHintStyle(this.ctx, "chaining"),
};
} }
syncCacheAndRenderHints() { syncCacheAndRenderHints() {
@@ -183,6 +194,12 @@ class HintsUpdater implements Disposable {
private renderDecorations(editor: RustEditor, decorations: InlaysDecorations) { private renderDecorations(editor: RustEditor, decorations: InlaysDecorations) {
const { typeHints, paramHints, chainingHints } = this.inlayHintsStyles; const { typeHints, paramHints, chainingHints } = this.inlayHintsStyles;
if (this.pendingDisposeDecorations !== undefined) {
const { typeHints, paramHints, chainingHints } = this.pendingDisposeDecorations;
editor.setDecorations(typeHints.decorationType, []);
editor.setDecorations(paramHints.decorationType, []);
editor.setDecorations(chainingHints.decorationType, []);
}
editor.setDecorations(typeHints.decorationType, decorations.type); editor.setDecorations(typeHints.decorationType, decorations.type);
editor.setDecorations(paramHints.decorationType, decorations.param); editor.setDecorations(paramHints.decorationType, decorations.param);
editor.setDecorations(chainingHints.decorationType, decorations.chaining); editor.setDecorations(chainingHints.decorationType, decorations.chaining);