CPP-4824 Inconsistent order of settings in Code Style | CMake | Spaces
authorVasily Pisar <vasily.pisar@jetbrains.com>
Thu, 29 Oct 2015 14:07:59 +0000 (17:07 +0300)
committerVasily Pisar <vasily.pisar@jetbrains.com>
Thu, 29 Oct 2015 14:07:59 +0000 (17:07 +0300)
Better order: definition, then call

platform/lang-api/src/com/intellij/psi/codeStyle/presentation/CodeStyleSettingPresentation.java

index f4b893d2ce1bebeebaba1e209a52345e06bece59..4d65bd83f49f62553dce346161e88b12d7b15cda 100644 (file)
@@ -153,10 +153,10 @@ public class CodeStyleSettingPresentation {
 
     result = ContainerUtil.newLinkedHashMap();
     result.put(new SettingsGroup(SPACES_BEFORE_PARENTHESES), ContainerUtil.immutableList(
-      new CodeStyleSettingPresentation("SPACE_BEFORE_METHOD_CALL_PARENTHESES",
-                                       ApplicationBundle.message("checkbox.spaces.method.call.parentheses")),
       new CodeStyleSettingPresentation("SPACE_BEFORE_METHOD_PARENTHESES",
                                        ApplicationBundle.message("checkbox.spaces.method.declaration.parentheses")),
+      new CodeStyleSettingPresentation("SPACE_BEFORE_METHOD_CALL_PARENTHESES",
+                                       ApplicationBundle.message("checkbox.spaces.method.call.parentheses")),
       new CodeStyleSettingPresentation("SPACE_BEFORE_IF_PARENTHESES", ApplicationBundle.message("checkbox.spaces.if.parentheses")),
       new CodeStyleSettingPresentation("SPACE_BEFORE_FOR_PARENTHESES", ApplicationBundle.message("checkbox.spaces.for.parentheses")),
       new CodeStyleSettingPresentation("SPACE_BEFORE_WHILE_PARENTHESES",
@@ -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",