Skip to content

Commit 3272246

Browse files
graememorganError Prone Team
authored andcommitted
Use getLast now that EP is on 21 (or will be after unknown commit)
RELNOTES=no PiperOrigin-RevId: 826447287
1 parent 0c3c520 commit 3272246

File tree

152 files changed

+266
-232
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

152 files changed

+266
-232
lines changed

check_api/src/main/java/com/google/errorprone/apply/DescriptionBasedDiff.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public boolean isEmpty() {
9090
public void onDescribed(Description description) {
9191
// Use only first (most likely) suggested fix
9292
if (description.fixes.size() > 0) {
93-
handleFix(description.fixes.get(0));
93+
handleFix(description.fixes.getFirst());
9494
}
9595
}
9696

check_api/src/main/java/com/google/errorprone/dataflow/nullnesspropagation/NullnessPropagationTransfer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -889,7 +889,7 @@ private static void setConditionalArgumentNullness(
889889
elseUpdates.set(var, NONNULL);
890890
}
891891
if (isEqualsMethod(calleeName, arguments, types, symtab)) {
892-
LocalVariableNode var = variablesAtIndexes(ImmutableSet.of(0), arguments).get(0);
892+
LocalVariableNode var = variablesAtIndexes(ImmutableSet.of(0), arguments).getFirst();
893893
thenUpdates.set(var, NONNULL);
894894
}
895895
}

check_api/src/main/java/com/google/errorprone/fixes/SuggestedFixes.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ int pos(ClassTree tree, VisitorState state) {
582582
// is just as good.
583583
return LAST.pos(tree, state);
584584
}
585-
JCTree firstMember = (JCTree) members.get(0);
585+
JCTree firstMember = (JCTree) members.getFirst();
586586
int firstMemberStart = firstMember.getStartPosition();
587587
List<ErrorProneToken> methodTokens = state.getOffsetTokens(classStart, firstMemberStart);
588588
ListIterator<ErrorProneToken> iter = methodTokens.listIterator(methodTokens.size());
@@ -744,7 +744,7 @@ public static SuggestedFix renameMethodInvocation(
744744
int endPos =
745745
tree.getArguments().isEmpty()
746746
? state.getEndPosition(tree)
747-
: getStartPosition(tree.getArguments().get(0));
747+
: getStartPosition(tree.getArguments().getFirst());
748748
List<ErrorProneToken> tokens = state.getOffsetTokens(startPos, endPos);
749749
for (ErrorProneToken token : Lists.reverse(tokens)) {
750750
if (token.kind() == TokenKind.IDENTIFIER && token.name().equals(identifier)) {
@@ -909,7 +909,7 @@ public static Fix deleteExceptions(
909909
.map(state::getSourceForNode)
910910
.collect(joining(", "));
911911
return SuggestedFix.replace(
912-
getStartPosition(tree.getThrows().get(0)),
912+
getStartPosition(tree.getThrows().getFirst()),
913913
state.getEndPosition(getLast(tree.getThrows())),
914914
replacement);
915915
}
@@ -1135,7 +1135,7 @@ public static SuggestedFix.Builder addValuesToAnnotationArgument(
11351135
if (!maybeExistingArgument.isPresent()) {
11361136
return SuggestedFix.builder()
11371137
.prefixWith(
1138-
annotation.getArguments().get(0),
1138+
annotation.getArguments().getFirst(),
11391139
parameterName + " = " + newArgument(newValues) + ", ");
11401140
}
11411141

@@ -1195,7 +1195,7 @@ public static SuggestedFix.Builder updateAnnotationArgumentValues(
11951195
if (!maybeExistingArgument.isPresent()) {
11961196
return SuggestedFix.builder()
11971197
.prefixWith(
1198-
annotation.getArguments().get(0),
1198+
annotation.getArguments().getFirst(),
11991199
parameterName + " = " + newArgument(newValues) + ", ");
12001200
}
12011201

@@ -1667,19 +1667,19 @@ public static SuggestedFix replaceIncludingComments(
16671667
// int deletingThisVariable;
16681668
// }
16691669
// Treat this as morally part of the previous member.
1670-
if (!tokens.isEmpty() && tokens.get(0).kind() == TokenKind.SEMI) {
1670+
if (!tokens.isEmpty() && tokens.getFirst().kind() == TokenKind.SEMI) {
16711671
tokens = tokens.subList(1, tokens.size());
16721672
}
16731673
if (tokens.isEmpty()) {
16741674
return SuggestedFix.replace(tree, replacement);
16751675
}
1676-
if (tokens.get(0).comments().isEmpty()) {
1677-
return SuggestedFix.replace(tokens.get(0).pos(), state.getEndPosition(tree), replacement);
1676+
if (tokens.getFirst().comments().isEmpty()) {
1677+
return SuggestedFix.replace(tokens.getFirst().pos(), state.getEndPosition(tree), replacement);
16781678
}
16791679
ImmutableList<ErrorProneComment> comments =
16801680
ImmutableList.sortedCopyOf(
16811681
Comparator.<ErrorProneComment>comparingInt(c -> c.getSourcePos(0)).reversed(),
1682-
tokens.get(0).comments());
1682+
tokens.getFirst().comments());
16831683
int startPos = getStartPosition(tree);
16841684
// This can happen for desugared expressions like `int a, b;`.
16851685
if (startPos < startTokenization) {

check_api/src/main/java/com/google/errorprone/matchers/JUnitMatchers.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package com.google.errorprone.matchers;
1818

1919
import static com.google.common.base.MoreObjects.firstNonNull;
20+
import static com.google.common.collect.Iterables.getOnlyElement;
2021
import static com.google.errorprone.matchers.ChildMultiMatcher.MatchType.AT_LEAST_ONE;
2122
import static com.google.errorprone.matchers.Matchers.allOf;
2223
import static com.google.errorprone.matchers.Matchers.annotations;
@@ -236,7 +237,7 @@ public boolean matches(ExpressionTree t, VisitorState state) {
236237
if (typeArgs.size() != 1) {
237238
return false;
238239
}
239-
Type runnerType = typeArgs.get(0);
240+
Type runnerType = getOnlyElement(typeArgs);
240241
for (String testRunner : runnerTypes) {
241242
Symbol parent = state.getSymbolFromString(testRunner);
242243
if (parent == null) {

check_api/src/main/java/com/google/errorprone/matchers/UnusedReturnValueMatcher.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package com.google.errorprone.matchers;
1818

19+
import static com.google.common.collect.Iterables.getOnlyElement;
1920
import static com.google.errorprone.matchers.Matchers.allOf;
2021
import static com.google.errorprone.matchers.Matchers.anyOf;
2122
import static com.google.errorprone.matchers.Matchers.enclosingMethod;
@@ -228,7 +229,7 @@ private static boolean isOnlyStatementInBlock(StatementTree t, VisitorState s) {
228229
BlockTree parentBlock = ASTHelpers.findEnclosingNode(s.getPath(), BlockTree.class);
229230
return parentBlock != null
230231
&& parentBlock.getStatements().size() == 1
231-
&& parentBlock.getStatements().get(0) == t;
232+
&& getOnlyElement(parentBlock.getStatements()) == t;
232233
}
233234

234235
/** Allow return values to be ignored in tests that expect an exception to be thrown. */

check_api/src/main/java/com/google/errorprone/util/MoreAnnotations.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public static Stream<Compound> getDeclarationAndTypeAttributes(Symbol sym) {
6666
groupingBy(c -> c.type.asElement().getQualifiedName(), LinkedHashMap::new, toList()))
6767
.values()
6868
.stream()
69-
.map(c -> c.get(0));
69+
.map(c -> c.getFirst());
7070
}
7171

7272
/**

core/src/main/java/com/google/errorprone/bugpatterns/AbstractAsKeyOfSetOrMap.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ private Description matchType(ExpressionTree tree, VisitorState state) {
9898
if (argumentTypes.isEmpty()) {
9999
return Description.NO_MATCH;
100100
}
101-
Type typeArg = argumentTypes.get(0);
101+
Type typeArg = argumentTypes.getFirst();
102102
if (isBadType(typeArg, state)) {
103103
return describeMatch(tree);
104104
}

core/src/main/java/com/google/errorprone/bugpatterns/AbstractMockChecker.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ public static TypeExtractor<MethodInvocationTree> extractFirstArg(
173173
return Optional.empty();
174174
}
175175
if (tree.getArguments().size() >= 1) {
176-
return Optional.ofNullable(ASTHelpers.getType(tree.getArguments().get(0)));
176+
return Optional.ofNullable(ASTHelpers.getType(tree.getArguments().getFirst()));
177177
}
178178
return Optional.ofNullable(TargetType.targetType(state)).map(t -> t.type());
179179
};

core/src/main/java/com/google/errorprone/bugpatterns/AbstractMustBeClosedChecker.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,8 @@ private static Optional<Change> wrapTryFinallyAroundVariableScope(
529529
*/
530530
private static boolean isClosingDecorator(
531531
NewClassTree decorator, Tree resource, VisitorState state) {
532-
if (decorator.getArguments().isEmpty() || !decorator.getArguments().get(0).equals(resource)) {
532+
if (decorator.getArguments().isEmpty()
533+
|| !decorator.getArguments().getFirst().equals(resource)) {
533534
// we assume the decorated resource is always the first argument to the decorator constructor
534535
return false;
535536
}
@@ -538,7 +539,7 @@ private static boolean isClosingDecorator(
538539
// resource would not be closed if the decorator constructor throws
539540
return false;
540541
}
541-
Type resourceType = constructor.params().get(0).type;
542+
Type resourceType = constructor.params().getFirst().type;
542543
Type decoratorType = constructor.owner.type;
543544
return CLOSEABLE_DECORATOR_TYPES.keySet().stream()
544545
.filter(key -> isSameType(resourceType, state.getTypeFromString(key), state))

core/src/main/java/com/google/errorprone/bugpatterns/AbstractReturnValueIgnored.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ final ImmutableList<Fix> fixesAtCallSite(ExpressionTree invocationTree, VisitorS
264264
ImmutableMap.Builder<String, SuggestedFix> fixes = ImmutableMap.builder();
265265
if (MOCKITO_VERIFY.matches(invocationTree, state)) {
266266
ExpressionTree maybeCallToMock =
267-
((MethodInvocationTree) invocationTree).getArguments().get(0);
267+
((MethodInvocationTree) invocationTree).getArguments().getFirst();
268268
if (maybeCallToMock instanceof MethodInvocationTree methodInvocationTree) {
269269
ExpressionTree maybeMethodSelectOnMock = methodInvocationTree.getMethodSelect();
270270
if (maybeMethodSelectOnMock instanceof MemberSelectTree maybeSelectOnMock) {
@@ -420,7 +420,7 @@ private Description checkLostType(MethodInvocationTree tree, VisitorState state)
420420
&& !returnedFutureType.hasTag(TypeTag.ERROR) // work around error-prone#996
421421
&& !returnedFutureType.isRaw()) {
422422
if (isSubtype(
423-
getUpperBound(returnedFutureType.getTypeArguments().get(0), state.getTypes()),
423+
getUpperBound(returnedFutureType.getTypeArguments().getFirst(), state.getTypes()),
424424
lostType,
425425
state)) {
426426
return buildDescription(tree)

0 commit comments

Comments
 (0)