Use list

zigtools · Apr 30, 2024 · 1296105 · 1296105
1 parent d45cd2a
commit 1296105
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/src/Server.zig b/src/Server.zig
@@ -1627,7 +1627,7 @@ fn workspaceSymbolHandler(server: *Server, arena: std.mem.Allocator, request: ty
     } else |_| return null;
 
     var workspace_symbols = std.ArrayListUnmanaged(types.WorkspaceSymbol){};
-    var candidates_decl_map = std.AutoArrayHashMapUnmanaged(Analyser.Declaration.Index, void){};
+    var candidates_decl_map = std.ArrayListUnmanaged(Analyser.Declaration.Index){};
     var narrowing_decl_map = std.AutoArrayHashMapUnmanaged(Analyser.Declaration.Index, void){};
 
     doc_loop: for (server.document_store.trigram_stores.keys(), server.document_store.trigram_stores.values()) |uri, trigram_store| {
@@ -1646,31 +1646,31 @@ fn workspaceSymbolHandler(server: *Server, arena: std.mem.Allocator, request: ty
 
         var first_pass = true;
         for (trigrams.items) |trigram| {
-            if (!first_pass and candidates_decl_map.count() == 0) break;
+            if (!first_pass and candidates_decl_map.items.len == 0) break;
 
             var it = trigram_store.iterate(trigram);
             while (it.next().unwrap()) |decl| {
                 if (first_pass) {
-                    try candidates_decl_map.put(arena, decl, {});
+                    try candidates_decl_map.append(arena, decl);
                 } else {
                     try narrowing_decl_map.put(arena, decl, {});
                 }
             }
 
             if (!first_pass) {
                 var index: usize = 0;
-                while (index < candidates_decl_map.keys().len) {
-                    if (!narrowing_decl_map.contains(candidates_decl_map.keys()[index])) {
-                        candidates_decl_map.orderedRemoveAt(index);
+                while (index < candidates_decl_map.items.len) {
+                    if (!narrowing_decl_map.contains(candidates_decl_map.items[index])) {
+                        _ = candidates_decl_map.swapRemove(index);
                     } else index += 1;
                 }
             }
 
             first_pass = false;
         }
 
-        for (candidates_decl_map.keys()) |key| {
-            const decl = doc_scope.declarations.get(@intFromEnum(key));
+        for (candidates_decl_map.items) |decl_idx| {
+            const decl = doc_scope.declarations.get(@intFromEnum(decl_idx));
             const name_token = decl.nameToken(tree);
 
             // TODO: integrate with document_symbol.zig for right kind info