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

added function comments and signature

Browse Source
This commit is contained in:
SuperAuguste 2020-05-03 17:27:08 -04:00
parent 88814b9589
commit 738a9be0cc
2 changed files with 61 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/analysis.zig
View File

@ -2,10 +2,8 @@ const std = @import("std");
/// REALLY BAD CODE, PLEASE DON'T USE THIS!!!!!!! (only for testing)
pub fn getFunctionByName(tree: *std.zig.ast.Tree, name: []const u8) ?*std.zig.ast.Node.FnProto {
var decls = tree.root_node.decls.iterator(0);
while (decls.next()) |decl_ptr| {
var decl = decl_ptr.*;
switch (decl.id) {
.FnProto => {
@ -14,11 +12,9 @@ pub fn getFunctionByName(tree: *std.zig.ast.Tree, name: []const u8) ?*std.zig.as
},
else => {}
}
}
return null;
}
/// Gets a function's doc comments, caller must free memory when a value is returned
@ -28,7 +24,6 @@ pub fn getFunctionByName(tree: *std.zig.ast.Tree, name: []const u8) ?*std.zig.as
///defer if (comments) |comments_pointer| allocator.free(comments_pointer);
///```
pub fn getFunctionDocComments(allocator: *std.mem.Allocator, tree: *std.zig.ast.Tree, func: *std.zig.ast.Node.FnProto) !?[]const u8 {
if (func.doc_comments) |doc_comments| {
var doc_it = doc_comments.lines.iterator(0);
var lines = std.ArrayList([]const u8).init(allocator);
@ -41,5 +36,15 @@ pub fn getFunctionDocComments(allocator: *std.mem.Allocator, tree: *std.zig.ast.
} else {
return null;
}
}
/// Gets a function definition (keywords, name, return value)
pub fn getFunctionDefinition(tree: *std.zig.ast.Tree, func: *std.zig.ast.Node.FnProto) []const u8 {
var start = tree.tokens.at(func.firstToken()).start;
var end =
if (func.body_node) |body| tree.tokens.at(body.firstToken()).start
else tree.tokens.at(switch (func.return_type) {
.Explicit, .InferErrorSet => |node| node.lastToken()
}).end;
return tree.source[start..end];
}

12
src/main.zig
View File

@ -126,7 +126,7 @@ pub fn publishDiagnostics(document: types.TextDocument) !void {
pub fn completeGlobal(id: i64, document: types.TextDocument) !void {
const tree = try std.zig.parse(allocator, document.text);
defer tree.deinit();
// defer tree.deinit();
if (tree.errors.len > 0) return try respondGeneric(id, no_completions_response);
@ -140,10 +140,20 @@ pub fn completeGlobal(id: i64, document: types.TextDocument) !void {
switch (decl.id) {
.FnProto => {
const func = decl.cast(std.zig.ast.Node.FnProto).?;
var doc_comments = try analysis.getFunctionDocComments(allocator, tree, func);
defer if (doc_comments) |dc| allocator.free(dc);
// var abc = "abc";
// try log("{}", .{abc});
// if (std.mem.eql(u8, tree.tokenSlice(func.name_token.?), name)) return func;
var doc = types.MarkupContent{
.kind = types.MarkupKind.Markdown,
.value = doc_comments orelse ""
};
try completions.append(types.CompletionItem{
.label = tree.tokenSlice(func.name_token.?),
.kind = types.CompletionItemKind.Function,
.documentation = doc,
.detail = analysis.getFunctionDefinition(tree, func)
});
},
.VarDecl => {