KT-2217 Formatter fails to format unary minus

#KT-2217 fixed

idea/src/org/jetbrains/jet/plugin/formatter/JetFormattingModelBuilder.java

@@ -73,7 +73,7 @@ public class JetFormattingModelBuilder implements FormattingModelBuilder {
                 .around(TokenSet.create(ANDAND, OROR)).spaceIf(jetCommonSettings.SPACE_AROUND_LOGICAL_OPERATORS)
                 .around(TokenSet.create(EQEQ, EXCLEQ, EQEQEQ, EXCLEQEQEQ)).spaceIf(jetCommonSettings.SPACE_AROUND_EQUALITY_OPERATORS)
                 .aroundInside(TokenSet.create(LT, GT, LTEQ, GTEQ), BINARY_EXPRESSION).spaceIf(jetCommonSettings.SPACE_AROUND_RELATIONAL_OPERATORS)
-                .around(TokenSet.create(PLUS, MINUS)).spaceIf(jetCommonSettings.SPACE_AROUND_ADDITIVE_OPERATORS)
+                .aroundInside(TokenSet.create(PLUS, MINUS), BINARY_EXPRESSION).spaceIf(jetCommonSettings.SPACE_AROUND_ADDITIVE_OPERATORS)
                 .aroundInside(TokenSet.create(MUL, DIV, PERC), BINARY_EXPRESSION).spaceIf(jetCommonSettings.SPACE_AROUND_MULTIPLICATIVE_OPERATORS)
                 .around(TokenSet.create(PLUSPLUS, MINUSMINUS, EXCLEXCL, MINUS, PLUS, EXCL)).spaceIf(jetCommonSettings.SPACE_AROUND_UNARY_OPERATOR)
                 .around(RANGE).spaceIf(jetSettings.SPACE_AROUND_RANGE)

idea/testData/formatter/SpacesAroundOperations.kt

@@ -26,14 +26,14 @@ class Some {
 
         12%3*12/3
 
-        !true
-        int++
-        ++int
-        int--
-        --int
-        +12
-        -12
-
         1..2
     }
-}
+}
+
+// SET_TRUE: SPACE_AROUND_ASSIGNMENT_OPERATORS
+// SET_TRUE: SPACE_AROUND_LOGICAL_OPERATORS
+// SET_TRUE: SPACE_AROUND_EQUALITY_OPERATORS
+// SET_TRUE: SPACE_AROUND_RELATIONAL_OPERATORS
+// SET_TRUE: SPACE_AROUND_ADDITIVE_OPERATORS
+// SET_TRUE: SPACE_AROUND_MULTIPLICATIVE_OPERATORS
+// SET_TRUE: SPACE_AROUND_RANGE

idea/testData/formatter/SpacesAroundOperations_after.kt

@@ -26,14 +26,14 @@ class Some {
 
         12 % 3 * 12 / 3
 
-        ! true
-        int ++
-        ++ int
-        int --
-        -- int
-        + 12
-        - 12
-
         1 .. 2
     }
-}
+}
+
+// SET_TRUE: SPACE_AROUND_ASSIGNMENT_OPERATORS
+// SET_TRUE: SPACE_AROUND_LOGICAL_OPERATORS
+// SET_TRUE: SPACE_AROUND_EQUALITY_OPERATORS
+// SET_TRUE: SPACE_AROUND_RELATIONAL_OPERATORS
+// SET_TRUE: SPACE_AROUND_ADDITIVE_OPERATORS
+// SET_TRUE: SPACE_AROUND_MULTIPLICATIVE_OPERATORS
+// SET_TRUE: SPACE_AROUND_RANGE

idea/testData/formatter/SpacesAroundOperations_after_inv.kt

@@ -26,14 +26,14 @@ class Some {
 
         12%3*12/3
 
-        !true
-        int++
-        ++int
-        int--
-        --int
-        +12
-        -12
-
         1..2
     }
-}
+}
+
+// SET_TRUE: SPACE_AROUND_ASSIGNMENT_OPERATORS
+// SET_TRUE: SPACE_AROUND_LOGICAL_OPERATORS
+// SET_TRUE: SPACE_AROUND_EQUALITY_OPERATORS
+// SET_TRUE: SPACE_AROUND_RELATIONAL_OPERATORS
+// SET_TRUE: SPACE_AROUND_ADDITIVE_OPERATORS
+// SET_TRUE: SPACE_AROUND_MULTIPLICATIVE_OPERATORS
+// SET_TRUE: SPACE_AROUND_RANGE

idea/testData/formatter/SpacesAroundUnaryOperations.kt

@@ -0,0 +1,20 @@
+fun test() {
+    ! true
+    !true
+    int ++
+    int++
+    ++ int
+    ++int
+    int --
+    int--
+    -- int
+    --int
+    + 12
+    +12
+    - 12
+    -12
+    test!!
+    test !!
+}
+
+// SET_TRUE: SPACE_AROUND_UNARY_OPERATOR

idea/testData/formatter/SpacesAroundUnaryOperations_after.kt

@@ -0,0 +1,20 @@
+fun test() {
+    ! true
+    ! true
+    int ++
+    int ++
+    ++ int
+    ++ int
+    int --
+    int --
+    -- int
+    -- int
+    + 12
+    + 12
+    - 12
+    - 12
+    test !!
+    test !!
+}
+
+// SET_TRUE: SPACE_AROUND_UNARY_OPERATOR

idea/testData/formatter/SpacesAroundUnaryOperations_after_inv.kt

@@ -0,0 +1,20 @@
+fun test() {
+    !true
+    !true
+    int++
+    int++
+    ++int
+    ++int
+    int--
+    int--
+    --int
+    --int
+    +12
+    +12
+    -12
+    -12
+    test!!
+    test!!
+}
+
+// SET_TRUE: SPACE_AROUND_UNARY_OPERATOR

idea/tests/org/jetbrains/jet/formatter/JetFormatterTest.java

@@ -24,20 +24,6 @@ import org.jetbrains.jet.plugin.formatter.JetCodeStyleSettings;
  * Based on com.intellij.psi.formatter.java.JavaFormatterTest
  */
 public class JetFormatterTest extends AbstractJetFormatterTest {
-    public void testAddSpacesAroundOperations() throws Exception {
-        getSettings().SPACE_AROUND_ASSIGNMENT_OPERATORS = true;
-        getSettings().SPACE_AROUND_LOGICAL_OPERATORS = true;
-        getSettings().SPACE_AROUND_EQUALITY_OPERATORS = true;
-        getSettings().SPACE_AROUND_RELATIONAL_OPERATORS = true;
-        getSettings().SPACE_AROUND_ADDITIVE_OPERATORS = true;
-        getSettings().SPACE_AROUND_MULTIPLICATIVE_OPERATORS = true;
-        getSettings().SPACE_AROUND_UNARY_OPERATOR = true;
-        getJetSettings().SPACE_AROUND_RANGE = true;
-
-        doTest();
-
-        getSettings().clearCodeStyleSettings();
-    }
 
     public void testBlockFor() throws Exception {
         doTest();
@@ -79,21 +65,6 @@ public class JetFormatterTest extends AbstractJetFormatterTest {
         doTestWithInvert();
     }
 
-    public void testRemoveSpacesAroundOperations() throws Exception {
-        getSettings().SPACE_AROUND_ASSIGNMENT_OPERATORS = false;
-        getSettings().SPACE_AROUND_LOGICAL_OPERATORS = false;
-        getSettings().SPACE_AROUND_EQUALITY_OPERATORS = false;
-        getSettings().SPACE_AROUND_RELATIONAL_OPERATORS = false;
-        getSettings().SPACE_AROUND_ADDITIVE_OPERATORS = false;
-        getSettings().SPACE_AROUND_MULTIPLICATIVE_OPERATORS = false;
-        getSettings().SPACE_AROUND_UNARY_OPERATOR = false;
-        getJetSettings().SPACE_AROUND_RANGE = false;
-
-        doTest();
-
-        getSettings().clearCodeStyleSettings();
-    }
-
     public void testRightBracketOnNewLine() throws Exception {
         doTestWithInvert();
     }
@@ -102,6 +73,14 @@ public class JetFormatterTest extends AbstractJetFormatterTest {
         doTestWithInvert();
     }
 
+    public void testSpacesAroundOperations() throws Exception {
+        doTestWithInvert();
+    }
+
+    public void testSpacesAroundUnaryOperations() throws Exception {
+        doTestWithInvert();
+    }
+
     public void testWhen() throws Exception {
         doTest();
     }