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
4 changes: 2 additions & 2 deletions build.zig
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const builtin = @import("builtin");
const zls_version: std.SemanticVersion = .{ .major = 0, .minor = 16, .patch = 0, .pre = "dev" };

/// Specify the minimum Zig version that is required to compile and test ZLS:
/// std.Build.Step.Run: Enable passing (generated) file content as args
/// Add error bundle support to `translate-c`, unify `cmdTranslateC` and `cImport`
///
/// If you do not use Nix, a ZLS maintainer can take care of this.
/// Whenever this version is increased, run the following command:
Expand All @@ -15,7 +15,7 @@ const zls_version: std.SemanticVersion = .{ .major = 0, .minor = 16, .patch = 0,
/// ```
///
/// Also update the `minimum_zig_version` in `build.zig.zon`.
const minimum_build_zig_version = "0.16.0-dev.313+be571f32c";
const minimum_build_zig_version = "0.16.0-dev.722+c17e18647";

/// Specify the minimum Zig version that is usable with ZLS:
/// Release 0.15.1
Expand Down
2 changes: 1 addition & 1 deletion build.zig.zon
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
.version = "0.16.0-dev",
// Must be kept in line with the `minimum_build_zig_version` in `build.zig`.
// Should be a Zig version that is downloadable from https://ziglang.org/download/ or a mirror.
.minimum_zig_version = "0.16.0-dev.368+2a97e0af6",
.minimum_zig_version = "0.16.0-dev.728+87c18945c",
// If you do not use Nix, a ZLS maintainer can take care of this.
// Whenever the dependencies are updated, run the following command:
// ```bash
Expand Down
12 changes: 6 additions & 6 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/Server.zig
Original file line number Diff line number Diff line change
Expand Up @@ -1821,7 +1821,7 @@ fn processMessageReportError(server: *Server, arena_state: std.heap.ArenaAllocat
} else |err| {
log.err("failed to process {f}: {}", .{ fmtMessage(message), err });
if (@errorReturnTrace()) |trace| {
std.debug.dumpStackTrace(trace.*);
std.debug.dumpStackTrace(trace);
}

switch (message) {
Expand Down
6 changes: 4 additions & 2 deletions src/analysis.zig
Original file line number Diff line number Diff line change
Expand Up @@ -5035,13 +5035,15 @@ pub fn getPositionContext(
},
.l_bracket => try stack.append(allocator, .{ .ctx = .empty, .stack_id = .bracket }),
.r_paren => {
_ = stack.pop();
// Do this manually, as .pop() sets `stack.items[stack.items.len - 1]` to `undefined` which currently curr_ctx points to
if (stack.items.len != 0) stack.items.len -= 1;
if (curr_ctx.stack_id != .paren) {
(try peek(allocator, &stack)).ctx = .empty;
}
},
.r_bracket => {
_ = stack.pop();
// Do this manually, as .pop() sets `stack.items[stack.items.len - 1]` to `undefined` which currently curr_ctx points to
if (stack.items.len != 0) stack.items.len -= 1;
if (curr_ctx.stack_id != .bracket) {
(try peek(allocator, &stack)).ctx = .empty;
}
Expand Down
1 change: 0 additions & 1 deletion tests/language_features/cimport.zig
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ test "zig compile server - translate c" {
defer result1.deinit(allocator);
try std.testing.expect(result1 == .success);

if (true) return error.SkipZigTest; // https://github.com/ziglang/zig/issues/25393
var result2 = try testTranslate(
\\#include <this_file_doesnt_exist>
);
Expand Down