fixes error that prevented namespaces being correctly resolved

rokucommunity · Oct 25, 2023 · 9dcfa58 · 9dcfa58
1 parent 10f6305
commit 9dcfa58
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/bsc-plugin/src/lib/rooibos/MockUtil.ts b/bsc-plugin/src/lib/rooibos/MockUtil.ts
@@ -81,7 +81,7 @@ export class MockUtil {
         }
 
         // console.log('processing  stubbed method', methodName);
-        //TODO check if the user has actually mocked or stubbed this function, otherwise leave it alone!
+        // TODO check if the user has actually mocked or stubbed this function, otherwise leave it alone!
 
         for (let param of functionStatement.func.parameters) {
             param.asToken = null;
@@ -142,7 +142,7 @@ export class MockUtil {
                 walkMode: brighterscript.WalkMode.visitStatementsRecursive
             });
         } catch (e) {
-            // console.log(e);
+            console.log(e);
             // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
             diagnosticErrorProcessingFile(testSuite.file, e.message);
         }

diff --git a/bsc-plugin/src/lib/rooibos/RooibosSession.ts b/bsc-plugin/src/lib/rooibos/RooibosSession.ts
@@ -227,11 +227,21 @@ export class RooibosSession {
 
     private getNamespaces(program: Program) {
         let scopeNamespaces = new Map<string, NamespaceContainer>();
-        for (const files of Object.values(program.files)) {
+        let processedScopes = new Set<string>();
 
-            for (let scope of program.getScopesForFile(files)) {
+        for (const file of Object.values(program.files)) {
+
+            for (let scope of program.getScopesForFile(file)) {
+                if (processedScopes.has(scope.dependencyGraphKey)) {
+                    // Skip this scope if it has already been processed
+                    continue;
+                }
                 let scopeMap = this.getNamespaceLookup(scope);
-                scopeNamespaces = new Map<string, NamespaceContainer>([...Array.from(scopeMap.entries())]);
+                // scopeNamespaces = new Map<string, NamespaceContainer>([...Array.from(scopeMap.entries())]);
+                for (let [key, value] of scopeMap.entries()) {
+                    scopeNamespaces.set(key, value);
+                }
+                processedScopes.add(scope.dependencyGraphKey);
             }
         }
         return scopeNamespaces;

diff --git a/tests/src/source/NewExpectSyntax.spec.bs b/tests/src/source/NewExpectSyntax.spec.bs
@@ -15,7 +15,7 @@ namespace tests
       isFail = m.currentResult.isFail
       m.currentResult.Reset()
       m.cleanMocks()
-      m.cleanSTubs()
+      m.cleanStubs()
       m.assertTrue(isFail)
     end function
 
@@ -26,7 +26,7 @@ namespace tests
       isFail = m.currentResult.isFail
       m.currentResult.Reset()
       m.cleanMocks()
-      m.cleanSTubs()
+      m.cleanStubs()
       m.assertFalse(isFail)
     end function