minor items

Author: eric-milles

Diff for: Site-org.codehaus.groovy.eclipse/pom.xml

@@ -66,7 +66,6 @@
 				<version>${tycho-version}</version>
 				<configuration>
 					<filterProvided>true</filterProvided>
-					<keepNonXzIndexFiles>false</keepNonXzIndexFiles>
 				</configuration>
 			</plugin>
 		</plugins>

Diff for: base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/ErrorRecoveryTests.java

@@ -2669,10 +2669,15 @@ public void testUnrecoverableErrors_GRE755_1() {
         runNegativeTest(sources,
             "----------\n" +
             "1. ERROR in X.groovy (at line 2)\n" +
-            "\tdef x=\"\n" +
+            "\tdef x=\"\n" + (isParrotParser()
+            ?
+            "\t      ^\n" +
+            "Groovy:Unexpected character: '\"'\n"
+            :
             "}\n" +
             "\t       ^\n" +
-            "Groovy:expecting anything but \'\'\\n\'\'; got it anyway\n" +
+            "Groovy:expecting anything but \'\'\\n\'\'; got it anyway\n"
+            ) +
             "----------\n");
 
         ModuleNode moduleNode = getModuleNode("X.groovy");
@@ -2691,11 +2696,24 @@ public void testUnrecoverableErrors_GRE755_2() {
         //@formatter:on
 
         runNegativeTest(sources,
+            "----------\n" + (isParrotParser()
+            ?
+            "1. ERROR in X.groovy (at line 0)\n" +
+            "\tpackage a\n" +
+            "\t^\n" +
+            "Groovy:General error during conversion: groovyjarjarantlr4.v4.runtime.InputMismatchException\n" +
             "----------\n" +
+            "2. ERROR in X.groovy (at line 4)\n" +
+            "\tdef foo(Nuthin\n" +
+            "\n" +
+            "\t              ^\n" +
+            "Groovy:Unexpected input: '<EOF>'\n"
+            :
             "1. ERROR in X.groovy (at line 3)\n" +
             "\tdef foo(Nuthin\n" +
             "\t        ^\n" +
-            "Groovy:unexpected token: Nuthin\n" +
+            "Groovy:unexpected token: Nuthin\n"
+            ) +
             "----------\n");
 
         ModuleNode moduleNode = getModuleNode("X.groovy");

Diff for: base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/TraitsTests.java

@@ -1432,7 +1432,7 @@ public void testTraits55() {
         runNegativeTest(sources,
             "----------\n" +
             "1. ERROR in Script.groovy (at line 7)\n" +
-            "\tdef m() {'D'}\n" +
+            "\tdef m() { 'D' }\n" +
             "\t    ^^^\n" +
             "Groovy:You are not allowed to override the final method m() from class 'C'.\n" +
             "----------\n");

Diff for: base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/TypeCheckedTests.java

@@ -1984,7 +1984,7 @@ public void testTypeChecked8034() {
         String[] sources = {
             "Test.groovy",
             "class A<I, O> {\n" +
-            "  def <IO extends A<? super O, ?>> IO andThen(IO next) {\n" +
+            "  def <T extends A<? super O, ?>> T andThen(T next) {\n" +
             "    next\n" +
             "  }\n" +
             "}\n" +

Diff for: ide-test/org.codehaus.groovy.eclipse.codeassist.test/src/org/codehaus/groovy/eclipse/codeassist/tests/FieldCompletionTests.groovy

@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2024 the original author or authors.
+ * Copyright 2009-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -1093,8 +1093,14 @@ final class FieldCompletionTests extends CompletionTestSuite {
             |}
             |'''.stripMargin()
         ICompletionProposal[] proposals = createProposalsAtOffset(contents, getLastIndexOf(contents, '.'))
-        float javaVersion = Float.parseFloat(System.getProperty('java.specification.version'))
-        proposalExists(proposals, 'forName', javaVersion < 9 ? 2 : (javaVersion < 21 ? 3 : 6))
+        int forNameCount
+        switch (Integer.parseInt(System.getProperty('java.specification.version'))) {
+        case  0..< 9: forNameCount = 2; break
+        case  9..<21: forNameCount = 3; break
+        case 21..<24: forNameCount = 6; break
+        case 24..<99: forNameCount = 4; break
+        }
+        proposalExists(proposals, 'forName', forNameCount)
     }
 
     @Test

Diff for: jdt-patch/e435/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/util/TestVerifier.java

@@ -449,9 +449,11 @@ private String[] getVMArguments(String[] vmArguments) {
 	if (vmArguments != null) {
 		Collections.addAll(completeVmArguments, vmArguments);
 	}
-	completeVmArguments.add("-verify");
+	if (Integer.parseInt(System.getProperty("java.specification.version")) < 24) {
+		completeVmArguments.add("-verify");
+	}
 
-	return completeVmArguments.toArray(new String[0]);
+	return completeVmArguments.toArray(String[]::new);
 }
 
 private void launchAndRun(String className, String[] classpaths, String[] programArguments, String[] vmArguments) {