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

name suggestions: by assignment context (IDEA-167826)

Browse Source
This commit is contained in:
Anna Kozlova
2017-05-26 12:00:34 +03:00
parent 9f160ca1d2
commit a0c646cbdb
2 changed files with 19 additions and 1 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
+9 -1
View File
@@ -783,7 +783,7 @@ public class JavaCodeStyleManagerImpl extends JavaCodeStyleManager {
}
}
}
else if (expr.getParent() instanceof PsiAssignmentExpression && variableKind == VariableKind.PARAMETER) {
else if (expr.getParent() instanceof PsiAssignmentExpression) {
final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)expr.getParent();
if (expr == assignmentExpression.getRExpression()) {
final PsiExpression leftExpression = assignmentExpression.getLExpression();
@@ -800,6 +800,14 @@ public class JavaCodeStyleManagerImpl extends JavaCodeStyleManager {
}
}
}
else if (expr.getParent() instanceof PsiLocalVariable) {
PsiVariable variable = (PsiVariable)expr.getParent();
String variableName = variable.getName();
if (variableName != null) {
String propertyName = variableNameToPropertyName(variableName, getVariableKind(variable));
return new NamesByExprInfo(propertyName, getSuggestionsByName(propertyName, variableKind, false, correctKeywords));
}
}
return new NamesByExprInfo(null, ArrayUtil.EMPTY_STRING_ARRAY);
}
java/java-tests/testSrc/com/intellij/java/refactoring/NameSuggestionsByExpressionTest.java
+10
View File
@@ -46,4 +46,14 @@ public class NameSuggestionsByExpressionTest extends LightCodeInsightFixtureTest
new String[] {"getParentOfType", "parentOfType", "ofType", "type", "parent", "s"},
nameInfo.names);
}
public void testNameByAssignmentContext() throws Exception {
PsiFile file = myFixture.configureByText("A.java", "class A {{String bar = \"<caret>\";}}");
PsiExpression expression = PsiTreeUtil.getParentOfType(file.findElementAt(getEditor().getCaretModel().getOffset()), PsiExpression.class);
SuggestedNameInfo nameInfo = JavaCodeStyleManager.getInstance(getProject())
.suggestVariableName(VariableKind.LOCAL_VARIABLE, null, expression, null);
Assert.assertArrayEquals("Suggested: " + Arrays.toString(nameInfo.names),
new String[] {"bar", "s"},
nameInfo.names);
}
}