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

replace unnecessary std.ArrayListUnmanaged in document scope

Browse Source
This commit is contained in:
Techatrix 2023-03-12 23:57:47 +01:00 committed by Lee Cannon
parent ea02e4364f
commit 9d7012596a
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/analysis.zig
View File

@ -2026,7 +2026,7 @@ fn iterateSymbolsContainerInternal(
try callback(context, decl); try callback(context, decl);
} }
for (scope_uses[container_scope_index].items) |use| { for (scope_uses[container_scope_index]) |use| {
const use_token = tree.nodes.items(.main_token)[use]; const use_token = tree.nodes.items(.main_token)[use];
const is_pub = use_token > 0 and token_tags[use_token - 1] == .keyword_pub; const is_pub = use_token > 0 and token_tags[use_token - 1] == .keyword_pub;
if (handle != orig_handle and !is_pub) continue; if (handle != orig_handle and !is_pub) continue;
@ -2132,7 +2132,7 @@ fn iterateSymbolsGlobalInternal(
try callback(context, DeclWithHandle{ .decl = entry.value_ptr, .handle = handle }); try callback(context, DeclWithHandle{ .decl = entry.value_ptr, .handle = handle });
} }
for (scope_uses[scope_index].items) |use| { for (scope_uses[scope_index]) |use| {
const gop = try analyser.using_trail.getOrPut(analyser.gpa, use); const gop = try analyser.using_trail.getOrPut(analyser.gpa, use);
if (gop.found_existing) continue; if (gop.found_existing) continue;
@ -2282,7 +2282,7 @@ pub fn lookupSymbolGlobal(analyser: *Analyser, handle: *const DocumentStore.Hand
.handle = handle, .handle = handle,
}; };
} }
if (try analyser.resolveUse(scope_uses[curr].items, symbol, handle)) |result| return result; if (try analyser.resolveUse(scope_uses[curr], symbol, handle)) |result| return result;
} }
if (curr == 0) break; if (curr == 0) break;
} }
@ -2323,7 +2323,7 @@ pub fn lookupSymbolContainer(
return DeclWithHandle{ .decl = candidate.value_ptr, .handle = handle }; return DeclWithHandle{ .decl = candidate.value_ptr, .handle = handle };
} }
if (try analyser.resolveUse(scope_uses[container_scope_index].items, symbol, handle)) |result| return result; if (try analyser.resolveUse(scope_uses[container_scope_index], symbol, handle)) |result| return result;
} }
return null; return null;
@ -2358,11 +2358,10 @@ pub const DocumentScope = struct {
enum_completions: CompletionSet, enum_completions: CompletionSet,
pub fn deinit(self: *DocumentScope, allocator: std.mem.Allocator) void { pub fn deinit(self: *DocumentScope, allocator: std.mem.Allocator) void {
var i: usize = 0; for (self.scopes.items(.decls), self.scopes.items(.tests), self.scopes.items(.uses)) |*decls, tests, uses| {
while (i < self.scopes.len) : (i += 1) { decls.deinit(allocator);
self.scopes.items(.decls)[i].deinit(allocator); allocator.free(tests);
self.scopes.items(.tests)[i].deinit(allocator); allocator.free(uses);
self.scopes.items(.uses)[i].deinit(allocator);
} }
self.scopes.deinit(allocator); self.scopes.deinit(allocator);
@ -2402,8 +2401,8 @@ pub const Scope = struct {
loc: offsets.Loc, loc: offsets.Loc,
decls: std.StringHashMapUnmanaged(Declaration) = .{}, decls: std.StringHashMapUnmanaged(Declaration) = .{},
tests: std.ArrayListUnmanaged(Ast.Node.Index) = .{}, tests: []const Ast.Node.Index = &.{},
uses: std.ArrayListUnmanaged(Ast.Node.Index) = .{}, uses: []const Ast.Node.Index = &.{},
data: Data, data: Data,
}; };
@ -2451,9 +2450,15 @@ fn makeInnerScope(allocator: std.mem.Allocator, context: ScopeContext, node_idx:
var buf: [2]Ast.Node.Index = undefined; var buf: [2]Ast.Node.Index = undefined;
const container_decl = tree.fullContainerDecl(&buf, node_idx).?; const container_decl = tree.fullContainerDecl(&buf, node_idx).?;
var tests = std.ArrayListUnmanaged(Ast.Node.Index){};
errdefer tests.deinit(allocator);
var uses = std.ArrayListUnmanaged(Ast.Node.Index){};
errdefer uses.deinit(allocator);
for (container_decl.ast.members) |decl| { for (container_decl.ast.members) |decl| {
if (tags[decl] == .@"usingnamespace") { if (tags[decl] == .@"usingnamespace") {
try scopes.items(.uses)[scope_index].append(allocator, decl); try uses.append(allocator, decl);
continue; continue;
} }
@ -2461,7 +2466,7 @@ fn makeInnerScope(allocator: std.mem.Allocator, context: ScopeContext, node_idx:
const name = getDeclName(tree, decl) orelse continue; const name = getDeclName(tree, decl) orelse continue;
if (tags[decl] == .test_decl) { if (tags[decl] == .test_decl) {
try scopes.items(.tests)[scope_index].append(allocator, decl); try tests.append(allocator, decl);
continue; continue;
} }
if (try scopes.items(.decls)[scope_index].fetchPut(allocator, name, .{ .ast_node = decl })) |existing| { if (try scopes.items(.decls)[scope_index].fetchPut(allocator, name, .{ .ast_node = decl })) |existing| {
@ -2486,6 +2491,9 @@ fn makeInnerScope(allocator: std.mem.Allocator, context: ScopeContext, node_idx:
} }
} }
} }
scopes.items(.tests)[scope_index] = try tests.toOwnedSlice(allocator);
scopes.items(.uses)[scope_index] = try uses.toOwnedSlice(allocator);
} }
fn makeScopeInternal(allocator: std.mem.Allocator, context: ScopeContext, node_idx: Ast.Node.Index) error{OutOfMemory}!void { fn makeScopeInternal(allocator: std.mem.Allocator, context: ScopeContext, node_idx: Ast.Node.Index) error{OutOfMemory}!void {