From 6b9130135697f76e24dca2d57034e4f0e1f26cf3 Mon Sep 17 00:00:00 2001 From: Anton Makeev Date: Wed, 25 Aug 2010 18:28:00 +0400 Subject: [PATCH] CIDR Formatter: more spaces --- .../psi/formatter/java/JavaSpacePropertyProcessor.java | 2 +- .../intellij/psi/formatter/java/JavaFormatterSpaceTest.java | 4 ++-- .../src/com/intellij/psi/codeStyle/CodeStyleSettings.java | 6 +++++- .../application/options/codeStyle/CodeStyleSpacesPanel.java | 3 ++- .../src/messages/ApplicationBundle.properties | 2 +- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/java/java-impl/src/com/intellij/psi/formatter/java/JavaSpacePropertyProcessor.java b/java/java-impl/src/com/intellij/psi/formatter/java/JavaSpacePropertyProcessor.java index f2c6eacb3b5a..4af29e1b1990 100644 --- a/java/java-impl/src/com/intellij/psi/formatter/java/JavaSpacePropertyProcessor.java +++ b/java/java-impl/src/com/intellij/psi/formatter/java/JavaSpacePropertyProcessor.java @@ -1020,7 +1020,7 @@ public class JavaSpacePropertyProcessor extends JavaElementVisitor { processModifierList(); } else if (myRole1 == ChildRole.OPERATION_SIGN) { - createSpaceInCode(mySettings.SPACE_AFTER_UNARY_OPERATOR); + createSpaceInCode(mySettings.SPACE_AROUND_UNARY_OPERATOR); } else if (myChild1.getElementType() == JavaDocTokenType.DOC_TAG_VALUE_TOKEN && myChild2.getElementType() == JavaDocTokenType.DOC_TAG_VALUE_TOKEN) diff --git a/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterSpaceTest.java b/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterSpaceTest.java index 67d35c1ae293..d065bbc8a6c4 100644 --- a/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterSpaceTest.java +++ b/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterSpaceTest.java @@ -81,7 +81,7 @@ public class JavaFormatterSpaceTest extends AbstractJavaFormatterTest { public void testUnaryOperators() { // Inspired by IDEA-52127 - getSettings().SPACE_AFTER_UNARY_OPERATOR = false; + getSettings().SPACE_AROUND_UNARY_OPERATOR = false; String initial = "public class FormattingTest {\n" + @@ -100,7 +100,7 @@ public class JavaFormatterSpaceTest extends AbstractJavaFormatterTest { doTextTest(initial, initial); // Don't expect spaces to be inserted after unary operators - getSettings().SPACE_AFTER_UNARY_OPERATOR = true; + getSettings().SPACE_AROUND_UNARY_OPERATOR = true; String formatted = "public class FormattingTest {\n" + " public void foo() {\n" + diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSettings.java b/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSettings.java index ced56eafa4b3..e4a428feea17 100644 --- a/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSettings.java +++ b/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSettings.java @@ -516,6 +516,8 @@ public class CodeStyleSettings implements Cloneable, JDOMExternalizable { */ public boolean SPACE_AROUND_SHIFT_OPERATORS = true; + public boolean SPACE_AROUND_UNARY_OPERATOR = false; + public boolean SPACE_AFTER_COMMA = true; public boolean SPACE_AFTER_COMMA_IN_TYPE_ARGUMENTS = true; public boolean SPACE_BEFORE_COMMA = false; @@ -607,7 +609,6 @@ public class CodeStyleSettings implements Cloneable, JDOMExternalizable { public boolean SPACE_WITHIN_ARRAY_INITIALIZER_BRACES = false; public boolean SPACE_AFTER_TYPE_CAST = true; - public boolean SPACE_AFTER_UNARY_OPERATOR = false; /** * "f (x)" @@ -1276,6 +1277,9 @@ public class CodeStyleSettings implements Cloneable, JDOMExternalizable { JSP_INDENT_OPTIONS.SMART_TABS = value; XML_INDENT_OPTIONS.SMART_TABS = value; OTHER_INDENT_OPTIONS.SMART_TABS = value; + } else if ("SPACE_AFTER_UNARY_OPERATOR".equals(name)) { + final boolean value = Boolean.valueOf(option.getAttributeValue("value")).booleanValue(); + SPACE_AROUND_UNARY_OPERATOR = value; } } } diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSpacesPanel.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSpacesPanel.java index f2f73eabb8f3..d6fe40b99f91 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSpacesPanel.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSpacesPanel.java @@ -65,6 +65,8 @@ public class CodeStyleSpacesPanel extends OptionTreeWithPreviewPanel { SPACES_AROUND_OPERATORS); initBooleanField("SPACE_AROUND_SHIFT_OPERATORS", ApplicationBundle.message("checkbox.spaces.shift.operators"), SPACES_AROUND_OPERATORS); + initBooleanField("SPACE_AROUND_UNARY_OPERATOR", ApplicationBundle.message("checkbox.spaces.around.unary.operator"), + SPACES_AROUND_OPERATORS); initCustomOptions(SPACES_AROUND_OPERATORS); initBooleanField("SPACE_BEFORE_CLASS_LBRACE", ApplicationBundle.message("checkbox.spaces.class.left.brace"), SPACES_BEFORE_LEFT_BRACE); @@ -120,7 +122,6 @@ public class CodeStyleSpacesPanel extends OptionTreeWithPreviewPanel { initBooleanField("SPACE_BEFORE_SEMICOLON", ApplicationBundle.message("checkbox.spaces.before.semicolon"), SPACES_OTHER); initBooleanField("SPACE_AFTER_SEMICOLON", ApplicationBundle.message("checkbox.spaces.after.semicolon"), SPACES_OTHER); initBooleanField("SPACE_AFTER_TYPE_CAST", ApplicationBundle.message("checkbox.spaces.after.type.cast"), SPACES_OTHER); - initBooleanField("SPACE_AFTER_UNARY_OPERATOR", ApplicationBundle.message("checkbox.spaces.after.unary.operator"), SPACES_OTHER); initCustomOptions(SPACES_OTHER); } } diff --git a/platform/platform-resources-en/src/messages/ApplicationBundle.properties b/platform/platform-resources-en/src/messages/ApplicationBundle.properties index fde78cf40e29..d86281ea2e77 100644 --- a/platform/platform-resources-en/src/messages/ApplicationBundle.properties +++ b/platform/platform-resources-en/src/messages/ApplicationBundle.properties @@ -256,6 +256,7 @@ checkbox.spaces.bitwise.operators=Bitwise operators (\\&, |, ^) checkbox.spaces.additive.operators=Additive operators (+, -) checkbox.spaces.multiplicative.operators=Multiplicative operators (*, /, %) checkbox.spaces.shift.operators=Shift operators (<<, >>, >>>) +checkbox.spaces.around.unary.operator=Unary operators (!, -, +, ++, --) checkbox.spaces.class.left.brace=Class left brace checkbox.spaces.method.left.brace=Method left brace checkbox.spaces.if.left.brace="if" left brace @@ -286,7 +287,6 @@ checkbox.spaces.before.comma=Before comma checkbox.spaces.after.semicolon=After semicolon checkbox.spaces.before.semicolon=Before semicolon checkbox.spaces.after.type.cast=After type cast -checkbox.spaces.after.unary.operator=After unary operator title.warning=Warning title.editor=Editor combobox.strip.modified.lines=Modified Lines