MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-05-03 03:37:58 +07:00
Code Issues Packages Projects Releases Wiki Activity

Java: better name suggestions for boxed types, filter out common bad names and add special cases for common methods

Browse Source 
GitOrigin-RevId: 2bf3977d2873bd133ac6acb85df54aece740f428
This commit is contained in:
Bas Leijdekkers
2023-02-13 17:04:12 +01:00
committed by intellij-monorepo-bot
parent f0be15b132
commit 9a44d02318
46 changed files with 192 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamToLoop/afterArraySkipDistinctCount.java
View File

@@ -9,12 +9,12 @@ public class Main {
long count = 0L;
Set<Integer> uniqueValues = new HashSet<>();
boolean first = true;
for (Integer integer : new Integer[]{1, 2, 3, 2, 3}) {
for (Integer i : new Integer[]{1, 2, 3, 2, 3}) {
if (first) {
first = false;
continue;
}
if (uniqueValues.add(integer)) {
if (uniqueValues.add(i)) {
count++;
}
}

4
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamToLoop/afterBoxed.java
View File

@@ -9,8 +9,8 @@ public class Main {
private static List<Integer> test(int[] numbers) {
List<Integer> list = new ArrayList<>();
for (int number : numbers) {
Integer integer = number;
list.add(integer);
Integer i = number;
list.add(i);
}
return list;
}

4
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamToLoop/afterComplexMapper.java
View File

@@ -10,8 +10,8 @@ public class Main {
List<String> result = new ArrayList<>();
Function<? super String, ? extends String> function = list.size() < 10 ? String::trim : Function.identity();
for (String s : list) {
String s1 = function.apply(s);
result.add(s1);
String string = function.apply(s);
result.add(string);
}
System.out.println(result);
}

4
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamToLoop/afterFilterMapCollect.java
View File

@@ -10,8 +10,8 @@ public class Main {
List<Integer> list = new ArrayList<>();
for (int x : input) {
if (x > 0) {
Integer integer = x * 2;
list.add(integer);
Integer i = x * 2;
list.add(i);
}
}
return list;

10
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamToLoop/afterFlatMap.java
View File

@@ -12,11 +12,11 @@ public class Main {
private static long testChain(List<? extends String> list) {
long count = 0L;
for (Object o : Arrays.asList(0, null, "1", list)) {
for (Object o1 : Arrays.asList(o)) {
for (Object o2 : Arrays.asList(o1)) {
for (Object o3 : Arrays.asList(o2)) {
for (Object o4 : Arrays.asList(o3)) {
for (Object o5 : Arrays.asList(o4)) {
for (Object object : Arrays.asList(o)) {
for (Object o1 : Arrays.asList(object)) {
for (Object object1 : Arrays.asList(o1)) {
for (Object o2 : Arrays.asList(object1)) {
for (Object object2 : Arrays.asList(o2)) {
count++;
}
}

4
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamToLoop/afterGenerate.java
View File

@@ -27,8 +27,8 @@ public class Main {
Integer acc = 0;
SplittableRandom splittableRandom = new SplittableRandom(1);
for (long count = 100; count > 0; count--) {
Integer integer = 500;
acc = splittableRandom.nextInt(acc, integer);
Integer i = 500;
acc = splittableRandom.nextInt(acc, i);
}
int n1 = acc;
System.out.println(n1);

4
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamToLoop/afterGroupingBy.java
View File

@@ -66,8 +66,8 @@ public class Main {
TreeMap<Integer, List<Integer>> map = new TreeMap<>(Comparator.reverseOrder());
for (String string : strings) {
Integer len = string.length();
Integer integer = len * 2;
map.computeIfAbsent(string.length(), k -> new ArrayList<>()).add(integer);
Integer i = len * 2;
map.computeIfAbsent(string.length(), k -> new ArrayList<>()).add(i);
}
return map;
}

82
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamToLoop/afterInExactVariable.java
View File

@@ -8,54 +8,54 @@ import java.util.stream.Stream;
public class InExactVariable {
public void testMap() {
HashMap<String, String> map = new HashMap<>();
for (Integer integer2 : Arrays.asList(1, 2, 3, 4)) {
String of = String.valueOf(integer2);
map.putIfAbsent(of.trim(), of);
for (Integer i1 : Arrays.asList(1, 2, 3, 4)) {
String valueOf = String.valueOf(i1);
map.putIfAbsent(valueOf.trim(), valueOf);
}
Object map1 = map;
HashMap<String, String> map2 = new HashMap<>();
for (Integer integer1 : Arrays.asList(1, 2, 3, 4)) {
String valueOf = String.valueOf(integer1);
map2.putIfAbsent(valueOf.trim(), valueOf);
for (Integer integer : Arrays.asList(1, 2, 3, 4)) {
String string = String.valueOf(integer);
map2.putIfAbsent(string.trim(), string);
}
Map<String, String> map3 = new HashMap<>();
for (Integer integer : Arrays.asList(1, 2, 3, 4)) {
String s = String.valueOf(integer);
for (Integer i : Arrays.asList(1, 2, 3, 4)) {
String s = String.valueOf(i);
map3.putIfAbsent(s.trim(), s);
}
}
public void testList() {
List<String> result1 = new ArrayList<>();
for (Integer integer5 : Arrays.asList(1, 2, 3, 4)) {
String valuedOf = String.valueOf(integer5);
result1.add(valuedOf);
for (Integer integer2 : Arrays.asList(1, 2, 3, 4)) {
String string1 = String.valueOf(integer2);
result1.add(string1);
}
Object list1 = result1;
List<String> result = new ArrayList<>();
for (Integer integer4 : Arrays.asList(1, 2, 3, 4)) {
String valued = String.valueOf(integer4);
result.add(valued);
for (Integer i2 : Arrays.asList(1, 2, 3, 4)) {
String s1 = String.valueOf(i2);
result.add(s1);
}
Iterable<String> list2 = result;
Collection<String> list3 = new ArrayList<>();
for (Integer integer3 : Arrays.asList(1, 2, 3, 4)) {
String value = String.valueOf(integer3);
for (Integer integer1 : Arrays.asList(1, 2, 3, 4)) {
String value = String.valueOf(integer1);
list3.add(value);
}
List<String> list4 = new ArrayList<>();
for (Integer integer2 : Arrays.asList(1, 2, 3, 4)) {
String of = String.valueOf(integer2);
list4.add(of);
for (Integer i1 : Arrays.asList(1, 2, 3, 4)) {
String valueOf = String.valueOf(i1);
list4.add(valueOf);
}
Collection<Object> list5 = new ArrayList<>();
for (Integer integer1 : Arrays.asList(1, 2, 3, 4)) {
String valueOf = String.valueOf(integer1);
list5.add(valueOf);
for (Integer integer : Arrays.asList(1, 2, 3, 4)) {
String string = String.valueOf(integer);
list5.add(string);
}
List<String> list = new ArrayList<>();
for (Integer integer : Arrays.asList(1, 2, 3, 4)) {
String s = String.valueOf(integer);
for (Integer i : Arrays.asList(1, 2, 3, 4)) {
String s = String.valueOf(i);
list.add(s);
}
Collection<?> list6 = list;
@@ -65,45 +65,45 @@ public class InExactVariable {
Map<Boolean, List<String>> map = new HashMap<>();
map.put(false, new ArrayList<>());
map.put(true, new ArrayList<>());
for (Integer integer1 : Arrays.asList(1, 2, 3, 4)) {
String s = String.valueOf(integer1);
for (Integer integer : Arrays.asList(1, 2, 3, 4)) {
String s = String.valueOf(integer);
map.get(s.length() > 1).add(s);
}
Object map1 = map;
Map<Boolean, List<String>> map2 = new HashMap<>();
map2.put(false, new ArrayList<>());
map2.put(true, new ArrayList<>());
for (Integer integer : Arrays.asList(1, 2, 3, 4)) {
String x = String.valueOf(integer);
for (Integer i : Arrays.asList(1, 2, 3, 4)) {
String x = String.valueOf(i);
map2.get(x.length() > 1).add(x);
}
}
public void testGroupingBy() {
TreeMap<Integer, Set<String>> result = new TreeMap<>();
for (Integer integer4 : Arrays.asList(1, 2, 3, 4)) {
String valued = String.valueOf(integer4);
result.computeIfAbsent(valued.length(), k2 -> new HashSet<>()).add(valued);
for (Integer i2 : Arrays.asList(1, 2, 3, 4)) {
String s1 = String.valueOf(i2);
result.computeIfAbsent(s1.length(), k2 -> new HashSet<>()).add(s1);
}
Object map1 = result;
TreeMap<Integer, Set<String>> map2 = new TreeMap<>();
for (Integer integer3 : Arrays.asList(1, 2, 3, 4)) {
String value = String.valueOf(integer3);
for (Integer integer1 : Arrays.asList(1, 2, 3, 4)) {
String value = String.valueOf(integer1);
map2.computeIfAbsent(value.length(), key1 -> new HashSet<>()).add(value);
}
NavigableMap<Integer, Set<String>> map3 = new TreeMap<>();
for (Integer integer2 : Arrays.asList(1, 2, 3, 4)) {
String of = String.valueOf(integer2);
map3.computeIfAbsent(of.length(), k1 -> new HashSet<>()).add(of);
for (Integer i1 : Arrays.asList(1, 2, 3, 4)) {
String valueOf = String.valueOf(i1);
map3.computeIfAbsent(valueOf.length(), k1 -> new HashSet<>()).add(valueOf);
}
SortedMap<Integer, Set<String>> map4 = new TreeMap<>();
for (Integer integer1 : Arrays.asList(1, 2, 3, 4)) {
String valueOf = String.valueOf(integer1);
map4.computeIfAbsent(valueOf.length(), key -> new HashSet<>()).add(valueOf);
for (Integer integer : Arrays.asList(1, 2, 3, 4)) {
String string = String.valueOf(integer);
map4.computeIfAbsent(string.length(), key -> new HashSet<>()).add(string);
}
TreeMap<Integer, Set<String>> map = new TreeMap<>();
for (Integer integer : Arrays.asList(1, 2, 3, 4)) {
String s = String.valueOf(integer);
for (Integer i : Arrays.asList(1, 2, 3, 4)) {
String s = String.valueOf(i);
map.computeIfAbsent(s.length(), k -> new HashSet<>()).add(s);
}
Cloneable map5 = map;

6
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamToLoop/afterInLambda.java
View File

@@ -10,9 +10,9 @@ public class Main {
DoubleSupplier s = () -> {
long sum = 0;
long count = 0;
for (String s1 : list) {
if (s1 != null) {
sum += s1.length();
for (String string : list) {
if (string != null) {
sum += string.length();
count++;
}
}

6
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamToLoop/afterInVoidLambda.java
View File

@@ -6,9 +6,9 @@ import java.util.stream.Stream;
public class Main {
public void test(String... list) {
Runnable s = () -> {
for (String s1 : list) {
if (s1 != null) {
System.out.println(s1);
for (String string : list) {
if (string != null) {
System.out.println(string);
}
}
};

4
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamToLoop/afterIterate.java
View File

@@ -47,8 +47,8 @@ public class Main {
private static List<String> testNestedUseName() {
List<String> list = new ArrayList<>();
for (int x = 0; x < 20; x++) {
Integer integer = x;
long limit = integer;
Integer i = x;
long limit = i;
for (String str = ""; ; str = "a" + str) {
if (limit-- == 0) break;
list.add(str);

4
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamToLoop/afterMappingToList.java
View File

@@ -8,8 +8,8 @@ public class Main {
List<Integer> list = new ArrayList<>();
for (String string : strings) {
Integer len = string.length();
Integer integer = len * 2;
list.add(integer);
Integer i = len * 2;
list.add(i);
}
System.out.println(list);
}

4
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamToLoop/afterStreamInFor.java
View File

@@ -36,8 +36,8 @@ public class Main {
System.out.println(j);
StringJoiner joiner = new StringJoiner(",");
for (String s1 : list) {
joiner.add(s1);
for (String string : list) {
joiner.add(string);
}
for(String s = joiner.toString(); !s.isEmpty(); s = s.substring(1)) {
System.out.println(s);

8
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamToLoop/afterTakeDrop.java
View File

@@ -27,17 +27,17 @@ public class Test {
boolean dropping = true;
OUTER:
for (String s : data) {
for (String s1 : Arrays.asList(s, s + s)) {
if (s1.isEmpty()) {
for (String string : Arrays.asList(s, s + s)) {
if (string.isEmpty()) {
break OUTER;
}
if (dropping) {
if (s1.length() < 3) {
if (string.length() < 3) {
continue;
}
dropping = false;
}
xyz.add(s1);
xyz.add(string);
}
}
System.out.println(xyz);

12
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamToLoop/afterToArray.java
View File

@@ -8,8 +8,8 @@ public class Main {
private static Object[] test(int[] numbers) {
List<Integer> list = new ArrayList<>();
for (int number : numbers) {
Integer integer = number;
list.add(integer);
Integer i = number;
list.add(i);
}
return list.toArray();
}
@@ -27,8 +27,8 @@ public class Main {
private static Number[] testCovariant(int[] numbers) {
List<Integer> list = new ArrayList<>();
for (int number : numbers) {
Integer integer = number;
list.add(integer);
Integer i = number;
list.add(i);
}
return list.toArray(new Integer[0]);
}
@@ -36,8 +36,8 @@ public class Main {
private static Number[] testCovariantLambda(int[] numbers) {
List<Integer> list = new ArrayList<>();
for (int number : numbers) {
Integer integer = number;
list.add(integer);
Integer i = number;
list.add(i);
}
return list.toArray(new Integer[0]);
}

4
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamToLoop/afterUnknownSource.java
View File

@@ -8,8 +8,8 @@ public class Test {
static void test() {
for (int n = 1; n < 100; n++) {
if (n > 20) {
Integer integer = n;
for (PrimitiveIterator.OfDouble it = new Random(integer).doubles(integer).iterator(); it.hasNext(); ) {
Integer i = n;
for (PrimitiveIterator.OfDouble it = new Random(i).doubles(i).iterator(); it.hasNext(); ) {
double v = it.next();
if (v < 0.01) {
System.out.println(v);

4
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamToLoop/afterUnnecessaryQualifier.java
View File

@@ -14,8 +14,8 @@ public class Test {
public static void main(String[] args) {
List<String> list = new ArrayList<>();
for (String s : Arrays.asList("a", "b", "c")) {
String doProcess = doProcess(s);
list.add(doProcess);
String string = doProcess(s);
list.add(string);
}
System.out.println(list);
}