From 9684af1c5abc703a507b1f86b65417eb6cd74838 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Fri, 27 Apr 2012 13:56:27 +0200
Subject: [PATCH] don't force braces when completing in if condition

---
 .../codeInsight/completion/JavaChainLookupElement.java    | 2 +-
 .../codeInsight/completion/normal/NoForceBraces.java      | 6 ++++++
 .../completion/normal/NoForceBraces_after.java            | 8 ++++++++
 .../codeInsight/completion/NormalCompletionTest.groovy    | 5 +++++
 4 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 java/java-tests/testData/codeInsight/completion/normal/NoForceBraces.java
 create mode 100644 java/java-tests/testData/codeInsight/completion/normal/NoForceBraces_after.java

diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaChainLookupElement.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaChainLookupElement.java
index aba177fd4f2e..5c80671f0496 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaChainLookupElement.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaChainLookupElement.java
@@ -121,7 +121,7 @@ public class JavaChainLookupElement extends LookupElementDecorator<LookupElement
     int formatStart = context.getOffset(oldStart);
     int formatEnd = context.getTailOffset();
     if (formatStart >= 0 && formatEnd >= 0) {
-      CodeStyleManager.getInstance(context.getProject()).reformatRange(context.getFile(), formatStart, formatEnd);
+      CodeStyleManager.getInstance(context.getProject()).reformatText(context.getFile(), formatStart, formatEnd);
     }
   }
 
diff --git a/java/java-tests/testData/codeInsight/completion/normal/NoForceBraces.java b/java/java-tests/testData/codeInsight/completion/normal/NoForceBraces.java
new file mode 100644
index 000000000000..a967eee64cf0
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/normal/NoForceBraces.java
@@ -0,0 +1,6 @@
+public class Foo {
+  void foo(boolean flag) {
+      if ('\\' == File.separach<caret>)
+      System.out.println();
+  }
+}
diff --git a/java/java-tests/testData/codeInsight/completion/normal/NoForceBraces_after.java b/java/java-tests/testData/codeInsight/completion/normal/NoForceBraces_after.java
new file mode 100644
index 000000000000..67bfc3131f7b
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/normal/NoForceBraces_after.java
@@ -0,0 +1,8 @@
+import java.io.File;
+
+public class Foo {
+  void foo(boolean flag) {
+      if ('\\' == File.separatorChar<caret>)
+      System.out.println();
+  }
+}
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy
index f38adaf36b8d..2127814c8adb 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy
@@ -406,6 +406,11 @@ public class NormalCompletionTest extends LightFixtureCompletionTestCase {
     doTest();
   }
 
+  public void testNoForceBraces() {
+    codeStyleSettings.IF_BRACE_FORCE = CommonCodeStyleSettings.FORCE_BRACES_ALWAYS
+    doTest()
+  }
+
   public void testExcludeStringBuffer() throws Throwable {
     CodeInsightSettings.getInstance().EXCLUDED_PACKAGES = [StringBuffer.name] as String[]
     try {