Skip to content

Fix completions for interned null-terminated slice #2641

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
Mar 10, 2026
Merged

Fix completions for interned null-terminated slice #2641

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
37 changes: 29 additions & 8 deletions src/analyser/completions.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,19 +91,20 @@ pub fn dotCompletions(
}
},
.slice => {
const formatted = try std.fmt.allocPrint(arena, "{f}", .{inner_ty.fmt(ip)});
std.debug.assert(std.mem.startsWith(u8, formatted, "[]"));
var slice_ptr_info = pointer_info;
slice_ptr_info.flags.size = .many;
const slice_ptr_ty = try ip.get(.{ .pointer_type = slice_ptr_info });

try completions.appendSlice(arena, &.{
.{
.label = "ptr",
.kind = .Field,
.detail = try std.fmt.allocPrint(arena, "ptr: [*]{s}", .{formatted["[]".len..]}),
.detail = try std.fmt.allocPrint(arena, "{f}", .{slice_ptr_ty.fmt(ip)}),
},
.{
.label = "len",
.kind = .Field,
.detail = "len: usize",
.detail = "usize",
},
});
},
Expand Down Expand Up @@ -314,6 +315,14 @@ test "dotCompletions - pointer types" {
.size = .c,
},
} });
const @"[:0]const u8" = try ip.get(.{ .pointer_type = .{
.elem_type = .u8_type,
.sentinel = .zero_u8,
.flags = .{
.size = .slice,
.is_const = true,
},
} });

try testCompletion(&ip, try ip.getUnknown(@"*u32"), &.{
.{
Expand All @@ -326,24 +335,24 @@ test "dotCompletions - pointer types" {
.{
.label = "ptr",
.kind = .Field,
.detail = "ptr: [*]u32",
.detail = "[*]u32",
},
.{
.label = "len",
.kind = .Field,
.detail = "len: usize",
.detail = "usize",
},
});
try testCompletion(&ip, try ip.getUnknown(@"[]const u32"), &.{
.{
.label = "ptr",
.kind = .Field,
.detail = "ptr: [*]const u32",
.detail = "[*]const u32",
},
.{
.label = "len",
.kind = .Field,
.detail = "len: usize",
.detail = "usize",
},
});
try testCompletion(&ip, try ip.getUnknown(@"[*c]u32"), &.{
Expand All @@ -358,6 +367,18 @@ test "dotCompletions - pointer types" {
.detail = "[*c]u32",
},
});
try testCompletion(&ip, try ip.getUnknown(@"[:0]const u8"), &.{
.{
.label = "ptr",
.kind = .Field,
.detail = "[*:0]const u8",
},
.{
.label = "len",
.kind = .Field,
.detail = "usize",
},
});
}

test "dotCompletions - single pointer indirection" {
Expand Down
10 changes: 10 additions & 0 deletions tests/lsp_features/completion.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4630,6 +4630,16 @@ test "dot after try" {
});
}

test "null-terminated slice" {
try testCompletion(
\\const foo = if (undefined) "a" else "ab";
\\const bar = foo.<cursor>
, &.{
.{ .label = "len", .kind = .Field, .detail = "usize" },
.{ .label = "ptr", .kind = .Field, .detail = "[*:0]const u8" },
});
}

fn testCompletion(source: []const u8, expected_completions: []const Completion) !void {
try testCompletionWithOptions(source, expected_completions, .{});
}
Expand Down