andr3/zls
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(Hopefully) fix configuration uri/memory bugs

Browse Source 
Closes #533
This commit is contained in:
Auguste Rame 2022-07-14 12:43:10 +02:00
parent c0668876f9
commit 2e379336b9
No known key found for this signature in database
GPG Key ID: 3A5E3F90DF2AAEFE
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main.zig
View File

@ -1787,7 +1787,6 @@ fn requestConfiguration(arena: *std.heap.ArenaAllocator) !void {
var comp_confi: [std.meta.fields(Config).len]types.ConfigurationParams.ConfigurationItem = undefined; var comp_confi: [std.meta.fields(Config).len]types.ConfigurationParams.ConfigurationItem = undefined;
inline for (std.meta.fields(Config)) |field, index| { inline for (std.meta.fields(Config)) |field, index| {
comp_confi[index] = .{ comp_confi[index] = .{
.scopeUri = "zls",
.section = "zls." ++ field.name, .section = "zls." ++ field.name,
}; };
} }
@ -2189,7 +2188,7 @@ fn didChangeConfigurationHandler(arena: *std.heap.ArenaAllocator, id: types.Requ
inline for (std.meta.fields(Config)) |field| { inline for (std.meta.fields(Config)) |field| {
if (@field(req.params.settings, field.name)) |value| { if (@field(req.params.settings, field.name)) |value| {
logger.debug("setting configuration option '{s}' to '{any}'", .{ field.name, value }); logger.debug("setting configuration option '{s}' to '{any}'", .{ field.name, value });
@field(config, field.name) = value; @field(config, field.name) = if (@TypeOf(value) == []const u8) try gpa_state.allocator().dupe(u8, value) else value;
} }
} }
} else if (client_capabilities.supports_configuration) } else if (client_capabilities.supports_configuration)
@ -2262,7 +2261,7 @@ fn processJsonRpc(arena: *std.heap.ArenaAllocator, parser: *std.json.Parser, jso
if (value != .Null) { if (value != .Null) {
const new_value: field.field_type = switch (ft) { const new_value: field.field_type = switch (ft) {
[]const u8 => switch (value) { []const u8 => switch (value) {
.String => |s| s, .String => |s| try gpa_state.allocator().dupe(u8, s), // TODO: Allocation model? (same with didChangeConfiguration); imo this isn't *that* bad but still
else => @panic("Invalid configuration value"), // TODO: Handle this else => @panic("Invalid configuration value"), // TODO: Handle this
}, },
else => switch (ti) { else => switch (ti) {

1
src/types.zig
View File

@ -398,7 +398,6 @@ pub const ConfigurationParams = struct {
items: []const ConfigurationItem, items: []const ConfigurationItem,
pub const ConfigurationItem = struct { pub const ConfigurationItem = struct {
scopeUri: ?[]const u8,
section: ?[]const u8, section: ?[]const u8,
}; };
}; };