Revert "Handy tool for making encoding formats that don't have any forbidden characters."

This reverts commit 9afa6dd.

Author: nedtwigg

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
 package com.diffplug.spotless;
 
 import java.io.File;
-import java.util.List;
 import java.util.Objects;
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import javax.annotation.Nullable;
@@ -36,24 +36,14 @@ final class FilterByContentPatternFormatterStep extends DelegateFormatterStep {
 	public @Nullable String format(String raw, File file) throws Exception {
 		Objects.requireNonNull(raw, "raw");
 		Objects.requireNonNull(file, "file");
-		if (contentPattern.matcher(raw).find() == (onMatch == OnMatch.INCLUDE)) {
+		Matcher matcher = contentPattern.matcher(raw);
+		if (matcher.find() == (onMatch == OnMatch.INCLUDE)) {
 			return delegateStep.format(raw, file);
 		} else {
 			return raw;
 		}
 	}
 
-	@Override
-	public List<Lint> lint(String raw, File file) throws Exception {
-		Objects.requireNonNull(raw, "raw");
-		Objects.requireNonNull(file, "file");
-		if (contentPattern.matcher(raw).find() == (onMatch == OnMatch.INCLUDE)) {
-			return delegateStep.lint(raw, file);
-		} else {
-			return List.of();
-		}
-	}
-
 	@Override
 	public boolean equals(Object o) {
 		if (this == o) {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 package com.diffplug.spotless;
 
 import java.io.File;
-import java.util.List;
 import java.util.Objects;
 
 import javax.annotation.Nullable;
@@ -40,17 +39,6 @@ final class FilterByFileFormatterStep extends DelegateFormatterStep {
 		}
 	}
 
-	@Override
-	public List<Lint> lint(String content, File file) throws Exception {
-		Objects.requireNonNull(content, "content");
-		Objects.requireNonNull(file, "file");
-		if (filter.accept(file)) {
-			return delegateStep.lint(content, file);
-		} else {
-			return List.of();
-		}
-	}
-
 	@Override
 	public boolean equals(Object o) {
 		if (this == o) {

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

@@ -26,7 +26,6 @@
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.ListIterator;
 import java.util.Objects;
 
 /** Formatter which performs the full formatting. */
@@ -128,28 +127,12 @@ public String computeLineEndings(String unix, File file) {
 	 * is guaranteed to also have unix line endings.
 	 */
 	public String compute(String unix, File file) {
-		ExceptionPerStep exceptionPerStep = new ExceptionPerStep(this);
-		String result = compute(unix, file, exceptionPerStep);
-		exceptionPerStep.rethrowFirstIfPresent();
-		return result;
-	}
-
-	/**
-	 * Returns the result of calling all of the FormatterSteps, while also
-	 * tracking any exceptions which are thrown.
-	 * <p>
-	 * The input must have unix line endings, and the output
-	 * is guaranteed to also have unix line endings.
-	 * <p>
-	 */
-	String compute(String unix, File file, ExceptionPerStep exceptionPerStep) {
 		Objects.requireNonNull(unix, "unix");
 		Objects.requireNonNull(file, "file");
 
-		ListIterator<FormatterStep> iter = steps.listIterator();
-		while (iter.hasNext()) {
+		for (FormatterStep step : steps) {
 			try {
-				String formatted = iter.next().format(unix, file);
+				String formatted = step.format(unix, file);
 				if (formatted == null) {
 					// This probably means it was a step that only checks
 					// for errors and doesn't actually have any fixes.
@@ -159,9 +142,12 @@ String compute(String unix, File file, ExceptionPerStep exceptionPerStep) {
 					unix = LineEnding.toUnix(formatted);
 				}
 			} catch (Throwable e) {
-				// store the exception which was thrown, and stop execution so we don't alter line numbers
-				exceptionPerStep.set(iter.previousIndex(), e);
-				return unix;
+				// TODO: this is bad, but it won't matter when add support for linting
+				if (e instanceof RuntimeException) {
+					throw (RuntimeException) e;
+				} else {
+					throw new RuntimeException(e);
+				}
 			}
 		}
 		return unix;

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

@@ -16,7 +16,6 @@
 package com.diffplug.spotless;
 
 import java.io.File;
-import java.util.List;
 import java.util.Objects;
 
 /**
@@ -33,14 +32,6 @@ default String apply(String unix, File file) throws Exception {
 		return apply(unix);
 	}
 
-	/**
-	 * Calculates a list of lints against the given content.
-	 * By default, that's just an throwables thrown by the lint.
-	 */
-	default List<Lint> lint(String content, File file) throws Exception {
-		return List.of();
-	}
-
 	/**
 	 * {@code Function<String, String>} and {@code BiFunction<String, File, String>} whose implementation
 	 * requires a resource which should be released when the function is no longer needed.
@@ -83,14 +74,6 @@ public String apply(String unix) throws Exception {
 		@FunctionalInterface
 		interface ResourceFunc<T extends AutoCloseable> {
 			String apply(T resource, String unix) throws Exception;
-
-			/**
-			 * Calculates a list of lints against the given content.
-			 * By default, that's just an throwables thrown by the lint.
-			 */
-			default List<Lint> lint(T resource, String unix) throws Exception {
-				return List.of();
-			}
 		}
 
 		/** Creates a {@link FormatterFunc.Closeable} which uses the given resource to execute the format function. */
@@ -118,10 +101,6 @@ public String apply(String unix) throws Exception {
 		@FunctionalInterface
 		interface ResourceFuncNeedsFile<T extends AutoCloseable> {
 			String apply(T resource, String unix, File file) throws Exception;
-
-			default List<Lint> lint(T resource, String content, File file) throws Exception {
-				return List.of();
-			}
 		}
 
 		/** Creates a {@link FormatterFunc.Closeable} which uses the given resource to execute the file-dependent format function. */
@@ -144,11 +123,6 @@ public String apply(String unix, File file) throws Exception {
 				public String apply(String unix) throws Exception {
 					return apply(unix, Formatter.NO_FILE_SENTINEL);
 				}
-
-				@Override
-				public List<Lint> lint(String content, File file) throws Exception {
-					return function.lint(resource, content, file);
-				}
 			};
 		}
 	}

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

@@ -17,7 +17,6 @@
 
 import java.io.File;
 import java.io.Serializable;
-import java.util.List;
 import java.util.Objects;
 
 import javax.annotation.Nullable;
@@ -47,22 +46,6 @@ public interface FormatterStep extends Serializable, AutoCloseable {
 	@Nullable
 	String format(String rawUnix, File file) throws Exception;
 
-	/**
-	 * Returns a list of lints against the given file content
-	 *
-	 * @param content
-	 *            the content to check
-	 * @param file
-	 *            the file which {@code content} was obtained from; never null. Pass an empty file using
-	 *            {@code new File("")} if and only if no file is actually associated with {@code content}
-	 * @return a list of lints
-	 * @throws Exception if the formatter step experiences a problem
-	 */
-	@Nullable
-	default List<Lint> lint(String content, File file) throws Exception {
-		return List.of();
-	}
-
 	/**
 	 * Returns a new {@code FormatterStep} which, observing the value of {@code formatIfMatches},
 	 * will only apply, or not, its changes to files which pass the given filter.

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

@@ -18,7 +18,6 @@
 import java.io.File;
 import java.io.Serializable;
 import java.util.Arrays;
-import java.util.List;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
@@ -49,14 +48,6 @@ public String format(String rawUnix, File file) throws Exception {
 		return formatter.apply(rawUnix, file);
 	}
 
-	@Override
-	public List<Lint> lint(String content, File file) throws Exception {
-		if (formatter == null) {
-			formatter = stateToFormatter(state());
-		}
-		return formatter.lint(content, file);
-	}
-
 	@Override
 	public boolean equals(Object o) {
 		if (o == null) {