Fix enclosingPackage after 3ac0471

cushon · Error Prone Team · commit 8fa64d48f3a1 · 2022-04-14T09:41:34.000-07:00
PiperOrigin-RevId: 441783482
diff --git a/check_api/src/main/java/com/google/errorprone/util/ASTHelpers.java b/check_api/src/main/java/com/google/errorprone/util/ASTHelpers.java
@@ -1163,10 +1163,11 @@ public static ClassSymbol enclosingClass(Symbol sym) {
   @Nullable
   public static PackageSymbol enclosingPackage(Symbol sym) {
     Symbol curr = sym;
-    for (; curr != null && curr.owner != null; curr = curr.owner) {
+    while (curr != null) {
       if (curr.getKind().equals(ElementKind.PACKAGE)) {
         return (PackageSymbol) curr;
       }
+      curr = curr.owner;
     }
     return null;
   }

Original file line number	Diff line number	Diff line change
`@@ -1163,10 +1163,11 @@ public static ClassSymbol enclosingClass(Symbol sym) {`
`1163`	`1163`	`@Nullable`
`1164`	`1164`	`public static PackageSymbol enclosingPackage(Symbol sym) {`
`1165`	`1165`	`Symbol curr = sym;`
`1166`		`- for (; curr != null && curr.owner != null; curr = curr.owner) {`
	`1166`	`+ while (curr != null) {`
`1167`	`1167`	`if (curr.getKind().equals(ElementKind.PACKAGE)) {`
`1168`	`1168`	`return (PackageSymbol) curr;`
`1169`	`1169`	`}`
	`1170`	`+ curr = curr.owner;`
`1170`	`1171`	`}`
`1171`	`1172`	`return null;`
`1172`	`1173`	`}`