Merge #1610

1610: Ignore cancelled inlay hints responses r=matklad a=SomeoneToIgnore

Fixes #1607

Co-authored-by: Kirill Bulatov <[email protected]>

1 files changed, 11 insertions, 6 deletions

diff --git a/editors/code/src/commands/inlay_hints.ts b/editors/code/src/commands/inlay_hints.ts
index 8154af8dc..3ba9da48b 100644
--- a/editors/code/src/commands/inlay_hints.ts
+++ b/editors/code/src/commands/inlay_hints.ts
@@ -79,12 +79,17 @@ export class HintsUpdater {
         documentUri: string,
         editor: TextEditor
     ): Promise<void> {
-        const newHints = (await this.queryHints(documentUri)) || [];
-        const newDecorations = newHints.map(hint => ({
-            range: hint.range,
-            renderOptions: { after: { contentText: `: ${hint.label}` } }
-        }));
-        return editor.setDecorations(typeHintDecorationType, newDecorations);
+        const newHints = await this.queryHints(documentUri);
+        if (newHints != null) {
+            const newDecorations = newHints.map(hint => ({
+                range: hint.range,
+                renderOptions: { after: { contentText: `: ${hint.label}` } }
+            }));
+            return editor.setDecorations(
+                typeHintDecorationType,
+                newDecorations
+            );
+        }
     }
 
     private async queryHints(documentUri: string): Promise<InlayHint[] | null> {