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

Merge pull request #16 from alexnask/snippet_improvements

Browse Source 
Snippet improvements
This commit is contained in:
Auguste Rame 2020-05-12 13:43:13 -04:00 committed by GitHub
commit 8283fad107
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/analysis.zig
View File

@ -88,22 +88,41 @@ pub fn getFunctionSnippet(allocator: *std.mem.Allocator, tree: *ast.Tree, func:
var param_it = func.params.iterator(0); var param_it = func.params.iterator(0);
while (param_it.next()) |param_ptr| : (param_num += 1) { while (param_it.next()) |param_ptr| : (param_num += 1) {
const param = param_ptr.*; const param = param_ptr.*;
const param_decl = param.cast(ast.Node.ParamDecl).?;
if (param_num != 1) try buffer.appendSlice(", ${") if (param_num != 1) try buffer.appendSlice(", ${")
else try buffer.appendSlice("${"); else try buffer.appendSlice("${");
try buf_stream.print("{}:", .{param_num}); try buf_stream.print("{}:", .{param_num});
var curr_tok = param.firstToken();
const end_tok = param.lastToken();
var first_tok = true; if (param_decl.comptime_token) |_| {
try buffer.appendSlice("comptime ");
}
if (param_decl.noalias_token) |_| {
try buffer.appendSlice("noalias ");
}
if (param_decl.name_token) |name_token| {
try buffer.appendSlice(tree.tokenSlice(name_token));
try buffer.appendSlice(": ");
}
if (param_decl.var_args_token) |_| {
try buffer.appendSlice("...");
}
var curr_tok = param_decl.type_node.firstToken();
var end_tok = param_decl.type_node.lastToken();
while (curr_tok <= end_tok) : (curr_tok += 1) { while (curr_tok <= end_tok) : (curr_tok += 1) {
try buffer.appendSlice(tree.tokenSlice(curr_tok)); try buffer.appendSlice(tree.tokenSlice(curr_tok));
if (!first_tok and curr_tok != end_tok) try buffer.append(' ') if (tree.tokens.at(curr_tok).id == .Comma) try buffer.append(' ');
else first_tok = false;
} }
try buffer.append('}'); try buffer.append('}');
if (param_it.peek() != null) {
try buffer.appendSlice(", ");
}
} }
try buffer.append(')'); try buffer.append(')');