MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-08-25 14:25:04 +07:00
Code Issues Packages Projects Releases Wiki Activity

DeclarationJoinLinesHandler: respect precedence for both initializer and right-hand operand

Browse Source 
Fixes IDEA-195416 Join lines over arithmetic operations should preserve order
Also StreamApiMigrationInspection#getOperationSign moved to TypeConversionUtil#getBinaryOperationText and reused
This commit is contained in:
Tagir Valeev
2018-07-12 11:26:49 +07:00
parent 7a88ce07ab
commit 7730b97ee4
6 changed files with 71 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/editorActions/DeclarationJoinLinesHandler.java
+19 -60
View File
@@ -24,6 +24,7 @@ import com.intellij.psi.search.LocalSearchScope;
import com.intellij.psi.search.searches.ReferencesSearch;
import com.intellij.psi.tree.IElementType;
import com.intellij.psi.util.PsiUtil;
import com.intellij.psi.util.TypeConversionUtil;
import com.intellij.util.IncorrectOperationException;
import com.siyeh.ig.psiutils.ExpressionUtils;
import com.siyeh.ig.psiutils.ParenthesesUtils;
@@ -81,7 +82,7 @@ public class DeclarationJoinLinesHandler implements JoinLinesHandlerDelegate {
try {
PsiDeclarationStatement newDecl = factory.createVariableDeclarationStatement(var.getName(), var.getType(), initializerExpression);
PsiVariable newVar = (PsiVariable)newDecl.getDeclaredElements()[0];
if (var.getModifierList().getText().length() > 0) {
if (!var.getModifierList().getText().isEmpty()) {
PsiUtil.setModifierProperty(newVar, PsiModifier.FINAL, true);
}
newVar.getModifierList().replace(var.getModifierList());
@@ -121,73 +122,31 @@ public class DeclarationJoinLinesHandler implements JoinLinesHandlerDelegate {
}
@Nullable
public static PsiExpression getInitializerExpression(PsiExpression initializer,
PsiAssignmentExpression assignment) {
public static PsiExpression getInitializerExpression(PsiExpression initializer, PsiAssignmentExpression assignment) {
PsiExpression initializerExpression;
final IElementType originalOpSign = assignment.getOperationTokenType();
final IElementType compoundOp = assignment.getOperationTokenType();
final PsiExpression rExpression = assignment.getRExpression();
if (rExpression == null) return null;
if (originalOpSign == JavaTokenType.EQ) {
if (compoundOp == JavaTokenType.EQ) {
initializerExpression = rExpression;
}
else {
if (initializer == null) return null;
String opSign = null;
if (originalOpSign == JavaTokenType.ANDEQ) {
opSign = "&";
}
else if (originalOpSign == JavaTokenType.ASTERISKEQ) {
opSign = "*";
}
else if (originalOpSign == JavaTokenType.DIVEQ) {
opSign = "/";
}
else if (originalOpSign == JavaTokenType.GTGTEQ) {
opSign = ">>";
}
else if (originalOpSign == JavaTokenType.GTGTGTEQ) {
opSign = ">>>";
}
else if (originalOpSign == JavaTokenType.LTLTEQ) {
opSign = "<<";
}
else if (originalOpSign == JavaTokenType.MINUSEQ) {
opSign = "-";
}
else if (originalOpSign == JavaTokenType.OREQ) {
opSign = "|";
}
else if (originalOpSign == JavaTokenType.PERCEQ) {
opSign = "%";
}
else if (originalOpSign == JavaTokenType.PLUSEQ) {
opSign = "+";
}
else if (originalOpSign == JavaTokenType.XOREQ) {
opSign = "^";
}
try {
final Project project = assignment.getProject();
String initializerText = initializer.getText() + opSign;
final String rightText = rExpression.getText();
if (ParenthesesUtils.areParenthesesNeeded(assignment.getOperationSign(), rExpression)) {
initializerText += "(" + rightText + ")";
}
else {
initializerText += rightText;
}
if ("+".equals(opSign) && ExpressionUtils.isZero(initializer) ||
"*".equals(opSign) && ExpressionUtils.isOne(initializer)) {
initializerText = rightText;
}
initializerExpression = JavaPsiFacade.getElementFactory(project).createExpressionFromText(initializerText, assignment);
initializerExpression = (PsiExpression)CodeStyleManager.getInstance(project).reformat(initializerExpression);
}
catch (IncorrectOperationException e) {
LOG.error(e);
return null;
IElementType simpleOp = TypeConversionUtil.convertEQtoOperation(compoundOp);
if (simpleOp == null) return null;
String opSign = TypeConversionUtil.getBinaryOperationText(simpleOp);
if (opSign == null) return null;
final Project project = assignment.getProject();
final String rightText = rExpression.getText();
int precedence = ParenthesesUtils.getPrecedenceForOperator(simpleOp) + 1;
String initializerText =
ParenthesesUtils.getText(initializer, precedence) + opSign + ParenthesesUtils.getText(rExpression, precedence);
if ("+".equals(opSign) && ExpressionUtils.isZero(initializer) ||
"*".equals(opSign) && ExpressionUtils.isOne(initializer)) {
initializerText = rightText;
}
initializerExpression = JavaPsiFacade.getElementFactory(project).createExpressionFromText(initializerText, assignment);
initializerExpression = (PsiExpression)CodeStyleManager.getInstance(project).reformat(initializerExpression);
}
return initializerExpression;
}
java/java-impl/src/com/intellij/codeInspection/streamMigration/StreamApiMigrationInspection.java
+1 -40
View File
@@ -1234,45 +1234,6 @@ public class StreamApiMigrationInspection extends AbstractBaseJavaLocalInspectio
myUnaryExpression = unaryExpression;
}
@Nullable
@Contract(pure = true)
private static String getOperationSign(IElementType op) {
if (op == JavaTokenType.AND) {
return "&";
}
else if (op == JavaTokenType.ASTERISK) {
return "*";
}
else if (op == JavaTokenType.DIV) {
return "/";
}
else if (op == JavaTokenType.GTGT) {
return ">>";
}
else if (op == JavaTokenType.GTGTGT) {
return ">>>";
}
else if (op == JavaTokenType.LTLT) {
return "<<";
}
else if (op == JavaTokenType.MINUS) {
return "-";
}
else if (op == JavaTokenType.OR) {
return "|";
}
else if (op == JavaTokenType.PERC) {
return "%";
}
else if (op == JavaTokenType.PLUS) {
return "+";
}
else if (op == JavaTokenType.XOR) {
return "^";
}
return null;
}
@Override
String createReplacement(CommentTracker ct) {
String lambda;
@@ -1280,7 +1241,7 @@ public class StreamApiMigrationInspection extends AbstractBaseJavaLocalInspectio
PsiElementFactory factory = JavaPsiFacade.getElementFactory(myVariable.getProject());
PsiExpression expression = myUnaryExpression == null ? myExpression : factory.createExpressionFromText("1", null);
String expressionText = ParenthesesUtils.getText(ct.markUnchanged(expression), ParenthesesUtils.getPrecedenceForOperator(myOpType));
String lambdaBody = myVariable.getName() + getOperationSign(myOpType) + expressionText;
String lambdaBody = myVariable.getName() + TypeConversionUtil.getBinaryOperationText(myOpType) + expressionText;
if (!myVariable.getType().equals(expression.getType())) {
lambdaBody = ("(" + myVariable.getType().getCanonicalText() + ")") + "(" + lambdaBody + ")";
}
java/java-psi-api/src/com/intellij/psi/util/TypeConversionUtil.java
+39
View File
@@ -1333,6 +1333,45 @@ public class TypeConversionUtil {
return PsiType.INT;
}
@Nullable
@Contract(pure = true)
public static String getBinaryOperationText(IElementType op) {
if (op == JavaTokenType.AND) {
return "&";
}
else if (op == JavaTokenType.ASTERISK) {
return "*";
}
else if (op == JavaTokenType.DIV) {
return "/";
}
else if (op == JavaTokenType.GTGT) {
return ">>";
}
else if (op == JavaTokenType.GTGTGT) {
return ">>>";
}
else if (op == JavaTokenType.LTLT) {
return "<<";
}
else if (op == JavaTokenType.MINUS) {
return "-";
}
else if (op == JavaTokenType.OR) {
return "|";
}
else if (op == JavaTokenType.PERC) {
return "%";
}
else if (op == JavaTokenType.PLUS) {
return "+";
}
else if (op == JavaTokenType.XOR) {
return "^";
}
return null;
}
public static IElementType convertEQtoOperation(IElementType eqOpSign) {
IElementType opSign = null;
if (eqOpSign == JavaTokenType.ANDEQ) {
java/java-tests/testData/codeInsight/joinLines/AssignmentExpressionPrecedence.java
+6
View File
@@ -0,0 +1,6 @@
class Foo {
{
int a = 1 + 2<caret>;
a *= 2 + 3;
}
}
java/java-tests/testData/codeInsight/joinLines/AssignmentExpressionPrecedence_after.java
+5
View File
@@ -0,0 +1,5 @@
class Foo {
{
int a = (1 + 2) * (2 + 3);
}
}
java/java-tests/testSrc/com/intellij/java/codeInsight/JoinLinesTest.java
+1
View File
@@ -187,6 +187,7 @@ public class JoinLinesTest extends LightCodeInsightTestCase {
public void testAssignmentExpression() { doTest(); }
public void testAssignmentExpression2() { doTest(); }
public void testAssignmentExpressionPrecedence() { doTest(); }
public void testReformatInsertsNewlines() {
CommonCodeStyleSettings settings = getJavaSettings();