Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 65 additions & 0 deletions languages/java/runnables.scm
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,39 @@
(#set! tag java-test-method)
)

; Run nested test function
(
(package_declaration
(scoped_identifier) @java_package_name
)
(class_declaration
name: (identifier) @java_outer_class_name
body: (class_body
(class_declaration
(modifiers
(marker_annotation
name: (identifier) @nested_annotation
)
)
name: (identifier) @java_class_name
body: (class_body
(method_declaration
(modifiers
(marker_annotation
name: (identifier) @annotation_name
)
)
name: (identifier) @run @java_method_name
(#eq? @annotation_name "Test")
)
)
(#eq? @nested_annotation "Nested")
) @_
)
)
(#set! tag java-test-method-nested)
)

; Run test class
(
(package_declaration
Expand All @@ -84,3 +117,35 @@
) @_
(#set! tag java-test-class)
)

; Run nested test class
(
(package_declaration
(scoped_identifier) @java_package_name
)
(class_declaration
name: (identifier) @java_outer_class_name
body: (class_body
(class_declaration
(modifiers
(marker_annotation
name: (identifier) @nested_annotation
)
)
name: (identifier) @run @java_class_name
body: (class_body
(method_declaration
(modifiers
(marker_annotation
name: (identifier) @annotation_name
)
)
(#eq? @annotation_name "Test")
)
)
(#eq? @nested_annotation "Nested")
) @_
)
)
(#set! tag java-test-class-nested)
)
34 changes: 17 additions & 17 deletions languages/java/tasks.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
[
{
"label": "Run $ZED_CUSTOM_java_class_name",
"command": "pkg=\"${ZED_CUSTOM_java_package_name:}\"; cls=\"$ZED_CUSTOM_java_class_name\"; if [ -n \"$pkg\" ]; then c=\"$pkg.$cls\"; else c=\"$cls\"; fi; if [ -f pom.xml ]; then ./mvnw clean compile exec:java -Dexec.mainClass=\"$c\"; elif [ -f gradlew ]; then ./gradlew run -PmainClass=\"$c\"; else find . -name '*.java' -not -path './bin/*' -not -path './target/*' -not -path './build/*' -print0 | xargs -0 javac -d bin && java -cp bin \"$c\"; fi;",
"use_new_terminal": false,
"reveal": "always",
"tags": ["java-main"],
"shell": {
"with_arguments": {
"program": "/bin/sh",
"args": ["-c"]
}
{
"label": "Run $ZED_CUSTOM_java_class_name",
"command": "pkg=\"${ZED_CUSTOM_java_package_name:}\"; cls=\"$ZED_CUSTOM_java_class_name\"; if [ -n \"$pkg\" ]; then c=\"$pkg.$cls\"; else c=\"$cls\"; fi; if [ -f pom.xml ]; then ./mvnw clean compile exec:java -Dexec.mainClass=\"$c\"; elif [ -f gradlew ]; then ./gradlew run -PmainClass=\"$c\"; else find . -name '*.java' -not -path './bin/*' -not -path './target/*' -not -path './build/*' -print0 | xargs -0 javac -d bin && java -cp bin \"$c\"; fi;",
"use_new_terminal": false,
"reveal": "always",
"tags": ["java-main"],
"shell": {
"with_arguments": {
"program": "/bin/sh",
"args": ["-c"]
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this part is just indentation

}
},
}
},
{
"label": "Test $ZED_CUSTOM_java_class_name.$ZED_CUSTOM_java_method_name",
"command": "c=\"$ZED_CUSTOM_java_package_name.$ZED_CUSTOM_java_class_name\"; m=\"$ZED_CUSTOM_java_method_name\"; if [ -f pom.xml ]; then ./mvnw clean test -Dtest=\"$c#$m\"; elif [ -f gradlew ]; then ./gradlew test --tests $c.$m; else >&2 echo 'No build system found'; exit 1; fi;",
"label": "$ZED_CUSTOM_java_class_name.${ZED_CUSTOM_java_outer_class_name:}.$ZED_CUSTOM_java_method_name",
"command": "package=\"$ZED_CUSTOM_java_package_name\"; outer=\"${ZED_CUSTOM_java_outer_class_name:}\"; inner=\"$ZED_CUSTOM_java_class_name\"; method=\"$ZED_CUSTOM_java_method_name\"; sep=\"$\"; if [ -n \"$outer\" ]; then c=\"$outer$sep$inner\"; else c=\"$inner\"; fi; if [ -f pom.xml ]; then ./mvnw clean test -Dtest=\"$package.$c#$method\"; elif [ -f gradlew ]; then ./gradlew test --tests \"$package.$c.$method\"; else >&2 echo 'No build system found'; exit 1; fi;",
Comment on lines +16 to +17
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice clarity improvement. Too bad we are limited to having everything inlined

"use_new_terminal": false,
"reveal": "always",
"tags": ["java-test-method"],
"tags": ["java-test-method", "java-test-method-nested"],
"shell": {
"with_arguments": {
"program": "/bin/sh",
Expand All @@ -27,10 +27,10 @@
},
{
"label": "Test class $ZED_CUSTOM_java_class_name",
"command": "c=\"$ZED_CUSTOM_java_package_name.$ZED_CUSTOM_java_class_name\"; if [ -f pom.xml ]; then ./mvnw clean test -Dtest=\"$c\"; elif [ -f gradlew ]; then ./gradlew test --tests $c; else >&2 echo 'No build system found'; exit 1; fi;",
"command": "package=\"$ZED_CUSTOM_java_package_name\"; outer=\"${ZED_CUSTOM_java_outer_class_name:}\"; inner=\"$ZED_CUSTOM_java_class_name\"; sep=\"$\"; if [ -n \"$outer\" ]; then c=\"$outer$sep$inner\"; else c=\"$inner\"; fi; if [ -f pom.xml ]; then ./mvnw clean test -Dtest=\"$package.$c\"; elif [ -f gradlew ]; then ./gradlew test --tests \"$package.$c\"; else >&2 echo 'No build system found'; exit 1; fi;",
"use_new_terminal": false,
"reveal": "always",
"tags": ["java-test-class"],
"tags": ["java-test-class", "java-test-class-nested"],
"shell": {
"with_arguments": {
"program": "/bin/sh",
Expand Down