andr3/zls
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve textDocument/references performance

Browse Source 
Filtering out documents in symbolReferences that do not @import the file
defining the symbol led to an order of magnitude speedup in the projects
that I tested.
This commit is contained in:
Jonathan Hähne 2021-03-28 17:02:04 +02:00
parent 3a8d4c7bfb
commit 826172edeb
1 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/references.zig
View File

@ -531,31 +531,53 @@ pub fn symbolReferences(
) !void { ) !void {
std.debug.assert(decl_handle.decl.* != .label_decl); std.debug.assert(decl_handle.decl.* != .label_decl);
const curr_handle = decl_handle.handle; const curr_handle = decl_handle.handle;
if (include_decl) {
try tokenReference(curr_handle, decl_handle.nameToken(), encoding, context, handler);
}
switch (decl_handle.decl.*) { switch (decl_handle.decl.*) {
.ast_node => |decl_node| { .ast_node => |decl_node| {
var handles = std.ArrayList(*DocumentStore.Handle).init(&arena.allocator); try symbolReferencesInternal(arena, store, .{ .node = 0, .handle = curr_handle }, decl_handle, encoding, context, handler);
var imports = std.ArrayList(*DocumentStore.Handle).init(&arena.allocator);
var handle_it = store.handles.iterator(); var handle_it = store.handles.iterator();
while (handle_it.next()) |entry| { while (handle_it.next()) |entry| {
if (skip_std_references and std.mem.indexOf(u8, entry.key, "std") != null) { if (skip_std_references and std.mem.indexOf(u8, entry.key, "std") != null) {
if (!include_decl or entry.value != curr_handle) if (!include_decl or entry.value != curr_handle)
continue; continue;
} }
try handles.append(entry.value);
} // Check entry's transitive imports
for (handles.items) |handle| { try imports.append(entry.value);
if (include_decl and handle == curr_handle) { var i: usize = 0;
try tokenReference(curr_handle, decl_handle.nameToken(), encoding, context, handler); blk: while (i < imports.items.len) : (i += 1) {
const import = imports.items[i];
for (import.import_uris.items) |uri| {
const h = store.getHandle(uri) orelse break;
if (h == curr_handle) {
// entry does import curr_handle
try symbolReferencesInternal(arena, store, .{ .node = 0, .handle = entry.value }, decl_handle, encoding, context, handler);
break :blk;
} }
try symbolReferencesInternal(arena, store, .{ .node = 0, .handle = handle }, decl_handle, encoding, context, handler); select: {
for (imports.items) |item| {
if (item == h) {
// already checked this import
break :select;
}
}
try imports.append(h);
}
}
}
try imports.resize(0);
} }
}, },
.param_decl => |param| { .param_decl => |param| {
// Rename the param tok. // Rename the param tok.
if (include_decl) {
try tokenReference(curr_handle, decl_handle.nameToken(), encoding, context, handler);
}
const fn_node: ast.full.FnProto = loop: for (curr_handle.document_scope.scopes) |scope| { const fn_node: ast.full.FnProto = loop: for (curr_handle.document_scope.scopes) |scope| {
switch (scope.data) { switch (scope.data) {
.function => |proto| { .function => |proto| {
@ -587,9 +609,6 @@ pub fn symbolReferences(
}; };
}, },
.pointer_payload, .switch_payload, .array_payload, .array_index => { .pointer_payload, .switch_payload, .array_payload, .array_index => {
if (include_decl) {
try tokenReference(curr_handle, decl_handle.nameToken(), encoding, context, handler);
}
try symbolReferencesInternal(arena, store, .{ .node = 0, .handle = curr_handle }, decl_handle, encoding, context, handler); try symbolReferencesInternal(arena, store, .{ .node = 0, .handle = curr_handle }, decl_handle, encoding, context, handler);
}, },
.label_decl => unreachable, .label_decl => unreachable,