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

replace scope decl container from StringHashMap with StringArrayHashMap

Browse Source
This commit is contained in:
Techatrix 2023-05-22 01:06:01 +02:00
parent a378eb74b1
commit 52c38afe46
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/analysis.zig
View File

@ -2191,9 +2191,8 @@ fn iterateSymbolsContainerInternal(
const scope_uses = handle.document_scope.scopes.items(.uses); const scope_uses = handle.document_scope.scopes.items(.uses);
const container_scope_index = findContainerScopeIndex(container_handle) orelse return; const container_scope_index = findContainerScopeIndex(container_handle) orelse return;
var decl_it = scope_decls[container_scope_index].valueIterator(); for (scope_decls[container_scope_index].values()) |decl_index| {
while (decl_it.next()) |decl_index| { const decl = &handle.document_scope.decls.items[@enumToInt(decl_index)];
const decl = &handle.document_scope.decls.items[@enumToInt(decl_index.*)];
switch (decl.*) { switch (decl.*) {
.ast_node => |node| { .ast_node => |node| {
if (node_tags[node].isContainerField()) { if (node_tags[node].isContainerField()) {
@ -2291,9 +2290,8 @@ pub fn iterateLabels(handle: *const DocumentStore.Handle, source_index: usize, c
var scope_iterator = iterateEnclosingScopes(handle.document_scope, source_index); var scope_iterator = iterateEnclosingScopes(handle.document_scope, source_index);
while (scope_iterator.next()) |scope_index| { while (scope_iterator.next()) |scope_index| {
var decl_it = scope_decls[@enumToInt(scope_index)].valueIterator(); for (scope_decls[@enumToInt(scope_index)].values()) |decl_index| {
while (decl_it.next()) |decl_index| { const decl = &handle.document_scope.decls.items[@enumToInt(decl_index)];
const decl = &handle.document_scope.decls.items[@enumToInt(decl_index.*)];
if (decl.* != .label_decl) continue; if (decl.* != .label_decl) continue;
try callback(context, DeclWithHandle{ .decl = decl, .handle = handle }); try callback(context, DeclWithHandle{ .decl = decl, .handle = handle });
} }
@ -2312,9 +2310,8 @@ fn iterateSymbolsGlobalInternal(
var scope_iterator = iterateEnclosingScopes(handle.document_scope, source_index); var scope_iterator = iterateEnclosingScopes(handle.document_scope, source_index);
while (scope_iterator.next()) |scope_index| { while (scope_iterator.next()) |scope_index| {
var decl_it = scope_decls[@enumToInt(scope_index)].valueIterator(); for (scope_decls[@enumToInt(scope_index)].values()) |decl_index| {
while (decl_it.next()) |decl_index| { const decl = &handle.document_scope.decls.items[@enumToInt(decl_index)];
const decl = &handle.document_scope.decls.items[@enumToInt(decl_index.*)];
if (decl.* == .ast_node and handle.tree.nodes.items(.tag)[decl.ast_node].isContainerField()) continue; if (decl.* == .ast_node and handle.tree.nodes.items(.tag)[decl.ast_node].isContainerField()) continue;
if (decl.* == .label_decl) continue; if (decl.* == .label_decl) continue;
try callback(context, DeclWithHandle{ .decl = decl, .handle = handle }); try callback(context, DeclWithHandle{ .decl = decl, .handle = handle });
@ -2450,15 +2447,15 @@ pub fn lookupSymbolGlobal(analyser: *Analyser, handle: *const DocumentStore.Hand
const scope_index = @enumToInt(current_scope); const scope_index = @enumToInt(current_scope);
defer current_scope = scope_parents[scope_index]; defer current_scope = scope_parents[scope_index];
if (scope_decls[scope_index].get(symbol)) |decl_index| { if (scope_decls[scope_index].get(symbol)) |decl_index| {
const decl = &handle.document_scope.decls.items[@enumToInt(decl_index)]; const candidate = &handle.document_scope.decls.items[@enumToInt(decl_index)];
switch (decl.*) { switch (candidate.*) {
.ast_node => |node| { .ast_node => |node| {
if (handle.tree.nodes.items(.tag)[node].isContainerField()) continue; if (handle.tree.nodes.items(.tag)[node].isContainerField()) continue;
}, },
.label_decl => continue, .label_decl => continue,
else => {}, else => {},
} }
return DeclWithHandle{ .decl = decl, .handle = handle }; return DeclWithHandle{ .decl = candidate, .handle = handle };
} }
if (try analyser.resolveUse(scope_uses[scope_index], symbol, handle)) |result| return result; if (try analyser.resolveUse(scope_uses[scope_index], symbol, handle)) |result| return result;
} }
@ -2593,7 +2590,7 @@ pub const Scope = struct {
loc: offsets.Loc, loc: offsets.Loc,
parent: Index, parent: Index,
data: Data, data: Data,
decls: std.StringHashMapUnmanaged(Declaration.Index) = .{}, decls: std.StringArrayHashMapUnmanaged(Declaration.Index) = .{},
child_scopes: std.ArrayListUnmanaged(Scope.Index) = .{}, child_scopes: std.ArrayListUnmanaged(Scope.Index) = .{},
tests: []const Ast.Node.Index = &.{}, tests: []const Ast.Node.Index = &.{},
uses: []const Ast.Node.Index = &.{}, uses: []const Ast.Node.Index = &.{},