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

only return block scopes from innermostBlockScope

Browse Source
This commit is contained in:
Techatrix 2023-03-14 00:54:31 +01:00 committed by Lee Cannon
parent 487281f8e2
commit c2d15bfc9a
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/analysis.zig
View File

@ -2176,16 +2176,25 @@ pub fn iterateSymbolsGlobal(
pub fn innermostBlockScopeIndex(handle: DocumentStore.Handle, source_index: usize) Scope.Index { pub fn innermostBlockScopeIndex(handle: DocumentStore.Handle, source_index: usize) Scope.Index {
var scope_iterator = iterateEnclosingScopes(handle.document_scope, source_index); var scope_iterator = iterateEnclosingScopes(handle.document_scope, source_index);
var current_scope: Scope.Index = .none; var scope_index: Scope.Index = .none;
while (scope_iterator.next()) |inner_scope| { while (scope_iterator.next()) |inner_scope| {
current_scope = inner_scope; scope_index = inner_scope;
} }
return current_scope; return scope_index;
} }
pub fn innermostBlockScope(handle: DocumentStore.Handle, source_index: usize) Ast.Node.Index { pub fn innermostBlockScope(handle: DocumentStore.Handle, source_index: usize) Ast.Node.Index {
const scope_index = innermostBlockScopeIndex(handle, source_index); const scope_datas = handle.document_scope.scopes.items(.data);
return handle.document_scope.scopes.items(.data)[@enumToInt(scope_index)].toNodeIndex().?; const scope_parents = handle.document_scope.scopes.items(.parent);
var scope_index = innermostBlockScopeIndex(handle, source_index);
while (true) {
defer scope_index = scope_parents[@enumToInt(scope_index)];
switch (scope_datas[@enumToInt(scope_index)]) {
.container, .function, .block => return scope_datas[@enumToInt(scope_index)].toNodeIndex().?,
else => {},
}
}
} }
pub fn innermostContainer(handle: *const DocumentStore.Handle, source_index: usize) TypeWithHandle { pub fn innermostContainer(handle: *const DocumentStore.Handle, source_index: usize) TypeWithHandle {