Restore the "legacy" error printing for both Formatter and DirtyState.

Author: nedtwigg

lib/src/main/java/com/diffplug/spotless/DirtyState.java

@@ -101,7 +101,10 @@ private Calculation(Formatter formatter, File file, byte[] rawBytes) {
 		 * due to diverging idempotence.
 		 */
 		public DirtyState calculateDirtyState() {
-			return calculateDirtyState(new ValuePerStep<>(formatter));
+			ValuePerStep<Throwable> exceptionPerStep = new ValuePerStep<>(formatter);
+			DirtyState result = calculateDirtyState(exceptionPerStep);
+			LintPolicy.legacyBehavior(formatter, file, exceptionPerStep);
+			return result;
 		}
 
 		/**

lib/src/main/java/com/diffplug/spotless/Formatter.java

@@ -129,13 +129,7 @@ public String computeLineEndings(String unix, File file) {
 	public String compute(String unix, File file) {
 		ValuePerStep<Throwable> exceptionPerStep = new ValuePerStep<>(this);
 		String result = computeWithLint(unix, file, exceptionPerStep);
-		for (int i = 0; i < steps.size(); ++i) {
-			Throwable exception = exceptionPerStep.get(i);
-			if (exception != null && exception != LintState.formatStepCausedNoChange()) {
-				LintPolicy.error(exception, steps.get(i), file.getAbsolutePath());
-				throw ThrowingEx.asRuntimeRethrowError(exception);
-			}
-		}
+		LintPolicy.legacyBehavior(this, file, exceptionPerStep);
 		return result;
 	}
 

lib/src/main/java/com/diffplug/spotless/LintPolicy.java

@@ -15,6 +15,8 @@
  */
 package com.diffplug.spotless;
 
+import java.io.File;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -28,4 +30,14 @@ static void error(Throwable e, FormatterStep step, String relativePath) {
 	static void warning(Throwable e, FormatterStep step, String relativePath) {
 		logger.warn("Unable to apply step '{}' to '{}'", step.getName(), relativePath, e);
 	}
+
+	static void legacyBehavior(Formatter formatter, File file, ValuePerStep<Throwable> exceptionPerStep) {
+		for (int i = 0; i < formatter.getSteps().size(); ++i) {
+			Throwable exception = exceptionPerStep.get(i);
+			if (exception != null && exception != LintState.formatStepCausedNoChange()) {
+				LintPolicy.error(exception, formatter.getSteps().get(i), file.getName());
+				throw ThrowingEx.asRuntimeRethrowError(exception);
+			}
+		}
+	}
 }

plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BiomeIntegrationTest.java

@@ -21,12 +21,9 @@
 
 import java.io.IOException;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.owasp.encoder.Encode;
 
-import com.diffplug.spotless.tag.ForLintRefactor;
-
 class BiomeIntegrationTest extends GradleIntegrationHarness {
 	/**
 	 * Tests that biome can be used as a generic formatting step.
@@ -323,8 +320,6 @@ void failureWhenExeNotFound() throws Exception {
 	 * @throws Exception When a test failure occurs.
 	 */
 	@Test
-	@Disabled
-	@ForLintRefactor
 	void failureWhenNotParseable() throws Exception {
 		setFile("build.gradle").toLines(
 				"plugins {",

plugin-gradle/src/test/java/com/diffplug/gradle/spotless/ErrorShouldRethrowTest.java

@@ -32,8 +32,6 @@
 import com.diffplug.spotless.tag.ForLintRefactor;
 
 /** Tests the desired behavior from https://github.com/diffplug/spotless/issues/46. */
-@Disabled
-@ForLintRefactor
 class ErrorShouldRethrowTest extends GradleIntegrationHarness {
 	private void writeBuild(String... toInsert) throws IOException {
 		List<String> lines = new ArrayList<>();
@@ -86,6 +84,8 @@ void unlessEnforceCheckIsFalse() throws Exception {
 		runWithSuccess("> Task :processResources NO-SOURCE");
 	}
 
+	@Disabled
+	@ForLintRefactor
 	@Test
 	void unlessExemptedByStep() throws Exception {
 		writeBuild(
@@ -97,6 +97,8 @@ void unlessExemptedByStep() throws Exception {
 				"Unable to apply step 'no swearing' to 'README.md'");
 	}
 
+	@Disabled
+	@ForLintRefactor
 	@Test
 	void unlessExemptedByPath() throws Exception {
 		writeBuild(

plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java

@@ -20,11 +20,8 @@
 import java.io.File;
 import java.io.IOException;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-import com.diffplug.spotless.tag.ForLintRefactor;
-
 class KotlinExtensionTest extends GradleIntegrationHarness {
 	private static final String HEADER = "// License Header";
 	private static final String HEADER_WITH_YEAR = "// License Header $YEAR";
@@ -150,8 +147,6 @@ void testSetEditorConfigCanOverrideEditorConfigFile() throws IOException {
 	}
 
 	@Test
-	@Disabled
-	@ForLintRefactor
 	void withCustomRuleSetApply() throws IOException {
 		setFile("build.gradle.kts").toLines(
 				"plugins {",

plugin-maven/src/test/java/com/diffplug/spotless/maven/biome/BiomeMavenTest.java

@@ -20,11 +20,9 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.owasp.encoder.Encode.forXml;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.maven.MavenIntegrationHarness;
-import com.diffplug.spotless.tag.ForLintRefactor;
 
 class BiomeMavenTest extends MavenIntegrationHarness {
 	/**
@@ -192,8 +190,6 @@ void failureWhenExeNotFound() throws Exception {
 	 * @throws Exception When a test failure occurs.
 	 */
 	@Test
-	@Disabled
-	@ForLintRefactor
 	void failureWhenNotParseable() throws Exception {
 		writePomWithBiomeSteps("**/*.js", "<biome><version>1.2.0</version><language>json</language></biome>");
 		setFile("biome_test.js").toResource("biome/js/fileBefore.js");