Stop implementing DiagnosticPosition in ErrorPronePosition

cushon · Error Prone Team · commit f3915ec322fa · 2025-12-08T05:23:54.000-08:00
Startblock:
  * unknown commit is submitted

Tested:
    TAP for global presubmit queue
    []
PiperOrigin-RevId: 841719167
diff --git a/check_api/src/main/java/com/google/errorprone/fixes/AdjustedPosition.java b/check_api/src/main/java/com/google/errorprone/fixes/AdjustedPosition.java
@@ -16,7 +16,6 @@
 
 package com.google.errorprone.fixes;
 
-import com.sun.tools.javac.tree.EndPosTable;
 import com.sun.tools.javac.tree.JCTree;
 
 /** Describes a tree position with adjustments to the start and end indices. */
@@ -39,11 +38,6 @@ public int getPreferredPosition() {
     return position.getPreferredPosition();
   }
 
-  @Override
-  public int getEndPosition(EndPosTable endPositions) {
-    return position.getEndPosition(endPositions) + endPositionAdjustment;
-  }
-
   @Override
   public int getEndPosition(ErrorProneEndPosTable endPositions) {
     return endPositions.getEndPosition(position) + endPositionAdjustment;
diff --git a/check_api/src/main/java/com/google/errorprone/fixes/ErrorProneEndPosTable.java b/check_api/src/main/java/com/google/errorprone/fixes/ErrorProneEndPosTable.java
@@ -18,19 +18,15 @@
 
 import com.sun.source.tree.CompilationUnitTree;
 import com.sun.source.tree.Tree;
-import com.sun.tools.javac.tree.EndPosTable;
 import com.sun.tools.javac.tree.JCTree;
 import com.sun.tools.javac.util.JCDiagnostic;
 
-/** A compatibility wrapper around {@link EndPosTable}. */
+/** A compatibility wrapper around {@code EndPosTable}. */
 public interface ErrorProneEndPosTable {
 
   static ErrorProneEndPosTable create(CompilationUnitTree unit) {
-    EndPosTable endPosTable = ((JCTree.JCCompilationUnit) unit).endPositions;
-    return pos -> pos.getEndPosition(endPosTable);
-  }
-
-  static ErrorProneEndPosTable create(EndPosTable endPosTable) {
+    com.sun.tools.javac.tree.EndPosTable endPosTable =
+        ((JCTree.JCCompilationUnit) unit).endPositions;
     return pos -> pos.getEndPosition(endPosTable);
   }
 
diff --git a/check_api/src/main/java/com/google/errorprone/fixes/ErrorPronePosition.java b/check_api/src/main/java/com/google/errorprone/fixes/ErrorPronePosition.java
@@ -21,7 +21,7 @@
 import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
 
 /** A compatibility wrapper around {@link DiagnosticPosition}. */
-public interface ErrorPronePosition extends DiagnosticPosition {
+public interface ErrorPronePosition {
   static ErrorPronePosition from(Tree node) {
     return from((DiagnosticPosition) node);
   }
@@ -34,13 +34,10 @@ static ErrorPronePosition from(DiagnosticPosition pos) {
     return new WrappedDiagnosticPosition(pos);
   }
 
-  @Override
   int getStartPosition();
 
-  @Override
   int getPreferredPosition();
 
-  @Override
   JCTree getTree();
 
   int getEndPosition(ErrorProneEndPosTable endPosTable);
diff --git a/check_api/src/main/java/com/google/errorprone/fixes/Fix.java b/check_api/src/main/java/com/google/errorprone/fixes/Fix.java
@@ -17,7 +17,6 @@
 package com.google.errorprone.fixes;
 
 import com.google.common.collect.ImmutableSet;
-import com.sun.tools.javac.tree.EndPosTable;
 import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
 
 /**
@@ -41,14 +40,6 @@ public interface Fix {
 
   ImmutableSet<Replacement> getReplacements(ErrorProneEndPosTable endPositions);
 
-  /**
-   * @deprecated use {@link #getReplacements(ErrorProneEndPosTable) instead}
-   */
-  @Deprecated
-  default ImmutableSet<Replacement> getReplacements(EndPosTable endPositions) {
-    return getReplacements(ErrorProneEndPosTable.create(endPositions));
-  }
-
   ImmutableSet<String> getImportsToAdd();
 
   ImmutableSet<String> getImportsToRemove();
diff --git a/check_api/src/main/java/com/google/errorprone/fixes/FixedPosition.java b/check_api/src/main/java/com/google/errorprone/fixes/FixedPosition.java
@@ -17,7 +17,6 @@
 package com.google.errorprone.fixes;
 
 import com.sun.source.tree.Tree;
-import com.sun.tools.javac.tree.EndPosTable;
 import com.sun.tools.javac.tree.JCTree;
 import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
 
@@ -52,9 +51,4 @@ public int getPreferredPosition() {
   public int getEndPosition(ErrorProneEndPosTable endPosTable) {
     return endPosition;
   }
-
-  @Override
-  public int getEndPosition(EndPosTable endPosTable) {
-    return endPosition;
-  }
 }
diff --git a/check_api/src/main/java/com/google/errorprone/fixes/IndexedPosition.java b/check_api/src/main/java/com/google/errorprone/fixes/IndexedPosition.java
@@ -18,7 +18,6 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 
-import com.sun.tools.javac.tree.EndPosTable;
 import com.sun.tools.javac.tree.JCTree;
 
 /** Describes a position that only has a start and end index. */
@@ -48,9 +47,4 @@ public int getPreferredPosition() {
   public int getEndPosition(ErrorProneEndPosTable endPosTable) {
     return endPos;
   }
-
-  @Override
-  public int getEndPosition(EndPosTable endPosTable) {
-    return endPos;
-  }
 }
diff --git a/check_api/src/main/java/com/google/errorprone/fixes/WrappedDiagnosticPosition.java b/check_api/src/main/java/com/google/errorprone/fixes/WrappedDiagnosticPosition.java
@@ -16,7 +16,6 @@
 
 package com.google.errorprone.fixes;
 
-import com.sun.tools.javac.tree.EndPosTable;
 import com.sun.tools.javac.tree.JCTree;
 import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
 
@@ -37,11 +36,6 @@ public JCTree getTree() {
     return pos.getTree();
   }
 
-  @Override
-  public int getEndPosition(EndPosTable endPosTable) {
-    return pos.getEndPosition(endPosTable);
-  }
-
   @Override
   public int getEndPosition(ErrorProneEndPosTable endPosTable) {
     return endPosTable.getEndPosition(pos);

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@`
`18`	`18`
`19`	`19`	`import static com.google.common.base.Preconditions.checkArgument;`
`20`	`20`
`21`		`-import com.sun.tools.javac.tree.EndPosTable;`
`22`	`21`	`import com.sun.tools.javac.tree.JCTree;`
`23`	`22`
`24`	`23`	`/** Describes a position that only has a start and end index. */`
`@@ -48,9 +47,4 @@ public int getPreferredPosition() {`
`48`	`47`	`public int getEndPosition(ErrorProneEndPosTable endPosTable) {`
`49`	`48`	`return endPos;`
`50`	`49`	`}`
`51`		`-`
`52`		`- @Override`
`53`		`- public int getEndPosition(EndPosTable endPosTable) {`
`54`		`- return endPos;`
`55`		`- }`
`56`	`50`	`}`