Skip to content

fix position context after question mark token #2615

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

Merged
Techatrix merged 1 commit into from
Feb 18, 2026
Merged

fix position context after question mark token #2615

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
5 changes: 3 additions & 2 deletions src/analysis.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5054,8 +5054,9 @@ pub fn getPositionContext(
.test_doctest_name, .var_access, .field_access => |loc| .{ .field_access = tokenLocAppend(loc, tok) },
else => .{ .field_access = tokenLocAppend(curr_ctx.ctx.loc(tree) orelse tok.loc, tok) },
},
.question_mark, .period_asterisk => switch (curr_ctx.ctx) {
.var_access, .field_access => |loc| .{ .field_access = tokenLocAppend(loc, tok) },
.period_asterisk => .{ .field_access = tokenLocAppend(curr_ctx.ctx.loc(tree) orelse tok.loc, tok) },
.question_mark => switch (curr_ctx.ctx) {
.field_access => |loc| .{ .field_access = tokenLocAppend(loc, tok) },
else => .empty,
},
.colon => switch (curr_ctx.ctx) {
Expand Down
25 changes: 25 additions & 0 deletions tests/utility/position_context.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,31 @@ test "var_access.nested" {
, .var_access, .{ .lookahead = true });
}

test "var_access.optional" {
try testContext(
\\const foo = ?<cursor>
, .empty, .{});
try testContext(
\\const foo = ?<loc>T<cursor></loc>
, .var_access, .{});
}

test "var_access.pointer" {
try testContext(
\\const foo = *<cursor>
, .empty, .{});
try testContext(
\\const foo = *<loc>T<cursor></loc>
, .var_access, .{});

try testContext(
\\const foo = []<cursor>
, .empty, .{});
try testContext(
\\const foo = []<loc>T<cursor></loc>
, .var_access, .{});
}

test "var_access no lookahead" {
try testContext(
\\const a_var =<cursor> identifier;
Expand Down