Tree-Sitter queries moved to folder structure for better organization

Author: elifarley

pyproject.toml

@@ -64,7 +64,7 @@ version_scheme = "post-release"
 
 [tool.setuptools.packages.find]
 where = ["src"]
-include = ["version", "cedarscript_editor*", "text_manipulation*"]
+include = ["version", "tree-sitter-queries", "cedarscript_editor*", "text_manipulation*"]
 exclude = ["cedarscript_ast_parser.tests*"]
 namespaces = false
 

src/cedarscript_editor/tree_sitter_identifier_finder.py

@@ -10,7 +10,7 @@
 from text_manipulation import IdentifierFinder
 from tree_sitter_languages import get_language, get_parser
 from pylibtreesitter import nodes_by_type_suffix
-from .tree_sitter_identifier_queries import LANG_TO_TREE_SITTER_QUERY
+from .tree_sitter_identifier_queries import get_query
 
 """
 Parser for extracting identifier information from source code using tree-sitter.
@@ -48,7 +48,7 @@ def __init__(self, fname: str, source: str | Sequence[str], parent_restriction:
             self.query_info = None
             _log.info(f"[TreeSitterIdentifierFinder] NO LANGUAGE for `{fname}`")
             return
-        self.query_info: dict[str, dict[str, str]] = LANG_TO_TREE_SITTER_QUERY[langstr]
+        self.query_info: dict[str, str] = get_query(langstr)
         self.language = get_language(langstr)
         _log.info(f"[TreeSitterIdentifierFinder] Selected {self.language}")
         self.tree = get_parser(langstr).parse(bytes(source, "utf-8"))

src/cedarscript_editor/tree_sitter_identifier_queries.py

@@ -0,0 +1,3 @@
+name: (simple_identifier) @_{type}_name
+(#match? @_{type}_name "^{{name}}$")
+(#set! role name)

src/tree-sitter-queries/TODO/TODO.txt

@@ -0,0 +1,28 @@
+; Regular class definitions with optional annotations and KDoc
+(class_declaration
+  (modifiers (annotation) )* @class.decorator
+  (comment)? @class.docstring
+  ["data" "enum"]? @class.subtype
+  {definition_base}
+  body: (class_body) @class.body
+) @class.definition
+
+; Interface definitions
+(interface_declaration
+  (modifiers (annotation) @class.decorator)*
+  (comment)? @class.docstring
+  name: (type_identifier) @_class_name
+  (#match? @_class_name "^{{name}}$")
+  (#set! role name)
+  body: (class_body) @class.body
+) @class.definition
+
+; Object declarations
+(object_declaration
+  (modifiers (annotation) @class.decorator)*
+  (comment)? @class.docstring
+  name: (type_identifier) @_class_name
+  (#match? @_class_name "^{{name}}$")
+  (#set! role name)
+  body: (class_body) @class.body
+) @class.definition

src/tree-sitter-queries/kotlin/basedef.scm

@@ -0,0 +1,21 @@
+(function_declaration
+  (comment)? @function.docstring
+  (modifiers (annotation) )* @function.decorator
+  (receiver_type: (type_reference))? @function.receiver
+  (comment)? @function.docstring
+  {definition_base}
+  (type_parameters: (type_parameters))? @function.type_parameters
+  body: (function_body) @function.body
+) @function.definition
+
+; Constructor definitions
+(constructor_declaration
+  (modifiers (annotation) )* @function.decorator
+  (comment)? @function.docstring
+  body: (function_body) @function.body
+) @function.definition
+
+; Lambda expressions
+(lambda_literal
+  body: (_) @function.body
+) @function.definition

src/tree-sitter-queries/kotlin/classes.scm

@@ -0,0 +1,3 @@
+name: (identifier) @_{type}_name
+(#match? @_{type}_name "^{{name}}$")
+(#set! role name)

src/tree-sitter-queries/kotlin/common.scm

@@ -0,0 +1,37 @@
+; Class Definitions
+(class_definition
+    {definition_base}
+    {common_body}
+) @class.definition
+
+; Decorated Class Definitions
+(decorated_definition
+    (decorator)+ @class.decorator
+    (class_definition
+        {definition_base}
+        {common_body}
+    ) @class.definition
+)
+
+; Nested Classes
+(class_definition
+    body: (block
+        (class_definition
+            {definition_base}
+            {common_body}
+        ) @class.definition
+    )
+)
+
+; Decorated Nested Classes
+(class_definition
+    body: (block
+        (decorated_definition
+            (decorator)+ @class.decorator
+            (class_definition
+                {definition_base}
+                {common_body}
+            ) @class.definition
+        )
+    )
+)

src/tree-sitter-queries/kotlin/functions.scm

@@ -0,0 +1,6 @@
+; Common pattern for body and docstring capture
+body: (block
+    .
+    (expression_statement
+        (string) @{type}.docstring)?
+ ) @{type}.body

src/tree-sitter-queries/python/basedef.scm

@@ -0,0 +1,14 @@
+; Function Definitions
+(function_definition
+    {definition_base}
+    {common_body}
+) @function.definition
+
+; Decorated Function Definitions
+(decorated_definition
+    (decorator)+ @function.decorator
+    (function_definition
+        {definition_base}
+        {common_body}
+    ) @function.definition
+)