Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Sergeeeek 2020-05-19 07:17:28 +03:00
commit c4aa35872c
5 changed files with 237 additions and 228 deletions

View File

@ -27,9 +27,9 @@ zig build
### Build Options ### Build Options
| Option | Type | What it Does | | Option | Type | Default Value | What it Does |
| --- | --- | --- | | --- | --- | --- | --- |
| `-Ddata_version` | `string` | The data file version. Any files in the `src/data` file that correspond with the Zig version you want the language server to build for (0.6.0, master). | `-Ddata_version` | `string` (master or 0.6.0) | 0.6.0 | The data file version. This selects the files in the `src/data` folder that correspond to the Zig version being served.
Then, you can use the `zls` executable in an editor of your choice that has a Zig language server client! Then, you can use the `zls` executable in an editor of your choice that has a Zig language server client!

View File

@ -180,61 +180,57 @@ pub fn isPascalCase(name: []const u8) bool {
// ANALYSIS ENGINE // ANALYSIS ENGINE
pub fn getDeclNameToken(tree: *ast.Tree, node: *ast.Node) ?ast.TokenIndex {
switch (node.id) {
.VarDecl => {
const vari = node.cast(ast.Node.VarDecl).?;
return vari.name_token;
},
.ParamDecl => {
const decl = node.cast(ast.Node.ParamDecl).?;
if (decl.name_token == null) return null;
return decl.name_token.?;
},
.FnProto => {
const func = node.cast(ast.Node.FnProto).?;
if (func.name_token == null) return null;
return func.name_token.?;
},
.ContainerField => {
const field = node.cast(ast.Node.ContainerField).?;
return field.name_token;
},
else => {},
}
return null;
}
fn getDeclName(tree: *ast.Tree, node: *ast.Node) ?[]const u8 {
return tree.tokenSlice(getDeclNameToken(tree, node) orelse return null);
}
/// Gets the child of node /// Gets the child of node
pub fn getChild(tree: *ast.Tree, node: *ast.Node, name: []const u8) ?*ast.Node { pub fn getChild(tree: *ast.Tree, node: *ast.Node, name: []const u8) ?*ast.Node {
var index: usize = 0; var index: usize = 0;
while (node.iterate(index)) |child| { while (node.iterate(index)) |child| : (index += 1) {
switch (child.id) { const child_name = getDeclName(tree, child) orelse continue;
.VarDecl => { if (std.mem.eql(u8, child_name, name)) return child;
const vari = child.cast(ast.Node.VarDecl).?;
if (std.mem.eql(u8, tree.tokenSlice(vari.name_token), name)) return child;
},
.FnProto => {
const func = child.cast(ast.Node.FnProto).?;
if (func.name_token != null and std.mem.eql(u8, tree.tokenSlice(func.name_token.?), name)) return child;
},
.ContainerField => {
const field = child.cast(ast.Node.ContainerField).?;
if (std.mem.eql(u8, tree.tokenSlice(field.name_token), name)) return child;
},
else => {},
}
index += 1;
} }
return null; return null;
} }
/// Gets the child of slice /// Gets the child of slice
pub fn getChildOfSlice(tree: *ast.Tree, nodes: []*ast.Node, name: []const u8) ?*ast.Node { pub fn getChildOfSlice(tree: *ast.Tree, nodes: []*ast.Node, name: []const u8) ?*ast.Node {
// var index: usize = 0;
for (nodes) |child| { for (nodes) |child| {
switch (child.id) { const child_name = getDeclName(tree, child) orelse continue;
.VarDecl => { if (std.mem.eql(u8, child_name, name)) return child;
const vari = child.cast(ast.Node.VarDecl).?;
if (std.mem.eql(u8, tree.tokenSlice(vari.name_token), name)) return child;
},
.ParamDecl => {
const decl = child.cast(ast.Node.ParamDecl).?;
if (decl.name_token != null and std.mem.eql(u8, tree.tokenSlice(decl.name_token.?), name)) return child;
},
.FnProto => {
const func = child.cast(ast.Node.FnProto).?;
if (func.name_token != null and std.mem.eql(u8, tree.tokenSlice(func.name_token.?), name)) return child;
},
.ContainerField => {
const field = child.cast(ast.Node.ContainerField).?;
if (std.mem.eql(u8, tree.tokenSlice(field.name_token), name)) return child;
},
else => {},
}
// index += 1;
} }
return null; return null;
} }
/// Resolves the type of a node /// Resolves the type of a node
pub fn resolveTypeOfNode(analysis_ctx: *AnalysisContext, node: *ast.Node) ?*ast.Node { pub fn resolveTypeOfNode(analysis_ctx: *AnalysisContext, node: *ast.Node) ?*ast.Node {
std.debug.warn("NODE {}\n", .{node});
switch (node.id) { switch (node.id) {
.VarDecl => { .VarDecl => {
const vari = node.cast(ast.Node.VarDecl).?; const vari = node.cast(ast.Node.VarDecl).?;
@ -254,22 +250,14 @@ pub fn resolveTypeOfNode(analysis_ctx: *AnalysisContext, node: *ast.Node) ?*ast.
return node; return node;
}, },
.Identifier => { .Identifier => {
// std.debug.warn("IDENTIFIER {}\n", .{analysis_ctx.tree.getNodeSource(node)});
if (getChildOfSlice(analysis_ctx.tree, analysis_ctx.scope_nodes, analysis_ctx.tree.getNodeSource(node))) |child| { if (getChildOfSlice(analysis_ctx.tree, analysis_ctx.scope_nodes, analysis_ctx.tree.getNodeSource(node))) |child| {
// std.debug.warn("CHILD {}\n", .{child});
return resolveTypeOfNode(analysis_ctx, child); return resolveTypeOfNode(analysis_ctx, child);
} else return null; } else return null;
}, },
.ContainerDecl => {
return node;
},
.ContainerField => { .ContainerField => {
const field = node.cast(ast.Node.ContainerField).?; const field = node.cast(ast.Node.ContainerField).?;
return resolveTypeOfNode(analysis_ctx, field.type_expr orelse return null); return resolveTypeOfNode(analysis_ctx, field.type_expr orelse return null);
}, },
.ErrorSetDecl => {
return node;
},
.SuffixOp => { .SuffixOp => {
const suffix_op = node.cast(ast.Node.SuffixOp).?; const suffix_op = node.cast(ast.Node.SuffixOp).?;
switch (suffix_op.op) { switch (suffix_op.op) {
@ -337,12 +325,8 @@ pub fn resolveTypeOfNode(analysis_ctx: *AnalysisContext, node: *ast.Node) ?*ast.
break :block null; break :block null;
}; };
}, },
.MultilineStringLiteral, .StringLiteral => { .MultilineStringLiteral, .StringLiteral, .ContainerDecl, .ErrorSetDecl => return node,
return node; else => std.debug.warn("Type resolution case not implemented; {}\n", .{node.id}),
},
else => {
std.debug.warn("Type resolution case not implemented; {}\n", .{node.id});
},
} }
return null; return null;
} }
@ -360,10 +344,8 @@ fn maybeCollectImport(tree: *ast.Tree, builtin_call: *ast.Node.BuiltinCall, arr:
/// Collects all imports we can find into a slice of import paths (without quotes). /// Collects all imports we can find into a slice of import paths (without quotes).
/// The import paths are valid as long as the tree is. /// The import paths are valid as long as the tree is.
pub fn collectImports(allocator: *std.mem.Allocator, tree: *ast.Tree) ![][]const u8 { pub fn collectImports(import_arr: *std.ArrayList([]const u8), tree: *ast.Tree) !void {
// TODO: Currently only detects `const smth = @import("string literal")<.SometThing>;` // TODO: Currently only detects `const smth = @import("string literal")<.SomeThing>;`
var arr = std.ArrayList([]const u8).init(allocator);
var idx: usize = 0; var idx: usize = 0;
while (tree.root_node.iterate(idx)) |decl| : (idx += 1) { while (tree.root_node.iterate(idx)) |decl| : (idx += 1) {
if (decl.id != .VarDecl) continue; if (decl.id != .VarDecl) continue;
@ -373,7 +355,7 @@ pub fn collectImports(allocator: *std.mem.Allocator, tree: *ast.Tree) ![][]const
switch (var_decl.init_node.?.id) { switch (var_decl.init_node.?.id) {
.BuiltinCall => { .BuiltinCall => {
const builtin_call = var_decl.init_node.?.cast(ast.Node.BuiltinCall).?; const builtin_call = var_decl.init_node.?.cast(ast.Node.BuiltinCall).?;
try maybeCollectImport(tree, builtin_call, &arr); try maybeCollectImport(tree, builtin_call, import_arr);
}, },
.InfixOp => { .InfixOp => {
const infix_op = var_decl.init_node.?.cast(ast.Node.InfixOp).?; const infix_op = var_decl.init_node.?.cast(ast.Node.InfixOp).?;
@ -383,27 +365,25 @@ pub fn collectImports(allocator: *std.mem.Allocator, tree: *ast.Tree) ![][]const
else => continue, else => continue,
} }
if (infix_op.lhs.id != .BuiltinCall) continue; if (infix_op.lhs.id != .BuiltinCall) continue;
try maybeCollectImport(tree, infix_op.lhs.cast(ast.Node.BuiltinCall).?, &arr); try maybeCollectImport(tree, infix_op.lhs.cast(ast.Node.BuiltinCall).?, import_arr);
}, },
else => {}, else => {},
} }
} }
return arr.toOwnedSlice();
} }
pub fn getFieldAccessTypeNode(analysis_ctx: *AnalysisContext, tokenizer: *std.zig.Tokenizer) ?*ast.Node { pub fn getFieldAccessTypeNode(
analysis_ctx: *AnalysisContext,
tokenizer: *std.zig.Tokenizer,
line_length: usize,
) ?*ast.Node {
var current_node = &analysis_ctx.tree.root_node.base; var current_node = &analysis_ctx.tree.root_node.base;
while (true) { while (true) {
var next = tokenizer.next(); var next = tokenizer.next();
switch (next.id) { switch (next.id) {
.Eof => { .Eof => return current_node,
return current_node;
},
.Identifier => { .Identifier => {
// var root = current_node.cast(ast.Node.Root).?;
// current_node.
if (getChildOfSlice(analysis_ctx.tree, analysis_ctx.scope_nodes, tokenizer.buffer[next.start..next.end])) |child| { if (getChildOfSlice(analysis_ctx.tree, analysis_ctx.scope_nodes, tokenizer.buffer[next.start..next.end])) |child| {
if (resolveTypeOfNode(analysis_ctx, child)) |node_type| { if (resolveTypeOfNode(analysis_ctx, child)) |node_type| {
current_node = node_type; current_node = node_type;
@ -412,9 +392,12 @@ pub fn getFieldAccessTypeNode(analysis_ctx: *AnalysisContext, tokenizer: *std.zi
}, },
.Period => { .Period => {
var after_period = tokenizer.next(); var after_period = tokenizer.next();
if (after_period.id == .Eof) { if (after_period.id == .Eof or after_period.id == .Comma) {
return current_node; return current_node;
} else if (after_period.id == .Identifier) { } else if (after_period.id == .Identifier) {
// TODO: This works for now, maybe we should filter based on the partial identifier ourselves?
if (after_period.end == line_length) return current_node;
if (getChild(analysis_ctx.tree, current_node, tokenizer.buffer[after_period.start..after_period.end])) |child| { if (getChild(analysis_ctx.tree, current_node, tokenizer.buffer[after_period.start..after_period.end])) |child| {
if (resolveTypeOfNode(analysis_ctx, child)) |child_type| { if (resolveTypeOfNode(analysis_ctx, child)) |child_type| {
current_node = child_type; current_node = child_type;
@ -422,9 +405,7 @@ pub fn getFieldAccessTypeNode(analysis_ctx: *AnalysisContext, tokenizer: *std.zi
} else return null; } else return null;
} }
}, },
else => { else => std.debug.warn("Not implemented; {}\n", .{next.id}),
std.debug.warn("Not implemented; {}\n", .{next.id});
},
} }
} }
@ -473,70 +454,44 @@ pub fn nodeToString(tree: *ast.Tree, node: *ast.Node) ?[]const u8 {
return null; return null;
} }
pub fn declsFromIndexInternal(allocator: *std.mem.Allocator, tree: *ast.Tree, node: *ast.Node, nodes: *std.ArrayList(*ast.Node)) anyerror!void { pub fn declsFromIndexInternal(decls: *std.ArrayList(*ast.Node), tree: *ast.Tree, node: *ast.Node) anyerror!void {
switch (node.id) { switch (node.id) {
.FnProto => { .FnProto => {
const func = node.cast(ast.Node.FnProto).?; const func = node.cast(ast.Node.FnProto).?;
var param_index: usize = 0; var param_index: usize = 0;
while (param_index < func.params.len) : (param_index += 1) while (param_index < func.params.len) : (param_index += 1)
try declsFromIndexInternal(allocator, tree, func.params.at(param_index).*, nodes); try declsFromIndexInternal(decls, tree, func.params.at(param_index).*);
if (func.body_node) |body_node| if (func.body_node) |body_node|
try declsFromIndexInternal(allocator, tree, body_node, nodes); try declsFromIndexInternal(decls, tree, body_node);
}, },
.Block => { .Block => {
var index: usize = 0; var index: usize = 0;
while (node.iterate(index)) |inode| : (index += 1) {
while (node.iterate(index)) |inode| { try declsFromIndexInternal(decls, tree, inode);
try declsFromIndexInternal(allocator, tree, inode, nodes);
index += 1;
} }
}, },
.VarDecl => { .VarDecl, .ParamDecl => try decls.append(node),
try nodes.append(node); else => try addChildrenNodes(decls, tree, node),
},
.ParamDecl => {
try nodes.append(node);
},
else => {
try nodes.appendSlice(try getCompletionsFromNode(allocator, tree, node));
},
} }
} }
pub fn getCompletionsFromNode(allocator: *std.mem.Allocator, tree: *ast.Tree, node: *ast.Node) ![]*ast.Node { pub fn addChildrenNodes(decls: *std.ArrayList(*ast.Node), tree: *ast.Tree, node: *ast.Node) !void {
var nodes = std.ArrayList(*ast.Node).init(allocator);
var index: usize = 0; var index: usize = 0;
while (node.iterate(index)) |child_node| { while (node.iterate(index)) |child_node| : (index += 1) {
try nodes.append(child_node); try decls.append(child_node);
index += 1;
} }
return nodes.items;
} }
pub fn declsFromIndex(allocator: *std.mem.Allocator, tree: *ast.Tree, index: usize) ![]*ast.Node { pub fn declsFromIndex(decls: *std.ArrayList(*ast.Node), tree: *ast.Tree, index: usize) !void {
var iindex: usize = 0;
var node = &tree.root_node.base; var node = &tree.root_node.base;
var nodes = std.ArrayList(*ast.Node).init(allocator);
try nodes.appendSlice(try getCompletionsFromNode(allocator, tree, node)); try addChildrenNodes(decls, tree, node);
var node_index: usize = 0;
while (node.iterate(iindex)) |inode| { while (node.iterate(node_index)) |inode| : (node_index += 1) {
if (tree.tokens.at(inode.firstToken()).start < index and index < tree.tokens.at(inode.lastToken()).start) { if (tree.tokens.at(inode.firstToken()).start < index and index < tree.tokens.at(inode.lastToken()).end) {
try declsFromIndexInternal(allocator, tree, inode, &nodes); try declsFromIndexInternal(decls, tree, inode);
} }
iindex += 1;
} }
if (tree.tokens.at(node.firstToken()).start < index and index < tree.tokens.at(node.lastToken()).start) {
return nodes.items;
}
return nodes.items;
} }

View File

@ -64,7 +64,6 @@ fn newDocument(self: *DocumentStore, uri: []const u8, text: []u8) !*Handle {
.mem = text, .mem = text,
}, },
}; };
try self.checkSanity(handle);
const kv = try self.handles.getOrPutValue(uri, handle); const kv = try self.handles.getOrPutValue(uri, handle);
return kv.value; return kv.value;
} }
@ -121,10 +120,7 @@ pub fn getHandle(self: *DocumentStore, uri: []const u8) ?*Handle {
} }
// Check if the document text is now sane, move it to sane_text if so. // Check if the document text is now sane, move it to sane_text if so.
fn checkSanity(self: *DocumentStore, handle: *Handle) !void { fn removeOldImports(self: *DocumentStore, handle: *Handle) !void {
const tree = try handle.tree(self.allocator);
defer tree.deinit();
std.debug.warn("New text for document {}\n", .{handle.uri()}); std.debug.warn("New text for document {}\n", .{handle.uri()});
// TODO: Better algorithm or data structure? // TODO: Better algorithm or data structure?
// Removing the imports is costly since they live in an array list // Removing the imports is costly since they live in an array list
@ -133,19 +129,22 @@ fn checkSanity(self: *DocumentStore, handle: *Handle) !void {
// Try to detect removed imports and decrement their counts. // Try to detect removed imports and decrement their counts.
if (handle.import_uris.items.len == 0) return; if (handle.import_uris.items.len == 0) return;
const import_strs = try analysis.collectImports(self.allocator, tree); const tree = try handle.tree(self.allocator);
defer self.allocator.free(import_strs); defer tree.deinit();
const still_exist = try self.allocator.alloc(bool, handle.import_uris.items.len); var arena = std.heap.ArenaAllocator.init(self.allocator);
defer self.allocator.free(still_exist); defer arena.deinit();
var import_strs = std.ArrayList([]const u8).init(&arena.allocator);
try analysis.collectImports(&import_strs, tree);
const still_exist = try arena.allocator.alloc(bool, handle.import_uris.items.len);
for (still_exist) |*ex| { for (still_exist) |*ex| {
ex.* = false; ex.* = false;
} }
for (import_strs) |str| { for (import_strs.items) |str| {
const uri = (try uriFromImportStr(self, handle.*, str)) orelse continue; const uri = (try uriFromImportStr(self, &arena.allocator, handle.*, str)) orelse continue;
defer self.allocator.free(uri);
var idx: usize = 0; var idx: usize = 0;
exists_loop: while (idx < still_exist.len) : (idx += 1) { exists_loop: while (idx < still_exist.len) : (idx += 1) {
@ -226,28 +225,29 @@ pub fn applyChanges(self: *DocumentStore, handle: *Handle, content_changes: std.
} }
} }
try self.checkSanity(handle); try self.removeOldImports(handle);
} }
fn uriFromImportStr(store: *DocumentStore, handle: Handle, import_str: []const u8) !?[]const u8 { fn uriFromImportStr(store: *DocumentStore, allocator: *std.mem.Allocator, handle: Handle, import_str: []const u8) !?[]const u8 {
return if (std.mem.eql(u8, import_str, "std")) return if (std.mem.eql(u8, import_str, "std"))
if (store.std_uri) |std_root_uri| try std.mem.dupe(store.allocator, u8, std_root_uri) else { if (store.std_uri) |std_root_uri| try std.mem.dupe(allocator, u8, std_root_uri)
else {
std.debug.warn("Cannot resolve std library import, path is null.\n", .{}); std.debug.warn("Cannot resolve std library import, path is null.\n", .{});
return null; return null;
} }
else b: { else b: {
// Find relative uri // Find relative uri
const path = try URI.parse(store.allocator, handle.uri()); const path = try URI.parse(allocator, handle.uri());
defer store.allocator.free(path); defer allocator.free(path);
const dir_path = std.fs.path.dirname(path) orelse ""; const dir_path = std.fs.path.dirname(path) orelse "";
const import_path = try std.fs.path.resolve(store.allocator, &[_][]const u8{ const import_path = try std.fs.path.resolve(allocator, &[_][]const u8 {
dir_path, import_str, dir_path, import_str
}); });
defer store.allocator.free(import_path); defer allocator.free(import_path);
break :b (try URI.fromPath(store.allocator, import_path)); break :b (try URI.fromPath(allocator, import_path));
}; };
} }
@ -262,9 +262,15 @@ pub const AnalysisContext = struct {
tree: *std.zig.ast.Tree, tree: *std.zig.ast.Tree,
scope_nodes: []*std.zig.ast.Node, scope_nodes: []*std.zig.ast.Node,
fn refreshScopeNodes(self: *AnalysisContext) !void {
var scope_nodes = std.ArrayList(*std.zig.ast.Node).init(&self.arena.allocator);
try analysis.addChildrenNodes(&scope_nodes, self.tree, &self.tree.root_node.base);
self.scope_nodes = scope_nodes.items;
}
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 = (try uriFromImportStr(self.store, self.handle.*, import_str)) orelse return null; const final_uri = (try uriFromImportStr(self.store, self.store.allocator, self.handle.*, import_str)) orelse return null;
std.debug.warn("Import final URI: {}\n", .{final_uri}); std.debug.warn("Import final URI: {}\n", .{final_uri});
var consumed_final_uri = false; var consumed_final_uri = false;
@ -278,6 +284,7 @@ pub const AnalysisContext = struct {
self.tree.deinit(); self.tree.deinit();
self.tree = try self.handle.tree(allocator); self.tree = try self.handle.tree(allocator);
try self.refreshScopeNodes();
return &self.tree.root_node.base; return &self.tree.root_node.base;
} }
} }
@ -291,6 +298,7 @@ pub const AnalysisContext = struct {
self.tree.deinit(); self.tree.deinit();
self.tree = try self.handle.tree(allocator); self.tree = try self.handle.tree(allocator);
try self.refreshScopeNodes();
return &self.tree.root_node.base; return &self.tree.root_node.base;
} }
@ -330,6 +338,7 @@ pub const AnalysisContext = struct {
// If we return null, no one should access the tree. // If we return null, no one should access the tree.
self.tree.deinit(); self.tree.deinit();
self.tree = try self.handle.tree(allocator); self.tree = try self.handle.tree(allocator);
try self.refreshScopeNodes();
return &self.tree.root_node.base; return &self.tree.root_node.base;
} }
@ -352,12 +361,16 @@ pub const AnalysisContext = struct {
pub fn analysisContext(self: *DocumentStore, handle: *Handle, arena: *std.heap.ArenaAllocator, position: types.Position) !AnalysisContext { pub fn analysisContext(self: *DocumentStore, handle: *Handle, arena: *std.heap.ArenaAllocator, position: types.Position) !AnalysisContext {
const tree = try handle.tree(self.allocator); const tree = try handle.tree(self.allocator);
var scope_nodes = std.ArrayList(*std.zig.ast.Node).init(&arena.allocator);
try analysis.declsFromIndex(&scope_nodes, tree, try handle.document.positionToIndex(position));
return AnalysisContext{ return AnalysisContext{
.store = self, .store = self,
.handle = handle, .handle = handle,
.arena = arena, .arena = arena,
.tree = tree, .tree = tree,
.scope_nodes = try analysis.declsFromIndex(&arena.allocator, tree, try handle.document.positionToIndex(position)) .scope_nodes = scope_nodes.items,
}; };
} }

View File

@ -11,13 +11,13 @@ const analysis = @import("analysis.zig");
// Code is largely based off of https://github.com/andersfr/zig-lsp/blob/master/server.zig // Code is largely based off of https://github.com/andersfr/zig-lsp/blob/master/server.zig
var stdout: std.fs.File.OutStream = undefined; var stdout: std.io.BufferedOutStream(4096, std.fs.File.OutStream) = undefined;
var allocator: *std.mem.Allocator = undefined; var allocator: *std.mem.Allocator = undefined;
var document_store: DocumentStore = undefined; var document_store: DocumentStore = undefined;
const initialize_response = const initialize_response =
\\,"result":{"capabilities":{"signatureHelpProvider":{"triggerCharacters":["(",","]},"textDocumentSync":1,"completionProvider":{"resolveProvider":false,"triggerCharacters":[".",":","@"]},"documentHighlightProvider":false,"codeActionProvider":false,"workspace":{"workspaceFolders":{"supported":true}}}}} \\,"result":{"capabilities":{"signatureHelpProvider":{"triggerCharacters":["(",","]},"textDocumentSync":1,"completionProvider":{"resolveProvider":false,"triggerCharacters":[".",":","@"]},"documentHighlightProvider":false,"codeActionProvider":false,"declarationProvider":true,"definitionProvider":true,"typeDefinitionProvider":true,"workspace":{"workspaceFolders":{"supported":true}}}}}
; ;
const not_implemented_response = const not_implemented_response =
@ -46,26 +46,11 @@ fn send(reqOrRes: var) !void {
var mem_buffer: [1024 * 128]u8 = undefined; var mem_buffer: [1024 * 128]u8 = undefined;
var fbs = std.io.fixedBufferStream(&mem_buffer); var fbs = std.io.fixedBufferStream(&mem_buffer);
try std.json.stringify(reqOrRes, std.json.StringifyOptions{}, fbs.outStream()); try std.json.stringify(reqOrRes, std.json.StringifyOptions{}, fbs.outStream());
try stdout.print("Content-Length: {}\r\n\r\n", .{fbs.pos});
try stdout.writeAll(fbs.getWritten());
}
fn log(comptime fmt: []const u8, args: var) !void { const stdout_stream = stdout.outStream();
// Disable logs on Release modes. try stdout_stream.print("Content-Length: {}\r\n\r\n", .{fbs.pos});
if (std.builtin.mode != .Debug) return; try stdout_stream.writeAll(fbs.getWritten());
try stdout.flush();
var message = try std.fmt.allocPrint(allocator, fmt, args);
defer allocator.free(message);
try send(types.Notification{
.method = "window/logMessage",
.params = .{
.LogMessageParams = .{
.@"type" = .Log,
.message = message,
},
},
});
} }
fn respondGeneric(id: i64, response: []const u8) !void { fn respondGeneric(id: i64, response: []const u8) !void {
@ -82,8 +67,11 @@ fn respondGeneric(id: i64, response: []const u8) !void {
// Numbers of character that will be printed from this string: len - 3 brackets // Numbers of character that will be printed from this string: len - 3 brackets
// 1 from the beginning (escaped) and the 2 from the arg {} // 1 from the beginning (escaped) and the 2 from the arg {}
const json_fmt = "{{\"jsonrpc\":\"2.0\",\"id\":{}"; const json_fmt = "{{\"jsonrpc\":\"2.0\",\"id\":{}";
try stdout.print("Content-Length: {}\r\n\r\n" ++ json_fmt, .{ response.len + id_digits + json_fmt.len - 3, id });
try stdout.writeAll(response); const stdout_stream = stdout.outStream();
try stdout_stream.print("Content-Length: {}\r\n\r\n" ++ json_fmt, .{ response.len + id_digits + json_fmt.len - 3, id });
try stdout_stream.writeAll(response);
try stdout.flush();
} }
// TODO: Is this correct or can we get a better end? // TODO: Is this correct or can we get a better end?
@ -184,7 +172,7 @@ fn publishDiagnostics(handle: DocumentStore.Handle, config: Config) !void {
fn containerToCompletion(list: *std.ArrayList(types.CompletionItem), analysis_ctx: *DocumentStore.AnalysisContext, container: *std.zig.ast.Node, config: Config) !void { fn containerToCompletion(list: *std.ArrayList(types.CompletionItem), analysis_ctx: *DocumentStore.AnalysisContext, container: *std.zig.ast.Node, config: Config) !void {
var index: usize = 0; var index: usize = 0;
while (container.iterate(index)) |child_node| : (index+=1) { while (container.iterate(index)) |child_node| : (index += 1) {
if (analysis.isNodePublic(analysis_ctx.tree, child_node)) { if (analysis.isNodePublic(analysis_ctx.tree, child_node)) {
try nodeToCompletion(list, analysis_ctx, child_node, config); try nodeToCompletion(list, analysis_ctx, child_node, config);
} }
@ -283,6 +271,78 @@ fn nodeToCompletion(list: *std.ArrayList(types.CompletionItem), analysis_ctx: *D
} }
} }
fn identifierFromPosition(pos_index: usize, handle: DocumentStore.Handle) []const u8 {
var start_idx = pos_index;
while (start_idx > 0 and
(std.ascii.isAlNum(handle.document.text[start_idx]) or handle.document.text[start_idx] == '_')) : (start_idx -= 1)
{}
var end_idx = pos_index;
while (end_idx < handle.document.text.len and
(std.ascii.isAlNum(handle.document.text[end_idx]) or handle.document.text[end_idx] == '_')) : (end_idx += 1)
{}
return handle.document.text[start_idx + 1 .. end_idx];
}
fn gotoDefinitionGlobal(id: i64, pos_index: usize, handle: DocumentStore.Handle) !void {
var tree = try handle.tree(allocator);
defer tree.deinit();
const name = identifierFromPosition(pos_index, handle);
var arena = std.heap.ArenaAllocator.init(allocator);
defer arena.deinit();
var decl_nodes = std.ArrayList(*std.zig.ast.Node).init(&arena.allocator);
try analysis.declsFromIndex(&decl_nodes, tree, pos_index);
const decl = analysis.getChildOfSlice(tree, decl_nodes.items, name) orelse return try respondGeneric(id, null_result_response);
const name_token = analysis.getDeclNameToken(tree, decl) orelse unreachable;
try send(types.Response{
.id = .{ .Integer = id },
.result = .{
.Location = .{
.uri = handle.document.uri,
.range = astLocationToRange(tree.tokenLocation(0, name_token)),
},
},
});
}
fn gotoDefinitionFieldAccess(id: i64, handle: *DocumentStore.Handle, position: types.Position, line_start_idx: usize) !void {
var arena = std.heap.ArenaAllocator.init(allocator);
defer arena.deinit();
var analysis_ctx = try document_store.analysisContext(handle, &arena, position);
defer analysis_ctx.deinit();
const pos_index = try handle.document.positionToIndex(position);
var name = identifierFromPosition(pos_index, handle.*);
const line = try handle.document.getLine(@intCast(usize, position.line));
var tokenizer = std.zig.Tokenizer.init(line[line_start_idx..]);
const line_length = @ptrToInt(name.ptr) - @ptrToInt(line.ptr) + name.len - line_start_idx;
name = try std.mem.dupe(&arena.allocator, u8, name);
if (analysis.getFieldAccessTypeNode(&analysis_ctx, &tokenizer, line_length)) |container| {
const decl = analysis.getChild(analysis_ctx.tree, container, name) orelse return try respondGeneric(id, null_result_response);
const name_token = analysis.getDeclNameToken(analysis_ctx.tree, decl) orelse unreachable;
return try send(types.Response{
.id = .{ .Integer = id },
.result = .{
.Location = .{
.uri = analysis_ctx.handle.document.uri,
.range = astLocationToRange(analysis_ctx.tree.tokenLocation(0, name_token)),
},
},
});
}
try respondGeneric(id, null_result_response);
}
fn completeGlobal(id: i64, pos_index: usize, handle: *DocumentStore.Handle, config: Config) !void { fn completeGlobal(id: i64, pos_index: usize, handle: *DocumentStore.Handle, config: Config) !void {
var tree = try handle.tree(allocator); var tree = try handle.tree(allocator);
defer tree.deinit(); defer tree.deinit();
@ -296,9 +356,9 @@ fn completeGlobal(id: i64, pos_index: usize, handle: *DocumentStore.Handle, conf
var analysis_ctx = try document_store.analysisContext(handle, &arena, types.Position{.line = 0, .character = 0,}); var analysis_ctx = try document_store.analysisContext(handle, &arena, types.Position{.line = 0, .character = 0,});
defer analysis_ctx.deinit(); defer analysis_ctx.deinit();
// var decls = tree.root_node.decls.iterator(0); var decl_nodes = std.ArrayList(*std.zig.ast.Node).init(&arena.allocator);
var decls = try analysis.declsFromIndex(&arena.allocator, tree, pos_index); try analysis.declsFromIndex(&decl_nodes, tree, pos_index);
for (decls) |decl_ptr| { for (decl_nodes.items) |decl_ptr| {
var decl = decl_ptr.*; var decl = decl_ptr.*;
try nodeToCompletion(&completions, &analysis_ctx, decl_ptr, config); try nodeToCompletion(&completions, &analysis_ctx, decl_ptr, config);
} }
@ -334,39 +394,10 @@ fn completeFieldAccess(id: i64, handle: *DocumentStore.Handle, position: types.P
const line = try handle.document.getLine(@intCast(usize, position.line)); const line = try handle.document.getLine(@intCast(usize, position.line));
var tokenizer = std.zig.Tokenizer.init(line[line_start_idx..]); var tokenizer = std.zig.Tokenizer.init(line[line_start_idx..]);
const line_length = line.len - line_start_idx;
// var decls = try analysis.declsFromIndex(&arena.allocator, analysis_ctx.tree, try handle.document.positionToIndex(position)); if (analysis.getFieldAccessTypeNode(&analysis_ctx, &tokenizer, line_length)) |node| {
if (analysis.getFieldAccessTypeNode(&analysis_ctx, &tokenizer)) |node| { try nodeToCompletion(&completions, analysis_ctx, node, config);
try nodeToCompletion(&completions, &analysis_ctx, node, config);
// var index: usize = 0;
// while (node.iterate(index)) |child_node| {
// if (analysis.isNodePublic(analysis_ctx.tree, child_node)) {
// // TODO: Not great to allocate it again and again inside a loop
// // Creating a new context, so that we don't destroy the tree that is iterated above when resolving imports
// const initial_handle = analysis_ctx.handle;
// std.debug.warn("\ncompleteFieldAccess calling resolveTypeOfNode for {}\n", .{analysis_ctx.tree.getNodeSource(child_node)});
// var node_analysis_ctx = try document_store.analysisContext(initial_handle, &arena, nodePosition(analysis_ctx.tree, node));
// defer node_analysis_ctx.deinit();
// const resolved_node = analysis.resolveTypeOfNode(&node_analysis_ctx, child_node);
// if (resolved_node) |n| {
// std.debug.warn("completeFieldAccess resolveTypeOfNode result = {}\n", .{resolved_node});
// }
// const completion_node: struct { node: *std.zig.ast.Node, context: *DocumentStore.AnalysisContext } = blk: {
// if (resolved_node) |n| {
// break :blk .{ .node = n, .context = &node_analysis_ctx };
// }
// break :blk .{ .node = child_node, .context = &analysis_ctx };
// };
// std.debug.warn("completeFieldAccess resolved_node = {}\n", .{completion_node.context.tree.getNodeSource(completion_node.node)});
// try nodeToCompletion(&completions, completion_node.context.tree, completion_node.node, config);
// }
// index += 1;
// }
} }
try send(types.Response{ try send(types.Response{
.id = .{ .Integer = id }, .id = .{ .Integer = id },
@ -574,7 +605,7 @@ fn processJsonRpc(parser: *std.json.Parser, json: []const u8, config: Config) !v
const content_changes = params.getValue("contentChanges").?.Array; const content_changes = params.getValue("contentChanges").?.Array;
const handle = document_store.getHandle(uri) orelse { const handle = document_store.getHandle(uri) orelse {
try log("Trying to change non existent document {}", .{uri}); std.debug.warn("Trying to change non existent document {}", .{uri});
return; return;
}; };
@ -595,8 +626,8 @@ fn processJsonRpc(parser: *std.json.Parser, json: []const u8, config: Config) !v
const position = params.getValue("position").?.Object; const position = params.getValue("position").?.Object;
const handle = document_store.getHandle(uri) orelse { const handle = document_store.getHandle(uri) orelse {
try log("Trying to complete in non existent document {}", .{uri}); std.debug.warn("Trying to complete in non existent document {}", .{uri});
return; return try respondGeneric(id, no_completions_response);
}; };
const pos = types.Position{ const pos = types.Position{
@ -625,23 +656,41 @@ fn processJsonRpc(parser: *std.json.Parser, json: []const u8, config: Config) !v
try respondGeneric(id, no_completions_response); try respondGeneric(id, no_completions_response);
} }
} else if (std.mem.eql(u8, method, "textDocument/signatureHelp")) { } else if (std.mem.eql(u8, method, "textDocument/signatureHelp")) {
// try respondGeneric(id,
// \\,"result":{"signatures":[{
// \\"label": "nameOfFunction(aNumber: u8)",
// \\"documentation": {"kind": "markdown", "value": "Description of the function in **Markdown**!"},
// \\"parameters": [
// \\{"label": [15, 27], "documentation": {"kind": "markdown", "value": "An argument"}}
// \\]
// \\}]}}
// );
try respondGeneric(id, try respondGeneric(id,
\\,"result":{"signatures":[]}} \\,"result":{"signatures":[]}}
); );
} else if (std.mem.eql(u8, method, "textDocument/definition") or
std.mem.eql(u8, method, "textDocument/declaration") or
std.mem.eql(u8, method, "textDocument/typeDefinition"))
{
const document = params.getValue("textDocument").?.Object;
const uri = document.getValue("uri").?.String;
const position = params.getValue("position").?.Object;
const handle = document_store.getHandle(uri) orelse {
std.debug.warn("Trying to got to definition in non existent document {}", .{uri});
return try respondGeneric(id, null_result_response);
};
const pos = types.Position{
.line = position.getValue("line").?.Integer,
.character = position.getValue("character").?.Integer - 1,
};
if (pos.character >= 0) {
const pos_index = try handle.document.positionToIndex(pos);
const pos_context = documentPositionContext(handle.document, pos_index);
switch (pos_context) {
.var_access => try gotoDefinitionGlobal(id, pos_index, handle.*),
.field_access => |start_idx| try gotoDefinitionFieldAccess(id, handle, pos, start_idx),
else => try respondGeneric(id, null_result_response),
}
}
} else if (root.Object.getValue("id")) |_| { } else if (root.Object.getValue("id")) |_| {
try log("Method with return value not implemented: {}", .{method}); std.debug.warn("Method with return value not implemented: {}", .{method});
try respondGeneric(id, not_implemented_response); try respondGeneric(id, not_implemented_response);
} else { } else {
try log("Method without return value not implemented: {}", .{method}); std.debug.warn("Method without return value not implemented: {}", .{method});
} }
} }
@ -662,17 +711,9 @@ pub fn main() anyerror!void {
allocator = &debug_alloc_state.allocator; allocator = &debug_alloc_state.allocator;
} }
// Init buffer for stdin read
var buffer = std.ArrayList(u8).init(allocator);
defer buffer.deinit();
try buffer.resize(4096);
// Init global vars // Init global vars
const in_stream = std.io.getStdIn().inStream();
const stdin = std.io.getStdIn().inStream(); stdout = std.io.bufferedOutStream(std.io.getStdOut().outStream());
stdout = std.io.getStdOut().outStream();
// Read the configuration, if any. // Read the configuration, if any.
const config_parse_options = std.json.ParseOptions{ .allocator = allocator }; const config_parse_options = std.json.ParseOptions{ .allocator = allocator };
@ -717,19 +758,19 @@ pub fn main() anyerror!void {
defer json_parser.deinit(); defer json_parser.deinit();
while (true) { while (true) {
const headers = readRequestHeader(allocator, stdin) catch |err| { const headers = readRequestHeader(allocator, in_stream) catch |err| {
try log("{}; exiting!", .{@errorName(err)}); std.debug.warn("{}; exiting!", .{@errorName(err)});
return; return;
}; };
defer headers.deinit(allocator); defer headers.deinit(allocator);
const buf = try allocator.alloc(u8, headers.content_length); const buf = try allocator.alloc(u8, headers.content_length);
defer allocator.free(buf); defer allocator.free(buf);
try stdin.readNoEof(buf); try in_stream.readNoEof(buf);
try processJsonRpc(&json_parser, buf, config); try processJsonRpc(&json_parser, buf, config);
json_parser.reset(); json_parser.reset();
if (debug_alloc) |dbg| { if (debug_alloc) |dbg| {
try log("{}", .{dbg.info}); std.debug.warn("{}\n", .{dbg.info});
} }
} }
} }

View File

@ -51,7 +51,8 @@ pub const NotificationParams = union(enum) {
/// Params of a response (result) /// Params of a response (result)
pub const ResponseParams = union(enum) { pub const ResponseParams = union(enum) {
CompletionList: CompletionList CompletionList: CompletionList,
Location: Location,
}; };
/// JSONRPC error /// JSONRPC error
@ -282,4 +283,3 @@ pub const CompletionItem = struct {
documentation: ?MarkupContent = null documentation: ?MarkupContent = null
// filterText: String = .NotDefined, // filterText: String = .NotDefined,
}; };