github/ValueScript
1
1
Fork 0
mirror of https://github.com/voltrevo/ValueScript.git synced 2026-01-14 16:08:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix doubleCapture.ts

Browse Source
This commit is contained in:
Andrew Morris
2023-07-21 17:21:22 +10:00
parent 7ce3e4b2bb
commit bccc43f264
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
valuescript_compiler/src/scope_analysis.rs
View File

@@ -295,6 +295,18 @@ impl ScopeAnalysis {
);
}
fn handle_capture_chain(&mut self, scope: &Scope, name: &Name, ref_: swc_common::Span) {
if scope.borrow().owner_id == name.owner_id {
return;
}
self.insert_capture(&scope.borrow().owner_id, &name.id, ref_);
if let Some(parent_scope) = &scope.borrow().parent {
self.handle_capture_chain(parent_scope, name, ref_);
}
}
fn insert_capture(&mut self, captor_id: &OwnerId, name_id: &NameId, ref_: swc_common::Span) {
let name = match self.names.get_mut(name_id) {
Some(name) => name,
@@ -1629,7 +1641,7 @@ impl ScopeAnalysis {
);
let name = match self.names.get(&name_id) {
Some(name) => name,
Some(name) => name.clone(),
None => {
self.diagnostics.push(Diagnostic {
level: DiagnosticLevel::InternalError,
@@ -1640,9 +1652,7 @@ impl ScopeAnalysis {
}
};
if name.owner_id != scope.borrow().owner_id {
self.insert_capture(&scope.borrow().owner_id, &name_id, ident.span);
}
self.handle_capture_chain(scope, &name, ident.span);
}
fn prop_key(&mut self, scope: &Scope, prop_name: &swc_ecma_ast::PropName) {