Completely disable formatter settings that are not fully supported

Author: kshchepanovskyi

src/main/java/io/protostuff/jetbrains/plugin/formatter/FormattingModelBuilder.java

@@ -10,12 +10,35 @@
 import io.protostuff.jetbrains.plugin.ProtoLanguage;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+
 import static io.protostuff.jetbrains.plugin.formatter.StatementBlock.*;
+
 /**
  * @author Kostiantyn Shchepanovskyi
  */
 public class FormattingModelBuilder implements com.intellij.formatting.FormattingModelBuilder {
 
+    public static SpacingBuilder createSpacingBuilder(CodeStyleSettings settings) {
+        CommonCodeStyleSettings protoSettings = settings.getCommonSettings(ProtoLanguage.INSTANCE);
+        SpacingBuilder builder = new SpacingBuilder(settings, ProtoLanguage.INSTANCE);
+        builder.around(ASSIGN).spacing(1, 1, 0, false, 0);
+        builder.before(SEMICOLON).spacing(0, 0, 0, false, 0);
+        builder.after(LINE_COMMENT).spacing(0, 0, 1, true, 2);
+        builder.after(LCURLY).spacing(0, 0, 1, true, 2);
+        builder.before(RCURLY).spacing(0, 0, 1, true, 2);
+        builder.after(LPAREN).spacing(0, 0, 0, false, 0);
+        builder.before(RPAREN).spacing(0, 0, 0, false, 0);
+        builder.after(LSQUARE).spacing(0, 0, 0, false, 0);
+        builder.before(RSQUARE).spacing(0, 0, 0, false, 0);
+        builder.before(LT).spacing(0, 0, 0, false, 0);
+        builder.after(LT).spacing(0, 0, 0, false, 0);
+        builder.before(GT).spacing(0, 0, 0, false, 0);
+        builder.before(COMMA).spacing(0, 0, 0, false, 0);
+        builder.before(SEMICOLON).spacing(0, 0, 0, false, 0);
+        builder.after(COMMA).spacing(1, 1, 0, false, 0);
+        return builder;
+    }
+
     @NotNull
     @Override
     public FormattingModel createModel(PsiElement element, CodeStyleSettings settings) {
@@ -32,25 +55,4 @@ public FormattingModel createModel(PsiElement element, CodeStyleSettings setting
     public TextRange getRangeAffectingIndent(PsiFile file, int offset, ASTNode elementAtOffset) {
         return null;
     }
-
-    public static SpacingBuilder createSpacingBuilder(CodeStyleSettings settings) {
-        CommonCodeStyleSettings protoSettings = settings.getCommonSettings(ProtoLanguage.INSTANCE);
-        return new SpacingBuilder(settings, ProtoLanguage.INSTANCE)
-                .around(ASSIGN).spaceIf(protoSettings.SPACE_AROUND_ASSIGNMENT_OPERATORS)
-                .before(SEMICOLON).spaceIf(protoSettings.SPACE_BEFORE_SEMICOLON)
-                .after(LINE_COMMENT).spacing(0, 0, 1, true, 2)
-                .after(LCURLY).spacing(0, 0, 1, true, 2)
-                .before(RCURLY).spacing(0, 0, 1, true, 2)
-                .after(LPAREN).spacing(0, 0, 0, false, 0)
-                .before(RPAREN).spacing(0, 0, 0, false, 0)
-                .after(LSQUARE).spacing(0, 0, 0, false, 0)
-                .before(RSQUARE).spacing(0, 0, 0, false, 0)
-                .before(LT).spacing(0, 0, 0, false, 0)
-                .after(LT).spacing(0, 0, 0, false, 0)
-                .before(GT).spacing(0, 0, 0, false, 0)
-                .before(COMMA).spacing(0, 0, 0, false, 0)
-                .before(SEMICOLON).spacing(0, 0, 0, false, 0)
-                .after(COMMA).spacing(1, 1, 0, false, 0);
-
-    }
 }

src/main/java/io/protostuff/jetbrains/plugin/formatter/ProtoLanguageCodeStyleSettingsProvider.java

@@ -34,6 +34,7 @@ public void customizeSettings(@NotNull CodeStyleSettingsCustomizable consumer, @
 //                consumer.renameStandardOption("SPACE_AROUND_ASSIGNMENT_OPERATORS", "Space around assignment operator");
 //                break;
 //            case WRAPPING_AND_BRACES_SETTINGS:
+//                consumer.showStandardOptions("KEEP_LINE_BREAKS");
 //                consumer.showStandardOptions("BRACE_STYLE");
 //                break;
 //            case BLANK_LINES_SETTINGS:
@@ -60,6 +61,8 @@ public CommonCodeStyleSettings getDefaultCommonSettings() {
         settings.SPACE_AROUND_ASSIGNMENT_OPERATORS = true;
         settings.SPACE_BEFORE_SEMICOLON = false;
         settings.BRACE_STYLE = END_OF_LINE;
+        settings.KEEP_BLANK_LINES_IN_CODE = 2;
+        settings.KEEP_LINE_BREAKS = false;
         return settings;
     }
 

src/test/java/io/protostuff/jetbrains/plugin/formatter/FormatterTest.java

@@ -53,10 +53,10 @@ public void testCustomIndent() {
         });
     }
 
-    public void testDisableSpaceAroundAssignmentOperator() {
-        run("disable_space_around_assignment_operator", settings -> {
-            settings.SPACE_AROUND_ASSIGNMENT_OPERATORS = false;
-        });
-    }
+//    public void testDisableSpaceAroundAssignmentOperator() {
+//        run("disable_space_around_assignment_operator", settings -> {
+//            settings.SPACE_AROUND_ASSIGNMENT_OPERATORS = false;
+//        });
+//    }
 
 }