Merge branch 'topic/update_prettier_java' into 'master'

Update prettier java to 2.7.6

Closes #581

See merge request eng/libadalang/langkit-query-language!574

Author: HugoGGuerrier

.gitlab-ci.yml

@@ -12,7 +12,6 @@ variables:
   JAVA_VENDOR: graalvm
   MAVEN_VERSION: 3.9.9
   NODEJS_VERSION: 16.19.1
-  NPM_CACHE_ARCHIVE: prettier_java-npm_cache-20250203.tar.gz
 
 stages:
   - checkstyle
@@ -29,14 +28,9 @@ pre-commit:
     - generic_anod_ci
     - . /tmp/ci_env.sh
     # Define working variables
-    - npm_cache=$PWD/npm_cache
-    - npm_cache_install=$npm_cache/spotless-prettier-node-modules-fbb3f0657a1374078dbfdc0a3df68734
     - maven_local_repo=$(anod info maven-repo-pull -Qclient=lkql --show working_dir)/install
-    - npmrc_file=$PWD/.npmrc
 
     # Echo vars to log information about the run
-    - echo $npm_cache
-    - echo $npm_cache_install
     - echo $maven_local_repo
 
     # Install all pre-commit dependencies
@@ -49,11 +43,7 @@ pre-commit:
     - eval $(anod printenv java       -Q version=$JAVA_VERSION,vendor=$JAVA_VENDOR)
     - eval $(anod printenv maven      -Q version=$MAVEN_VERSION)
     - eval $(anod printenv nodejs     -Q version=$NODEJS_VERSION)
-    - mkdir -p $npm_cache_install
-    - e3-cathod thirdparty $NPM_CACHE_ARCHIVE --install $npm_cache_install --delete
-    - ls $npm_cache_install
-    - echo "offline=true" > $npmrc_file
-    - export MAVEN_ARGS="-Dmaven.repo.local=$maven_local_repo -Dconfig.npmInstallCache=$npm_cache -Dconfig.npmrc=$npmrc_file"
+    - export MAVEN_ARGS="-Dmaven.repo.local=$maven_local_repo"
 
 # Common part for all testing CIs
 .common-test-part: &common-test-part

lkql_jit/benchmarks/src/test/java/com/adacore/lkql_jit/benchmarks/ClosureBenchmark.java

@@ -10,8 +10,7 @@
 
 public class ClosureBenchmark extends TruffleBenchmark {
 
-    private static final String lkqlClosure =
-        """
+    private static final String lkqlClosure = """
         fun foo(v) = {
             fun bar(w) = {
                 fun baz(x) = {
@@ -26,8 +25,7 @@ fun baz(x) = {
         fun r() = clos(14)
         repeat(1000000, r)""";
 
-    private static final String jsClosure =
-        """
+    private static final String jsClosure = """
         function foo(v) {
             function bar(w) {
                 function baz(x) {

lkql_jit/benchmarks/src/test/java/com/adacore/lkql_jit/benchmarks/ClosureCreationBenchmark.java

@@ -13,40 +13,40 @@ public class ClosureCreationBenchmark extends TruffleBenchmark {
     @Benchmark
     public void truffle_js() {
         this.context.eval(
-                "js",
-                """
-                function foo(v) {
-                    function bar(w) {
-                        function baz(x) {
-                            return v + w + x;
-                        }
-                        return baz;
+            "js",
+            """
+            function foo(v) {
+                function bar(w) {
+                    function baz(x) {
+                        return v + w + x;
                     }
-                    return bar;
+                    return baz;
                 }
+                return bar;
+            }
 
-                for (let i = 0; i < 10000; i++) {
-                    foo(12)(13)(14)
-                }"""
-            );
+            for (let i = 0; i < 10000; i++) {
+                foo(12)(13)(14)
+            }"""
+        );
     }
 
     @Benchmark
     public void truffle_lkql() {
         this.context.eval(
-                "lkql",
-                """
-                fun foo(v) = {
-                    fun bar(w) = {
-                        fun baz(x) = {
-                            v + w + x
-                        };
-                        baz
+            "lkql",
+            """
+            fun foo(v) = {
+                fun bar(w) = {
+                    fun baz(x) = {
+                        v + w + x
                     };
-                    bar
-                }
+                    baz
+                };
+                bar
+            }
 
-                repeat(10000, () => foo(12)(13)(14))"""
-            );
+            repeat(10000, () => foo(12)(13)(14))"""
+        );
     }
 }

lkql_jit/benchmarks/src/test/java/com/adacore/lkql_jit/benchmarks/FibonacciBenchmark.java

@@ -20,8 +20,7 @@ public class FibonacciBenchmark extends TruffleBenchmark {
     private static final int term = 20;
 
     /** The fibonacci function in LKQL */
-    private static final String lkqlFibo =
-        """
+    private static final String lkqlFibo = """
         fun fibo(n) =
             if n <= 0
             then 0
@@ -32,8 +31,7 @@ else fibo(n-1) + fibo(n-2)
         """.formatted(term);
 
     /** The fibonacci function in JS */
-    private static final String jsFibo =
-        """
+    private static final String jsFibo = """
         function fibo(n) {
             if (n == 0) return 0;
             else if (n == 1) return 1;
@@ -43,8 +41,7 @@ function fibo(n) {
         """.formatted(term);
 
     /** The fibonacci function in SimpleLanguage */
-    private static final String slFibo =
-        """
+    private static final String slFibo = """
         function fibo(n) {
             if (n < 2) {
                 return 1;

lkql_jit/benchmarks/src/test/java/com/adacore/lkql_jit/benchmarks/ListComprehensionBenchmark.java

@@ -29,22 +29,22 @@ public class ListComprehensionBenchmark extends TruffleBenchmark {
     private static final int size = 10_000;
 
     /** The source for the LKQL list comprehension value. */
-    private static final String lkqlSource =
-        """
+    private static final String lkqlSource = """
         val generator = [%s]
         val result = [x * 2 for x in generator].to_list
         """;
 
     /** The fibonacci function in JS */
-    private static final String jsSource =
-        """
+    private static final String jsSource = """
         var generator = [%s];
         var result = generator.map(x => x * 2);
         """;
 
     /** Java recursive fibonacci implementation. */
     private void javaListComp() {
-        Arrays.stream(this.generator).map(x -> x * 2).toArray();
+        Arrays.stream(this.generator)
+            .map(x -> x * 2)
+            .toArray();
     }
 
     // ----- Benchmark lifecycle -----

lkql_jit/builtins_annotations/src/main/java/com/adacore/lkql_jit/annotations/BuiltInProcessor.java

@@ -112,11 +112,11 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
 
             stream.println(
                 "    static private Map<String, Pair<Integer, BuiltInFunctionValue>>" +
-                " allFunctionsCache = null;"
+                    " allFunctionsCache = null;"
             );
             stream.println(
                 "    static private Map<String, Map<String, BuiltInMethodFactory>>" +
-                " allMethodsCache = null;"
+                    " allMethodsCache = null;"
             );
 
             // allFunctions method
@@ -131,10 +131,10 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
             stream.println("    var fns = Stream.of(");
             stream.println(
                 builtInPackages
-                    .stream()
-                    .map(p -> "            Arrays.stream(" + p.getValue() + ".getFunctions())")
-                    .collect(Collectors.joining(",\n")) +
-                ")"
+                        .stream()
+                        .map(p -> "            Arrays.stream(" + p.getValue() + ".getFunctions())")
+                        .collect(Collectors.joining(",\n")) +
+                    ")"
             );
 
             stream.println(".reduce(Stream::concat).orElseGet(Stream::empty).toList();");
@@ -150,25 +150,25 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
             // allMethods method
             stream.println(
                 "    public static Map<String, Map<String, BuiltInMethodFactory>>" +
-                " allMethods() {"
+                    " allMethods() {"
             );
             stream.println("        if (allMethodsCache != null) {");
             stream.println("            return allMethodsCache;");
             stream.println("        }");
             stream.println(
                 "        allMethodsCache = new HashMap<String, Map<String," +
-                " BuiltInMethodFactory>>();"
+                    " BuiltInMethodFactory>>();"
             );
             for (var p : builtInPackages) {
                 stream.println("        for (var pair : " + p.getValue() + ".getMethods()) {");
                 stream.println(
                     "       var keys = pair.getLeft().length == 0 ?" +
-                    " LKQLTypesHelper.ALL_TYPES : pair.getLeft();"
+                        " LKQLTypesHelper.ALL_TYPES : pair.getLeft();"
                 );
                 stream.println("            for (var key : keys) {");
                 stream.println(
                     "            var typeMap = allMethodsCache.computeIfAbsent(key, t ->" +
-                    " new HashMap<>());"
+                        " new HashMap<>());"
                 );
                 stream.println(
                     "                 typeMap.put(pair.getRight().name, pair.getRight());"

lkql_jit/cli/src/main/java/com/adacore/lkql_jit/cli/BaseLKQLChecker.java

@@ -30,8 +30,7 @@ public abstract class BaseLKQLChecker extends AbstractLanguageLauncher {
     protected Args args;
 
     /** Common source to perform checker like process. */
-    public static final String checkerSource =
-        """
+    public static final String checkerSource = """
         val analysis_units = specified_units()
         analysis_units.map((unit) => node_checker(unit.root)).to_list
         analysis_units.map((unit) => unit_checker(unit)).to_list
@@ -227,14 +226,14 @@ public abstract static class Args implements Callable<Integer> {
         @CommandLine.Option(
             names = { "-r", "--rule" },
             description = "Rules to run on the provided code base (run all rules if none is " +
-            "provided)"
+                "provided)"
         )
         public List<String> rules = new ArrayList<>();
 
         @CommandLine.Option(
             names = { "-a", "--rule-arg" },
             description = "Argument to pass to a rule, with the syntax" +
-            " <rule_name>.<arg_name>=<arg_value>"
+                " <rule_name>.<arg_name>=<arg_value>"
         )
         public List<String> rulesArgs = new ArrayList<>();
 

lkql_jit/cli/src/main/java/com/adacore/lkql_jit/cli/GNATCheckWorker.java

@@ -49,8 +49,8 @@ public static class Args implements Callable<Integer> {
         @CommandLine.Option(
             names = { "--parse-lkql-config" },
             description = "Parse the given LKQL file as a rule configuration file and return its" +
-            " result as a JSON encoded string. If this option is provided, all" +
-            " other features are disabled."
+                " result as a JSON encoded string. If this option is provided, all" +
+                " other features are disabled."
         )
         public String lkqlConfigFile = null;
 
@@ -78,7 +78,7 @@ public static class Args implements Callable<Integer> {
         @CommandLine.Option(
             names = "-A",
             description = "The name of the subproject to analyse, if any. This implies that" +
-            " `projectFile` designates an aggregate project."
+                " `projectFile` designates an aggregate project."
         )
         public String subProject = null;
 
@@ -109,7 +109,7 @@ public static class Args implements Callable<Integer> {
         @CommandLine.Option(
             names = "--ignore-project-switches",
             description = "Process all units in the project tree, excluding externally built" +
-            " projects"
+                " projects"
         )
         public boolean ignoreProjectSwitches;
 
@@ -419,9 +419,9 @@ private static void processInstancesObject(
             errorInLKQLRuleFile(
                 lkqlRuleFile,
                 "The value associated to the '" +
-                instancesObjectSymbol +
-                "' symbol must be an LKQL object, got " +
-                instancesObject
+                    instancesObjectSymbol +
+                    "' symbol must be an LKQL object, got " +
+                    instancesObject
             );
         }
 
@@ -485,11 +485,11 @@ private static void processInstancesObject(
                             "WORKER_WARNING",
                             current.locationToGNATDiagnosisFormatString(),
                             "instance " +
-                            current.instanceId() +
-                            " runs the same check than instance " +
-                            instance.instanceId() +
-                            " declared at " +
-                            instance.locationToGNATDiagnosisFormatString()
+                                current.instanceId() +
+                                " runs the same check than instance " +
+                                instance.instanceId() +
+                                " declared at " +
+                                instance.locationToGNATDiagnosisFormatString()
                         );
                     }
                 }
@@ -542,20 +542,20 @@ private static void processArgsObject(
                     "WORKER_WARNING",
                     newInstance.locationToGNATDiagnosisFormatString(),
                     "ignore duplicate instance " +
-                    instanceId +
-                    ", previous declaration at " +
-                    oldInstance.locationToGNATDiagnosisFormatString()
+                        instanceId +
+                        ", previous declaration at " +
+                        oldInstance.locationToGNATDiagnosisFormatString()
                 );
             } else {
                 // On the contrary, emit an error.
                 emitMessageForTheDriver(
                     "WORKER_ERROR",
                     newInstance.locationToGNATDiagnosisFormatString(),
                     "instance " +
-                    instanceId +
-                    " has a different configuration than the one previously declared at " +
-                    oldInstance.locationToGNATDiagnosisFormatString() +
-                    " (instances should have unique names)"
+                        instanceId +
+                        " has a different configuration than the one previously declared at " +
+                        oldInstance.locationToGNATDiagnosisFormatString() +
+                        " (instances should have unique names)"
                 );
             }
         } else {
@@ -608,13 +608,13 @@ private static void processSoleArg(
                 "WORKER_ERROR",
                 newInstance.locationToGNATDiagnosisFormatString(),
                 "cannot add instance " +
-                ruleName +
-                " twice using the shortcut argument format. Previous instance has been declared in" +
-                ((newInstance
-                                .instanceLocation()
-                                .equals(toPopulate.get(ruleName).instanceLocation()))
-                        ? " the same set"
-                        : ": " + toPopulate.get(ruleName).locationToGNATDiagnosisFormatString())
+                    ruleName +
+                    " twice using the shortcut argument format. Previous instance has been declared in" +
+                    ((newInstance
+                                    .instanceLocation()
+                                    .equals(toPopulate.get(ruleName).instanceLocation()))
+                            ? " the same set"
+                            : ": " + toPopulate.get(ruleName).locationToGNATDiagnosisFormatString())
             );
         }
     }
@@ -636,8 +636,7 @@ public LKQLRuleFileError(String message) {
 
     // ----- The LKQL checker -----
 
-    public static final String checkerSource =
-        """
+    public static final String checkerSource = """
         val analysis_units = specified_units()
         val roots = [unit.root for unit in analysis_units]
 

lkql_jit/cli/src/main/java/com/adacore/lkql_jit/cli/LKQLChecker.java

@@ -23,7 +23,7 @@ public class LKQLChecker extends BaseLKQLChecker {
     @CommandLine.Command(
         name = "check",
         description = "Alternative checker driver. Like GNATcheck but with less options " +
-        "& a more modern command line interface"
+            "& a more modern command line interface"
     )
     public static class Args extends BaseLKQLChecker.Args {