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

Code style fixes

Browse Source
This commit is contained in:
Sergeeeek 2020-05-19 12:02:48 +03:00
parent 06ba823368
commit c55363e2c2
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/document_store.zig
View File

@ -230,8 +230,7 @@ pub fn applyChanges(self: *DocumentStore, handle: *Handle, content_changes: std.
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"))
if (store.std_uri) |std_root_uri| try std.mem.dupe(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", .{});
return null;
}
@ -242,7 +241,7 @@ fn uriFromImportStr(store: *DocumentStore, allocator: *std.mem.Allocator, handle
const dir_path = std.fs.path.dirname(path) orelse "";
const import_path = try std.fs.path.resolve(allocator, &[_][]const u8{
dir_path, import_str
dir_path, import_str,
});
defer allocator.free(import_path);
@ -252,8 +251,6 @@ fn uriFromImportStr(store: *DocumentStore, allocator: *std.mem.Allocator, handle
}
pub const AnalysisContext = struct {
const Self = @This();
store: *DocumentStore,
handle: *Handle,
// This arena is used for temporary allocations while analyzing,
@ -342,10 +339,10 @@ pub const AnalysisContext = struct {
return &self.tree.root_node.base;
}
pub fn clone(self: *Self) !Self {
pub fn clone(self: *AnalysisContext) !AnalysisContext {
// Create a new tree so it can be destroyed by the cloned AnalysisContext without affecting the original
const tree = try self.handle.tree(self.store.allocator);
return Self{
return AnalysisContext{
.store = self.store,
.handle = self.handle,
.arena = self.arena,

5
src/main.zig
View File

@ -355,7 +355,10 @@ fn completeGlobal(id: i64, pos_index: usize, handle: *DocumentStore.Handle, conf
// Deallocate all temporary data.
defer arena.deinit();
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();
var decl_nodes = std.ArrayList(*std.zig.ast.Node).init(&arena.allocator);