Add error recovery

src/main/java/net/fabricmc/mappingio/MappingReader.java

@@ -28,7 +28,9 @@
 
 import org.jetbrains.annotations.Nullable;
 
+import net.fabricmc.mappingio.format.ErrorSink;
 import net.fabricmc.mappingio.format.MappingFormat;
+import net.fabricmc.mappingio.format.ParsingError.Severity;
 import net.fabricmc.mappingio.format.enigma.EnigmaDirReader;
 import net.fabricmc.mappingio.format.enigma.EnigmaFileReader;
 import net.fabricmc.mappingio.format.jobf.JobfFileReader;
@@ -208,10 +210,23 @@ public static List<String> getNamespaces(Reader reader, MappingFormat format) th
 	 * @param visitor The receiving visitor.
 	 * @throws IOException If the format can't be detected or reading fails.
 	 */
+	@Deprecated
 	public static void read(Path path, MappingVisitor visitor) throws IOException {
 		read(path, null, visitor);
 	}
 
+	/**
+	 * Tries to detect the format of the given path and read it.
+	 *
+	 * @param path The path to read from. Can be a file or a directory.
+	 * @param visitor The receiving visitor.
+	 * @param errorSink The error sink to log errors to.
+	 * @throws IOException If the format can't be detected or reading fails.
+	 */
+	public static void read(Path path, MappingVisitor visitor, ErrorSink errorSink) throws IOException {
+		read(path, null, visitor, errorSink);
+	}
+
 	/**
 	 * Tries to read the given path using the passed format's reader.
 	 *
@@ -220,20 +235,33 @@ public static void read(Path path, MappingVisitor visitor) throws IOException {
 	 * @param visitor The receiving visitor.
 	 * @throws IOException If reading fails.
 	 */
+	@Deprecated
 	public static void read(Path path, MappingFormat format, MappingVisitor visitor) throws IOException {
+		read(path, format, visitor, ErrorSink.throwingOnSeverity(Severity.WARNING));
+	}
+
+	/**
+	 * Tries to read the given path using the passed format's reader.
+	 *
+	 * @param path The path to read from. Can be a file or a directory.
+	 * @param format The format to use. Has to match the path's format.
+	 * @param visitor The receiving visitor.
+	 * @throws IOException If reading fails.
+	 */
+	public static void read(Path path, MappingFormat format, MappingVisitor visitor, ErrorSink errorSink) throws IOException {
 		if (format == null) {
 			format = detectFormat(path);
 			if (format == null) throw new IOException("invalid/unsupported mapping format");
 		}
 
 		if (format.hasSingleFile()) {
 			try (Reader reader = Files.newBufferedReader(path)) {
-				read(reader, format, visitor);
+				read(reader, format, visitor, errorSink);
 			}
 		} else {
 			switch (format) {
 			case ENIGMA_DIR:
-				EnigmaDirReader.read(path, visitor);
+				EnigmaDirReader.read(path, visitor, errorSink);
 				break;
 			default:
 				throw new IllegalStateException();
@@ -248,10 +276,23 @@ public static void read(Path path, MappingFormat format, MappingVisitor visitor)
 	 * @param visitor The receiving visitor.
 	 * @throws IOException If the format can't be detected or reading fails.
 	 */
+	@Deprecated
 	public static void read(Reader reader, MappingVisitor visitor) throws IOException {
 		read(reader, null, visitor);
 	}
 
+	/**
+	 * Tries to detect the reader's content's format and read it.
+	 *
+	 * @param reader The reader to read from.
+	 * @param visitor The receiving visitor.
+	 * @param errorSink The error sink to log errors to.
+	 * @throws IOException If the format can't be detected or reading fails.
+	 */
+	public static void read(Reader reader, MappingVisitor visitor, ErrorSink errorSink) throws IOException {
+		read(reader, null, visitor, errorSink);
+	}
+
 	/**
 	 * Tries to read the reader's content using the passed format's mapping reader.
 	 *
@@ -260,7 +301,21 @@ public static void read(Reader reader, MappingVisitor visitor) throws IOExceptio
 	 * @param visitor The receiving visitor.
 	 * @throws IOException If reading fails.
 	 */
+	@Deprecated
 	public static void read(Reader reader, MappingFormat format, MappingVisitor visitor) throws IOException {
+		read(reader, format, visitor, ErrorSink.throwingOnSeverity(Severity.WARNING));
+	}
+
+	/**
+	 * Tries to read the reader's content using the passed format's mapping reader.
+	 *
+	 * @param reader The reader to read from.
+	 * @param format The format to use. Has to match the reader's content's format.
+	 * @param visitor The receiving visitor.
+	 * @param errorSink The error sink to log errors to.
+	 * @throws IOException If reading fails.
+	 */
+	public static void read(Reader reader, MappingFormat format, MappingVisitor visitor, ErrorSink errorSink) throws IOException {
 		if (format == null) {
 			if (!reader.markSupported()) reader = new BufferedReader(reader);
 			reader.mark(DETECT_HEADER_LEN);
@@ -273,34 +328,34 @@ public static void read(Reader reader, MappingFormat format, MappingVisitor visi
 
 		switch (format) {
 		case TINY_FILE:
-			Tiny1FileReader.read(reader, visitor);
+			Tiny1FileReader.read(reader, visitor, errorSink);
 			break;
 		case TINY_2_FILE:
-			Tiny2FileReader.read(reader, visitor);
+			Tiny2FileReader.read(reader, visitor, errorSink);
 			break;
 		case ENIGMA_FILE:
-			EnigmaFileReader.read(reader, visitor);
+			EnigmaFileReader.read(reader, visitor, errorSink);
 			break;
 		case SRG_FILE:
 		case XSRG_FILE:
-			SrgFileReader.read(reader, visitor);
+			SrgFileReader.read(reader, visitor, errorSink);
 			break;
 		case JAM_FILE:
-			JamFileReader.read(reader, visitor);
+			JamFileReader.read(reader, visitor, errorSink);
 			break;
 		case CSRG_FILE:
 		case TSRG_FILE:
 		case TSRG_2_FILE:
-			TsrgFileReader.read(reader, visitor);
+			TsrgFileReader.read(reader, visitor, errorSink);
 			break;
 		case PROGUARD_FILE:
-			ProGuardFileReader.read(reader, visitor);
+			ProGuardFileReader.read(reader, visitor, errorSink);
 			break;
 		case RECAF_SIMPLE_FILE:
-			RecafSimpleFileReader.read(reader, visitor);
+			RecafSimpleFileReader.read(reader, visitor, errorSink);
 			break;
 		case JOBF_FILE:
-			JobfFileReader.read(reader, visitor);
+			JobfFileReader.read(reader, visitor, errorSink);
 			break;
 		default:
 			throw new IllegalStateException();

src/main/java/net/fabricmc/mappingio/format/ColumnFileReader.java

@@ -227,13 +227,17 @@ public String peekCols(boolean unescape) throws IOException {
 	 *
 	 * @return -1 if nothing has been read (first char was EOL), otherwise the number present.
 	 */
-	public int nextIntCol() throws IOException {
+	public int nextIntCol(boolean rethrowNumberFormatExceptionAsIOException) throws IOException {
 		String str = nextCol(false);
 
 		try {
 			return str != null ? Integer.parseInt(str) : -1;
 		} catch (NumberFormatException e) {
-			throw new IOException("invalid number in line "+lineNumber+": "+str);
+			if (rethrowNumberFormatExceptionAsIOException) {
+				throw new IOException("invalid number in line "+lineNumber+": "+str);
+			} else {
+				throw e;
+			}
 		}
 	}
 

src/main/java/net/fabricmc/mappingio/format/ErrorCollector.java

@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2024 FabricMC
+ *
+ * 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 net.fabricmc.mappingio.format;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import net.fabricmc.mappingio.format.ParsingError.Severity;
+
+public interface ErrorCollector extends ErrorSink {
+	static ErrorCollector create() {
+		return new ErrorCollector() {
+			@Override
+			public void add(Severity severity, String message) throws IOException {
+				errors.add(ParsingError.create(severity, message));
+			}
+
+			@Override
+			public List<ParsingError> getErrors() {
+				return errors;
+			}
+
+			private final List<ParsingError> errors = new ArrayList<>();
+		};
+	}
+
+	List<ParsingError> getErrors();
+}

src/main/java/net/fabricmc/mappingio/format/ErrorSink.java

@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2023 FabricMC
+ *
+ * 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 net.fabricmc.mappingio.format;
+
+import java.io.IOException;
+
+import net.fabricmc.mappingio.format.ParsingError.Severity;
+
+public interface ErrorSink {
+	static ErrorSink noOp() {
+		return new ErrorSink() {
+			@Override
+			public void add(Severity severity, String message) {
+			}
+		};
+	}
+
+	/**
+	 * Create an ErrorSink that throws an exception when an error
+	 * of the specified severity (or higher) is encountered.
+	 *
+	 * @param severity The severity to throw on.
+	 * @return The constructed ErrorSink instance.
+	 */
+	static ErrorSink throwingOnSeverity(Severity severity) {
+		return new ThrowingErrorSink(severity);
+	}
+
+	default void addInfo(String message) throws IOException {
+		add(Severity.INFO, message);
+	}
+
+	default void addWarning(String message) throws IOException {
+		add(Severity.WARNING, message);
+	}
+
+	default void addError(String message) throws IOException {
+		add(Severity.ERROR, message);
+	}
+
+	void add(Severity severity, String message) throws IOException;
+}

src/main/java/net/fabricmc/mappingio/format/ParsingError.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2024 FabricMC
+ *
+ * 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 net.fabricmc.mappingio.format;
+
+import org.jetbrains.annotations.ApiStatus;
+
+@ApiStatus.NonExtendable
+public interface ParsingError {
+	static ParsingError create(Severity severity, String message) {
+		return new ParsingError() {
+			@Override
+			public Severity getSeverity() {
+				return severity;
+			}
+
+			@Override
+			public String getMessage() {
+				return message;
+			}
+		};
+	}
+
+	Severity getSeverity();
+
+	String getMessage();
+
+	enum Severity {
+		/**
+		 * When something's technically wrong but doesn't affect
+		 * parsing or the mapping data in any way.
+		 */
+		INFO,
+		/**
+		 * When element data is partially missing, but the rest of the element
+		 * could still be deciphered and it didn't have to be skipped entirely.
+		 * Or when an unknown top-level element is encountered.
+		 */
+		WARNING,
+		/**
+		 * An issue so severe that parsing of entire elements had to be skipped.
+		 * E.g. a class's/member's source name being absent.
+		 */
+		ERROR
+	}
+}

src/main/java/net/fabricmc/mappingio/format/ThrowingErrorSink.java

@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2024 FabricMC
+ *
+ * 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 net.fabricmc.mappingio.format;
+
+import java.io.IOException;
+
+import net.fabricmc.mappingio.format.ParsingError.Severity;
+
+final class ThrowingErrorSink implements ErrorSink {
+	ThrowingErrorSink(Severity severityToThrowAt) {
+		this.severityToThrowAt = severityToThrowAt;
+	}
+
+	@Override
+	public void add(Severity severity, String message) throws IOException {
+		if (severity.compareTo(severityToThrowAt) >= 0) {
+			throw new IOException(message);
+		}
+	}
+
+	private final Severity severityToThrowAt;
+}