Support any decorator ending in Test in runnables (#200)

tartarughina · web-flow · commit 6cda290ac28a · 2026-02-24T15:01:49.000+01:00
Address #198
diff --git a/languages/java/runnables.scm b/languages/java/runnables.scm
@@ -42,7 +42,7 @@
     (#set! tag java-main)
 )
 
-; Run test function
+; Run test function (marker annotation, e.g. @Test)
 (
     (package_declaration
         (scoped_identifier) @java_package_name
@@ -52,12 +52,15 @@
         body: (class_body
             (method_declaration
                 (modifiers
-                    (marker_annotation
+                    [(marker_annotation
                         name: (identifier) @annotation_name
                     )
+                    (annotation
+                        name: (identifier) @annotation_name
+                    )]
                 )
                 name: (identifier) @run @java_method_name
-                (#eq? @annotation_name "Test")
+                (#match? @annotation_name "Test$")
             )
         )
     ) @_
@@ -82,12 +85,15 @@
                 body: (class_body
                     (method_declaration
                         (modifiers
-                            (marker_annotation
+                            [(marker_annotation
                                 name: (identifier) @annotation_name
                                 )
+                            (annotation
+                                name: (identifier) @annotation_name
+                                )]
                             )
                         name: (identifier) @run @java_method_name
-                        (#eq? @annotation_name "Test")
+                        (#match? @annotation_name "Test$")
                     )
                 )
                 (#eq? @nested_annotation "Nested")
@@ -107,11 +113,14 @@
         body: (class_body
             (method_declaration
                 (modifiers
-                    (marker_annotation
+                    [(marker_annotation
                         name: (identifier) @annotation_name
                     )
+                    (annotation
+                        name: (identifier) @annotation_name
+                    )]
                 )
-                (#eq? @annotation_name "Test")
+                (#match? @annotation_name "Test$")
             )
         )
     ) @_
@@ -136,11 +145,14 @@
                 body: (class_body
                     (method_declaration
                         (modifiers
-                            (marker_annotation
+                            [(marker_annotation
                                 name: (identifier) @annotation_name
                                 )
+                            (annotation
+                                name: (identifier) @annotation_name
+                                )]
                             )
-                        (#eq? @annotation_name "Test")
+                        (#match? @annotation_name "Test$")
                     )
                 )
                 (#eq? @nested_annotation "Nested")

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@`
`42`	`42`	`(#set! tag java-main)`
`43`	`43`	`)`
`44`	`44`
`45`		`-; Run test function`
	`45`	`+; Run test function (marker annotation, e.g. @Test)`
`46`	`46`	`(`
`47`	`47`	`(package_declaration`
`48`	`48`	`(scoped_identifier) @java_package_name`
`@@ -52,12 +52,15 @@`
`52`	`52`	`body: (class_body`
`53`	`53`	`(method_declaration`
`54`	`54`	`(modifiers`
`55`		`- (marker_annotation`
	`55`	`+ [(marker_annotation`
`56`	`56`	`name: (identifier) @annotation_name`
`57`	`57`	`)`
	`58`	`+ (annotation`
	`59`	`+ name: (identifier) @annotation_name`
	`60`	`+ )]`
`58`	`61`	`)`
`59`	`62`	`name: (identifier) @run @java_method_name`
`60`		`- (#eq? @annotation_name "Test")`
	`63`	`+ (#match? @annotation_name "Test$")`
`61`	`64`	`)`
`62`	`65`	`)`
`63`	`66`	`) @_`
`@@ -82,12 +85,15 @@`
`82`	`85`	`body: (class_body`
`83`	`86`	`(method_declaration`
`84`	`87`	`(modifiers`
`85`		`- (marker_annotation`
	`88`	`+ [(marker_annotation`
`86`	`89`	`name: (identifier) @annotation_name`
`87`	`90`	`)`
	`91`	`+ (annotation`
	`92`	`+ name: (identifier) @annotation_name`
	`93`	`+ )]`
`88`	`94`	`)`
`89`	`95`	`name: (identifier) @run @java_method_name`
`90`		`- (#eq? @annotation_name "Test")`
	`96`	`+ (#match? @annotation_name "Test$")`
`91`	`97`	`)`
`92`	`98`	`)`
`93`	`99`	`(#eq? @nested_annotation "Nested")`
`@@ -107,11 +113,14 @@`
`107`	`113`	`body: (class_body`
`108`	`114`	`(method_declaration`
`109`	`115`	`(modifiers`
`110`		`- (marker_annotation`
	`116`	`+ [(marker_annotation`
`111`	`117`	`name: (identifier) @annotation_name`
`112`	`118`	`)`
	`119`	`+ (annotation`
	`120`	`+ name: (identifier) @annotation_name`
	`121`	`+ )]`
`113`	`122`	`)`
`114`		`- (#eq? @annotation_name "Test")`
	`123`	`+ (#match? @annotation_name "Test$")`
`115`	`124`	`)`
`116`	`125`	`)`
`117`	`126`	`) @_`
`@@ -136,11 +145,14 @@`
`136`	`145`	`body: (class_body`
`137`	`146`	`(method_declaration`
`138`	`147`	`(modifiers`
`139`		`- (marker_annotation`
	`148`	`+ [(marker_annotation`
`140`	`149`	`name: (identifier) @annotation_name`
`141`	`150`	`)`
	`151`	`+ (annotation`
	`152`	`+ name: (identifier) @annotation_name`
	`153`	`+ )]`
`142`	`154`	`)`
`143`		`- (#eq? @annotation_name "Test")`
	`155`	`+ (#match? @annotation_name "Test$")`
`144`	`156`	`)`
`145`	`157`	`)`
`146`	`158`	`(#eq? @nested_annotation "Nested")`