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

Fixed crash in snippet generation of varargs functions

Browse Source
This commit is contained in:
Alexandros Naskos 2020-05-14 13:57:55 +03:00
parent 6db3c74550
commit 112d38e7fa
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/analysis.zig
View File

@ -110,6 +110,7 @@ pub fn getFunctionSnippet(allocator: *std.mem.Allocator, tree: *ast.Tree, func:
if (param_decl.var_args_token) |_| { if (param_decl.var_args_token) |_| {
try buffer.appendSlice("..."); try buffer.appendSlice("...");
continue;
} }
var curr_tok = param_decl.type_node.firstToken(); var curr_tok = param_decl.type_node.firstToken();

5
src/document_store.zig
View File

@ -214,9 +214,6 @@ pub fn applyChanges(self: *DocumentStore, handle: *Handle, content_changes: std.
// Perhaps on new sane text we can go through imports // Perhaps on new sane text we can go through imports
// and remove those that are in the import_uris table // and remove those that are in the import_uris table
// but not in the file anymore. // but not in the file anymore.
// @TODO: Make this hold a single tree, remove tree param
// from analysis functions that take an import_context.
// (can we reset-reuse it or do we need to deinit-init a new one?)
pub const AnalysisContext = struct { pub const AnalysisContext = struct {
store: *DocumentStore, store: *DocumentStore,
handle: *Handle, handle: *Handle,
@ -227,7 +224,7 @@ pub const AnalysisContext = struct {
pub fn onImport(self: *AnalysisContext, import_str: []const u8) !?*std.zig.ast.Node { pub fn onImport(self: *AnalysisContext, import_str: []const u8) !?*std.zig.ast.Node {
const allocator = self.store.allocator; const allocator = self.store.allocator;
const final_uri = if (std.mem.eql(u8, import_str, "std")) const final_uri = if (std.mem.eql(u8, import_str, "std"))
if (self.store.std_uri) |std_root_uri| try std.mem.dupe(allocator, u8, std_root_uri) if (self.store.std_uri) |std_root_uri| try std.mem.dupe(allocator, u8, std_root_uri)
else { else {