Skip to content

Resolve multiple layers of callsite references #2642

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
FnControlOption wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −10
Draft

Resolve multiple layers of callsite references #2642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Server.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1276,7 +1276,7 @@ fn semanticTokensFullHandler(server: *Server, arena: std.mem.Allocator, request:
defer analyser.deinit();
// semantic tokens can be quite expensive to compute on large files
// and disabling callsite references can help with bringing the cost down.
analyser.collect_callsite_references = false;
analyser.max_callsite_depth = 0;

return try semantic_tokens.writeSemanticTokens(
arena,
Expand Down Expand Up @@ -1307,7 +1307,7 @@ fn semanticTokensRangeHandler(server: *Server, arena: std.mem.Allocator, request
defer analyser.deinit();
// semantic tokens can be quite expensive to compute on large files
// and disabling callsite references can help with bringing the cost down.
analyser.collect_callsite_references = false;
analyser.max_callsite_depth = 0;

return try semantic_tokens.writeSemanticTokens(
arena,
Expand Down
13 changes: 5 additions & 8 deletions src/analysis.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ store: *DocumentStore,
ip: *InternPool,
resolved_callsites: std.AutoHashMapUnmanaged(Declaration.Param, ?Type) = .empty,
resolved_nodes: std.HashMapUnmanaged(NodeWithUri, ?Binding, NodeWithUri.Context, std.hash_map.default_max_load_percentage) = .empty,
collect_callsite_references: bool,
max_callsite_depth: usize = 4, // TODO: come up with a sensible default
/// avoid unnecessarily parsing number literals
resolve_number_literal_values: bool,
/// handle of the doc where the request originated
Expand All @@ -57,7 +57,6 @@ pub fn init(
.arena = arena,
.store = store,
.ip = ip,
.collect_callsite_references = true,
.resolve_number_literal_values = false,
.root_handle = root_handle,
};
Expand Down Expand Up @@ -1753,7 +1752,7 @@ fn resolveCallsiteReferences(analyser: *Analyser, decl_handle: DeclWithHandle) E
const tree = &decl_handle.handle.tree;
const is_cimport = std.mem.eql(u8, std.Io.Dir.path.basename(decl_handle.handle.uri.raw), "cimport.zig");

if (is_cimport or !analyser.collect_callsite_references) return null;
if (is_cimport or analyser.max_callsite_depth == 0) return null;

// protection against recursive callsite resolution
const gop_resolved = try analyser.resolved_callsites.getOrPut(analyser.gpa, pay);
Expand Down Expand Up @@ -1792,10 +1791,8 @@ fn resolveCallsiteReferences(analyser: *Analyser, decl_handle: DeclWithHandle) E
if (real_param_idx >= call.ast.params.len) continue;

var ty = resolve_ty: {
// don't resolve callsite references while resolving callsite references
const old_collect_callsite_references = analyser.collect_callsite_references;
defer analyser.collect_callsite_references = old_collect_callsite_references;
analyser.collect_callsite_references = false;
analyser.max_callsite_depth -= 1;
defer analyser.max_callsite_depth += 1;

break :resolve_ty try analyser.resolveTypeOfNode(.of(
// TODO?: this is a """heuristic based approach"""
Expand All @@ -1818,7 +1815,7 @@ fn resolveCallsiteReferences(analyser: *Analyser, decl_handle: DeclWithHandle) E
}

const maybe_type = try Type.fromEither(analyser, possible.items);
if (maybe_type) |ty| analyser.resolved_callsites.getPtr(pay).?.* = ty;
if (maybe_type) |ty| gop_resolved.value_ptr.* = ty;
return maybe_type;
}

Expand Down
Loading