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

Renamed import context to analysis context, added arena for temporary allocations while analyzing

Browse Source
This commit is contained in:
Alexandros Naskos
2020-05-14 12:23:20 +03:00
parent 7a8a4e1ec5
commit 6db3c74550
3 changed files with 39 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main.zig
View File

@@ -254,7 +254,10 @@ fn completeGlobal(id: i64, handle: DocumentStore.Handle, config: Config) !void {
}
fn completeFieldAccess(id: i64, handle: *DocumentStore.Handle, position: types.Position, config: Config) !void {
var import_ctx = (try document_store.importContext(handle)) orelse {
var arena = std.heap.ArenaAllocator.init(allocator);
defer arena.deinit();
var analysis_ctx = (try document_store.analysisContext(handle, &arena)) orelse {
return send(types.Response{
.id = .{.Integer = id},
.result = .{
@@ -265,21 +268,17 @@ fn completeFieldAccess(id: i64, handle: *DocumentStore.Handle, position: types.P
},
});
};
defer import_ctx.deinit();
defer analysis_ctx.deinit();
// We use a local arena allocator to deallocate all temporary data without iterating
var arena = std.heap.ArenaAllocator.init(allocator);
var completions = std.ArrayList(types.CompletionItem).init(&arena.allocator);
// Deallocate all temporary data.
defer arena.deinit();
var line = try handle.document.getLine(@intCast(usize, position.line));
var tokenizer = std.zig.Tokenizer.init(line);
if (analysis.getFieldAccessTypeNode(&import_ctx, &tokenizer)) |node| {
if (analysis.getFieldAccessTypeNode(&analysis_ctx, &tokenizer)) |node| {
var index: usize = 0;
while (node.iterate(index)) |child_node| {
if (try nodeToCompletion(&arena.allocator, import_ctx.tree, child_node, config)) |completion| {
if (try nodeToCompletion(&arena.allocator, analysis_ctx.tree, child_node, config)) |completion| {
try completions.append(completion);
}
index += 1;