From 9e4f01319b2c430984984716be14298d9a4bba9f Mon Sep 17 00:00:00 2001
From: Zalim Bashorov <Zalim.Bashorov@jetbrains.com>
Date: Tue, 11 Jun 2013 13:59:23 +0400
Subject: [PATCH] Swapped some CodeStyle options because must first be "...
 before ..." then  "... after..."

---
 .../JetLanguageCodeStyleSettingsProvider.java      | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/idea/src/org/jetbrains/jet/plugin/formatter/JetLanguageCodeStyleSettingsProvider.java b/idea/src/org/jetbrains/jet/plugin/formatter/JetLanguageCodeStyleSettingsProvider.java
index c57784aab50..596a6d530cb 100644
--- a/idea/src/org/jetbrains/jet/plugin/formatter/JetLanguageCodeStyleSettingsProvider.java
+++ b/idea/src/org/jetbrains/jet/plugin/formatter/JetLanguageCodeStyleSettingsProvider.java
@@ -95,20 +95,22 @@ public class JetLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSetti
                 consumer.showCustomOption(JetCodeStyleSettings.class, "SPACE_AROUND_RANGE", "Around range (..)",
                                           CodeStyleSettingsCustomizable.SPACES_AROUND_OPERATORS);
 
-                consumer.showCustomOption(JetCodeStyleSettings.class, "SPACE_AFTER_TYPE_COLON", "Space after colon, before declarations' type",
+                consumer.showCustomOption(JetCodeStyleSettings.class, "SPACE_BEFORE_TYPE_COLON",
+                                          "Space before colon, after declarations' name",
                                           CodeStyleSettingsCustomizable.SPACES_OTHER);
 
-                consumer.showCustomOption(JetCodeStyleSettings.class, "SPACE_BEFORE_TYPE_COLON", "Space before colon, after declarations' name",
-                                          CodeStyleSettingsCustomizable.SPACES_OTHER);
-
-                consumer.showCustomOption(JetCodeStyleSettings.class, "SPACE_AFTER_EXTEND_COLON",
-                                          "Space after colon in new type definition",
+                consumer.showCustomOption(JetCodeStyleSettings.class, "SPACE_AFTER_TYPE_COLON",
+                                          "Space after colon, before declarations' type",
                                           CodeStyleSettingsCustomizable.SPACES_OTHER);
 
                 consumer.showCustomOption(JetCodeStyleSettings.class, "SPACE_BEFORE_EXTEND_COLON",
                                           "Space before colon in new type definition",
                                           CodeStyleSettingsCustomizable.SPACES_OTHER);
 
+                consumer.showCustomOption(JetCodeStyleSettings.class, "SPACE_AFTER_EXTEND_COLON",
+                                          "Space after colon in new type definition",
+                                          CodeStyleSettingsCustomizable.SPACES_OTHER);
+
                 consumer.showCustomOption(JetCodeStyleSettings.class, "INSERT_WHITESPACES_IN_SIMPLE_ONE_LINE_METHOD",
                                           "Insert whitespaces in simple one line methods",
                                           CodeStyleSettingsCustomizable.SPACES_OTHER);