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

Doc comments, function completion in structs

Browse Source
This commit is contained in:
SuperAuguste 2020-05-13 12:19:10 -04:00
parent e9b5bf433e
commit 20afe9ef3c
1 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/main.zig
View File

@ -248,7 +248,7 @@ fn completeGlobal(id: i64, document: *types.TextDocument, config: Config) !void
.FnProto => { .FnProto => {
const func = decl.cast(std.zig.ast.Node.FnProto).?; const func = decl.cast(std.zig.ast.Node.FnProto).?;
if (func.name_token) |name_token| { if (func.name_token) |name_token| {
const insert_text = if(config.enable_snippets) const insert_text = if (config.enable_snippets)
try analysis.getFunctionSnippet(&arena.allocator, tree, func) try analysis.getFunctionSnippet(&arena.allocator, tree, func)
else else
null; null;
@ -264,7 +264,7 @@ fn completeGlobal(id: i64, document: *types.TextDocument, config: Config) !void
.documentation = doc, .documentation = doc,
.detail = analysis.getFunctionSignature(tree, func), .detail = analysis.getFunctionSignature(tree, func),
.insertText = insert_text, .insertText = insert_text,
.insertTextFormat = if(config.enable_snippets) .Snippet else .PlainText, .insertTextFormat = if (config.enable_snippets) .Snippet else .PlainText,
}); });
} }
}, },
@ -316,10 +316,37 @@ fn completeFieldAccess(id: i64, document: *types.TextDocument, position: types.P
var index: usize = 0; var index: usize = 0;
while (node.iterate(index)) |child_node| { while (node.iterate(index)) |child_node| {
if (analysis.nodeToString(tree, child_node)) |string| { if (analysis.nodeToString(tree, child_node)) |string| {
var doc_comments = try analysis.getDocComments(&arena.allocator, tree, child_node);
var doc = types.MarkupContent{
.kind = .Markdown,
.value = doc_comments orelse "",
};
switch (child_node.id) {
.FnProto => {
const func = child_node.cast(std.zig.ast.Node.FnProto).?;
const insert_text = if (config.enable_snippets)
try analysis.getFunctionSnippet(&arena.allocator, tree, func)
else
null;
try completions.append(.{ try completions.append(.{
.label = string, .label = string,
.kind = .Variable, .kind = .Function,
.documentation = doc,
.detail = analysis.getFunctionSignature(tree, func),
.insertText = insert_text,
.insertTextFormat = if (config.enable_snippets) .Snippet else .PlainText,
}); });
},
else => {
try completions.append(.{
.label = string,
.kind = .Field,
.documentation = doc
});
}
}
} }
index += 1; index += 1;