From be1f51929763e3910bb89e09d035dae9fbc01862 Mon Sep 17 00:00:00 2001 From: DanielGavin Date: Sat, 30 Nov 2024 14:15:10 +0100 Subject: Fix issues with completing field with using. --- src/server/analysis.odin | 3 +++ src/server/check.odin | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/server/analysis.odin b/src/server/analysis.odin index ec5dee5..f3dba05 100644 --- a/src/server/analysis.odin +++ b/src/server/analysis.odin @@ -1497,6 +1497,9 @@ expand_struct_usings :: proc(ast_context: ^AstContext, symbol: Symbol, value: Sy } } } + + //We have to resolve the expressions two times, so clear it to prevent it from being picked up as recursion. + delete_key(&ast_context.recursion_map, value.types[k]) } if .ObjC in symbol.flags { diff --git a/src/server/check.odin b/src/server/check.odin index 0f9588b..b02587b 100644 --- a/src/server/check.odin +++ b/src/server/check.odin @@ -174,14 +174,14 @@ check :: proc(paths: []string, uri: common.Uri, writer: ^Writer, config: ^common diagnostics = {}, } - notifaction := Notification { + notification := Notification { jsonrpc = "2.0", method = "textDocument/publishDiagnostics", params = params, } if writer != nil { - send_notification(notifaction, writer) + send_notification(notification, writer) } delete(uri) -- cgit v1.2.3