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

IDEA-103266 Suggest names for vars by method names without 'get' prefix

Browse Source
This commit is contained in:
peter
2013-10-17 21:54:35 +02:00
parent 293e4c55a7
commit ce10d38c4d
2 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java
+13 -20
View File
@@ -455,31 +455,24 @@ public class JavaCodeStyleManagerImpl extends JavaCodeStyleManager {
}
private NamesByExprInfo suggestVariableNameByExpression(PsiExpression expr, VariableKind variableKind, boolean correctKeywords) {
final NamesByExprInfo names1 = suggestVariableNameByExpressionOnly(expr, variableKind, correctKeywords);
final NamesByExprInfo names2 = suggestVariableNameByExpressionPlace(expr, variableKind, correctKeywords);
PsiType type = expr.getType();
final String[] names3;
if (type != null) {
names3 = suggestVariableNameByType(type, variableKind, correctKeywords);
}
else {
names3 = null;
}
final LinkedHashSet<String> names = new LinkedHashSet<String>();
final String[] fromLiterals = suggestVariableNameFromLiterals(expr, variableKind, correctKeywords);
if (fromLiterals != null) {
ContainerUtil.addAll(names, fromLiterals);
}
ContainerUtil.addAll(names, names1.names);
ContainerUtil.addAll(names, names2.names);
if (names3 != null) {
ContainerUtil.addAll(names, names3);
ContainerUtil.addAll(names, suggestVariableNameByExpressionOnly(expr, variableKind, correctKeywords, false).names);
ContainerUtil.addAll(names, suggestVariableNameByExpressionPlace(expr, variableKind, correctKeywords).names);
PsiType type = expr.getType();
if (type != null) {
ContainerUtil.addAll(names, suggestVariableNameByType(type, variableKind, correctKeywords));
}
ContainerUtil.addAll(names, suggestVariableNameByExpressionOnly(expr, variableKind, correctKeywords, true).names);
String[] namesArray = ArrayUtil.toStringArray(names);
String propertyName = names1.propertyName != null ? names1.propertyName : names2.propertyName;
String propertyName = suggestVariableNameByExpressionOnly(expr, variableKind, correctKeywords, false).propertyName != null ? suggestVariableNameByExpressionOnly(expr, variableKind, correctKeywords, false).propertyName : suggestVariableNameByExpressionPlace(expr, variableKind, correctKeywords).propertyName;
return new NamesByExprInfo(propertyName, namesArray);
}
@@ -511,7 +504,7 @@ public class JavaCodeStyleManagerImpl extends JavaCodeStyleManager {
return null;
}
private NamesByExprInfo suggestVariableNameByExpressionOnly(PsiExpression expr, final VariableKind variableKind, boolean correctKeywords) {
private NamesByExprInfo suggestVariableNameByExpressionOnly(PsiExpression expr, final VariableKind variableKind, boolean correctKeywords, boolean useAllMethodNames) {
if (expr instanceof PsiMethodCallExpression) {
PsiReferenceExpression methodExpr = ((PsiMethodCallExpression)expr).getMethodExpression();
String methodName = methodExpr.getReferenceName();
@@ -533,7 +526,7 @@ public class JavaCodeStyleManagerImpl extends JavaCodeStyleManager {
return new NamesByExprInfo(propertyName, names);
}
}
else if (words.length == 1) {
else if (words.length == 1 || useAllMethodNames) {
return new NamesByExprInfo(methodName, getSuggestionsByName(methodName, variableKind, false, correctKeywords));
}
}
@@ -581,9 +574,9 @@ public class JavaCodeStyleManagerImpl extends JavaCodeStyleManager {
}
}
} else if (expr instanceof PsiParenthesizedExpression) {
return suggestVariableNameByExpressionOnly(((PsiParenthesizedExpression)expr).getExpression(), variableKind, correctKeywords);
return suggestVariableNameByExpressionOnly(((PsiParenthesizedExpression)expr).getExpression(), variableKind, correctKeywords, useAllMethodNames);
} else if (expr instanceof PsiTypeCastExpression) {
return suggestVariableNameByExpressionOnly(((PsiTypeCastExpression)expr).getOperand(), variableKind, correctKeywords);
return suggestVariableNameByExpressionOnly(((PsiTypeCastExpression)expr).getOperand(), variableKind, correctKeywords, useAllMethodNames);
} else if (expr instanceof PsiLiteralExpression) {
final String text = StringUtil.stripQuotesAroundValue(expr.getText());
if (isIdentifier(text)) {
java/java-tests/testSrc/com/intellij/codeInsight/completion/VariablesCompletionTest.groovy
+10
View File
@@ -217,4 +217,14 @@ class FooFoo {
'''
}
public void "test suggest variable names by non-getter initializer call"() {
myFixture.configureByText 'a.java', '''
class FooFoo {
{ long <caret>x = System.nanoTime(); }
}
'''
myFixture.completeBasic()
myFixture.assertPreferredCompletionItems 0, 'l', 'nanoTime', 'time'
}
}