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

NestedIfJoinLinesHandler: fix polyadic case.

Browse Source 
Fixes IDEA-190660 ClassCastException after code reformatting using 'Join Lines'
Fixes EA-119515 - CCE: NestedIfJoinLinesHandler.tryJoinLines
This commit is contained in:
Tagir Valeev
2018-04-21 18:10:13 +07:00
parent c54070c74f
commit 2590753b28
6 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/java-impl/src/com/intellij/codeInsight/editorActions/NestedIfJoinLinesHandler.java
View File

@@ -57,8 +57,8 @@ public class NestedIfJoinLinesHandler implements JoinLinesHandlerDelegate {
String childConditionText = ParenthesesUtils.getText(ct.markUnchanged(innerCondition), ParenthesesUtils.OR_PRECEDENCE);
String parentConditionText = ParenthesesUtils.getText(ct.markUnchanged(outerCondition), ParenthesesUtils.OR_PRECEDENCE);
PsiBinaryExpression newCondition = (PsiBinaryExpression)ct.replace(outerCondition, parentConditionText + "&&" + childConditionText);
PsiElement newCondition = ct.replace(outerCondition, parentConditionText + "&&" + childConditionText);
ct.replaceAndRestoreComments(outerIf.getThenBranch(), innerIf.getThenBranch());
return newCondition.getOperationSign().getTextRange().getStartOffset();
return newCondition.getTextRange().getStartOffset() + parentConditionText.length() + 1;
}
}

2
java/java-tests/testData/codeInsight/joinLines/IfChainNoBraces_after.java
View File

@@ -1,5 +1,5 @@
class Foo {
void test(int a, int b) {
if(a > 0 && b < 0) System.out.println(a + b);
if(a > 0 <caret>&& b < 0) System.out.println(a + b);
}
}

7
java/java-tests/testData/codeInsight/joinLines/IfChainPolyadic.java Normal file
View File

@@ -0,0 +1,7 @@
class Foo {
void test(int a, int b) {
<caret>if(a > 0 && a < 10) {
if (b > 0 && b < 10) System.out.println(a + b);
}
}
}

5
java/java-tests/testData/codeInsight/joinLines/IfChainPolyadic_after.java Normal file
View File

@@ -0,0 +1,5 @@
class Foo {
void test(int a, int b) {
if(a > 0 && a < 10 <caret>&& b > 0 && b < 10) System.out.println(a + b);
}
}

2
java/java-tests/testData/codeInsight/joinLines/IfChain_after.java
View File

@@ -1,6 +1,6 @@
class Foo {
void test(int a, int b) {
if(a > 0 && b < 0) {
if(a > 0 <caret>&& b < 0) {
System.out.println(a+b);
}
}

1
java/java-tests/testSrc/com/intellij/java/codeInsight/JoinLinesTest.java
View File

@@ -51,6 +51,7 @@ public class JoinLinesTest extends LightCodeInsightTestCase {
public void testAssignmentAndReassignmentWithCall() { doTest(); }
public void testIfChain() { doTest(); }
public void testIfChainPolyadic() { doTest(); }
public void testIfChainNoBraces() { doTest(); }
public void testIfChainElse() { doTest(); }