fix: support single-level and default packages for all runnables

Cargo.toml

@@ -23,3 +23,8 @@ serde = { version = "1.0.228", features = ["derive"] }
 serde_json = "1.0.145"
 sha1 = "0.10.6"
 zed_extension_api = "0.7.0"
+
+[dev-dependencies]
+tree-sitter = "0.26.8"
+tree-sitter-java = "0.23.5"
+insta = { version = "1.46", features = ["yaml"] }

languages/java/runnables.scm

@@ -1,6 +1,10 @@
 ; Run the main function
-((package_declaration
-  (scoped_identifier) @java_package_name)?
+(program
+  (package_declaration
+    [
+      (identifier)
+      (scoped_identifier)
+    ] @java_package_name)?
   (class_declaration
     (modifiers) @class-modifier
     (#match? @class-modifier "public")
@@ -15,8 +19,12 @@
   (#set! tag java-main))
 
 ; Run the main class
-((package_declaration
-  (scoped_identifier) @java_package_name)?
+(program
+  (package_declaration
+    [
+      (identifier)
+      (scoped_identifier)
+    ] @java_package_name)?
   (class_declaration
     (modifiers) @class-modifier
     (#match? @class-modifier "public")
@@ -31,8 +39,12 @@
   (#set! tag java-main))
 
 ; Run test function (marker annotation, e.g. @Test)
-((package_declaration
-  (scoped_identifier) @java_package_name)
+(program
+  (package_declaration
+    [
+      (identifier)
+      (scoped_identifier)
+    ] @java_package_name)?
   (class_declaration
     name: (identifier) @java_class_name
     body: (class_body
@@ -49,8 +61,12 @@
   (#set! tag java-test-method))
 
 ; Run nested test function
-((package_declaration
-  (scoped_identifier) @java_package_name)
+(program
+  (package_declaration
+    [
+      (identifier)
+      (scoped_identifier)
+    ] @java_package_name)?
   (class_declaration
     name: (identifier) @java_outer_class_name
     body: (class_body
@@ -74,8 +90,12 @@
   (#set! tag java-test-method-nested))
 
 ; Run test class
-((package_declaration
-  (scoped_identifier) @java_package_name)
+(program
+  (package_declaration
+    [
+      (identifier)
+      (scoped_identifier)
+    ] @java_package_name)?
   (class_declaration
     name: (identifier) @java_class_name @run
     body: (class_body
@@ -91,8 +111,12 @@
   (#set! tag java-test-class))
 
 ; Run nested test class
-((package_declaration
-  (scoped_identifier) @java_package_name)
+(program
+  (package_declaration
+    [
+      (identifier)
+      (scoped_identifier)
+    ] @java_package_name)?
   (class_declaration
     name: (identifier) @java_outer_class_name
     body: (class_body

languages/java/tasks.json

@@ -1,7 +1,7 @@
 [
   {
     "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; f=\"$ZED_FILE\"; p=\"$PWD\"; d=$(dirname \"${f#$p/}\"); if [ -f pom.xml ]; then m=\".\"; md=\"$d\"; while [ \"$md\" != \".\" ] && [ \"$md\" != \"/\" ]; do if [ -f \"$md/pom.xml\" ]; then m=\"$md\"; break; fi; md=$(dirname \"$md\"); done; [ -f ./mvnw ] && CMD=\"./mvnw\" || CMD=\"mvn\"; case \"$f\" in *\"/src/test/\"*) COMPILE_GOAL=\"test-compile\"; CLASSPATH_SCOPE=\"test\";; *) COMPILE_GOAL=\"compile\"; CLASSPATH_SCOPE=\"runtime\";; esac; if [ \"$m\" = \".\" ]; then $CMD clean $COMPILE_GOAL exec:java -Dexec.mainClass=\"$c\" -Dexec.classpathScope=$CLASSPATH_SCOPE; else $CMD clean $COMPILE_GOAL -pl \"$m\" -am && $CMD exec:java -pl \"$m\" -Dexec.mainClass=\"$c\" -Dexec.classpathScope=$CLASSPATH_SCOPE; fi; elif [ -f build.gradle ] || [ -f build.gradle.kts ] || [ -f settings.gradle ] || [ -f settings.gradle.kts ]; then m=\".\"; md=\"$d\"; while [ \"$md\" != \".\" ] && [ \"$md\" != \"/\" ]; do if [ -f \"$md/build.gradle\" ] || [ -f \"$md/build.gradle.kts\" ]; then m=\"$md\"; break; fi; md=$(dirname \"$md\"); done; if [ \"$m\" = \".\" ]; then mp=\"\"; else mp=\":$(echo \"$m\" | tr '/' ':')\"; fi; [ -f ./gradlew ] && CMD=\"./gradlew\" || CMD=\"gradle\"; $CMD ${mp}: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;",
+    "command": "pkg=\"${ZED_CUSTOM_java_package_name:-}\"; cls=\"$ZED_CUSTOM_java_class_name\"; if [ -n \"$pkg\" ]; then c=\"$pkg.$cls\"; else c=\"$cls\"; fi; f=\"$ZED_FILE\"; p=\"$PWD\"; d=$(dirname \"${f#$p/}\"); if [ -f pom.xml ]; then m=\".\"; md=\"$d\"; while [ \"$md\" != \".\" ] && [ \"$md\" != \"/\" ]; do if [ -f \"$md/pom.xml\" ]; then m=\"$md\"; break; fi; md=$(dirname \"$md\"); done; [ -f ./mvnw ] && CMD=\"./mvnw\" || CMD=\"mvn\"; case \"$f\" in *\"/src/test/\"*) COMPILE_GOAL=\"test-compile\"; CLASSPATH_SCOPE=\"test\";; *) COMPILE_GOAL=\"compile\"; CLASSPATH_SCOPE=\"runtime\";; esac; if [ \"$m\" = \".\" ]; then $CMD clean $COMPILE_GOAL exec:java -Dexec.mainClass=\"$c\" -Dexec.classpathScope=$CLASSPATH_SCOPE; else $CMD clean $COMPILE_GOAL -pl \"$m\" -am && $CMD exec:java -pl \"$m\" -Dexec.mainClass=\"$c\" -Dexec.classpathScope=$CLASSPATH_SCOPE; fi; elif [ -f build.gradle ] || [ -f build.gradle.kts ] || [ -f settings.gradle ] || [ -f settings.gradle.kts ]; then m=\".\"; md=\"$d\"; while [ \"$md\" != \".\" ] && [ \"$md\" != \"/\" ]; do if [ -f \"$md/build.gradle\" ] || [ -f \"$md/build.gradle.kts\" ]; then m=\"$md\"; break; fi; md=$(dirname \"$md\"); done; if [ \"$m\" = \".\" ]; then mp=\"\"; else mp=\":$(echo \"$m\" | tr '/' ':')\"; fi; [ -f ./gradlew ] && CMD=\"./gradlew\" || CMD=\"gradle\"; $CMD ${mp}: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"],
@@ -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; f=\"$ZED_FILE\"; p=\"$PWD\"; d=$(dirname \"${f#$p/}\"); if [ -f pom.xml ]; then m=\".\"; md=\"$d\"; while [ \"$md\" != \".\" ] && [ \"$md\" != \"/\" ]; do if [ -f \"$md/pom.xml\" ]; then m=\"$md\"; break; fi; md=$(dirname \"$md\"); done; [ -f ./mvnw ] && CMD=\"./mvnw\" || CMD=\"mvn\"; if [ \"$m\" = \".\" ]; then $CMD clean test -Dtest=\"$package.$c#$method\"; else $CMD clean test-compile -pl \"$m\" -am && $CMD test -pl \"$m\" -Dtest=\"$package.$c#$method\"; fi; elif [ -f build.gradle ] || [ -f build.gradle.kts ] || [ -f settings.gradle ] || [ -f settings.gradle.kts ]; then m=\".\"; md=\"$d\"; while [ \"$md\" != \".\" ] && [ \"$md\" != \"/\" ]; do if [ -f \"$md/build.gradle\" ] || [ -f \"$md/build.gradle.kts\" ]; then m=\"$md\"; break; fi; md=$(dirname \"$md\"); done; if [ \"$m\" = \".\" ]; then mp=\"\"; else mp=\":$(echo \"$m\" | tr '/' ':')\"; fi; [ -f ./gradlew ] && CMD=\"./gradlew\" || CMD=\"gradle\"; $CMD ${mp}: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; f=\"$ZED_FILE\"; p=\"$PWD\"; d=$(dirname \"${f#$p/}\"); if [ -f pom.xml ]; then m=\".\"; md=\"$d\"; while [ \"$md\" != \".\" ] && [ \"$md\" != \"/\" ]; do if [ -f \"$md/pom.xml\" ]; then m=\"$md\"; break; fi; md=$(dirname \"$md\"); done; [ -f ./mvnw ] && CMD=\"./mvnw\" || CMD=\"mvn\"; if [ \"$m\" = \".\" ]; then $CMD clean test -Dtest=\"$fqc#$method\"; else $CMD clean test-compile -pl \"$m\" -am && $CMD test -pl \"$m\" -Dtest=\"$fqc#$method\"; fi; elif [ -f build.gradle ] || [ -f build.gradle.kts ] || [ -f settings.gradle ] || [ -f settings.gradle.kts ]; then m=\".\"; md=\"$d\"; while [ \"$md\" != \".\" ] && [ \"$md\" != \"/\" ]; do if [ -f \"$md/build.gradle\" ] || [ -f \"$md/build.gradle.kts\" ]; then m=\"$md\"; break; fi; md=$(dirname \"$md\"); done; if [ \"$m\" = \".\" ]; then mp=\"\"; else mp=\":$(echo \"$m\" | tr '/' ':')\"; fi; [ -f ./gradlew ] && CMD=\"./gradlew\" || CMD=\"gradle\"; $CMD ${mp}: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"],
@@ -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; f=\"$ZED_FILE\"; p=\"$PWD\"; d=$(dirname \"${f#$p/}\"); if [ -f pom.xml ]; then m=\".\"; md=\"$d\"; while [ \"$md\" != \".\" ] && [ \"$md\" != \"/\" ]; do if [ -f \"$md/pom.xml\" ]; then m=\"$md\"; break; fi; md=$(dirname \"$md\"); done; [ -f ./mvnw ] && CMD=\"./mvnw\" || CMD=\"mvn\"; if [ \"$m\" = \".\" ]; then $CMD clean test -Dtest=\"$package.$c\"; else $CMD clean test-compile -pl \"$m\" -am && $CMD test -pl \"$m\" -Dtest=\"$package.$c\"; fi; elif [ -f build.gradle ] || [ -f build.gradle.kts ] || [ -f settings.gradle ] || [ -f settings.gradle.kts ]; then m=\".\"; md=\"$d\"; while [ \"$md\" != \".\" ] && [ \"$md\" != \"/\" ]; do if [ -f \"$md/build.gradle\" ] || [ -f \"$md/build.gradle.kts\" ]; then m=\"$md\"; break; fi; md=$(dirname \"$md\"); done; if [ \"$m\" = \".\" ]; then mp=\"\"; else mp=\":$(echo \"$m\" | tr '/' ':')\"; fi; [ -f ./gradlew ] && CMD=\"./gradlew\" || CMD=\"gradle\"; $CMD ${mp}: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; f=\"$ZED_FILE\"; p=\"$PWD\"; d=$(dirname \"${f#$p/}\"); if [ -f pom.xml ]; then m=\".\"; md=\"$d\"; while [ \"$md\" != \".\" ] && [ \"$md\" != \"/\" ]; do if [ -f \"$md/pom.xml\" ]; then m=\"$md\"; break; fi; md=$(dirname \"$md\"); done; [ -f ./mvnw ] && CMD=\"./mvnw\" || CMD=\"mvn\"; if [ \"$m\" = \".\" ]; then $CMD clean test -Dtest=\"$fqc\"; else $CMD clean test-compile -pl \"$m\" -am && $CMD test -pl \"$m\" -Dtest=\"$fqc\"; fi; elif [ -f build.gradle ] || [ -f build.gradle.kts ] || [ -f settings.gradle ] || [ -f settings.gradle.kts ]; then m=\".\"; md=\"$d\"; while [ \"$md\" != \".\" ] && [ \"$md\" != \"/\" ]; do if [ -f \"$md/build.gradle\" ] || [ -f \"$md/build.gradle.kts\" ]; then m=\"$md\"; break; fi; md=$(dirname \"$md\"); done; if [ \"$m\" = \".\" ]; then mp=\"\"; else mp=\":$(echo \"$m\" | tr '/' ':')\"; fi; [ -f ./gradlew ] && CMD=\"./gradlew\" || CMD=\"gradle\"; $CMD ${mp}: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"],

tests/java.rs

@@ -0,0 +1,72 @@
+mod support;
+
+// ============================================================================
+// Main Method Tests
+// ============================================================================
+
+#[test]
+fn runnables_multi_level_package() {
+    support::assert_query_snapshot(
+        "runnables_multi_level",
+        "tests/languages/java/org/example/MultiLevelPackage.java",
+        "languages/java/runnables.scm",
+    );
+}
+
+#[test]
+fn runnables_single_level_package() {
+    support::assert_query_snapshot(
+        "runnables_single_level",
+        "tests/languages/java/example/SingleLevelPackage.java",
+        "languages/java/runnables.scm",
+    );
+}
+
+#[test]
+fn runnables_default_package() {
+    support::assert_query_snapshot(
+        "runnables_default_package",
+        "tests/languages/java/DefaultPackage.java",
+        "languages/java/runnables.scm",
+    );
+}
+
+// ============================================================================
+// JUnit Test Tests
+// ============================================================================
+
+#[test]
+fn runnables_multi_level_test() {
+    support::assert_query_snapshot(
+        "runnables_multi_level_test",
+        "tests/languages/java/org/example/MultiLevelTest.java",
+        "languages/java/runnables.scm",
+    );
+}
+
+#[test]
+fn runnables_single_level_test() {
+    support::assert_query_snapshot(
+        "runnables_single_level_test",
+        "tests/languages/java/example/SingleLevelTest.java",
+        "languages/java/runnables.scm",
+    );
+}
+
+#[test]
+fn runnables_default_package_test() {
+    support::assert_query_snapshot(
+        "runnables_default_package_test",
+        "tests/languages/java/DefaultPackageTest.java",
+        "languages/java/runnables.scm",
+    );
+}
+
+#[test]
+fn runnables_nested_test() {
+    support::assert_query_snapshot(
+        "runnables_nested_test",
+        "tests/languages/java/example/NestedTest.java",
+        "languages/java/runnables.scm",
+    );
+}

tests/languages/java/DefaultPackage.java

@@ -0,0 +1,6 @@
+public class DefaultPackage {
+    public static void main(String[] args) {
+        System.out.println("Hello world!");
+    }
+}
+

tests/languages/java/DefaultPackageTest.java

@@ -0,0 +1,6 @@
+import org.junit.jupiter.api.Test;
+
+public class DefaultPackageTest {
+    @Test
+    void testMethod() {}
+}

tests/languages/java/example/NestedTest.java

@@ -0,0 +1,12 @@
+package example;
+
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+public class NestedTest {
+    @Nested
+    class Inner {
+        @Test
+        void testMethod() {}
+    }
+}

tests/languages/java/example/SingleLevelPackage.java

@@ -0,0 +1,7 @@
+package example;
+
+public class SingleLevelPackage {
+    public static void main(String[] args) {
+        System.out.println("Hello world!");
+    }
+}

tests/languages/java/example/SingleLevelTest.java

@@ -0,0 +1,8 @@
+package example;
+
+import org.junit.jupiter.api.Test;
+
+public class SingleLevelTest {
+    @Test
+    void testMethod() {}
+}

tests/languages/java/org/example/MultiLevelPackage.java

@@ -0,0 +1,7 @@
+package org.example;
+
+public class MultiLevelPackage {
+    public static void main(String[] args) {
+        System.out.println("Hello world!");
+    }
+}

tests/languages/java/org/example/MultiLevelTest.java

@@ -0,0 +1,8 @@
+package org.example;
+
+import org.junit.jupiter.api.Test;
+
+public class MultiLevelTest {
+    @Test
+    void testMethod() {}
+}

tests/languages/java/snapshots/runnables_default_package.snap

@@ -0,0 +1,49 @@
+---
+source: tests/support/mod.rs
+assertion_line: 82
+expression: captures
+---
+- name: _
+  line: 1
+  column: 1
+  text: "public class DefaultPackage {\n    public static void main(String[] args) {\n        System.out.println(\"Hello world!\");\n    }\n}"
+- name: class-modifier
+  line: 1
+  column: 1
+  text: public
+- name: java_class_name
+  line: 1
+  column: 14
+  text: DefaultPackage
+- name: modifier
+  line: 2
+  column: 5
+  text: public static
+- name: run
+  line: 2
+  column: 24
+  text: main
+- name: _
+  line: 1
+  column: 1
+  text: "public class DefaultPackage {\n    public static void main(String[] args) {\n        System.out.println(\"Hello world!\");\n    }\n}"
+- name: class-modifier
+  line: 1
+  column: 1
+  text: public
+- name: java_class_name
+  line: 1
+  column: 14
+  text: DefaultPackage
+- name: run
+  line: 1
+  column: 14
+  text: DefaultPackage
+- name: modifier
+  line: 2
+  column: 5
+  text: public static
+- name: method_name
+  line: 2
+  column: 24
+  text: main

tests/languages/java/snapshots/runnables_default_package_test.snap

@@ -0,0 +1,41 @@
+---
+source: tests/support/mod.rs
+assertion_line: 82
+expression: captures
+---
+- name: _
+  line: 3
+  column: 1
+  text: "public class DefaultPackageTest {\n    @Test\n    void testMethod() {}\n}"
+- name: java_class_name
+  line: 3
+  column: 14
+  text: DefaultPackageTest
+- name: run
+  line: 3
+  column: 14
+  text: DefaultPackageTest
+- name: annotation_name
+  line: 4
+  column: 6
+  text: Test
+- name: _
+  line: 3
+  column: 1
+  text: "public class DefaultPackageTest {\n    @Test\n    void testMethod() {}\n}"
+- name: java_class_name
+  line: 3
+  column: 14
+  text: DefaultPackageTest
+- name: annotation_name
+  line: 4
+  column: 6
+  text: Test
+- name: run
+  line: 5
+  column: 10
+  text: testMethod
+- name: java_method_name
+  line: 5
+  column: 10
+  text: testMethod