Update treesitter analysis to use global declerations of parser and language

Signed-off-by: Rahul Krishna <i.m.ralk@gmail.com>

Author: rahlk

cldk/analysis/commons/treesitter/treesitter_java.py

@@ -26,6 +26,9 @@
 
 logger = logging.getLogger(__name__)
 
+LANGUAGE: Language = Language(tsjava.language())
+PARSER: Parser = Parser(LANGUAGE)
+
 
 # pylint: disable=too-many-public-methods
 class TreesitterJava:
@@ -34,8 +37,7 @@ class TreesitterJava:
     """
 
     def __init__(self) -> None:
-        self.language: Language = Language(tsjava.language())
-        self.parser: Parser = Parser(self.language)
+        pass
 
     def method_is_not_in_class(self, method_name: str, class_body: str) -> bool:
         """Check if a method is in a class.
@@ -78,7 +80,7 @@ def syntax_error(node):
 
             return False
 
-        tree = self.parser.parse(bytes(code, "utf-8"))
+        tree = PARSER.parse(bytes(code, "utf-8"))
         if tree is not None:
             return not syntax_error(tree.root_node)
         return False
@@ -92,7 +94,7 @@ def get_raw_ast(self, code: str) -> Tree:
         Returns:
             Tree: the raw AST
         """
-        return self.parser.parse(bytes(code, "utf-8"))
+        return PARSER.parse(bytes(code, "utf-8"))
 
     def get_all_imports(self, source_code: str) -> Set[str]:
         """Get a list of all the imports in a class.
@@ -176,8 +178,8 @@ def frame_query_and_capture_output(self, query: str, code_to_process: str) -> Ca
         code_to_process : str
             The code to process.
         """
-        framed_query: Query = self.language.query(query)
-        tree = self.parser.parse(bytes(code_to_process, "utf-8"))
+        framed_query: Query = LANGUAGE.query(query)
+        tree = PARSER.parse(bytes(code_to_process, "utf-8"))
         return Captures(framed_query.captures(tree.root_node))
 
     def get_method_name_from_declaration(self, method_name_string: str) -> str:
@@ -424,7 +426,7 @@ def get_lexical_tokens(self, code: str, filter_by_node_type: List[str] | None =
         List of lexical tokens
 
         """
-        tree = self.parser.parse(bytes(code, "utf-8"))
+        tree = PARSER.parse(bytes(code, "utf-8"))
         root_node = tree.root_node
         lexical_tokens = []
 

cldk/analysis/commons/treesitter/treesitter_python.py

@@ -28,15 +28,16 @@
 from cldk.analysis.commons.treesitter.models import Captures
 from cldk.analysis.commons.treesitter.utils.treesitter_utils import TreeSitterUtils
 
+LANGUAGE: Language = Language(tspython.language())
+PARSER: Parser = Parser(LANGUAGE)
+
 
 class TreesitterPython:
     """
     Tree sitter for Python use cases.
     """
 
     def __init__(self) -> None:
-        self.language: Language = Language(tspython.language())
-        self.parser: Parser = Parser(self.language)
         self.utils: TreeSitterUtils = TreeSitterUtils()
 
     def is_parsable(self, code: str) -> bool:
@@ -62,7 +63,7 @@ def syntax_error(node):
 
             return False
 
-        tree = self.parser.parse(bytes(code, "utf-8"))
+        tree = PARSER.parse(bytes(code, "utf-8"))
         if tree is not None:
             return not syntax_error(tree.root_node)
         return False
@@ -76,7 +77,7 @@ def get_raw_ast(self, code: str) -> Tree:
         Returns:
             Tree: the raw AST
         """
-        return self.parser.parse(bytes(code, "utf-8"))
+        return PARSER.parse(bytes(code, "utf-8"))
 
     def get_all_methods(self, module: str) -> List[PyMethod]:
         """
@@ -163,8 +164,8 @@ def get_all_imports(self, module: str) -> List[str]:
             List[str]: List of imports
         """
         import_list = []
-        captures_from_import: Captures = self.utils.frame_query_and_capture_output(self.parser, self.language, "(((import_from_statement) @imports))", module)
-        captures_import: Captures = self.utils.frame_query_and_capture_output(self.parser, self.language, "(((import_statement) @imports))", module)
+        captures_from_import: Captures = self.utils.frame_query_and_capture_output(PARSER, LANGUAGE, "(((import_from_statement) @imports))", module)
+        captures_import: Captures = self.utils.frame_query_and_capture_output(PARSER, LANGUAGE, "(((import_statement) @imports))", module)
         for capture in captures_import:
             import_list.append(capture.node.text.decode())
         for capture in captures_from_import:
@@ -188,8 +189,8 @@ def get_all_imports_details(self, module: str) -> List[PyImport]:
             List[PyImport]: List of imports
         """
         import_list = []
-        captures_from_import: Captures = self.utils.frame_query_and_capture_output(self.parser, self.language, "(((import_from_statement) @imports))", module)
-        captures_import: Captures = self.utils.frame_query_and_capture_output(self.parser, self.language, "(((import_statement) @imports))", module)
+        captures_from_import: Captures = self.utils.frame_query_and_capture_output(PARSER, LANGUAGE, "(((import_from_statement) @imports))", module)
+        captures_import: Captures = self.utils.frame_query_and_capture_output(PARSER, LANGUAGE, "(((import_statement) @imports))", module)
         for capture in captures_import:
             imports = []
             for import_name in capture.node.children:
@@ -223,7 +224,7 @@ def get_all_classes(self, module: str) -> List[PyClass]:
             List[PyClass]: returns details of all classes in it
         """
         classes: List[PyClass] = []
-        all_class_details: Captures = self.utils.frame_query_and_capture_output(self.parser, self.language, "(((class_definition) @class_name))", module)
+        all_class_details: Captures = self.utils.frame_query_and_capture_output(PARSER, LANGUAGE, "(((class_definition) @class_name))", module)
         for class_name in all_class_details:
             code_body = class_name.node.text.decode()
             class_full_signature = ""  # TODO: what to fill here
@@ -331,7 +332,7 @@ def __get_function_details(self, node: Node, klass_name: str = "") -> PyMethod:
         is_constructor = False
         is_static = False
         call_sites: List[PyCallSite] = []
-        call_nodes: Captures = self.utils.frame_query_and_capture_output(self.parser, self.language, "(((call) @call_name))", node.text.decode())
+        call_nodes: Captures = self.utils.frame_query_and_capture_output(PARSER, LANGUAGE, "(((call) @call_name))", node.text.decode())
         for call_node in call_nodes:
             call_sites.append(self.__get_call_site_details(call_node.node))
         for function_detail in node.children:
@@ -390,9 +391,9 @@ def __get_function_details(self, node: Node, klass_name: str = "") -> PyMethod:
         return function
 
     def __get_class_nodes(self, module: str) -> Captures:
-        captures: Captures = self.utils.frame_query_and_capture_output(self.parser, self.language, "(((class_definition) @class_name))", module)
+        captures: Captures = self.utils.frame_query_and_capture_output(PARSER, LANGUAGE, "(((class_definition) @class_name))", module)
         return captures
 
     def __get_method_nodes(self, module: str) -> Captures:
-        captures: Captures = self.utils.frame_query_and_capture_output(self.parser, self.language, "(((function_definition) @function_name))", module)
+        captures: Captures = self.utils.frame_query_and_capture_output(PARSER, LANGUAGE, "(((function_definition) @function_name))", module)
         return captures