Incorporate review feedback

Author: odenix

README.md

@@ -10,14 +10,12 @@ Java bindings to the [tree-sitter] parsing library.
 
 - Install JDK 22 and set `JAVA_HOME` to it
 - Download [jextract] and add it to your `PATH`
+- Install the `tree-sitter` & `tree-sitter-java` libraries
 
 ```bash
 git clone https://github.com/tree-sitter/java-tree-sitter
 cd java-tree-sitter
-git submodule init
-git submodule update
-# build tree-sitter and tree-sitter-java native libraries,
-# for example by replicating the steps in .github/workflows/ci.yml
+git submodule update --init
 mvn test
 ```
 

pom.xml

@@ -81,8 +81,7 @@
               <skip>${jextract.skip}</skip>
               <target name="jextract">
                 <echo level="info">Generating sources using jextract</echo>
-                <exec osfamily="windows" executable="powershell" failonerror="true">
-                  <arg value="${project.basedir}/scripts/jextract.ps1"/>
+                <exec osfamily="windows" executable="${project.basedir}/scripts/jextract.ps1" failonerror="true">
                   <arg value="${project.basedir}"/>
                   <arg value="${project.build.directory}"/>
                 </exec>

scripts/TreeSitter_java.patch

@@ -1,5 +1,5 @@
---- a/target/generated-sources/jextract/io/github/treesitter/jtreesitter/internal/TreeSitter.java	
-+++ b/target/generated-sources/jextract/io/github/treesitter/jtreesitter/internal/TreeSitter.java
+--- a/generated-sources/jextract/io/github/treesitter/jtreesitter/internal/TreeSitter.java
++++ b/generated-sources/jextract/io/github/treesitter/jtreesitter/internal/TreeSitter.java
 @@ -55,9 +55,7 @@
          };
      }

src/main/java/io/github/treesitter/jtreesitter/NativeLibraryLookup.java

@@ -10,6 +10,7 @@
  *
  * @see java.util.ServiceLoader
  */
+@FunctionalInterface
 public interface NativeLibraryLookup {
     /**
      * Returns the {@link SymbolLookup} to be used for the tree-sitter native library.

src/main/java/io/github/treesitter/jtreesitter/internal/ChainedLibraryLookup.java

@@ -11,16 +11,17 @@ final class ChainedLibraryLookup implements NativeLibraryLookup {
     @Override
     public SymbolLookup get(Arena arena) {
         var serviceLoader = ServiceLoader.load(NativeLibraryLookup.class);
+        // NOTE: can't use _ because of palantir/palantir-java-format#934
         SymbolLookup lookup = (name) -> Optional.empty();
         for (var libraryLookup : serviceLoader) {
             lookup = lookup.or(libraryLookup.get(arena));
         }
         return lookup.or(findLibrary(arena)).or(Linker.nativeLinker().defaultLookup());
     }
 
-    private SymbolLookup findLibrary(Arena arena) {
+    private static SymbolLookup findLibrary(Arena arena) {
         try {
-            String library = System.mapLibraryName("tree-sitter");
+            var library = System.mapLibraryName("tree-sitter");
             return SymbolLookup.libraryLookup(library, arena);
         } catch (IllegalArgumentException e) {
             return SymbolLookup.loaderLookup();