Skip to content

Commit 5d57e71

Browse files
graememorganError Prone Team
graememorgan
authored and
Error Prone Team
committed
Automatic code cleanup.
PiperOrigin-RevId: 753600430
1 parent 3a69509 commit 5d57e71

15 files changed

+36
-22
lines changed

‎core/src/main/java/com/google/errorprone/bugpatterns/CanBeStaticAnalyzer.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package com.google.errorprone.bugpatterns;
1818

19+
import static com.google.errorprone.util.ASTHelpers.enclosingClass;
1920
import static com.google.errorprone.util.ASTHelpers.isStatic;
2021

2122
import com.google.auto.value.AutoValue;
@@ -184,9 +185,9 @@ private static boolean memberOfEnclosing(Symbol owner, VisitorState state, Symbo
184185
if (sym == null || !sym.hasOuterInstance()) {
185186
return false;
186187
}
187-
for (ClassSymbol encl = owner.owner.enclClass();
188+
for (ClassSymbol encl = enclosingClass(owner);
188189
encl != null;
189-
encl = encl.owner != null ? encl.owner.enclClass() : null) {
190+
encl = encl.owner != null ? enclosingClass(encl) : null) {
190191
if (sym.isMemberOf(encl, state.getTypes())) {
191192
return true;
192193
}

‎core/src/main/java/com/google/errorprone/bugpatterns/ClassCanBeStatic.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import static com.google.errorprone.BugPattern.SeverityLevel.WARNING;
2020
import static com.google.errorprone.matchers.Description.NO_MATCH;
21+
import static com.google.errorprone.util.ASTHelpers.enclosingClass;
2122
import static com.google.errorprone.util.ASTHelpers.hasAnnotation;
2223

2324
import com.google.errorprone.BugPattern;
@@ -57,11 +58,11 @@ public Description matchClass(ClassTree tree, VisitorState state) {
5758
// local or anonymous classes can't be static
5859
return NO_MATCH;
5960
}
60-
switch (currentClass.owner.enclClass().getNestingKind()) {
61+
switch (enclosingClass(currentClass).getNestingKind()) {
6162
case TOP_LEVEL -> {}
6263
case MEMBER -> {
6364
if (!SourceVersion.supportsStaticInnerClass(state.context)
64-
&& currentClass.owner.enclClass().hasOuterInstance()) {
65+
&& enclosingClass(currentClass).hasOuterInstance()) {
6566
// class is nested inside an inner class, so it can't be static
6667
return NO_MATCH;
6768
}

‎core/src/main/java/com/google/errorprone/bugpatterns/ConstantPatternCompile.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import static com.google.errorprone.matchers.Matchers.instanceMethod;
2626
import static com.google.errorprone.matchers.Matchers.staticMethod;
2727
import static com.google.errorprone.util.ASTHelpers.canBeRemoved;
28+
import static com.google.errorprone.util.ASTHelpers.enclosingClass;
2829
import static com.google.errorprone.util.ASTHelpers.getStartPosition;
2930
import static com.google.errorprone.util.ASTHelpers.getSymbol;
3031
import static com.google.errorprone.util.ASTHelpers.isInStaticInitializer;
@@ -184,7 +185,7 @@ private static SuggestedFix fixLocal(
184185
}
185186
MethodSymbol methodSymbol = getSymbol(outerMethodTree);
186187
boolean canUseStatic =
187-
methodSymbol.owner.enclClass().getNestingKind() == NestingKind.TOP_LEVEL
188+
enclosingClass(methodSymbol).getNestingKind() == NestingKind.TOP_LEVEL
188189
|| outerMethodTree.getModifiers().getFlags().contains(Modifier.STATIC);
189190
String replacement =
190191
String.format(

‎core/src/main/java/com/google/errorprone/bugpatterns/DoNotClaimAnnotations.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import static com.google.errorprone.BugPattern.SeverityLevel.WARNING;
2121
import static com.google.errorprone.VisitorState.memoize;
2222
import static com.google.errorprone.matchers.Description.NO_MATCH;
23+
import static com.google.errorprone.util.ASTHelpers.enclosingClass;
2324

2425
import com.google.common.collect.ImmutableList;
2526
import com.google.common.collect.Streams;
@@ -84,7 +85,7 @@ public Description matchMethod(MethodTree tree, VisitorState state) {
8485
.allMatch(x -> x)) {
8586
return NO_MATCH;
8687
}
87-
if (!sym.owner.enclClass().isSubClass(PROCESSOR_SYMBOL.get(state), state.getTypes())) {
88+
if (!enclosingClass(sym).isSubClass(PROCESSOR_SYMBOL.get(state), state.getTypes())) {
8889
return NO_MATCH;
8990
}
9091
List<ReturnTree> returns = new ArrayList<>();

‎core/src/main/java/com/google/errorprone/bugpatterns/FieldCanBeStatic.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import static com.google.errorprone.matchers.Description.NO_MATCH;
2525
import static com.google.errorprone.util.ASTHelpers.annotationsAmong;
2626
import static com.google.errorprone.util.ASTHelpers.canBeRemoved;
27+
import static com.google.errorprone.util.ASTHelpers.enclosingClass;
2728
import static com.google.errorprone.util.ASTHelpers.getSymbol;
2829
import static com.google.errorprone.util.ASTHelpers.getType;
2930
import static javax.lang.model.element.ElementKind.FIELD;
@@ -99,7 +100,7 @@ public Description matchVariable(VariableTree tree, VisitorState state) {
99100
|| (symbol.flags() & RECORD_FLAG) == RECORD_FLAG) {
100101
return NO_MATCH;
101102
}
102-
ClassSymbol enclClass = symbol.owner.enclClass();
103+
ClassSymbol enclClass = enclosingClass(symbol);
103104
if (enclClass == null) {
104105
return NO_MATCH;
105106
}

‎core/src/main/java/com/google/errorprone/bugpatterns/InterfaceWithOnlyStatics.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import static com.google.common.collect.Iterables.getLast;
2020
import static com.google.errorprone.bugpatterns.inject.dagger.DaggerAnnotations.isAnyModule;
2121
import static com.google.errorprone.util.ASTHelpers.createPrivateConstructor;
22+
import static com.google.errorprone.util.ASTHelpers.enclosingClass;
2223
import static com.google.errorprone.util.ASTHelpers.getStartPosition;
2324
import static com.google.errorprone.util.ASTHelpers.getSymbol;
2425
import static com.google.errorprone.util.ASTHelpers.isStatic;
@@ -105,7 +106,7 @@ private static SuggestedFix fixClass(ClassTree classTree, VisitorState state) {
105106
int endPos = getStartPosition(classTree.getMembers().get(0));
106107
ImmutableList<ErrorProneToken> tokens = state.getOffsetTokens(startPos, endPos);
107108
String modifiers =
108-
getSymbol(classTree).owner.enclClass() == null ? "final class" : "static final class";
109+
enclosingClass(getSymbol(classTree)) == null ? "final class" : "static final class";
109110
SuggestedFix.Builder fix = SuggestedFix.builder();
110111
for (ErrorProneToken token : tokens) {
111112
if (token.kind() == TokenKind.INTERFACE) {

‎core/src/main/java/com/google/errorprone/bugpatterns/MethodCanBeStatic.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import static com.google.errorprone.fixes.SuggestedFixes.addModifiers;
2222
import static com.google.errorprone.matchers.Description.NO_MATCH;
2323
import static com.google.errorprone.matchers.Matchers.SERIALIZATION_METHODS;
24+
import static com.google.errorprone.util.ASTHelpers.enclosingClass;
2425
import static com.google.errorprone.util.ASTHelpers.getStartPosition;
2526
import static com.google.errorprone.util.ASTHelpers.streamSuperMethods;
2627
import static java.util.Collections.disjoint;
@@ -233,7 +234,7 @@ public Void visitMemberReference(MemberReferenceTree tree, Void unused) {
233234

234235
private void fixQualifier(Tree tree, ExpressionTree qualifierExpression) {
235236
if (sym.equals(ASTHelpers.getSymbol(tree))) {
236-
builder.replace(qualifierExpression, sym.owner.enclClass().getSimpleName().toString());
237+
builder.replace(qualifierExpression, enclosingClass(sym).getSimpleName().toString());
237238
}
238239
}
239240
}.scan(state.getPath().getCompilationUnit(), null);
@@ -248,11 +249,11 @@ private static boolean isExcluded(MethodTree tree, VisitorState state) {
248249
if (!ASTHelpers.canBeRemoved(sym, state) || ASTHelpers.shouldKeep(tree)) {
249250
return true;
250251
}
251-
switch (sym.owner.enclClass().getNestingKind()) {
252+
switch (enclosingClass(sym).getNestingKind()) {
252253
case TOP_LEVEL -> {}
253254
case MEMBER -> {
254255
if (!SourceVersion.supportsStaticInnerClass(state.context)
255-
&& sym.owner.enclClass().hasOuterInstance()) {
256+
&& enclosingClass(sym).hasOuterInstance()) {
256257
return true;
257258
}
258259
}

‎core/src/main/java/com/google/errorprone/bugpatterns/NamedLikeContextualKeyword.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import static com.google.errorprone.matchers.Matchers.methodIsConstructor;
2424
import static com.google.errorprone.matchers.Matchers.methodIsNamed;
2525
import static com.google.errorprone.matchers.Matchers.not;
26+
import static com.google.errorprone.util.ASTHelpers.enclosingClass;
2627
import static com.google.errorprone.util.ASTHelpers.findPathFromEnclosingNodeToTopLevel;
2728
import static com.google.errorprone.util.ASTHelpers.getSymbol;
2829
import static com.google.errorprone.util.ASTHelpers.streamSuperMethods;
@@ -129,7 +130,7 @@ public Description matchMethodInvocation(MethodInvocationTree tree, VisitorState
129130
private static String getQualifier(
130131
VisitorState state, MethodSymbol sym, SuggestedFix.Builder fix) {
131132
if (sym.isStatic()) {
132-
return qualifyType(state, fix, sym.owner.enclClass());
133+
return qualifyType(state, fix, enclosingClass(sym));
133134
}
134135
TreePath path = findPathFromEnclosingNodeToTopLevel(state.getPath(), ClassTree.class);
135136
if (sym.isMemberOf(getSymbol((ClassTree) path.getLeaf()), state.getTypes())) {

‎core/src/main/java/com/google/errorprone/bugpatterns/StaticQualifiedUsingExpression.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import static com.google.errorprone.BugPattern.SeverityLevel.ERROR;
2020
import static com.google.errorprone.fixes.SuggestedFixes.qualifyType;
2121
import static com.google.errorprone.matchers.Description.NO_MATCH;
22+
import static com.google.errorprone.util.ASTHelpers.enclosingClass;
2223
import static com.google.errorprone.util.ASTHelpers.getSymbol;
2324
import static com.google.errorprone.util.ASTHelpers.isStatic;
2425

@@ -71,7 +72,7 @@ public Description matchMemberSelect(MemberSelectTree tree, VisitorState state)
7172
default:
7273
return NO_MATCH;
7374
}
74-
ClassSymbol owner = sym.owner.enclClass();
75+
ClassSymbol owner = enclosingClass(sym);
7576
ExpressionTree expression = tree.getExpression();
7677
switch (expression.getKind()) {
7778
case MEMBER_SELECT, IDENTIFIER -> {

‎core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryAnonymousClass.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import static com.google.errorprone.BugPattern.SeverityLevel.WARNING;
2424
import static com.google.errorprone.matchers.Description.NO_MATCH;
2525
import static com.google.errorprone.util.ASTHelpers.canBeRemoved;
26+
import static com.google.errorprone.util.ASTHelpers.enclosingClass;
2627
import static com.google.errorprone.util.ASTHelpers.getReceiver;
2728
import static com.google.errorprone.util.ASTHelpers.getStartPosition;
2829
import static com.google.errorprone.util.ASTHelpers.getSymbol;
@@ -106,7 +107,7 @@ public Description matchVariable(VariableTree tree, VisitorState state) {
106107
return NO_MATCH;
107108
}
108109
if (!methodSymbol.overrides(
109-
descriptorSymbol, methodSymbol.owner.enclClass(), state.getTypes(), false)) {
110+
descriptorSymbol, enclosingClass(methodSymbol), state.getTypes(), false)) {
110111
return NO_MATCH;
111112
}
112113
if (tree.getModifiers().getAnnotations().stream()
@@ -255,7 +256,7 @@ public Void visitIdentifier(IdentifierTree node, Void unused) {
255256
return SuggestedFix.replace(
256257
node,
257258
String.format(
258-
"%s::%s", isStatic(sym) ? sym.owner.enclClass().getSimpleName() : "this", newName));
259+
"%s::%s", isStatic(sym) ? enclosingClass(sym).getSimpleName() : "this", newName));
259260
}
260261
}
261262

‎core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryLambda.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import static com.google.errorprone.BugPattern.SeverityLevel.WARNING;
2525
import static com.google.errorprone.fixes.SuggestedFixes.prettyType;
2626
import static com.google.errorprone.matchers.Description.NO_MATCH;
27+
import static com.google.errorprone.util.ASTHelpers.enclosingClass;
2728
import static com.google.errorprone.util.ASTHelpers.enclosingPackage;
2829
import static com.google.errorprone.util.ASTHelpers.getModifiers;
2930
import static com.google.errorprone.util.ASTHelpers.getReceiver;
@@ -314,7 +315,7 @@ private static void replaceUseWithMethodReference(
314315
if (node instanceof MethodInvocationTree && getReceiver(node) != null) {
315316
receiverCode = state.getSourceForNode(getReceiver(node));
316317
} else {
317-
receiverCode = isStatic(sym) ? sym.owner.enclClass().getSimpleName().toString() : "this";
318+
receiverCode = isStatic(sym) ? enclosingClass(sym).getSimpleName().toString() : "this";
318319
}
319320
fix.replace(node, String.format("%s::%s", receiverCode, newName));
320321
}

‎core/src/main/java/com/google/errorprone/bugpatterns/UnsynchronizedOverridesSynchronized.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import static com.google.common.collect.Iterables.getOnlyElement;
2121
import static com.google.errorprone.BugPattern.SeverityLevel.WARNING;
2222
import static com.google.errorprone.matchers.Description.NO_MATCH;
23+
import static com.google.errorprone.util.ASTHelpers.enclosingClass;
2324
import static com.google.errorprone.util.ASTHelpers.isSameType;
2425

2526
import com.google.errorprone.BugPattern;
@@ -145,7 +146,7 @@ private boolean overrides(MethodSymbol sym, MethodSymbol other) {
145146
&& (((sym.flags() | other.flags()) & Flags.SYNTHETIC) == 0)
146147
&& sym.name.contentEquals(other.name)
147148
&& sym.overrides(
148-
other, sym.owner.enclClass(), state.getTypes(), /* checkResult= */ false);
149+
other, enclosingClass(sym), state.getTypes(), /* checkResult= */ false);
149150
}
150151
}.scan(method.getBody(), null),
151152
false);

‎core/src/main/java/com/google/errorprone/bugpatterns/threadsafety/GuardedByBinder.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package com.google.errorprone.bugpatterns.threadsafety;
1818

1919
import static com.google.errorprone.bugpatterns.threadsafety.IllegalGuardedBy.checkGuardedBy;
20+
import static com.google.errorprone.util.ASTHelpers.enclosingClass;
2021
import static com.google.errorprone.util.ASTHelpers.isStatic;
2122

2223
import com.google.errorprone.VisitorState;
@@ -306,7 +307,7 @@ private GuardedByExpression computeBase(BinderContext context, Symbol symbol) {
306307
private GuardedByExpression normalizeBase(
307308
BinderContext context, Symbol symbol, GuardedByExpression base) {
308309
if (isStatic(symbol)) {
309-
return F.typeLiteral(symbol.owner.enclClass());
310+
return F.typeLiteral(enclosingClass(symbol));
310311
}
311312

312313
if (base != null && base.kind() != GuardedByExpression.Kind.THIS) {
@@ -331,9 +332,9 @@ private GuardedByExpression normalizeBase(
331332
*/
332333
private @Nullable ClassSymbol isEnclosedIn(
333334
ClassSymbol startingClass, Symbol member, Types types) {
334-
for (ClassSymbol scope = startingClass.owner.enclClass();
335+
for (ClassSymbol scope = enclosingClass(startingClass);
335336
scope != null;
336-
scope = scope.owner.enclClass()) {
337+
scope = enclosingClass(scope)) {
337338
if (member.isMemberOf(scope.type.tsym, types)) {
338339
return scope;
339340
}

‎core/src/main/java/com/google/errorprone/bugpatterns/threadsafety/GuardedByExpression.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package com.google.errorprone.bugpatterns.threadsafety;
1818

1919
import static com.google.errorprone.bugpatterns.threadsafety.IllegalGuardedBy.checkGuardedBy;
20+
import static com.google.errorprone.util.ASTHelpers.enclosingClass;
2021

2122
import com.google.auto.value.AutoValue;
2223
import com.sun.tools.javac.code.Flags;
@@ -180,7 +181,7 @@ GuardedByExpression qualifiedThis(Names names, ClassSymbol access, Symbol enclos
180181
GuardedByExpression base = thisliteral();
181182
Symbol curr = access;
182183
do {
183-
curr = curr.owner.enclClass();
184+
curr = enclosingClass(curr);
184185
if (curr == null) {
185186
break;
186187
}

‎core/src/main/java/com/google/errorprone/bugpatterns/threadsafety/GuardedBySymbolResolver.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public class GuardedBySymbolResolver implements GuardedByBinder.Resolver {
6464

6565
public static GuardedBySymbolResolver from(Tree tree, VisitorState visitorState) {
6666
return GuardedBySymbolResolver.from(
67-
ASTHelpers.getSymbol(tree).owner.enclClass(),
67+
ASTHelpers.enclosingClass(ASTHelpers.getSymbol(tree)),
6868
MethodInfo.create(tree, visitorState),
6969
visitorState.getPath().getCompilationUnit(),
7070
visitorState.context,

0 commit comments

Comments
 (0)