Fix scope bug

voltrevo · Jul 27, 2023 · f6546ab · f6546ab
1 parent 6966319
commit f6546ab
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 6 deletions.
diff --git a/inputs/failing/collidingClasses.ts → inputs/passing/collidingClasses.ts b/inputs/failing/collidingClasses.ts → inputs/passing/collidingClasses.ts
@@ -1,4 +1,4 @@
-// //! test_output("foo")
+//! test_output("foo")
 
 export default () => {
   class X {

diff --git a/valuescript_compiler/src/module_compiler.rs b/valuescript_compiler/src/module_compiler.rs
@@ -714,10 +714,10 @@ impl ModuleCompiler {
     let mut static_: Object = Object::default();
 
     let defn_name = match ident {
-      Some(ident) => match self
-        .scope_analysis
-        .lookup_value(&OwnerId::Module, &Ident::from_swc_ident(ident))
-      {
+      Some(ident) => match self.scope_analysis.lookup_value(
+        &OwnerId::Module, // TODO: Do we need the scope/owner_id to be passed in instead?
+        &Ident::from_swc_ident(ident),
+      ) {
         Some(Value::Pointer(p)) => p,
         _ => {
           self.internal_error(

diff --git a/valuescript_compiler/src/scope.rs b/valuescript_compiler/src/scope.rs
@@ -40,6 +40,7 @@ pub enum OwnerId {
 }
 
 pub trait ScopeTrait {
+  fn trace(&self);
   fn get(&self, name: &swc_atoms::JsWord) -> Option<NameId>;
   fn set(
     &self,
@@ -52,6 +53,24 @@ pub trait ScopeTrait {
 }
 
 impl ScopeTrait for Scope {
+  fn trace(&self) {
+    println!(
+      "scope trace {:?} names: {:?}",
+      &self.borrow().owner_id,
+      &self
+        .borrow()
+        .name_map
+        .keys()
+        .map(|k| k.to_string())
+        .collect::<Vec<String>>()
+    );
+
+    match &self.borrow().parent {
+      Some(parent) => parent.trace(),
+      None => println!("scope trace end"),
+    };
+  }
+
   fn get(&self, name: &swc_atoms::JsWord) -> Option<NameId> {
     match self.borrow().name_map.get(name) {
       Some(mapped_name) => Some(mapped_name.clone()),

diff --git a/valuescript_compiler/src/scope_analysis.rs b/valuescript_compiler/src/scope_analysis.rs
@@ -254,7 +254,14 @@ impl ScopeAnalysis {
       Some(name_id) => {
         let name = self.names.get(&name_id).expect("Name not found");
 
-        if name.type_ != NameType::This {
+        let name_span = match name.id {
+          NameId::Span(span) => Some(span),
+          NameId::This(span) => Some(span),
+          NameId::Builtin(_) => None,
+          NameId::Constant(_) => None,
+        };
+
+        if name.type_ != NameType::This && name_span == Some(origin_ident.span) {
           match &name.value {
             // Already inserted, skip
             Value::Pointer(_) => return,