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

Java: ignore "as" and "to" prefixes to generate better variable names (IJP-1469)

Browse Source 
GitOrigin-RevId: 12cde9892bece40321b4655e7d32b75bd43748e8
This commit is contained in:
Bas Leijdekkers
2023-01-25 16:49:43 +01:00
committed by intellij-monorepo-bot
parent d522e0a3d9
commit 3c556d8fe0
15 changed files with 38 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java
View File

@@ -40,6 +40,8 @@ public class JavaCodeStyleManagerImpl extends JavaCodeStyleManager {
@NonNls private static final String FIND_PREFIX = "find";
@NonNls private static final String CREATE_PREFIX = "create";
@NonNls private static final String SET_PREFIX = "set";
@NonNls private static final String AS_PREFIX = "as";
@NonNls private static final String TO_PREFIX = "to";
@NonNls private static final String[] ourPrepositions = {
"as", "at", "by", "down", "for", "from", "in", "into", "of", "on", "onto", "out", "over",
@@ -47,7 +49,6 @@ public class JavaCodeStyleManagerImpl extends JavaCodeStyleManager {
@NonNls private static final String[] ourCommonTypeSuffixes = {"Entity"};
private final Project myProject;
public JavaCodeStyleManagerImpl(final Project project) {
@@ -668,7 +669,9 @@ public class JavaCodeStyleManagerImpl extends JavaCodeStyleManager {
if (GET_PREFIX.equals(firstWord)
|| IS_PREFIX.equals(firstWord)
|| FIND_PREFIX.equals(firstWord)
|| CREATE_PREFIX.equals(firstWord)) {
|| CREATE_PREFIX.equals(firstWord)
|| AS_PREFIX.equals(firstWord)
|| TO_PREFIX.equals(firstWord)) {
if (words.length > 1) {
final String propertyName = methodName.substring(firstWord.length());
final PsiExpression qualifierExpression = methodExpr.getQualifierExpression();

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/optionalToIf/afterFlatMap.java
View File

@@ -77,7 +77,7 @@ class Test {
void flatMapsWithSameParamName(String param0) {
if (param0 == null) throw new NullPointerException();
String s = "foo";
String toLowerCase = ("foo").toLowerCase();
String lowerCase = ("foo").toLowerCase();
String bar = "bar";
}

14
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/optionalToIf/afterOr.java
View File

@@ -5,15 +5,15 @@ import java.util.*;
class Test {
String reusesVariable(String in) {
String s1 = null;
String s = null;
if (in == null) throw new NullPointerException();
String s = toName(in);
if (s != null) s1 = s;
if (s1 == null) {
String value = toDefaultName();
s1 = value;
String name = toName(in);
if (name != null) s = name;
if (s == null) {
String defaultName = toDefaultName();
s = defaultName;
}
return s1;
return s;
}
String removesRedundantAssignment(String in) {

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

@@ -15,10 +15,10 @@ public class Main {
boolean seen = false;
int best = 0;
for (Index index : set.asList()) {
int asInteger = index.asInteger();
if (!seen || asInteger < best) {
int integer = index.asInteger();
if (!seen || integer < best) {
seen = true;
best = asInteger;
best = integer;
}
}
return seen ? OptionalInt.of(best) : OptionalInt.empty();

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

@@ -29,12 +29,12 @@ public class Main {
}
private void collect2() {
List<List<? extends CharSequence>> list = new ArrayList<>();
List<List<? extends CharSequence>> result = new ArrayList<>();
for (CharSequence charSequence : getListExtends()) {
List<? extends CharSequence> charSequences = asList(charSequence);
list.add(charSequences);
List<? extends CharSequence> list = asList(charSequence);
result.add(list);
}
List<? extends List<? extends CharSequence>> res2 = list;
List<? extends List<? extends CharSequence>> res2 = result;
System.out.println(res2);
}
@@ -45,8 +45,8 @@ public class Main {
MyList<? extends List<? extends CharSequence>> res2 =
new MyList<>();
for (CharSequence charSequence : getListExtends()) {
List<? extends CharSequence> charSequences = asList(charSequence);
res2.add(charSequences);
List<? extends CharSequence> list = asList(charSequence);
res2.add(list);
}
System.out.println(res2);
}

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

@@ -9,8 +9,8 @@ public class Main {
static {
List<String> list = new ArrayList<>();
for (String s : Arrays.asList("foo", "bar", "baz")) {
String toUpperCase = s.toUpperCase();
list.add(toUpperCase);
String upperCase = s.toUpperCase();
list.add(upperCase);
}
STR = list;
}

4
java/java-tests/testData/inspection/streamApiCallChains/afterFilterMapLambdasWithCurlyBraces.java
View File

@@ -6,8 +6,8 @@ class X {
void foo(List<String> list) {
list.stream().map(x -> {
return x.toUpperCase();
}).filter(s -> {
return s.length() > 3;
}).filter(upperCase -> {
return upperCase.length() > 3;
}).count();
}
}

2
java/java-tests/testData/inspection/streamApiCallChains/afterFilterMapLambdasWithoutCurlyBraces.java
View File

@@ -4,6 +4,6 @@ import java.util.List;
class X {
void foo(List<String> list) {
list.stream().map(x -> x.toUpperCase()).filter(s -> s.length() > 3).count();
list.stream().map(x -> x.toUpperCase()).filter(upperCase -> upperCase.length() > 3).count();
}
}

2
java/java-tests/testData/inspection/streamApiCallChains/afterFilterMapMethodReference.java
View File

@@ -4,6 +4,6 @@ import java.util.List;
class X {
void foo(List<String> list) {
list.stream().map(String::toUpperCase).filter(s -> s.length() > 3).count();
list.stream().map(String::toUpperCase).filter(upperCase -> upperCase.length() > 3).count();
}
}

2
java/java-tests/testData/inspection/streamApiCallChains/afterFilterMapParenthesizedParam.java
View File

@@ -5,6 +5,6 @@ import java.util.stream.Collectors;
class X {
void test(List<List<String>> list) {
list.stream().map(l -> l.toString()).filter(s -> s.isEmpty()).collect(Collectors.toList());
list.stream().map(l -> l.toString()).filter(string -> string.isEmpty()).collect(Collectors.toList());
}
}

2
java/java-tests/testData/inspection/streamApiCallChains/afterFilterMapWithParentheses.java
View File

@@ -6,6 +6,6 @@ class X {
void foo(List<String> list) {
list.stream().map((((x) -> {
return ((x.toUpperCase()));
}))).filter(((s -> ((((((s)).length())) > 3))))).count();
}))).filter(((upperCase -> ((((((upperCase)).length())) > 3))))).count();
}
}

6
java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ExpressionDuplicates_after.java
View File

@@ -2,15 +2,15 @@ import org.jetbrains.annotations.NotNull;
public class Test {
void f1(String p) {
String r = getR(p);
String r = getLowerCase(p);
}
@NotNull
private static String getR(String p) {
private static String getLowerCase(String p) {
return p.toLowerCase();
}
void f2(String p) {
String r = getR(p);
String r = getLowerCase(p);
}
}

2
java/java-tests/testData/refactoring/inplaceIntroduceVariable/streamSimple_after.java
View File

@@ -2,6 +2,6 @@ import java.util.List;
public class StreamExtract {
void test(List<String> list) {
list.stream().map(String::toLowerCase).forEach(s1 -> System.out.println(s1));
list.stream().map(String::toLowerCase).forEach(lowerCase -> System.out.println(lowerCase));
}
}

4
java/java-tests/testData/refactoring/introduceField/afterStaticFieldInInnerClass.java
View File

@@ -1,9 +1,9 @@
public class A {
private static final class Inner {
public final String str;
public final String string;
public Inner(Integer param) {
str = param.toString();
string = param.toString();
}
}
}

4
java/java-tests/testData/refactoring/introduceParameter/afterVarargMethodStricktlyCalled.java
View File

@@ -5,8 +5,8 @@ class Main {
public static void main(String...args){
String[] array = new String[]{"a", "b", "c"};
final List<String> strings = Arrays.asList(array);
foo(strings);
final List<String> list = Arrays.asList(array);
foo(list);
}
private static void foo(List<String> anObject){