Deal with DirtyState.Calculation is gone.

Author: nedtwigg

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

@@ -74,7 +74,14 @@ public static DirtyState of(Formatter formatter, File file) throws IOException {
 	}
 
 	public static DirtyState of(Formatter formatter, File file, byte[] rawBytes) {
-		String raw = new String(rawBytes, formatter.getEncoding());
+		return of(formatter, file, rawBytes, new String(rawBytes, formatter.getEncoding()));
+	}
+
+	public static DirtyState of(Formatter formatter, File file, byte[] rawBytes, String raw) {
+		return of(formatter, file, rawBytes, raw, new ValuePerStep<>(formatter));
+	}
+
+	public static DirtyState of(Formatter formatter, File file, byte[] rawBytes, String raw, ValuePerStep<Throwable> exceptionPerStep) {
 		// check that all characters were encodable
 		String encodingError = EncodingErrorMsg.msg(raw, rawBytes, formatter.getEncoding());
 		if (encodingError != null) {
@@ -84,7 +91,7 @@ public static DirtyState of(Formatter formatter, File file, byte[] rawBytes) {
 		String rawUnix = LineEnding.toUnix(raw);
 
 		// enforce the format
-		String formattedUnix = formatter.compute(rawUnix, file);
+		String formattedUnix = formatter.computeWithLint(rawUnix, file, exceptionPerStep);
 		// convert the line endings if necessary
 		String formatted = formatter.computeLineEndings(formattedUnix, file);
 
@@ -95,13 +102,13 @@ public static DirtyState of(Formatter formatter, File file, byte[] rawBytes) {
 		}
 
 		// F(input) != input, so we'll do a padded check
-		String doubleFormattedUnix = formatter.compute(formattedUnix, file);
+		String doubleFormattedUnix = formatter.computeWithLint(formattedUnix, file, exceptionPerStep);
 		if (doubleFormattedUnix.equals(formattedUnix)) {
 			// most dirty files are idempotent-dirty, so this is a quick-short circuit for that common case
 			return new DirtyState(formattedBytes);
 		}
 
-		PaddedCell cell = PaddedCell.check(formatter, file, rawUnix);
+		PaddedCell cell = PaddedCell.check(formatter, file, rawUnix, exceptionPerStep);
 		if (!cell.isResolvable()) {
 			return didNotConverge;
 		}

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

@@ -90,10 +90,10 @@ public static LintState of(Formatter formatter, File file) throws IOException {
 
 	public static LintState of(Formatter formatter, File file, byte[] rawBytes) {
 		var exceptions = new ValuePerStep<Throwable>(formatter);
-		var dirtyCalculation = DirtyState.of(formatter, file, rawBytes);
-		var dirty = dirtyCalculation.calculateDirtyState(exceptions);
+		var raw = new String(rawBytes, formatter.getEncoding());
+		var dirty = DirtyState.of(formatter, file, rawBytes, raw, exceptions);
 
-		String toLint = LineEnding.toUnix(dirty.isClean() || dirty.didNotConverge() ? dirtyCalculation.raw : new String(dirty.canonicalBytes(), formatter.getEncoding()));
+		String toLint = LineEnding.toUnix(dirty.isClean() || dirty.didNotConverge() ? raw : new String(dirty.canonicalBytes(), formatter.getEncoding()));
 
 		var lints = new ValuePerStep<List<Lint>>(formatter);
 		// if a step did not throw an exception, then it gets to check for lints if it wants