Skip to content

Support Java files without package declarations #248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tartarughina wants to merge 1 commit into
base: main
Choose a base branch
from
+34 −12
Open

Support Java files without package declarations #248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 32 additions & 10 deletions languages/java/runnables.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
; Run the main function
((package_declaration
(scoped_identifier) @java_package_name)?
[
(scoped_identifier)
(identifier)
] @java_package_name)?
(class_declaration
(modifiers) @class-modifier
(#match? @class-modifier "public")
Expand All @@ -16,7 +19,10 @@

; Run the main class
((package_declaration
(scoped_identifier) @java_package_name)?
[
(scoped_identifier)
(identifier)
] @java_package_name)?
(class_declaration
(modifiers) @class-modifier
(#match? @class-modifier "public")
Expand All @@ -31,8 +37,12 @@
(#set! tag java-main))

; Run test function (marker annotation, e.g. @Test)
((package_declaration
(scoped_identifier) @java_package_name)
(program
(package_declaration
[
(scoped_identifier)
(identifier)
] @java_package_name)?
(class_declaration
name: (identifier) @java_class_name
body: (class_body
Expand All @@ -49,8 +59,12 @@
(#set! tag java-test-method))

; Run nested test function
((package_declaration
(scoped_identifier) @java_package_name)
(program
(package_declaration
[
(scoped_identifier)
(identifier)
] @java_package_name)?
(class_declaration
name: (identifier) @java_outer_class_name
body: (class_body
Expand All @@ -74,8 +88,12 @@
(#set! tag java-test-method-nested))

; Run test class
((package_declaration
(scoped_identifier) @java_package_name)
(program
(package_declaration
[
(scoped_identifier)
(identifier)
] @java_package_name)?
(class_declaration
name: (identifier) @java_class_name @run
body: (class_body
Expand All @@ -91,8 +109,12 @@
(#set! tag java-test-class))

; Run nested test class
((package_declaration
(scoped_identifier) @java_package_name)
(program
(package_declaration
[
(scoped_identifier)
(identifier)
] @java_package_name)?
(class_declaration
name: (identifier) @java_outer_class_name
body: (class_body
Expand Down
4 changes: 2 additions & 2 deletions languages/java/tasks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
{
"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 [ -f ./mvnw ] && CMD=\"./mvnw\" || CMD=\"mvn\"; $CMD clean test -Dtest=\"$package.$c#$method\"; elif [ -f build.gradle ] || [ -f build.gradle.kts ]; then [ -f ./gradlew ] && CMD=\"./gradlew\" || CMD=\"gradle\"; $CMD test --tests \"$package.$c.$method\"; else >&2 echo 'No build tool found'; exit 1; fi;",
"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 [ -n \"$package\" ]; then fqc=\"$package.$c\"; else fqc=\"$c\"; fi; if [ -f pom.xml ]; then [ -f ./mvnw ] && CMD=\"./mvnw\" || CMD=\"mvn\"; $CMD clean test -Dtest=\"$fqc#$method\"; elif [ -f build.gradle ] || [ -f build.gradle.kts ]; then [ -f ./gradlew ] && CMD=\"./gradlew\" || CMD=\"gradle\"; $CMD test --tests \"$fqc.$method\"; else >&2 echo 'No build tool found'; exit 1; fi;",
"use_new_terminal": false,
"reveal": "always",
"tags": ["java-test-method", "java-test-method-nested"],
Expand All @@ -27,7 +27,7 @@
},
{
"label": "Test class $ZED_CUSTOM_java_class_name",
"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 [ -f ./mvnw ] && CMD=\"./mvnw\" || CMD=\"mvn\"; $CMD clean test -Dtest=\"$package.$c\"; elif [ -f build.gradle ] || [ -f build.gradle.kts ]; then [ -f ./gradlew ] && CMD=\"./gradlew\" || CMD=\"gradle\"; $CMD test --tests \"$package.$c\"; else >&2 echo 'No build tool 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 [ -n \"$package\" ]; then fqc=\"$package.$c\"; else fqc=\"$c\"; fi; if [ -f pom.xml ]; then [ -f ./mvnw ] && CMD=\"./mvnw\" || CMD=\"mvn\"; $CMD clean test -Dtest=\"$fqc\"; elif [ -f build.gradle ] || [ -f build.gradle.kts ]; then [ -f ./gradlew ] && CMD=\"./gradlew\" || CMD=\"gradle\"; $CMD test --tests \"$fqc\"; else >&2 echo 'No build tool found'; exit 1; fi;",
"use_new_terminal": false,
"reveal": "always",
"tags": ["java-test-class", "java-test-class-nested"],
Expand Down
Loading