Limit references to current document for documentHighlight

src/Server.zig

@@ -1151,6 +1151,7 @@ fn referencesDefinitionGlobal(
         &locs,
         std.ArrayList(types.Location).append,
         server.config.skip_std_references,
+        !highlight,
     );
 
     const result: types.ResponseParams = if (highlight) result: {
@@ -1185,7 +1186,17 @@ fn referencesDefinitionFieldAccess(
 
     const decl = (try server.getSymbolFieldAccess(handle, arena, position, range)) orelse return try respondGeneric(id, null_result_response);
     var locs = std.ArrayList(types.Location).init(arena.allocator());
-    try references.symbolReferences(arena, &server.document_store, decl, server.offset_encoding, include_decl, &locs, std.ArrayList(types.Location).append, server.config.skip_std_references);
+    try references.symbolReferences(
+        arena,
+        &server.document_store,
+        decl,
+        server.offset_encoding,
+        include_decl,
+        &locs,
+        std.ArrayList(types.Location).append,
+        server.config.skip_std_references,
+        !highlight,
+    );
     const result: types.ResponseParams = if (highlight) result: {
         var highlights = try std.ArrayList(types.DocumentHighlight).initCapacity(arena.allocator(), locs.items.len);
         for (locs.items) |loc| {

src/references.zig

@@ -492,7 +492,7 @@ fn symbolReferencesInternal(arena: *std.heap.ArenaAllocator, store: *DocumentSto
     }
 }
 
-pub fn symbolReferences(arena: *std.heap.ArenaAllocator, store: *DocumentStore, decl_handle: analysis.DeclWithHandle, encoding: offsets.Encoding, include_decl: bool, context: anytype, comptime handler: anytype, skip_std_references: bool) !void {
+pub fn symbolReferences(arena: *std.heap.ArenaAllocator, store: *DocumentStore, decl_handle: analysis.DeclWithHandle, encoding: offsets.Encoding, include_decl: bool, context: anytype, comptime handler: anytype, skip_std_references: bool, workspace: bool) !void {
     std.debug.assert(decl_handle.decl.* != .label_decl);
     const curr_handle = decl_handle.handle;
     if (include_decl) {
@@ -503,6 +503,7 @@ pub fn symbolReferences(arena: *std.heap.ArenaAllocator, store: *DocumentStore,
         .ast_node => {
             try symbolReferencesInternal(arena, store, .{ .node = 0, .handle = curr_handle }, decl_handle, encoding, context, handler);
 
+            if (workspace) {
                 var imports = std.ArrayList(*DocumentStore.Handle).init(arena.allocator());
 
                 var handle_it = store.handles.iterator();
@@ -539,6 +540,7 @@ pub fn symbolReferences(arena: *std.heap.ArenaAllocator, store: *DocumentStore,
                     }
                     try imports.resize(0);
                 }
+            }
         },
         .param_decl => |param| {
             // Rename the param tok.

src/rename.zig

@@ -31,7 +31,7 @@ pub fn renameSymbol(arena: *std.heap.ArenaAllocator, store: *DocumentStore, decl
         .edits = edits,
         .allocator = arena.allocator(),
         .new_name = new_name,
-    }, refHandler, true);
+    }, refHandler, true, true);
 }
 
 pub fn renameLabel(arena: *std.heap.ArenaAllocator, decl_handle: analysis.DeclWithHandle, new_name: []const u8, edits: *std.StringHashMap([]types.TextEdit), encoding: offsets.Encoding) !void {