config) throws Exception {
+ Properties properties = new Properties();
+ config.accept(properties);
+ GrEclipseFormatterStepImpl formatter = new GrEclipseFormatterStepImpl(properties);
+ return formatter.format(input);
+ }
+
+}
diff --git a/_ext/eclipse-groovy/src/test/java/com/diffplug/spotless/extra/eclipse/groovy/TestData.java b/_ext/eclipse-groovy/src/test/java/com/diffplug/spotless/extra/eclipse/groovy/TestData.java
new file mode 100644
index 0000000000..5fc8bb4571
--- /dev/null
+++ b/_ext/eclipse-groovy/src/test/java/com/diffplug/spotless/extra/eclipse/groovy/TestData.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2016 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.extra.eclipse.groovy;
+/*
+ * Copyright 2016 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+public class TestData {
+ public static TestData getTestDataOnFileSystem() {
+ final String userDir = System.getProperty("user.dir", ".");
+ Path dataPath = Paths.get(userDir, "src", "test", "resources");
+ if (Files.isDirectory(dataPath)) {
+ return new TestData(dataPath);
+ }
+ return null;
+ }
+
+ private final Path inputPath;
+ private final Path expectedPath;
+
+ private TestData(Path dataPath) {
+ inputPath = dataPath.resolve("input").toAbsolutePath();
+ expectedPath = dataPath.resolve("expected").toAbsolutePath();
+ for (Path testDataDir : new Path[]{inputPath, expectedPath}) {
+ if (!Files.isDirectory(testDataDir)) {
+ throw new IllegalArgumentException(String.format("'%1$s' is not a directory.", testDataDir));
+ }
+ }
+ }
+
+ public String input(final String fileName) throws Exception {
+ return read(inputPath.resolve(fileName));
+ }
+
+ public String expected(final String fileName) {
+ Path path = expectedPath.resolve(fileName);
+ return read(path);
+ }
+
+ private String read(final Path xmlPath) {
+ if (!Files.isRegularFile(xmlPath)) {
+ throw new IllegalArgumentException(String.format("'%1$s' is not a regular file.", xmlPath));
+ }
+ try {
+ String checkedOutFileContent = new String(java.nio.file.Files.readAllBytes(xmlPath), "UTF8");
+ return checkedOutFileContent.replace("\r", ""); //Align GIT end-of-line normalization
+ } catch (IOException e) {
+ throw new IllegalArgumentException(String.format("Failed to read '%1$s'.", xmlPath), e);
+ }
+ }
+
+}
diff --git a/_ext/eclipse-groovy/src/test/resources/expected/nominal.test b/_ext/eclipse-groovy/src/test/resources/expected/nominal.test
new file mode 100644
index 0000000000..a40d247bad
--- /dev/null
+++ b/_ext/eclipse-groovy/src/test/resources/expected/nominal.test
@@ -0,0 +1,13 @@
+class TestClass {
+ def a;
+
+ TestClass(String s) {
+ this.a = s
+ }
+ def methodNamedArgs(Map args) {
+ "named args: $args"
+ }
+}
+
+def t = new TestClass()
+def arr = [4, 'string1', 'string2']
diff --git a/_ext/eclipse-groovy/src/test/resources/input/nominal.test b/_ext/eclipse-groovy/src/test/resources/input/nominal.test
new file mode 100644
index 0000000000..85f742677f
--- /dev/null
+++ b/_ext/eclipse-groovy/src/test/resources/input/nominal.test
@@ -0,0 +1,15 @@
+class TestClass {
+ def a;
+
+TestClass(String s) {
+this.a = s
+}
+ def methodNamedArgs(Map args) {
+ "named args: $args"
+ }
+}
+
+def t = new TestClass()
+def arr = [4,
+'string1',
+'string2']
diff --git a/_ext/gradle/java-setup.gradle b/_ext/gradle/java-setup.gradle
index ea5e5dc1f6..96a56e3d50 100644
--- a/_ext/gradle/java-setup.gradle
+++ b/_ext/gradle/java-setup.gradle
@@ -14,7 +14,11 @@ apply plugin: 'java'
sourceCompatibility = ext_VER_JAVA
targetCompatibility = ext_VER_JAVA
-tasks.withType(JavaCompile) { options.encoding = 'UTF-8' }
+tasks.withType(JavaCompile) {
+ options.encoding = 'UTF-8'
+ options.compilerArgs << "-Xlint:unchecked"
+ options.compilerArgs << "-Xlint:deprecation"
+}
// Use file locking
configurations {
diff --git a/_ext/greclipse/README.md b/_ext/greclipse/README.md
deleted file mode 100644
index 99c06e21bb..0000000000
--- a/_ext/greclipse/README.md
+++ /dev/null
@@ -1,41 +0,0 @@
-# spotless-groovy-eclipse
-
-Groovy-Eclipse is not available in a form which can be easily consumed by maven or gradle.
-To fix this, we publish Groovy-Eclipse's formatter and all its dependencies, along with a small amount of glue code, into the `com.diffplug.gradle.spotless:spotless-greclipse` artifact.
-
-## Build
-
-To publish a new version, update the `_ext/greclipse/gradle.properties` appropriately and run this from the root directory:
-
-```
-gradlew -b _ext/greclipse/build.gradle publish
-```
-
-Spotless at large is under the Apache 2.0 license, but this jar is under the EPL v1.
-
-## IDE
-
-For IDE support the JAR dependencies and their sources are downloaded from P2 repositories.
-This can, due to restrictions on server side, take up to half an hour.
-
-
-### Eclipse
-
-Run the `eclipse` task:
-
-```
-gradlew -b _ext/greclipse/build.gradle eclipse
-```
-
-Import the existing general project (NOT the Gradle project) from `_ext/greclipse` into your workspace.
-
-
-### IntelliJ IDEA
-
-Run the `idea` task:
-
-```
-gradlew -b _ext/greclipse/build.gradle idea
-```
-
-Import the project from `_ext/greclipse` using the external Gradle model.
diff --git a/_ext/greclipse/build.gradle b/_ext/greclipse/build.gradle
deleted file mode 100644
index 180a7e9d3c..0000000000
--- a/_ext/greclipse/build.gradle
+++ /dev/null
@@ -1,452 +0,0 @@
-import java.io.File
-
-import org.apache.commons.io.filefilter.DirectoryFileFilter
-
-plugins {
- // bintray uploading
- id 'com.jfrog.bintray' version '1.3.1'
- // p2 dependencies
- id 'com.diffplug.gradle.p2.asmaven' version '3.3.0'
-}
-
-repositories {
- maven { url 'https://plugins.gradle.org/m2/' }
-}
-
-apply plugin: 'java'
-
-///////////////////
-// Configuration //
-///////////////////
-
-// The dependencies to pull from GrEclipse's p2 repositories
-def grEclipseDeps = [
- 'org.codehaus.groovy.eclipse.refactoring':'+', // GroovyFormatter and related
-
- // The following lists does not reflect the complete transitive required packages, but
- // 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':"${grec_VER_JDT_PATCH}", // 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
-]
-
-// The dependencies to pull from Eclipse's p2 repositories
-def eclipseDeps = [
- 'org.eclipse.core.commands':'+', // Event manager required by preference store
- 'org.eclipse.core.contenttype':'+', // Required by JavaCore options
- 'org.eclipse.core.jobs':'+', // Required by JavaCore options
- 'org.eclipse.core.runtime':'+', // Provides central logging interface
- 'org.eclipse.core.resources':'+', // GrEclipse parser checks workspace resources
- 'org.eclipse.equinox.common':'+', // Provides runtime status used during exception reporting
- 'org.eclipse.equinox.preferences':'+', // Preferences used for formatter configuration
- 'org.eclipse.jface':'+', // PreferenceStore for creating preferences from properties
- 'org.eclipse.jface.text':'+', // Only required for ITextSelection (never used for our calls)
- 'org.eclipse.osgi':'+', // GroovyCore accesses OSGI bundle (but not effectively used)
- 'org.eclipse.text':'+' // Provides Document data structure for formatter
-]
-
-ext {
- //Include/Excludes form the JARs, which goes into a fat-jar with the spottless formatter interface.
- jarInclude = [
- '**/*.class', // Take all classes
- '**/*.java', // ... and sources.
- '**/*.properties', // Text resources (for messages, etc)
- '*.html', // License information about the included JARs,
- 'META-INF/**' // Information about the origin of the individual class files
- ]
- jarExclude = [
- 'META-INF/*.RSA', // The eclipse jars are signed, and our fat-jar breaks the signatures
- 'META-INF/*.SF', // ... so all signatures are filtered
- 'org/codehaus/groovy/eclipse/core/GroovyCoreActivator.*', // Is replaced to use the plugin code without Eclipse
- 'org/codehaus/groovy/antlr/ErrorRecoveredCSTParserPluginFactory.*' // Is replaced to allow parser error handling
- ]
-
- //Some JARs include JARs themselfs
- internalJars = [
- //Jars included by org.codehaus.groovy
- "**/groovy-all-${grec_VER_GROOVY}", // Use Groovy compiler compatible with GrEclipse instead of localGroovy
- "**/groovy-${grec_VER_GROOVY}", // Groovy compiler sources do not follow the same name pattern of groovy-all
- '**/groovy-eclipse', // Patches/Overrides some of the Groovy compiler classes
- '**/eclipse-trace', // Provides logging capabilities for groovy-eclipse
-
- //Jars included by org.eclipse.jdt.groovy.core
- '**/nlcl' //Non locking class loader used by groovy compiler
- ]
-
- // GrEclipse source bundle (not available as dedicated source JARs)
- grEclipseSourceUrl = "https://github.com/groovy/groovy-eclipse/archive/v${grec_VER_GRECLIPSE}.tar.gz"
- grEclipseSourceTgz = project.file("build/greclipse-archive/v${grec_VER_GRECLIPSE}.tar.gz")
- grEclipseSourceDir = project.file('build/greclipse-archive/grEclipseSource')
- // Sources of GrEclipse dependencies for...
- verGroovySource = grec_VER_GROOVY.substring(0, grec_VER_GROOVY.lastIndexOf('.')).replace('.', '')
- grEclipseDepsSource = [
- "base/org.codehaus.groovy${verGroovySource}/src", // org.codehaus.groovy unit
- "base/org.codehaus.groovy${verGroovySource}/src-trace", // eclipse-trace internal JAR
- 'base/org.eclipse.jdt.groovy.core/src', // org.eclipse.jdt.groovy.core unit
- 'ide/org.codehaus.groovy.eclipse.core/src', // org.codehaus.groovy.eclipse.core unit
- 'ide/org.codehaus.groovy.eclipse.refactoring/src', // org.codehaus.groovy.eclipse.refactoring unit
- ]
- //The jdt-patch is organised in sub-modules patching existing code
- jdtPatchDepsSourceDir = new File("${grEclipseSourceDir}/jdt-patch/e${grec_VER_ECLIPSE.replace('.', '')}/org.eclipse.jdt.core")
-
- // The directory contains all external classes for the fat-jar
- embeddedClassesDirName = 'build/embeddedClasses'
- embeddedClassesDir = project.file(embeddedClassesDirName)
-
- // The directory contains all external source files the fat-jar is based on
- embeddedSourcesDirName = 'build/embeddedSources'
- embeddedSourcesDir = project.file(embeddedSourcesDirName)
-
-}
-
-// build a maven repo in our build folder containing these artifacts
-p2AsMaven {
- group 'p2', {
- repoEclipse grec_VER_ECLIPSE
- eclipseDeps.keySet.each { p2.addIU(it) }
- eclipseDeps.keySet.each { p2.addIU(it + '.source') }
- repo "http://dist.springsource.org/release/GRECLIPSE/${grec_VER_GRECLIPSE}/e${grec_VER_ECLIPSE}"
- grEclipseDeps.keySet.each { p2.addIU(it) }
- }
-}
-
-configurations {
- embeddedJars // JARs (Eclipse and GrEclipse) the fat-jar is based uppon
- eclipseSource // Source for Eclipse JARS (GrEclipse provides no source packages)
-}
-
-///////////////////
-// External Deps //
-///////////////////
-
-task grEclipseSource {
- description = 'Download GrEclipse from GitHub archive.'
- inputs.property('url', grEclipseSourceUrl.toString())
- outputs.file(grEclipseSourceDir)
-
- doLast {
- grEclipseSourceDir.deleteDir()
- grEclipseSourceDir.mkdirs()
- ant.get(src: grEclipseSourceUrl, dest: grEclipseSourceTgz, skipexisting: 'true')
- ant.untar(src: grEclipseSourceTgz, dest: grEclipseSourceDir, compression: 'gzip') {
- cutdirsmapper(dirs: '1')
- }
- }
-}
-
-task copyEmbeddedSources(dependsOn: grEclipseSource) {
- description = "Copies filtered set of source files from the Eclise/GrEclipse dependencies to '${project.relativePath(embeddedSourcesDir)}'."
- inputs.files(configurations.eclipseSource)
- inputs.file(grEclipseSourceDir)
- inputs.property('internalJars', internalJars)
- inputs.property('jarInclude', jarInclude)
- inputs.property('jarExclude', jarExclude)
- outputs.file(embeddedSourcesDir)
-
- doLast {
- embeddedSourcesDir.deleteDir()
- embeddedSourcesDir.mkdirs()
- configurations.eclipseSource.each {
- unjar(it, embeddedSourcesDir)
- }
-
- // Incorparate the Eclipse patches/extensions into default source directory structure
- copy("${embeddedSourcesDir}/ant_tasks/resources-antsrc", embeddedSourcesDir, 'move')
-
- // Extract source JARs provided with GrEcslipse (for exampel the compiler)
- def jarSourceIncludes = []
- internalJars.each {
- def jarFilter = it
- ['sources', 'source', 'src'].each {
- jarSourceIncludes << "${jarFilter}-${it}.jar"
- }
- }
- def tree = fileTree(dir: grEclipseSourceDir, includes: jarSourceIncludes)
- tree.each {
- unjar(it, embeddedSourcesDir)
- }
-
- grEclipseDepsSource.each {
- copy("${grEclipseSourceDir}/${it}", embeddedSourcesDir)
- }
- //The jdt-patch is organised in sub-modules patching existing code
- jdtPatchDepsSourceDir.list(DirectoryFileFilter.DIRECTORY).each {
- copy("${jdtPatchDepsSourceDir}/${it}", embeddedSourcesDir)
- }
-
- //Clean up empty directories and class files
- ant.delete(includeemptydirs: 'true') {
- fileset(dir: embeddedSourcesDir) {
- or {
- and {
- size(value: '0')
- type(type: 'dir')
- }
- filename(name: '**/*.class')
- filename(name: '*.java')
- }
- }
- }
- }
-
-}
-
-def copy(fromDir, toDir, method='copy') {
- logger.debug("${method} ${fromDir} to ${toDir}")
- ant."$method"(todir: toDir, includeEmptyDirs: 'false', overwrite: 'true') {
- fileset(dir: fromDir) {
- jarInclude.each {
- include(name: "${it}")
- }
- jarExclude.each {
- exclude(name: "${it}")
- }
- }
- }
-}
-
-task unjarEmbeddedClasses {
- description = "Copies filtered set of embedded classes from the Eclise/GrEclipse dependencies to '${project.relativePath(embeddedClassesDir)}'."
- inputs.files(configurations.embeddedJars)
- inputs.property('internalJars', internalJars)
- inputs.property('jarInclude', jarInclude)
- inputs.property('jarExclude', jarExclude)
- outputs.file(embeddedClassesDir)
-
- doLast {
- embeddedClassesDir.deleteDir()
- embeddedClassesDir.mkdirs()
- configurations.embeddedJars.each {
- unjar(it, embeddedClassesDir)
- }
- //Unpack internal JARs. Maintain the order defined in internalJars
- internalJars.each {
- fileTree(embeddedClassesDir).include("${it}.jar").each {
- unjar(it, embeddedClassesDir)
- delete(it)
- }
- }
- }
-}
-
-def unjar(File jarFile, File destDir) {
- ant.unjar(src: jarFile, dest: destDir) {
- patternset {
- jarInclude.each {
- include(name: "${it}")
- }
- internalJars.each {
- include(name: "**/${it}.jar")
- }
- jarExclude.each {
- exclude(name: "${it}")
- }
- }
- }
- //Keep the manifest for transparency
- ant.move(file: "${destDir}/META-INF/MANIFEST.MF", tofile: "${destDir}/META-INF/${jarFile.getName()}-MANIFEST.MF", quiet: 'true', failonerror: 'false')
- //Keep licenses and other human readable information for transparency
- ant.move(todir: destDir, quiet: 'true') {
- fileset(dir: destDir) {
- include(name: '*')
- type(type: 'file')
- exclude(name: '*jar-*')
- exclude(name: '*.jar')
- }
- mapper(type: 'glob', from: '*', to: "${jarFile.getName()}-*")
- }
-}
-
-
-/////////////
-// Compile //
-/////////////
-
-dependencies {
- // Add the Eclipse and GrEclipse jars to the embedded configuration.
- eclipseDeps.each { groupArtifact, version ->
- embeddedJars "p2:${groupArtifact}:${version}"
- eclipseSource "p2:${groupArtifact}:${version}:sources"
- }
- // Some grEclipseDeps classes patch/override the eclipseDeps once. Hence grEclipseDeps
- // must added to embeddedJars after eclipseDeps.
- grEclipseDeps.each { groupArtifact, version ->
- embeddedJars "p2:${groupArtifact}:${version}"
- }
-
- // The resulting fat-jar will have no transitive dependencies itself.
- compile files(embeddedClassesDir)
-
- // testing
- testCompile "junit:junit:${grec_VER_JUNIT}"
-}
-
-tasks.compileJava.dependsOn(unjarEmbeddedClasses)
-
-
-/////////
-// IDE //
-/////////
-
-apply plugin: 'eclipse'
-
-eclipse {
- classpath {
- downloadSources true
- downloadJavadoc true
- file {
- withXml { xmlProvider ->
- def classpathNode = xmlProvider.asNode()
- def embeddedClassesPath = embeddedClassesDir.absolutePath
- def embeddedNode = classpathNode.find { it.@path == embeddedClassesPath }
- embeddedNode.@sourcepath = embeddedSourcesDir
- }
- }
- }
-}
-
-// always create fresh projects
-tasks.eclipse.dependsOn(cleanEclipse)
-// Encure that the dependent classes and sources are preovided for compilation if project is build via Eclipse instead of command line
-tasks.eclipseClasspath.dependsOn(unjarEmbeddedClasses, copyEmbeddedSources)
-
-apply plugin: 'idea'
-
-// Encure that the dependent classes and sources are preovided for compilation if project is build via Eclipse instead of command line
-tasks.idea.dependsOn(unjarEmbeddedClasses, copyEmbeddedSources)
-
-
-tasks.idea.doLast {
- def ideaEmbeddedLibTableFile = project.file('.idea/libraries/embeddedClasses.xml')
- def ideaEmbeddedLibTableDir = ideaEmbeddedLibTableFile.parentFile
- ideaEmbeddedLibTableDir.parentFile.mkdir()
- ideaEmbeddedLibTableDir.mkdir()
- ideaEmbeddedLibTableFile.delete()
- ideaEmbeddedLibTableFile << """
-
-
-
-
-
-
-
-
-
-
-
- """
-}
-
-////////////////
-// Publishing //
-////////////////
-apply plugin: 'maven-publish'
-
-jar {
- dependsOn << unjarEmbeddedClasses
- from (embeddedClassesDir)
-}
-
-task sourcesJar(type: Jar, dependsOn: copyEmbeddedSources) {
- classifier = 'sources'
- from ([sourceSets.main.allJava, embeddedSourcesDir])
-}
-
-task javadocJar(type: Jar, dependsOn: javadoc) {
- classifier = 'javadoc'
- from javadoc.destinationDir
-}
-
-def isSnapshot = grec_version.endsWith('-SNAPSHOT')
-// pulls the credentials from either the environment variable or gradle.properties
-def cred = {
- if (System.env[it] != null) {
- return System.env[it]
- } else if (project.hasProperty(it)) {
- return project[it]
- } else {
- return 'unknown_' + it
- }
-}
-
-model {
- publishing {
- publications {
- mavenJava(MavenPublication) {
- artifact jar
- artifact sourcesJar
- artifact javadocJar
-
- groupId project.grec_group
- artifactId project.grec_artifactId
- version project.grec_version
-
- pom.withXml {
-
- // add MavenCentral requirements to the POM
- asNode().children().last() + {
- resolveStrategy = Closure.DELEGATE_FIRST
- name project.grec_artifactId
- description project.grec_description
- url "https://github.com/${project.grec_org}/${project.name}"
- scm {
- url "https://github.com/${project.grec_org}/${project.name}"
- connection "scm:git:git://github.com/${project.grec_org}/${project.name}"
- developerConnection "scm:git:ssh:git@github.com/${project.grec_org}/${project.name}"
- }
- licenses {
- license {
- name 'Eclipse Public License - v 1.0'
- url 'https://www.eclipse.org/legal/epl-v10.html'
- distribution 'repo'
- }
- }
- developers {
- developer {
- id 'fvgh'
- name 'Frank Vennemeyer'
- email 'frankgh@zoho.com'
- }
- }
- }
- }
- }
- }
- if (isSnapshot) {
- // upload snapshots to oss.sonatype.org
- repositories { maven {
- url = 'https://oss.sonatype.org/content/repositories/snapshots'
- credentials {
- username = cred('nexus_user')
- password = cred('nexus_pass')
- }
- } }
- }
- }
-}
-
-if (!isSnapshot) {
- // upload releases to bintray and then mavenCentral
- bintray {
- user = cred('bintray_user')
- key = cred('bintray_pass')
- publications = ['mavenJava']
- publish = true
- pkg {
- repo = 'opensource'
- name = project.grec_artifactId
- userOrg = project.grec_org
- version {
- name = project.grec_version
- mavenCentralSync {
- user = cred('nexus_user')
- password = cred('nexus_pass')
- }
- }
- }
- }
-
- publish.dependsOn(bintrayUpload)
- bintrayUpload.dependsOn(['generatePomFileForMavenJavaPublication', jar, sourcesJar, javadocJar])
-}
diff --git a/_ext/greclipse/gradle.properties b/_ext/greclipse/gradle.properties
deleted file mode 100644
index dbffb524cd..0000000000
--- a/_ext/greclipse/gradle.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# Mayor/Minor versions are in line with the Groovy version values.
-# Patch version is an incremental counter for the Spotless plugin.
-grec_version=2.3.0
-grec_artifactId=spotless-ext-greclipse
-grec_description=Groovy Eclipse's formatter bundled for Spotless
-
-grec_org=diffplug
-grec_group=com.diffplug.spotless
-
-# Compile
-grec_VER_ECLIPSE=4.4
-grec_VER_GRECLIPSE=2.9.1
-grec_VER_GROOVY=2.3.7
-grec_VER_JDT_PATCH=3.10.0.xx-201411061335-e44-RELEASE
-
-# Test
-grec_VER_JUNIT=4.12
diff --git a/_ext/greclipse/src/main/java/org/codehaus/groovy/antlr/ErrorRecoveredCSTParserPluginFactory.java b/_ext/greclipse/src/main/java/org/codehaus/groovy/antlr/ErrorRecoveredCSTParserPluginFactory.java
deleted file mode 100644
index d26283015d..0000000000
--- a/_ext/greclipse/src/main/java/org/codehaus/groovy/antlr/ErrorRecoveredCSTParserPluginFactory.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2016 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.codehaus.groovy.antlr;
-
-import java.util.List;
-
-import org.codehaus.groovy.control.ParserPlugin;
-import org.codehaus.groovy.control.ParserPluginFactory;
-import org.codehaus.groovy.eclipse.core.GroovyCoreActivator;
-import org.eclipse.core.runtime.ILog;
-import org.eclipse.core.runtime.Status;
-
-/**
- * Overrides original class allowing spotless formatter to handle parser errors.
- *
- * Compiler Parser errors in GrEclipse are treated as warnings, directed to the "standard"
- * error output stream, if less than 'groovy.errors.tolerance' are detected.
- * The 'groovy.errors.tolerance' is set to the fixed value 10 by the GrEclipse patch of
- * the original codehaus groovy, which is convenient within Eclipse editor on 'unfinished' code.
- * For Spotless is can be assumed that the plugin is applied after successful compilation.
- * Hence for all compiler errors, it can be assumed that the eclipse-groovy parser is not
- * able to cope with the code and therefore should not alter it.
- * Furthermore, in the default GrEclipse warnings, the source file name is replaced by
- * "Hello.groovy" (see GroovySnippetParser), which is not helpful for a spotless error report.
- *
- * This patch is used as the least intrusive work-around.
- */
-public class ErrorRecoveredCSTParserPluginFactory extends ParserPluginFactory {
-
- @Override
- public ParserPlugin createParserPlugin() {
- return new ErrorRecoveredCSTParserPlugin(new SpotlessCstReporter());
- }
-
- private static class SpotlessCstReporter implements ICSTReporter {
-
- @Override
- public void generatedCST(String fileName, GroovySourceAST ast) {
- //Always called when an AST has been generated. Nothing to do.
- }
-
- @Override
- public void reportErrors(String fileName, @SuppressWarnings("rawtypes") List errors) {
- ILog log = GroovyCoreActivator.getDefault().getLog();
- for (Object error : errors) {
- log.log(new Status(Status.ERROR, GroovyCoreActivator.PLUGIN_ID, error.toString()));
- }
- }
-
- };
-}
diff --git a/_ext/greclipse/src/main/java/org/codehaus/groovy/eclipse/core/GroovyCoreActivator.java b/_ext/greclipse/src/main/java/org/codehaus/groovy/eclipse/core/GroovyCoreActivator.java
deleted file mode 100644
index 4a54531748..0000000000
--- a/_ext/greclipse/src/main/java/org/codehaus/groovy/eclipse/core/GroovyCoreActivator.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * Copyright 2016 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.codehaus.groovy.eclipse.core;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.security.cert.X509Certificate;
-import java.util.Arrays;
-import java.util.Dictionary;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.codehaus.groovy.eclipse.GroovyLogManager;
-import org.eclipse.core.runtime.ILog;
-import org.eclipse.core.runtime.ILogListener;
-import org.eclipse.core.runtime.IStatus;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.BundleException;
-import org.osgi.framework.ServiceReference;
-import org.osgi.framework.Version;
-
-/**
- * Overrides original class allowing Spotless to run formatter without activating Eclipse core.
- *
- * Class provides access to central logger as required by GroovyCore.
- * Furthermore GroovyCore requires a OSGI bundle, which is just used for accessing the plug-in id.
- * This class provides a corresponding mock for the bundle.
- */
-public class GroovyCoreActivator {
-
- public static final String PLUGIN_ID = "com.diffplug.gradle.spotless.groovy.eclipse";
-
- private static GroovyCoreActivator INSTANCE = null;
-
- private final ILog logger;
- private final Bundle bundle;
-
- public GroovyCoreActivator() {
- bundle = new MockOsgiBundle();
- logger = new LogAdapter(bundle);
- GroovyLogManager.manager.setUseDefaultLogger(false);
- }
-
- /** Lazy constructor returning the shared activator instance */
- public static GroovyCoreActivator getDefault() {
- if (null == INSTANCE) {
- INSTANCE = new GroovyCoreActivator();
- }
- return INSTANCE;
- }
-
- /** Returns a OSIG bundle mock for GroovyCore, just providing functionality for Groovy error handling */
- public Bundle getBundle() {
- return bundle;
- }
-
- /** Provides Eclipse logger interface without requiring an active Eclipse core */
- public ILog getLog() {
- return logger;
- }
-
- private static class LogAdapter implements ILog {
-
- private final static Integer[] QUIET_SEVERITY_VALUES = new Integer[]{IStatus.CANCEL, IStatus.INFO, IStatus.OK};
- private final static Set QUIET_SEVERITIES = new HashSet(Arrays.asList(QUIET_SEVERITY_VALUES));
-
- private final Set listeners;
- private final Bundle bundle;
-
- public LogAdapter(Bundle bundle) {
- listeners = new HashSet();
- this.bundle = bundle;
- }
-
- @Override
- public void addLogListener(ILogListener arg0) {
- listeners.add(arg0);
- }
-
- @Override
- public Bundle getBundle() {
- return bundle;
- }
-
- @Override
- public void log(IStatus status) {
- for (ILogListener listener : listeners) {
- listener.logging(status, PLUGIN_ID);
- }
- if (QUIET_SEVERITIES.contains(status.getSeverity())) {
- System.out.println(status.getMessage());
- } else {
- System.err.println(status.getMessage());
- }
- }
-
- @Override
- public void removeLogListener(ILogListener arg0) {
- listeners.remove(arg0);
- }
-
- }
-
- private static class MockOsgiBundle implements Bundle {
-
- @Override
- public int compareTo(Bundle arg0) {
- return 0; //Always equal. There is only one bundle
- }
-
- @Override
- public A adapt(Class arg0) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public Enumeration findEntries(String arg0, String arg1, boolean arg2) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public BundleContext getBundleContext() {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public long getBundleId() {
- return 0;
- }
-
- @Override
- public File getDataFile(String arg0) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public URL getEntry(String arg0) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public Enumeration getEntryPaths(String arg0) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public Dictionary getHeaders() {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public Dictionary getHeaders(String arg0) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public long getLastModified() {
- return 0; //No modifications
- }
-
- @Override
- public String getLocation() {
- return PLUGIN_ID;
- }
-
- @Override
- public ServiceReference[] getRegisteredServices() {
- return new ServiceReference[0];
- }
-
- @Override
- public URL getResource(String arg0) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public Enumeration getResources(String arg0) throws IOException {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public ServiceReference[] getServicesInUse() {
- return new ServiceReference[0];
- }
-
- @Override
- public Map> getSignerCertificates(int arg0) {
- return new HashMap>();
- }
-
- @Override
- public int getState() {
- return Bundle.ACTIVE;
- }
-
- @Override
- public String getSymbolicName() {
- return PLUGIN_ID;
- }
-
- @Override
- public Version getVersion() {
- return new Version(0, 0, 0);
- }
-
- @Override
- public boolean hasPermission(Object arg0) {
- return true;
- }
-
- @Override
- public Class loadClass(String arg0) throws ClassNotFoundException {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public void start() throws BundleException {
- //Nothing to do
- }
-
- @Override
- public void start(int arg0) throws BundleException {
- //Nothing to do
- }
-
- @Override
- public void stop() throws BundleException {
- //Nothing to do
- }
-
- @Override
- public void stop(int arg0) throws BundleException {
- //Nothing to do
- }
-
- @Override
- public void uninstall() throws BundleException {
- //Nothing to do
- }
-
- @Override
- public void update() throws BundleException {
- //Nothing to do
- }
-
- @Override
- public void update(InputStream arg0) throws BundleException {
- //Nothing to do
- }
-
- }
-
-}
diff --git a/_ext/greclipse/src/test/java/com/diffplug/gradle/spotless/groovy/eclipse/GrEclipseFormatterStepImplTest.java b/_ext/greclipse/src/test/java/com/diffplug/gradle/spotless/groovy/eclipse/GrEclipseFormatterStepImplTest.java
deleted file mode 100644
index c60605fc74..0000000000
--- a/_ext/greclipse/src/test/java/com/diffplug/gradle/spotless/groovy/eclipse/GrEclipseFormatterStepImplTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright 2016 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.gradle.spotless.groovy.eclipse;
-
-import static org.junit.Assert.assertTrue;
-
-import java.util.Properties;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/** Smoke test checking that transitive dependencies are complete. */
-public class GrEclipseFormatterStepImplTest {
-
- private final static String INPUT = "class Test { void method() {} }";
- private final static String OUTPUT = "class Test {\n\tvoid method() {}\n}";
- private final static String PARSER_EXCEPTION = "class Test { void method() {} ";
- private final static String SCANNER_EXCEPTION = "{";
- private static GrEclipseFormatterStepImpl FORMATTER = null;
-
- @BeforeClass
- public static void initializeTestData() throws Exception {
- FORMATTER = new GrEclipseFormatterStepImpl(new Properties());
- }
-
- /**
- * Test nominal scenario
- * @throws Throwable No exception is expected
- */
- @Test
- public void formatDefault() throws Throwable {
- String output = FORMATTER.format(INPUT);
- assertTrue(output.equals(OUTPUT));
- }
-
- /**
- * Test the handling AntlrParserPlugin exceptions by SpotlessCstReporter logging
- * @throws Throwable IllegalArgumentException is expected
- */
- @Test(expected = IllegalArgumentException.class)
- public void parserException() throws Throwable {
- FORMATTER.format(PARSER_EXCEPTION);
- }
-
- /**
- * Test the handling GroovyDocumentScanner exceptions by GroovyCore logging
- * @throws Throwable IllegalArgumentException is expected
- */
- @Test(expected = IllegalArgumentException.class)
- public void scannerException() throws Throwable {
- FORMATTER.format(SCANNER_EXCEPTION);
- }
-
-}