|
24 | 24 | import static com.google.errorprone.bugpatterns.nullness.NullnessUtils.nullnessChecksShouldBeConservative; |
25 | 25 | import static com.google.errorprone.matchers.Description.NO_MATCH; |
26 | 26 | import static com.google.errorprone.suppliers.Suppliers.typeFromString; |
| 27 | +import static com.google.errorprone.util.ASTHelpers.enclosingClass; |
27 | 28 | import static com.google.errorprone.util.ASTHelpers.enclosingPackage; |
28 | 29 | import static com.google.errorprone.util.ASTHelpers.getSymbol; |
29 | 30 | import static com.google.errorprone.util.ASTHelpers.hasAnnotation; |
@@ -175,7 +176,7 @@ && isParameterOfMethodOnType(sym, ARGUMENT_CAPTOR_CLASS, state)) { |
175 | 176 | } |
176 | 177 |
|
177 | 178 | // Hardcoding #3: Immutable*.Builder.* |
178 | | - if (sym.enclClass().name.equals(BUILDER_NAME.get(state)) |
| 179 | + if (enclosingClass(sym).name.equals(BUILDER_NAME.get(state)) |
179 | 180 | && (isParameterOfMethodOnTypeStartingWith(sym, GUAVA_COLLECT_IMMUTABLE_PREFIX, state) |
180 | 181 | || isParameterOfMethodOnTypeStartingWith(sym, GUAVA_GRAPH_IMMUTABLE_PREFIX, state))) { |
181 | 182 | return true; |
@@ -224,12 +225,12 @@ && isParameterOfMethodOnType(sym, ARGUMENT_CAPTOR_CLASS, state)) { |
224 | 225 | private static boolean isParameterOfMethodOnType( |
225 | 226 | VarSymbol sym, Supplier<Type> typeSupplier, VisitorState state) { |
226 | 227 | Type target = typeSupplier.get(state); |
227 | | - return target != null && state.getTypes().isSameType(sym.enclClass().type, target); |
| 228 | + return target != null && state.getTypes().isSameType(enclosingClass(sym).type, target); |
228 | 229 | } |
229 | 230 |
|
230 | 231 | private static boolean isParameterOfMethodOnTypeStartingWith( |
231 | 232 | VarSymbol sym, Supplier<Name> nameSupplier, VisitorState state) { |
232 | | - return sym.enclClass().fullname.startsWith(nameSupplier.get(state)); |
| 233 | + return enclosingClass(sym).fullname.startsWith(nameSupplier.get(state)); |
233 | 234 | } |
234 | 235 |
|
235 | 236 | private boolean enclosingAnnotationDefaultsNonTypeVariablesToNonNull( |
|
0 commit comments