Merge branch 'master' into daywalker/cmake_option_sorting
authorVasily Pisar <vasily.pisar@jetbrains.com>
Thu, 29 Oct 2015 13:07:05 +0000 (16:07 +0300)
committerVasily Pisar <vasily.pisar@jetbrains.com>
Thu, 29 Oct 2015 13:07:05 +0000 (16:07 +0300)
platform/lang-api/src/com/intellij/psi/codeStyle/presentation/CodeStyleSettingPresentation.java

index b26c8df07a5b3f4028cdaeb6a16f380fa3446c2b..f4b893d2ce1bebeebaba1e209a52345e06bece59 100644 (file)
@@ -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.
@@ -153,10 +153,10 @@ public class CodeStyleSettingPresentation {
 
     result = ContainerUtil.newLinkedHashMap();
     result.put(new SettingsGroup(SPACES_BEFORE_PARENTHESES), ContainerUtil.immutableList(
-      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_METHOD_PARENTHESES",
+                                       ApplicationBundle.message("checkbox.spaces.method.declaration.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",