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

preserve comments: extract if with end of line comments

Browse Source
This commit is contained in:
Anna.Kozlova
2017-11-27 16:14:35 +01:00
parent f6f68c5d42
commit ab80e0dcdd
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/java-impl/src/com/intellij/codeInsight/intention/impl/ExtractIfConditionAction.java
View File

@@ -218,14 +218,14 @@ public class ExtractIfConditionAction extends PsiElementBaseIntentionAction {
private static String createIfString(@NotNull String condition,
@NotNull String thenBranch,
@Nullable String elseBranch) {
final String elsePart = elseBranch != null ? " else " + elseBranch : "";
final String elsePart = elseBranch != null ? "\n else " + elseBranch : "";
return "if (" + condition + ")\n" + thenBranch + elsePart;
}
@NotNull
private static String toThenBranchString(@NotNull PsiStatement statement) {
if (!(statement instanceof PsiBlockStatement)) {
return "{ " + statement.getText() + " }";
return "{ " + statement.getText() + "\n }";
}
return statement.getText();
@@ -241,7 +241,7 @@ public class ExtractIfConditionAction extends PsiElementBaseIntentionAction {
return statement.getText();
}
return "{ " + statement.getText() + " }";
return "{ " + statement.getText() + "\n }";
}
@Nullable

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/extractIfCondition/afterMissedBrackets.java
View File

@@ -3,7 +3,7 @@ class TestThreadInspection {
void f(boolean a, boolean b, boolean c){
if (a)
if (b) {
System.out.println("a&b");
System.out.println("a&b");//first comment
} else {
if (c) {
System.out.println("c");

6
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/extractIfCondition/beforeMissedBrackets.java
View File

@@ -1,9 +1,9 @@
// "Extract if (a)" "true"
class TestThreadInspection {
void f(boolean a, boolean b, boolean c){
if (<caret>a && b) {
System.out.println("a&b");
} else if (c) {
if (<caret>a && b)
System.out.println("a&b");//first comment
else if (c) {
System.out.println("c");
}
}