Prevented overwriting of scope_env when parsing multiple files

Author: acezxn

src/tstool/analyzer/Javascript_TS_analyzer.py

@@ -22,44 +22,43 @@ def extract_scope_info(self, tree: tree_sitter.Tree) -> None:
         :param tree: Parsed syntax tree
         """
         scope_stack: List[int] = []
-        scope_id: int = 0
 
         def search(root: Node) -> None:
-            nonlocal scope_id
-
             for child in root.children:
                 if child.type == "statement_block":
                     if len(scope_stack) > 0:
-                        self.scope_env[scope_stack[-1]][1].add(scope_id)
+                        self.scope_env[scope_stack[-1]][1].add(self.current_scope_id)
 
-                    self.scope_env[scope_id] = (child, set())
-                    self.scope_root_to_scope_id[child] = scope_id
-                    scope_stack.append(scope_id)
+                    self.scope_env[self.current_scope_id] = (child, set())
+                    self.scope_root_to_scope_id[child] = self.current_scope_id
+                    scope_stack.append(self.current_scope_id)
 
                     if child.parent:
                         if child.parent.type == "function_declaration":
-                            self.function_root_to_scope_id[child.parent] = scope_id
+                            self.function_root_to_scope_id[child.parent] = (
+                                self.current_scope_id
+                            )
                         elif (
                             child.parent.type == "arrow_function"
                             or child.parent.type == "function_expression"
                         ):
                             if child.parent.parent:
                                 self.function_root_to_scope_id[child.parent.parent] = (
-                                    scope_id
+                                    self.current_scope_id
                                 )
 
-                        scope_id += 1
+                        self.current_scope_id += 1
                         search(child)
                         scope_stack.pop()
                 else:
                     search(child)
 
             return
 
-        self.scope_env[scope_id] = (tree.root_node, set())
-        self.scope_root_to_scope_id[tree.root_node] = scope_id
-        scope_stack.append(scope_id)
-        scope_id += 1
+        self.scope_env[self.current_scope_id] = (tree.root_node, set())
+        self.scope_root_to_scope_id[tree.root_node] = self.current_scope_id
+        scope_stack.append(self.current_scope_id)
+        self.current_scope_id += 1
         search(tree.root_node)
         return
 

src/tstool/analyzer/TS_analyzer.py

@@ -178,6 +178,8 @@ def __init__(
         self.scope_env: Dict[int, Tuple[Node, Set[int]]] = {}
         self.api_env: Dict[int, API] = {}
 
+        self.current_scope_id: int = 0
+
         # Dictionary storing mapping from the root node of the scope to its scope id
         self.scope_root_to_scope_id: Dict[Node, int] = {}