CPP-4824 Inconsistent order of settings in Code Style | CMake | Spaces

[idea/community.git] / platform / lang-api / src / com / intellij / psi / codeStyle / presentation / CodeStyleSettingPresentation.java

diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/presentation/CodeStyleSettingPresentation.java b/platform/lang-api/src/com/intellij/psi/codeStyle/presentation/CodeStyleSettingPresentation.java
index 8cafca280569862508c4ab46e73fa528a29911e3..4d65bd83f49f62553dce346161e88b12d7b15cda 100644 (file)
--- a/platform/lang-api/src/com/intellij/psi/codeStyle/presentation/CodeStyleSettingPresentation.java
+++ b/platform/lang-api/src/com/intellij/psi/codeStyle/presentation/CodeStyleSettingPresentation.java
@@ -18,15 +18,15 @@ package com.intellij.psi.codeStyle.presentation;
 import com.intellij.openapi.application.ApplicationBundle;
 import com.intellij.psi.codeStyle.LanguageCodeStyleSettingsProvider;
 import com.intellij.util.containers.ContainerUtil;
-import com.intellij.util.containers.ContainerUtil.ImmutableMapBuilder;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import static com.intellij.psi.codeStyle.CodeStyleSettingsCustomizable.*;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
+import static com.intellij.psi.codeStyle.CodeStyleSettingsCustomizable.*;
+
 /**
  * @author Roman.Shein
  * @since 15.09.2015.
@@ -231,14 +231,14 @@ public class CodeStyleSettingPresentation {
       new CodeStyleSettingPresentation("SPACE_WITHIN_EMPTY_ARRAY_INITIALIZER_BRACES",
                                        ApplicationBundle.message("checkbox.spaces.within.empty.array.initializer.braces")),
       new CodeStyleSettingPresentation("SPACE_WITHIN_PARENTHESES", ApplicationBundle.message("checkbox.spaces.within.parentheses")),
+      new CodeStyleSettingPresentation("SPACE_WITHIN_METHOD_PARENTHESES",
+                                       ApplicationBundle.message("checkbox.spaces.checkbox.spaces.method.declaration.parentheses")),
+      new CodeStyleSettingPresentation("SPACE_WITHIN_EMPTY_METHOD_PARENTHESES", 
+                                       ApplicationBundle.message("checkbox.spaces.checkbox.spaces.empty.method.declaration.parentheses")),
       new CodeStyleSettingPresentation("SPACE_WITHIN_METHOD_CALL_PARENTHESES",
                                        ApplicationBundle.message("checkbox.spaces.checkbox.spaces.method.call.parentheses")),
       new CodeStyleSettingPresentation("SPACE_WITHIN_EMPTY_METHOD_CALL_PARENTHESES",
                                        ApplicationBundle.message("checkbox.spaces.checkbox.spaces.empty.method.call.parentheses")),
-      new CodeStyleSettingPresentation("SPACE_WITHIN_METHOD_PARENTHESES",
-                                       ApplicationBundle.message("checkbox.spaces.checkbox.spaces.method.declaration.parentheses")),
-      new CodeStyleSettingPresentation("SPACE_WITHIN_EMPTY_METHOD_PARENTHESES", ApplicationBundle
-        .message("checkbox.spaces.checkbox.spaces.empty.method.declaration.parentheses")),
       new CodeStyleSettingPresentation("SPACE_WITHIN_IF_PARENTHESES", ApplicationBundle.message("checkbox.spaces.if.parentheses")),
       new CodeStyleSettingPresentation("SPACE_WITHIN_FOR_PARENTHESES", ApplicationBundle.message("checkbox.spaces.for.parentheses")),
       new CodeStyleSettingPresentation("SPACE_WITHIN_WHILE_PARENTHESES",
@@ -268,7 +268,9 @@ public class CodeStyleSettingPresentation {
                                        ApplicationBundle.message("checkbox.spaces.after.comma"))
     ));
 
-    result.put(new SettingsGroup(SPACES_IN_TYPE_ARGUMENTS), ContainerUtil.<CodeStyleSettingPresentation>immutableList());
+    result.put(new SettingsGroup(SPACES_IN_TYPE_ARGUMENTS), ContainerUtil.immutableList(
+      new CodeStyleSettingPresentation("SPACE_BEFORE_TYPE_PARAMETER_LIST", ApplicationBundle.message("checkbox.spaces.before.opening.angle.bracket"))
+    ));
 
     result.put(new SettingsGroup(SPACES_IN_TYPE_PARAMETERS), ContainerUtil.<CodeStyleSettingPresentation>immutableList());
 
@@ -446,7 +448,9 @@ public class CodeStyleSettingPresentation {
       new CodeStyleSettingPresentation("ALIGN_GROUP_FIELD_DECLARATIONS",
                                        ApplicationBundle.message("wrapping.align.fields.in.columns")),
       new CodeStyleSettingPresentation("ALIGN_CONSECUTIVE_VARIABLE_DECLARATIONS",
-                                       ApplicationBundle.message("wrapping.align.variables.in.columns"))
+                                       ApplicationBundle.message("wrapping.align.variables.in.columns")),
+      new CodeStyleSettingPresentation("ALIGN_SUBSEQUENT_SIMPLE_METHODS",
+                                       ApplicationBundle.message("wrapping.align.simple.methods.in.columns"))
     ));
 
     putGroupTop(result, "TERNARY_OPERATION_WRAP", WRAPPING_TERNARY_OPERATION, WRAP_VALUES, WRAP_OPTIONS);