From fd692ab7bb9f7b1e8f5d878a16154a4a03d0f6f9 Mon Sep 17 00:00:00 2001
From: Zuhaitz Méndez Fernández de Aránguiz <zuhaitz@debian>
Date: Wed, 28 Jan 2026 19:52:37 +0000
Subject: Opaque structs and aliases + some improvements

---
 src/lsp/lsp_analysis.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++-
 src/lsp/lsp_index.c    | 52 +++++++++++++++++++++++++++++++++++-
 2 files changed, 121 insertions(+), 2 deletions(-)

(limited to 'src/lsp')

diff --git a/src/lsp/lsp_analysis.c b/src/lsp/lsp_analysis.c
index 088bede..0367d93 100644
--- a/src/lsp/lsp_analysis.c
+++ b/src/lsp/lsp_analysis.c
@@ -454,11 +454,80 @@ void lsp_completion(const char *uri, int line, int col, int id)
             cJSON_AddStringToObject(item, "label", s->name);
             cJSON_AddNumberToObject(item, "kind", 22); // Struct
             char detail[256];
-            sprintf(detail, "struct %s", s->name);
+            sprintf(detail, "%sstruct %s",
+                    (s->node && s->node->type == NODE_STRUCT && s->node->strct.is_opaque)
+                        ? "opaque "
+                        : "",
+                    s->name);
             cJSON_AddStringToObject(item, "detail", detail);
             cJSON_AddItemToArray(items, item);
             s = s->next;
         }
+
+        // Globals and Constants
+        StructRef *g = g_project->ctx->parsed_globals_list;
+        while (g)
+        {
+            if (g->node)
+            {
+                cJSON *item = cJSON_CreateObject();
+                char *name =
+                    (g->node->type == NODE_CONST) ? g->node->var_decl.name : g->node->var_decl.name;
+                cJSON_AddStringToObject(item, "label", name);
+                cJSON_AddNumberToObject(item, "kind", 21); // Constant/Variable
+                char detail[256];
+                sprintf(detail, "%s %s", (g->node->type == NODE_CONST) ? "const" : "var", name);
+                cJSON_AddStringToObject(item, "detail", detail);
+                cJSON_AddItemToArray(items, item);
+            }
+            g = g->next;
+        }
+
+        // Enums
+        StructRef *e = g_project->ctx->parsed_enums_list;
+        while (e)
+        {
+            if (e->node)
+            {
+                cJSON *item = cJSON_CreateObject();
+                cJSON_AddStringToObject(item, "label", e->node->enm.name);
+                cJSON_AddNumberToObject(item, "kind", 13); // Enum
+                char detail[256];
+                sprintf(detail, "enum %s", e->node->enm.name);
+                cJSON_AddStringToObject(item, "detail", detail);
+                cJSON_AddItemToArray(items, item);
+            }
+            e = e->next;
+        }
+
+        // Type Aliases
+        TypeAlias *ta = g_project->ctx->type_aliases;
+        while (ta)
+        {
+            cJSON *item = cJSON_CreateObject();
+            cJSON_AddStringToObject(item, "label", ta->alias);
+            cJSON_AddNumberToObject(item, "kind", 8); // Interface/Reference
+            char detail[256];
+            sprintf(detail, "alias %s = %s", ta->alias, ta->original_type);
+            cJSON_AddStringToObject(item, "detail", detail);
+            cJSON_AddItemToArray(items, item);
+            ta = ta->next;
+        }
+
+        // Keywords
+        const char *keywords[] = {
+            "fn",     "struct",   "enum", "alias",  "return", "if",     "else",   "for",    "while",
+            "break",  "continue", "true", "false",  "int",    "char",   "bool",   "string", "void",
+            "import", "module",   "test", "assert", "defer",  "sizeof", "opaque", "unsafe", "asm",
+            "trait",  "impl",     "u8",   "u16",    "u32",    "u64",    "i8",     "i16",    "i32",
+            "i64",    "f32",      "f64",  "usize",  "isize",  "const",  "var",    NULL};
+        for (int i = 0; keywords[i]; i++)
+        {
+            cJSON *item = cJSON_CreateObject();
+            cJSON_AddStringToObject(item, "label", keywords[i]);
+            cJSON_AddNumberToObject(item, "kind", 14); // Keyword
+            cJSON_AddItemToArray(items, item);
+        }
     }
 
     cJSON_AddItemToObject(root, "result", items);
diff --git a/src/lsp/lsp_index.c b/src/lsp/lsp_index.c
index 285dec3..975e153 100644
--- a/src/lsp/lsp_index.c
+++ b/src/lsp/lsp_index.c
@@ -151,7 +151,32 @@ void lsp_walk_node(LSPIndex *idx, ASTNode *node)
     else if (node->type == NODE_STRUCT)
     {
         char hover[256];
-        sprintf(hover, "struct %s", node->strct.name);
+        if (node->strct.is_opaque)
+        {
+            sprintf(hover, "opaque struct %s", node->strct.name);
+        }
+        else
+        {
+            sprintf(hover, "struct %s", node->strct.name);
+        }
+        lsp_index_add_def(idx, node->token, hover, node);
+    }
+    else if (node->type == NODE_ENUM)
+    {
+        char hover[256];
+        sprintf(hover, "enum %s", node->enm.name);
+        lsp_index_add_def(idx, node->token, hover, node);
+    }
+    else if (node->type == NODE_TYPE_ALIAS)
+    {
+        char hover[256];
+        sprintf(hover, "alias %s = %s", node->type_alias.alias, node->type_alias.original_type);
+        lsp_index_add_def(idx, node->token, hover, node);
+    }
+    else if (node->type == NODE_TRAIT)
+    {
+        char hover[256];
+        sprintf(hover, "trait %s", node->trait.name);
         lsp_index_add_def(idx, node->token, hover, node);
     }
 
@@ -196,6 +221,31 @@ void lsp_walk_node(LSPIndex *idx, ASTNode *node)
         lsp_walk_node(idx, node->call.callee);
         lsp_walk_node(idx, node->call.args);
         break;
+    case NODE_MATCH:
+        lsp_walk_node(idx, node->match_stmt.expr);
+        lsp_walk_node(idx, node->match_stmt.cases);
+        break;
+    case NODE_MATCH_CASE:
+        lsp_walk_node(idx, node->match_case.guard);
+        lsp_walk_node(idx, node->match_case.body);
+        break;
+    case NODE_FOR:
+        lsp_walk_node(idx, node->for_stmt.init);
+        lsp_walk_node(idx, node->for_stmt.condition);
+        lsp_walk_node(idx, node->for_stmt.step);
+        lsp_walk_node(idx, node->for_stmt.body);
+        break;
+    case NODE_FOR_RANGE:
+        lsp_walk_node(idx, node->for_range.start);
+        lsp_walk_node(idx, node->for_range.end);
+        lsp_walk_node(idx, node->for_range.body);
+        break;
+    case NODE_LOOP:
+        lsp_walk_node(idx, node->loop_stmt.body);
+        break;
+    case NODE_DEFER:
+        lsp_walk_node(idx, node->defer_stmt.stmt);
+        break;
     default:
         break;
     }
-- 
cgit v1.2.3