move workspace symbols implementation into separate file

Author: Techatrix

src/Server.zig

@@ -34,7 +34,6 @@ const goto = @import("features/goto.zig");
 const hover_handler = @import("features/hover.zig");
 const selection_range = @import("features/selection_range.zig");
 const diagnostics_gen = @import("features/diagnostics.zig");
-const TrigramStore = @import("TrigramStore.zig");
 
 const BuildOnSave = diagnostics_gen.BuildOnSave;
 const BuildOnSaveSupport = build_runner_shared.BuildOnSaveSupport;
@@ -1517,68 +1516,7 @@ fn selectionRangeHandler(server: *Server, arena: std.mem.Allocator, request: typ
 }
 
 fn workspaceSymbolHandler(server: *Server, arena: std.mem.Allocator, request: types.WorkspaceSymbolParams) Error!lsp.ResultType("workspace/symbol") {
-    if (request.query.len < 3) return null;
-
-    const handles = try server.document_store.loadTrigramStores();
-    defer server.document_store.allocator.free(handles);
-
-    var symbols: std.ArrayListUnmanaged(types.WorkspaceSymbol) = .empty;
-    var declaration_buffer: std.ArrayListUnmanaged(TrigramStore.Declaration.Index) = .empty;
-
-    for (handles) |handle| {
-        const trigram_store = handle.getTrigramStoreCached();
-
-        declaration_buffer.clearRetainingCapacity();
-        try trigram_store.declarationsForQuery(arena, request.query, &declaration_buffer);
-
-        const SortContext = struct {
-            names: []const std.zig.Ast.TokenIndex,
-            fn lessThan(ctx: @This(), lhs: TrigramStore.Declaration.Index, rhs: TrigramStore.Declaration.Index) bool {
-                return ctx.names[@intFromEnum(lhs)] < ctx.names[@intFromEnum(rhs)];
-            }
-        };
-
-        std.mem.sortUnstable(
-            TrigramStore.Declaration.Index,
-            declaration_buffer.items,
-            SortContext{ .names = trigram_store.declarations.items(.name) },
-            SortContext.lessThan,
-        );
-
-        const slice = trigram_store.declarations.slice();
-        const names = slice.items(.name);
-
-        var last_index: usize = 0;
-        var last_position: offsets.Position = .{ .line = 0, .character = 0 };
-
-        try symbols.ensureUnusedCapacity(arena, declaration_buffer.items.len);
-        for (declaration_buffer.items) |declaration| {
-            const name_token = names[@intFromEnum(declaration)];
-            const loc = offsets.identifierTokenToNameLoc(handle.tree, name_token);
-            const name = offsets.identifierTokenToNameSlice(handle.tree, name_token);
-
-            const start_position = offsets.advancePosition(handle.tree.source, last_position, last_index, loc.start, server.offset_encoding);
-            const end_position = offsets.advancePosition(handle.tree.source, start_position, loc.start, loc.end, server.offset_encoding);
-            last_index = loc.end;
-            last_position = end_position;
-
-            symbols.appendAssumeCapacity(.{
-                .name = name,
-                .kind = .Variable,
-                .location = .{
-                    .Location = .{
-                        .uri = handle.uri,
-                        .range = .{
-                            .start = start_position,
-                            .end = end_position,
-                        },
-                    },
-                },
-            });
-        }
-    }
-
-    return .{ .array_of_WorkspaceSymbol = symbols.items };
+    return try @import("features/workspace_symbols.zig").handler(server, arena, request);
 }
 
 const HandledRequestParams = union(enum) {

src/features/workspace_symbols.zig

@@ -0,0 +1,76 @@
+//! Implementation of [`workspace/symbol`](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#workspace_symbol)
+
+const std = @import("std");
+
+const lsp = @import("lsp");
+const types = lsp.types;
+
+const DocumentStore = @import("../DocumentStore.zig");
+const offsets = @import("../offsets.zig");
+const Server = @import("../Server.zig");
+const TrigramStore = @import("../TrigramStore.zig");
+
+pub fn handler(server: *Server, arena: std.mem.Allocator, request: types.WorkspaceSymbolParams) error{OutOfMemory}!lsp.ResultType("workspace/symbol") {
+    if (request.query.len < 3) return null;
+
+    const handles = try server.document_store.loadTrigramStores();
+    defer server.document_store.allocator.free(handles);
+
+    var symbols: std.ArrayListUnmanaged(lsp.types.WorkspaceSymbol) = .empty;
+    var declaration_buffer: std.ArrayListUnmanaged(TrigramStore.Declaration.Index) = .empty;
+
+    for (handles) |handle| {
+        const trigram_store = handle.getTrigramStoreCached();
+
+        declaration_buffer.clearRetainingCapacity();
+        try trigram_store.declarationsForQuery(arena, request.query, &declaration_buffer);
+
+        const SortContext = struct {
+            names: []const std.zig.Ast.TokenIndex,
+            fn lessThan(ctx: @This(), lhs: TrigramStore.Declaration.Index, rhs: TrigramStore.Declaration.Index) bool {
+                return ctx.names[@intFromEnum(lhs)] < ctx.names[@intFromEnum(rhs)];
+            }
+        };
+
+        std.mem.sortUnstable(
+            TrigramStore.Declaration.Index,
+            declaration_buffer.items,
+            SortContext{ .names = trigram_store.declarations.items(.name) },
+            SortContext.lessThan,
+        );
+
+        const slice = trigram_store.declarations.slice();
+        const names = slice.items(.name);
+
+        var last_index: usize = 0;
+        var last_position: offsets.Position = .{ .line = 0, .character = 0 };
+
+        try symbols.ensureUnusedCapacity(arena, declaration_buffer.items.len);
+        for (declaration_buffer.items) |declaration| {
+            const name_token = names[@intFromEnum(declaration)];
+            const loc = offsets.identifierTokenToNameLoc(handle.tree, name_token);
+            const name = offsets.identifierTokenToNameSlice(handle.tree, name_token);
+
+            const start_position = offsets.advancePosition(handle.tree.source, last_position, last_index, loc.start, server.offset_encoding);
+            const end_position = offsets.advancePosition(handle.tree.source, start_position, loc.start, loc.end, server.offset_encoding);
+            last_index = loc.end;
+            last_position = end_position;
+
+            symbols.appendAssumeCapacity(.{
+                .name = name,
+                .kind = .Variable,
+                .location = .{
+                    .Location = .{
+                        .uri = handle.uri,
+                        .range = .{
+                            .start = start_position,
+                            .end = end_position,
+                        },
+                    },
+                },
+            });
+        }
+    }
+
+    return .{ .array_of_WorkspaceSymbol = symbols.items };
+}