feat: add query_argument for function call arguments in multiple languages

Author: SunBK201

scubatrace/cpp/language.py

@@ -13,6 +13,29 @@ class C(Language):
         (field_identifier)@name
     """
     query_call = "(call_expression)@name"
+    query_argument = """
+        (call_expression
+            arguments: (argument_list
+                [
+                    (identifier)@name
+                    (pointer_expression
+                        (identifier)@name
+                    )
+                    (field_expression
+                        field: (field_identifier)@name
+                    )
+                    (cast_expression
+                        value: (identifier)@name
+                    )
+                    (cast_expression
+                        value: (field_expression
+                            field: (field_identifier)@name
+                        )
+                    )
+                ]
+            )
+        )
+    """
     query_import_identifier = """
         (preproc_include
             path: [

scubatrace/go/language.py

@@ -9,6 +9,18 @@ class GO(Language):
     tslanguage = TSLanguage(tsgo.language())
 
     query_call = "(call_expression)@name"
+    query_argument = """
+        (call_expression
+            arguments: (argument_list
+                [
+                    (selector_expression
+                        field: (field_identifier)@name
+                    )
+                    (identifier)@name
+                ]
+            )
+        )
+    """
     query_import_identifier = """
         (import_spec
             path: (interpreted_string_literal)@name

scubatrace/identifier.py

@@ -417,30 +417,9 @@ def is_argument(self) -> bool:
         """
         Checks if the identifier is an argument of a function call.
         """
-        query = """
-            (call_expression
-                arguments: (argument_list
-                    [
-                        (identifier)@name
-                        (pointer_expression
-                            (identifier)@name
-                        )
-                        (field_expression
-                            field: (field_identifier)@name
-                        )
-                        (cast_expression
-                        	value: (identifier)@name
-                        )
-                        (cast_expression
-                        	value: (field_expression
-                            	field: (field_identifier)@name
-                            )
-                        )
-                    ]
-                )
-            )
-        """
-        argument_nodes = self.file.parser.query_all(self.statement.node, query)
+        argument_nodes = self.file.parser.query_all(
+            self.statement.node, self.file.language.query_argument
+        )
         for argument_node in argument_nodes:
             if argument_node.start_point == self.node.start_point:
                 return True

scubatrace/java/language.py

@@ -9,6 +9,18 @@ class JAVA(Language):
     tslanguage = TSLanguage(tsjava.language())
 
     query_call = "(method_invocation)@name"
+    query_argument = """
+        (method_invocation
+            arguments: (argument_list
+                [
+                    (field_access
+                        field: (identifier)@name
+                    )
+                    (identifier)@name
+                ]
+            )
+        )
+    """
     query_import_identifier = """
         (import_declaration
             (scoped_identifier
@@ -66,7 +78,7 @@ class JAVA(Language):
         "do_statement",
         "enhanced_for_statement",
     ]
-    
+
     FUNCTION_STATEMENTS = [
         "method_declaration",
         "constructor_declaration",

scubatrace/javascript/language.py

@@ -9,6 +9,24 @@ class JAVASCRIPT(Language):
     tslanguage = TSLanguage(tsjavascript.language())
 
     query_call = "(call_expression)@name"
+    query_argument = """
+    (call_expression
+        arguments: (arguments
+            [
+                (identifier)@name
+                (assignment_expression
+                    right: (identifier)@name
+                )
+                (member_expression
+                    property: (property_identifier)@name
+                )
+                (binary_expression
+                	(identifier)@name
+                )
+            ]
+        )
+    )
+    """
     query_import = "(import_statement)@name"
     query_import_identifier = """
     (call_expression

scubatrace/language.py

@@ -34,6 +34,11 @@ class Language:
     The tree-sitter query to match function calls.
     """
 
+    query_argument: str
+    """
+    The tree-sitter query to match function call argument.
+    """
+
     query_import_identifier: str
     """
     The tree-sitter query to match import identifiers.

scubatrace/python/language.py

@@ -9,6 +9,21 @@ class PYTHON(Language):
     tslanguage = TSLanguage(tspython.language())
 
     query_call = "(call)@name"
+    query_argument = """
+    (call
+        arguments: (argument_list
+            [
+                (identifier)@name
+                (attribute
+                    attribute: (identifier)@name
+                )
+                (keyword_argument
+                    value: (identifier)@name
+                )
+            ]
+        )
+    )
+    """
     query_import_identifier = """
     (import_statement
         name: [