diff --git a/src/analysis.zig b/src/analysis.zig
index 0782a06..33e0d06 100644
--- a/src/analysis.zig
+++ b/src/analysis.zig
@@ -1,45 +1,50 @@
-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 => {
-                const func = decl.cast(std.zig.ast.Node.FnProto).?;
-                if (std.mem.eql(u8, tree.tokenSlice(func.name_token.?), name)) return func;
-            },
-            else => {}
-        }
-
-    }
-
-    return null;
-
-}
-
-/// Gets a function's doc comments, caller must free memory when a value is returned
-/// Like:
-///```zig
-///var comments = getFunctionDocComments(allocator, tree, func);
-///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);
-
-        while (doc_it.next()) |doc_comment| {
-            _ = try lines.append(std.fmt.trim(tree.tokenSlice(doc_comment.*)[3..]));
-        }
-
-        return try std.mem.join(allocator, "\n", lines.toOwnedSlice());
-    } else {
-        return null;
-    }
-
-}
+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 => {
+                const func = decl.cast(std.zig.ast.Node.FnProto).?;
+                if (std.mem.eql(u8, tree.tokenSlice(func.name_token.?), name)) return func;
+            },
+            else => {}
+        }
+    }
+
+    return null;
+}
+
+/// Gets a function's doc comments, caller must free memory when a value is returned
+/// Like:
+///```zig
+///var comments = getFunctionDocComments(allocator, tree, func);
+///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);
+
+        while (doc_it.next()) |doc_comment| {
+            _ = try lines.append(std.fmt.trim(tree.tokenSlice(doc_comment.*)[3..]));
+        }
+
+        return try std.mem.join(allocator, "\n", lines.toOwnedSlice());
+    } 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];
+}
diff --git a/src/main.zig b/src/main.zig
index a99125f..d531cde 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -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 => {