feat(plugin): infer source files

Author: ObserverOfTime

ktreesitter-plugin/README.md

@@ -35,10 +35,5 @@ grammar {
   className = "TreeSitterJava"
   // The name of the package
   packageName = "io.github.treesitter.ktreesitter.java"
-  // The source files of the grammar
-  files = arrayOf(
-    baseDir.get().resolve("src/parser.c"),
-    // baseDir.get().resolve("src/scanner.c")
-  )
 }
 ```

ktreesitter-plugin/src/main/java/io/github/treesitter/ktreesitter/plugin/GrammarFilesTask.java

@@ -6,6 +6,7 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.regex.Pattern;
@@ -25,8 +26,6 @@ public abstract class GrammarFilesTask extends DefaultTask {
 
     private String grammarName;
 
-    private File[] grammarFiles;
-
     private String interopName;
 
     private String libraryName;
@@ -63,18 +62,6 @@ public final void setGrammarName(String grammarName) {
         this.grammarName = grammarName;
     }
 
-    /** Get the source files of the grammar. */
-    @InputFiles
-    @PathSensitive(PathSensitivity.RELATIVE)
-    public final File[] getGrammarFiles() {
-        return grammarFiles;
-    }
-
-    /** Set the source files of the grammar. */
-    public final void setGrammarFiles(File[] grammarFiles) {
-        this.grammarFiles = grammarFiles;
-    }
-
     /** Get the name of the C interop def file. */
     @Input
     public final String getInteropName() {
@@ -281,9 +268,8 @@ jniPrefix, jniTransform(name), name
 
     private void generateCmakeLists(Path srcDir) throws GradleException {
         var jniBinding = srcDir.resolve("jni").resolve("binding.c");
-        var files = Arrays.stream(grammarFiles).map(file -> relative(file.toPath()).toString());
         var includeDir = relative(grammarDir.toPath().resolve("bindings/c"));
-        var sources = relative(jniBinding) + " " + String.join(" ", files.toList());
+        var sources = String.format("%s %s", relative(jniBinding), srcFiles());
         var template = readResource("CMakeLists.txt.in")
             .replace("@LIBRARY@", libraryName)
             .replace("@INCLUDE@", includeDir.toString())
@@ -305,6 +291,15 @@ private Path relative(Path file) {
         return getGeneratedSrc().get().getAsFile().toPath().getParent().relativize(file);
     }
 
+    private String srcFiles() {
+        var grammarSrcDir = grammarDir.toPath().resolve("src");
+        var scannerFile = grammarSrcDir.resolve("scanner.c");
+        if (!scannerFile.toFile().exists()) {
+            return grammarSrcDir.resolve("parser.c").toString();
+        }
+        return String.format("%s %s", grammarSrcDir.resolve("parser.c"), scannerFile);
+    }
+
     private String readResource(String file) throws GradleException {
         try (var stream = getClass().getResourceAsStream("/" + file)) {
             var bytes = Objects.requireNonNull(stream).readAllBytes();

ktreesitter-plugin/src/main/java/io/github/treesitter/ktreesitter/plugin/GrammarPlugin.java

@@ -30,7 +30,6 @@ public void apply(Project project) {
         project.getTasks().register("generateGrammarFiles", GrammarFilesTask.class, it -> {
             it.setGrammarDir(extension.getBaseDir().get());
             it.setGrammarName(extension.getGrammarName().get());
-            it.setGrammarFiles(extension.getFiles().get());
             it.setInteropName(extension.getInteropName().get());
             it.setLibraryName(extension.getLibraryName().get());
             it.setPackageName(extension.getPackageName().get());

ktreesitter-plugin/src/main/resources/CMakeLists.txt.in

@@ -2,20 +2,20 @@
 
 cmake_minimum_required(VERSION 3.12.0)
 
-project(ktreesitter-java LANGUAGES C)
+project(@LIBRARY@ LANGUAGES C)
 
 find_package(JNI REQUIRED)
 
 set(CMAKE_C_STANDARD 11)
 
 if(MSVC)
     add_compile_options(/W3 /wd4244)
-else(MSVC)
+else()
     set(CMAKE_C_VISIBILITY_PRESET hidden)
     add_compile_options(-Wall -Wextra
                         -Wno-unused-parameter
                         -Werror=implicit-function-declaration)
-endif(MSVC)
+endif()
 
 include_directories(${JNI_INCLUDE_DIRS} @INCLUDE@)
 

ktreesitter-plugin/src/main/resources/android.kt.in

@@ -12,5 +12,4 @@ actual object @CLASS@ {
         System.loadLibrary("@LIBRARY@")
     }
 
-@METHODS@
-}
+@METHODS@}

ktreesitter-plugin/src/main/resources/jvm.kt.in

@@ -20,7 +20,6 @@ actual object @CLASS@ {
     }
 
 @METHODS@
-
     @JvmStatic
     @Suppress("ConvertToStringTemplate")
     @Throws(UnsupportedOperationException::class)

languages/java/build.gradle.kts

@@ -28,10 +28,6 @@ grammar {
     grammarName = project.name
     className = "TreeSitterJava"
     packageName = "io.github.treesitter.ktreesitter.java"
-    files = arrayOf(
-        // grammarDir.resolve("src/scanner.c"),
-        grammarDir.resolve("src/parser.c")
-    )
 }
 
 val generateTask = tasks.generateGrammarFiles.get()
@@ -125,13 +121,16 @@ android {
 tasks.withType<CInteropProcess>().configureEach {
     if (name.startsWith("cinteropTest")) return@configureEach
 
-    val grammarFiles = grammar.files.get()
+    val srcDir = grammarDir.resolve("src")
+    val grammarFiles =
+        if (!srcDir.resolve("scanner.c").isFile) arrayOf(srcDir.resolve("parser.c"))
+        else arrayOf(srcDir.resolve("parser.c"), srcDir.resolve("scanner.c"))
     val grammarName = grammar.grammarName.get()
     val runKonan = File(konanHome.get()).resolve("bin")
         .resolve(if (os.isWindows) "run_konan.bat" else "run_konan").path
     val libFile = libsDir.dir(konanTarget.name).file("libtree-sitter-$grammarName.a").asFile
     val objectFiles = grammarFiles.map {
-        grammarDir.resolve(it.nameWithoutExtension + ".o").path
+        srcDir.resolve(it.nameWithoutExtension + ".o").path
     }.toTypedArray()
     val loader = PlatformManager(konanHome.get(), false, konanDataDir.orNull).loader(konanTarget)
 
@@ -141,7 +140,7 @@ tasks.withType<CInteropProcess>().configureEach {
         val argsFile = File.createTempFile("args", null)
         argsFile.deleteOnExit()
         argsFile.writer().useToRun {
-            write("-I" + grammarDir.resolve("src").unixPath + "\n")
+            write("-I" + srcDir.unixPath + "\n")
             write("-DTREE_SITTER_HIDE_SYMBOLS\n")
             write("-fvisibility=hidden\n")
             write("-std=c11\n")