From 117f3f1d2faa7e46b591c223319c9e0d1a0f3dd0 Mon Sep 17 00:00:00 2001 From: "Anna.Kozlova" Date: Mon, 12 Mar 2018 16:31:30 +0100 Subject: [PATCH] ensure tailing comments doesn't break statement in the middle (IDEA-188072) --- .../daemonCodeAnalyzer/quickFix/mergeIfOr/afterIfBlock.java | 4 ++-- .../daemonCodeAnalyzer/quickFix/mergeIfOr/beforeIfBlock.java | 4 ++-- .../src/com/siyeh/ipp/trivialif/MergeIfOrIntention.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/mergeIfOr/afterIfBlock.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/mergeIfOr/afterIfBlock.java index c6581a712ae2..e2e58eec4a52 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/mergeIfOr/afterIfBlock.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/mergeIfOr/afterIfBlock.java @@ -2,10 +2,10 @@ class Test { public static void main(String[] args) { - //c2 + //c3 if (args.length == 1 || args.length == 2) { return; // c1 - } + }//c2 System.out.println(); } } diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/mergeIfOr/beforeIfBlock.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/mergeIfOr/beforeIfBlock.java index 553fa28cd647..9db14b24fe27 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/mergeIfOr/beforeIfBlock.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/mergeIfOr/beforeIfBlock.java @@ -4,9 +4,9 @@ class Test { public static void main(String[] args) { if (args.length == 1) { return; // c1 - } + }//c2 else if (args.length == 2) { - return; //c2 + return; //c3 } System.out.println(); } diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/MergeIfOrIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/MergeIfOrIntention.java index b0a747da34d4..a3ef9c2c1011 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/MergeIfOrIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/MergeIfOrIntention.java @@ -74,7 +74,7 @@ public class MergeIfOrIntention extends Intention { statement.append(parentThenBranchText); final PsiStatement childElseBranch = childStatement.getElseBranch(); if (childElseBranch != null) { - statement.append("else "); + statement.append("\nelse "); statement.append(tracker.text(childElseBranch)); } PsiReplacementUtil.replaceStatement(parentStatement, statement.toString(), tracker); @@ -109,7 +109,7 @@ public class MergeIfOrIntention extends Intention { newStatement.append(parentTracker.text(parentThenBranch)); final PsiStatement childElseBranch = childStatement.getElseBranch(); if (childElseBranch != null) { - newStatement.append("else "); + newStatement.append("\nelse "); newStatement.append(childTracker.text(childElseBranch)); } PsiReplacementUtil.replaceStatement(parentStatement, newStatement.toString(), parentTracker);