From dbe5942f26bcdc75ca56d200b99ba11f6d084e8e Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Thu, 13 Dec 2012 16:36:40 +0100
Subject: [PATCH] take "space within braces" setting from correct place
 (PY-8069)

---
 .../formatter/PyLanguageCodeStyleSettingsProvider.java     | 2 +-
 .../python/formatter/PythonFormattingModelBuilder.java     | 2 +-
 python/testData/formatter/spaceWithinBraces.py             | 1 +
 python/testData/formatter/spaceWithinBraces_after.py       | 1 +
 python/testSrc/com/jetbrains/python/PyFormatterTest.java   | 7 +++++++
 5 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 python/testData/formatter/spaceWithinBraces.py
 create mode 100644 python/testData/formatter/spaceWithinBraces_after.py

diff --git a/python/src/com/jetbrains/python/formatter/PyLanguageCodeStyleSettingsProvider.java b/python/src/com/jetbrains/python/formatter/PyLanguageCodeStyleSettingsProvider.java
index c3a54389a0c8..c8fb8f513e11 100644
--- a/python/src/com/jetbrains/python/formatter/PyLanguageCodeStyleSettingsProvider.java
+++ b/python/src/com/jetbrains/python/formatter/PyLanguageCodeStyleSettingsProvider.java
@@ -55,7 +55,7 @@ public class PyLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSettin
                                 SPACES_AROUND_OPERATORS);
       consumer.showCustomOption(PyCodeStyleSettings.class, "SPACE_AROUND_EQ_IN_KEYWORD_ARGUMENT", "Around = in keyword argument",
                                 SPACES_AROUND_OPERATORS);
-      consumer.showCustomOption(PyCodeStyleSettings.class, "SPACE_WITHIN_BRACES", "Within braces", SPACES_WITHIN);
+      consumer.showCustomOption(PyCodeStyleSettings.class, "SPACE_WITHIN_BRACES", "Braces", SPACES_WITHIN);
       consumer.showCustomOption(PyCodeStyleSettings.class, "SPACE_BEFORE_PY_COLON", ApplicationBundle.message("checkbox.spaces.before.colon"), SPACES_OTHER);
       consumer.showCustomOption(PyCodeStyleSettings.class, "SPACE_AFTER_PY_COLON", ApplicationBundle.message("checkbox.spaces.after.colon"), SPACES_OTHER);
     }
diff --git a/python/src/com/jetbrains/python/formatter/PythonFormattingModelBuilder.java b/python/src/com/jetbrains/python/formatter/PythonFormattingModelBuilder.java
index 46317138c123..38f6d0078142 100644
--- a/python/src/com/jetbrains/python/formatter/PythonFormattingModelBuilder.java
+++ b/python/src/com/jetbrains/python/formatter/PythonFormattingModelBuilder.java
@@ -86,7 +86,7 @@ public class PythonFormattingModelBuilder implements FormattingModelBuilderEx, C
       .withinPairInside(LPAR, RPAR, ARGUMENT_LIST).spaceIf(commonSettings.SPACE_WITHIN_METHOD_CALL_PARENTHESES)
       .before(LBRACKET).spaceIf(pySettings.SPACE_BEFORE_LBRACKET)
 
-      .withinPair(LBRACE, RBRACE).spaceIf(commonSettings.SPACE_WITHIN_BRACES)
+      .withinPair(LBRACE, RBRACE).spaceIf(pySettings.SPACE_WITHIN_BRACES)
       .withinPair(LBRACKET, RBRACKET).spaceIf(commonSettings.SPACE_WITHIN_BRACKETS)
 
       .before(ARGUMENT_LIST).spaceIf(commonSettings.SPACE_BEFORE_METHOD_CALL_PARENTHESES)
diff --git a/python/testData/formatter/spaceWithinBraces.py b/python/testData/formatter/spaceWithinBraces.py
new file mode 100644
index 000000000000..45cb2f731835
--- /dev/null
+++ b/python/testData/formatter/spaceWithinBraces.py
@@ -0,0 +1 @@
+dict = {1: 'a', 2: 'b', 3: 'c'}
\ No newline at end of file
diff --git a/python/testData/formatter/spaceWithinBraces_after.py b/python/testData/formatter/spaceWithinBraces_after.py
new file mode 100644
index 000000000000..a24625b0e6af
--- /dev/null
+++ b/python/testData/formatter/spaceWithinBraces_after.py
@@ -0,0 +1 @@
+dict = { 1: 'a', 2: 'b', 3: 'c' }
\ No newline at end of file
diff --git a/python/testSrc/com/jetbrains/python/PyFormatterTest.java b/python/testSrc/com/jetbrains/python/PyFormatterTest.java
index 45c004149522..f21f5bdf8200 100644
--- a/python/testSrc/com/jetbrains/python/PyFormatterTest.java
+++ b/python/testSrc/com/jetbrains/python/PyFormatterTest.java
@@ -7,6 +7,7 @@ import com.intellij.psi.codeStyle.CodeStyleManager;
 import com.intellij.psi.codeStyle.CodeStyleSettings;
 import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
 import com.jetbrains.python.fixtures.PyTestCase;
+import com.jetbrains.python.formatter.PyCodeStyleSettings;
 import com.jetbrains.python.psi.LanguageLevel;
 import com.jetbrains.python.psi.PyElementGenerator;
 import com.jetbrains.python.psi.impl.PythonLanguageLevelPusher;
@@ -195,6 +196,12 @@ public class PyFormatterTest extends PyTestCase {
     doTest();
   }
 
+  public void testSpaceWithinBraces() {  // PY-8069
+    settings().getCustomSettings(PyCodeStyleSettings.class).SPACE_WITHIN_BRACES = true;
+    doTest();
+
+  }
+
   public void testPsiFormatting() { // IDEA-69724
     String initial =
       "def method_name(\n" +