Apply eclipse-jdt-4.8.1(2nd attempt) (#962)

Author: nedtwigg

_ext/eclipse-jdt/src/test/java/com/diffplug/spotless/extra/eclipse/java/EclipseJdtFormatterStepImplTest.java

@@ -46,8 +46,8 @@ static void beforeAll() throws IOException {
 
 	@BeforeEach
 	void beforeEach() throws IOException {
-		File sttingsFile = createTestFile("java/eclipse/formatter.xml");
-		config = FormatterProperties.from(sttingsFile).getProperties();
+		File settingsFile = createTestFile("java/eclipse/formatter.xml");
+		config = FormatterProperties.from(settingsFile).getProperties();
 	}
 
 	private final static String ILLEGAL_CHAR = Character.toString((char) 254);
@@ -97,10 +97,8 @@ void htmlPreTag() throws Throwable {
 
 	@Test
 	void moduleInfo() throws Throwable {
-		config.clear();
-		config.setProperty(
-				DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_MODULE_STATEMENTS,
-				DefaultCodeFormatterConstants.createAlignmentValue(true, DefaultCodeFormatterConstants.WRAP_ONE_PER_LINE, DefaultCodeFormatterConstants.INDENT_BY_ONE));
+		File settingsFile = createTestFile("java/eclipse/ModuleInfo.prefs");
+		config = FormatterProperties.from(settingsFile).getProperties();
 		String formatted = getTestResource("java/eclipse/ModuleInfoFormatted.test");
 		String unformatted = getTestResource("java/eclipse/ModuleInfoUnformatted.test");
 		assertEquals(formatted, format(unformatted, "whatever/module-info.java"), "Jvm9 module info not formatted.");

lib-extra/src/main/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStep.java

@@ -15,6 +15,7 @@
  */
 package com.diffplug.spotless.extra.java;
 
+import java.io.File;
 import java.lang.reflect.Method;
 import java.util.Properties;
 
@@ -49,8 +50,7 @@ private static FormatterFunc apply(State state) throws Exception {
 		JVM_SUPPORT.assertFormatterSupported(state.getSemanticVersion());
 		Class<?> formatterClazz = getClass(state);
 		Object formatter = formatterClazz.getConstructor(Properties.class).newInstance(state.getPreferences());
-		Method method = formatterClazz.getMethod(FORMATTER_METHOD, String.class);
-		FormatterFunc formatterFunc = getFormatterFunc(formatter, method);
+		FormatterFunc formatterFunc = getFormatterFunc(formatter, formatterClazz);
 		return JVM_SUPPORT.suggestLaterVersionOnError(state.getSemanticVersion(), formatterFunc);
 	}
 
@@ -61,10 +61,13 @@ private static Class<?> getClass(State state) {
 		return state.loadClass(FORMATTER_CLASS_OLD);
 	}
 
-	private static FormatterFunc getFormatterFunc(Object formatter, Method method) {
-		if (1 == method.getParameterCount()) {
+	private static FormatterFunc getFormatterFunc(Object formatter, Class<?> formatterClazz) throws NoSuchMethodException, SecurityException {
+		try {
+			Method method = formatterClazz.getMethod(FORMATTER_METHOD, String.class, File.class);
+			return (FormatterFunc.NeedsFile) (input, file) -> (String) method.invoke(formatter, input, file);
+		} catch (NoSuchMethodException e) {
+			Method method = formatterClazz.getMethod(FORMATTER_METHOD, String.class);
 			return input -> (String) method.invoke(formatter, input);
 		}
-		return (FormatterFunc.NeedsFile) (input, file) -> (String) method.invoke(formatter, input, file);
 	}
 }

lib-extra/src/test/java/com/diffplug/spotless/extra/eclipse/EclipseResourceHarness.java

@@ -43,17 +43,30 @@
  */
 public class EclipseResourceHarness extends ResourceHarness {
 	private final EclipseBasedStepBuilder stepBuilder;
+	private final String fileName;
 	private final String input;
 	private final String expected;
 
 	/**
 	 * Create harness to be used for several versions of the formatter step
 	 * @param builder Eclipse Formatter step builder
 	 * @param unformatted Simple unformatted input
-	 * @param formatted
+	 * @param formatted Expected formatted output
 	 */
 	public EclipseResourceHarness(EclipseBasedStepBuilder builder, String unformatted, String formatted) {
+		this(builder, "someSourceFile", unformatted, formatted);
+	}
+
+	/**
+	 * Create harness to be used for several versions of the formatter step
+	 * @param builder Eclipse Formatter step builder
+	 * @param sourceFileName File name of the source file
+	 * @param unformatted Simple unformatted input
+	 * @param formatted Expected formatted output
+	 */
+	public EclipseResourceHarness(EclipseBasedStepBuilder builder, String sourceFileName, String unformatted, String formatted) {
 		stepBuilder = builder;
+		fileName = sourceFileName;
 		input = unformatted;
 		expected = formatted;
 	}
@@ -77,7 +90,7 @@ protected String assertFormatted(String formatterVersion, File... settingsFiles)
 	 * @return Formatted string
 	 */
 	protected String format(String formatterVersion, File... settingsFiles) throws Exception {
-		File inputFile = setFile("someInputFile").toContent(input);
+		File inputFile = setFile(fileName).toContent(input);
 		stepBuilder.setVersion(formatterVersion);
 		stepBuilder.setPreferences(Arrays.asList(settingsFiles));
 		FormatterStep step = stepBuilder.build();

lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepTest.java

@@ -15,13 +15,20 @@
  */
 package com.diffplug.spotless.extra.java;
 
+import static org.junit.jupiter.api.condition.JRE.JAVA_11;
+
+import java.io.File;
 import java.util.stream.Stream;
 
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledForJreRange;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
 import com.diffplug.spotless.Jvm;
 import com.diffplug.spotless.TestProvisioner;
+import com.diffplug.spotless.extra.EclipseBasedStepBuilder;
 import com.diffplug.spotless.extra.eclipse.EclipseResourceHarness;
 
 class EclipseJdtFormatterStepTest extends EclipseResourceHarness {
@@ -30,8 +37,12 @@ class EclipseJdtFormatterStepTest extends EclipseResourceHarness {
 	private final static String INPUT = "package p; class C{}";
 	private final static String EXPECTED = "package p;\nclass C {\n}";
 
+	private static EclipseBasedStepBuilder createBuilder() {
+		return EclipseJdtFormatterStep.createBuilder(TestProvisioner.mavenCentral());
+	}
+
 	public EclipseJdtFormatterStepTest() {
-		super(EclipseJdtFormatterStep.createBuilder(TestProvisioner.mavenCentral()), INPUT, EXPECTED);
+		super(createBuilder(), INPUT, EXPECTED);
 	}
 
 	@ParameterizedTest
@@ -43,4 +54,19 @@ void formatWithVersion(String version) throws Exception {
 	private static Stream<String> formatWithVersion() {
 		return Stream.of(NON_SEMANTIC_ECLIPSE_VERSION, JVM_SUPPORT.getRecommendedFormatterVersion(), EclipseJdtFormatterStep.defaultVersion());
 	}
+
+	/** New format interface requires source file information to distinguish module-info from compilation unit */
+	@Nested
+	@EnabledForJreRange(min = JAVA_11)
+	class NewFormatInterface extends EclipseResourceHarness {
+		public NewFormatInterface() throws Exception {
+			super(createBuilder(), "module-info.java", getTestResource("java/eclipse/ModuleInfoUnformatted.test"), getTestResource("java/eclipse/ModuleInfoFormatted.test"));
+		}
+
+		@Test
+		void formatModuleInfo() throws Exception {
+			File settingsFile = createTestFile("java/eclipse/ModuleInfo.prefs");
+			assertFormatted(JVM_SUPPORT.getRecommendedFormatterVersion(), settingsFile);
+		}
+	}
 }

testlib/src/main/resources/java/eclipse/ModuleInfo.prefs

@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+#DefaultCodeFormatterConstants.createAlignmentValue(true, DefaultCodeFormatterConstants.WRAP_ONE_PER_LINE, DefaultCodeFormatterConstants.INDENT_BY_ONE)
+org.eclipse.jdt.core.formatter.alignment_for_module_statements=53