Merge pull request #288 from diffplug/ext_eclipse_groovy_3.0.0

Groovy-Eclipse 3.0.0
diffplug · Aug 29, 2018 · 96e74ec · 96e74ec
2 parents 7e50a75 + f5e2aff
commit 96e74ec
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/_ext/eclipse-groovy/build.gradle b/_ext/eclipse-groovy/build.gradle
@@ -12,13 +12,13 @@ ext {
 		// the once used during code formatting
 		'org.codehaus.groovy':'+', // Groovy compiler patches supporting use within GrEclipse and Groovy itself
 		'org.codehaus.groovy.eclipse.core':'+', // Groovy core classes (provides central logging used by formatter)
-		//'org.eclipse.jdt.core':"${VER_JDT_PATCH}", // Patches org.eclipse.jdt.core classes supporting use within GrEclipse (provides AST generator)
+		'org.eclipse.jdt.core':'+', // Patches org.eclipse.jdt.core classes supporting use within GrEclipse (provides AST generator)
 		'org.eclipse.jdt.groovy.core':'+' // Extends org.eclipse.jdt.core for Groovy
 	]
 
 	internalJars = [
 		//Jars included by org.codehaus.groovy
-		"**/groovy-all-${VER_GROOVY}-indy", // Use Groovy compiler compatible with GrEclipse instead of localGroovy
+		"**/groovy-${VER_GROOVY}-indy", // Use Groovy compiler compatible with GrEclipse instead of localGroovy
 		'**/groovy-eclipse', // Patches/Overrides some of the Groovy compiler classes
 		'**/eclipse-trace', // Provides logging capabilities for groovy-eclipse
 

diff --git a/_ext/eclipse-groovy/gradle.properties b/_ext/eclipse-groovy/gradle.properties
@@ -1,7 +1,7 @@
 # Versions correspond to the Groovy-Eclipse version used for the fat-JAR.
 # See https://github.com/groovy/groovy-eclipse/releases for further information about Groovy-Eclipse versions.
 # Patch version can be incremented independently for backward compatible patches of this library. 
-ext_version=2.9.2
+ext_version=3.0.0
 ext_artifactId=spotless-eclipse-groovy
 ext_description=Groovy Eclipse's formatter bundled for Spotless
 
@@ -12,8 +12,7 @@ ext_group=com.diffplug.spotless
 ext_VER_JAVA=1.8
 
 # Compile
-VER_ECLIPSE=4.7
+VER_ECLIPSE=4.8
 VER_SPOTLESS_ECLISPE_BASE=[3.0.0,4.0.0[
 VER_ECLISPE_JFACE=[3.12.0,4.0.0[
-VER_GROOVY=2.5.0
-VER_JDT_PATCH=3.13.100.xx-201801041714-e47-RELEASE
+VER_GROOVY=2.6.0
diff --git a/...e-groovy/src/main/java/com/diffplug/spotless/extra/eclipse/groovy/SpotlessLogService.java b/...e-groovy/src/main/java/com/diffplug/spotless/extra/eclipse/groovy/SpotlessLogService.java
@@ -369,7 +369,7 @@ public SimpleLogEntry(LogLevel level, String message) {
 		}
 
 		public SimpleLogEntry(LogLevel level, String message, Throwable execption) {
-			this(level, message, Optional.of(execption));
+			this(level, message, Optional.ofNullable(execption));
 		}
 
 		private SimpleLogEntry(LogLevel level, String message, Optional<Throwable> execption) {

diff --git a/.../test/java/com/diffplug/spotless/extra/eclipse/groovy/GrEclipseFormatterStepImplTest.java b/.../test/java/com/diffplug/spotless/extra/eclipse/groovy/GrEclipseFormatterStepImplTest.java
@@ -31,7 +31,7 @@ public class GrEclipseFormatterStepImplTest {
 	private final static TestData TEST_DATA = TestData.getTestDataOnFileSystem();
 	private final static String PARSER_EXCEPTION = "class Test { void method() {} ";
 	private final static String SCANNER_EXCEPTION = "{";
-	private final static String BOUNDED_WILDCARDS = "foo(Map<String, ? extends Object> e) {}";
+	private final static String BOUNDED_WILDCARDS = "foo(Map<String, ? extends  Object> e)\n{\ne.clear();\n}";
 
 	@Test
 	public void defaultFormat() throws Throwable {
@@ -71,10 +71,15 @@ public void scannerException() throws Throwable {
 		format(SCANNER_EXCEPTION, config -> {});
 	}
 
-	/** Test the handling bounded wildcards templates */
-	@Test(expected = IllegalArgumentException.class)
+	/**
+	 * Test the handling bounded wildcards templates
+	 * No exception since Groovy-Eclipse 3.0.0.
+	 */
+	@Test
 	public void boundedWildCards() throws Throwable {
-		format(BOUNDED_WILDCARDS, config -> {});
+		String output = format(BOUNDED_WILDCARDS, config -> {});
+		assertEquals("Groovy formatter does  notformat after bounded wildcards correctly.",
+				BOUNDED_WILDCARDS.replace("\n", " "), output);
 	}
 
 	@Test