Skip to content

Groovy-Eclipse 3.0.0 #288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 29, 2018
Merged

Groovy-Eclipse 3.0.0 #288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
435c5d4
Switch to Groovy-Eclipse release 3.0.0 and Groovy 2.6.
fvgh Aug 29, 2018
f5e2aff
Fixed potential logging bug, in case log(Object,int,String,Throwable)…
fvgh Aug 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions _ext/eclipse-groovy/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
7 changes: 3 additions & 4 deletions _ext/eclipse-groovy/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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
2 changes: 1 addition & 1 deletion ...e-groovy/src/main/java/com/diffplug/spotless/extra/eclipse/groovy/SpotlessLogService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
13 changes: 9 additions & 4 deletions .../test/java/com/diffplug/spotless/extra/eclipse/groovy/GrEclipseFormatterStepImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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
Expand Down