Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 6 additions & 8 deletions src/features/inlay_hints.zig
Original file line number Diff line number Diff line change
Expand Up @@ -565,15 +565,13 @@ pub fn writeRangeInlayHint(
.hover_kind = hover_kind,
};

const nodes = try ast.nodesAtLoc(arena, &handle.tree, loc);

for (nodes) |child| {
try writeNodeInlayHint(&builder, &handle.tree, child);

var walker: ast.Walker = try .init(arena, &handle.tree, child);
defer walker.deinit(arena);
while (try walker.nextIgnoreClose(arena, &handle.tree)) |node| {
var walker: ast.Walker = try .init(arena, &handle.tree, .root);
defer walker.deinit(arena);
while (try walker.nextIgnoreClose(arena, &handle.tree)) |node| {
if (offsets.locIntersect(loc, offsets.nodeToLoc(&handle.tree, node))) {
try writeNodeInlayHint(&builder, &handle.tree, node);
} else {
walker.skip();
}
}

Expand Down
18 changes: 11 additions & 7 deletions src/features/semantic_tokens.zig
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ const Builder = struct {
encoding: offsets.Encoding,
limited: bool,
overlappingTokenSupport: bool,
/// Only emit tokens for the given source range.
loc: ?offsets.Loc,

fn add(self: *Builder, token: Ast.TokenIndex, token_type: TokenType, token_modifiers: TokenModifiers) error{OutOfMemory}!void {
const tree = &self.handle.tree;
Expand Down Expand Up @@ -285,6 +287,10 @@ fn writeNodeTokens(builder: *Builder, node: Ast.Node.Index) Analyser.Error!void
const handle = builder.handle;
const tree = &handle.tree;

if (builder.loc) |loc| {
if (!offsets.locIntersect(loc, offsets.nodeToLoc(tree, node))) return;
}

const main_token = tree.nodeMainToken(node);

switch (tree.nodeTag(node)) {
Expand Down Expand Up @@ -1164,22 +1170,20 @@ pub fn writeSemanticTokens(
limited: bool,
overlappingTokenSupport: bool,
) Analyser.Error!types.semantic_tokens.Result {
var builder = Builder{
const tree = &handle.tree;

var builder: Builder = .{
.arena = arena,
.analyser = analyser,
.handle = handle,
.encoding = encoding,
.limited = limited,
.overlappingTokenSupport = overlappingTokenSupport,
.loc = loc,
};

var nodes = if (loc) |l| try ast.nodesAtLoc(arena, &handle.tree, l) else handle.tree.rootDecls();
if (nodes.len == 1 and nodes[0] == .root) {
nodes = handle.tree.rootDecls();
}

// reverse the ast from the root declarations
for (nodes) |child| {
for (tree.rootDecls()) |child| {
try writeNodeTokens(&builder, child);
}

Expand Down
Loading