Remove DiffNotApplicableException

Let any IndexOutOfBoundsExceptions propagate, and handle RuntimeException in DiffApplier. See discussion in #4086. PiperOrigin-RevId: 566971731
google · Sep 21, 2023 · 73d6b1c · 73d6b1c
1 parent 1d2bc93
commit 73d6b1c
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 39 deletions.
diff --git a/check_api/src/main/java/com/google/errorprone/apply/DescriptionBasedDiff.java b/check_api/src/main/java/com/google/errorprone/apply/DescriptionBasedDiff.java
@@ -109,7 +109,7 @@ public void handleFix(Fix fix) {
   }
 
   @Override
-  public void applyDifferences(SourceFile sourceFile) throws DiffNotApplicableException {
+  public void applyDifferences(SourceFile sourceFile) {
     if (!importsToAdd.isEmpty() || !importsToRemove.isEmpty()) {
       ImportStatements importStatements = ImportStatements.create(compilationUnit, importOrganizer);
       importStatements.addAll(importsToAdd);

diff --git a/check_api/src/main/java/com/google/errorprone/apply/Diff.java b/check_api/src/main/java/com/google/errorprone/apply/Diff.java
@@ -25,10 +25,6 @@ public interface Diff {
   /** Gets the name of the file this difference applies to */
   String getRelevantFileName();
 
-  /**
-   * Applies this difference to the supplied {@code sourceFile}.
-   *
-   * @throws DiffNotApplicableException if the diff could not be applied to the source file
-   */
+  /** Applies this difference to the supplied {@code sourceFile}. */
   void applyDifferences(SourceFile sourceFile);
 }
diff --git a/check_api/src/main/java/com/google/errorprone/apply/DiffApplier.java b/check_api/src/main/java/com/google/errorprone/apply/DiffApplier.java
@@ -123,7 +123,7 @@ public void run() {
         if (completed % 100 == 0) {
           logger.log(Level.INFO, String.format("Completed %d files in %s", completed, stopwatch));
         }
-      } catch (IOException | DiffNotApplicableException e) {
+      } catch (IOException | RuntimeException e) {
         logger.log(Level.WARNING, "Failed to apply diff to file " + diff.getRelevantFileName(), e);
         diffsFailedPaths.add(diff.getRelevantFileName());
       } finally {

diff --git a/check_api/src/main/java/com/google/errorprone/apply/DiffNotApplicableException.java b/check_api/src/main/java/com/google/errorprone/apply/DiffNotApplicableException.java