Post rebase fixes

Author: mohamedsamehsalah

error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/StreamRulesTestInput.java

@@ -50,6 +50,7 @@ public ImmutableSet<Object> elidedTypesAndStaticImports() {
         identity(),
         ImmutableList.class,
         ImmutableMap.class,
+        List.class,
         Map.class,
         mapping(null, null),
         maxBy(null),

refaster-test-support/src/main/java/tech/picnic/errorprone/refaster/test/RefasterRuleCollection.java

@@ -12,6 +12,7 @@
 import static java.util.stream.Collectors.joining;
 import static tech.picnic.errorprone.refaster.runner.Refaster.INCLUDED_RULES_PATTERN_FLAG;
 
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableListMultimap;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableRangeMap;
@@ -241,17 +242,13 @@ private void reportUnSortedElidedTypesAndStaticImports(
   }
 
   private static String getArgumentName(ExpressionTree arg, VisitorState state) {
-    switch (arg.getKind()) {
-      case MEMBER_SELECT:
-        return state.getSourceForNode(((MemberSelectTree) arg).getExpression());
-      case METHOD_INVOCATION:
-        return state.getSourceForNode(((MethodInvocationTree) arg).getMethodSelect());
-      case STRING_LITERAL:
-      case INT_LITERAL:
-        return ((LiteralTree) arg).getValue().toString();
-      default:
-        return "";
-    }
+    return switch (arg.getKind()) {
+      case MEMBER_SELECT -> state.getSourceForNode(((MemberSelectTree) arg).getExpression());
+      case METHOD_INVOCATION ->
+          state.getSourceForNode(((MethodInvocationTree) arg).getMethodSelect());
+      case STRING_LITERAL, INT_LITERAL -> ((LiteralTree) arg).getValue().toString();
+      default -> "";
+    };
   }
 
   private static ImmutableRangeMap<Integer, String> indexRuleMatches(