From 46a6cab671ca530ec286cb0f61cb77fe395a678d Mon Sep 17 00:00:00 2001
From: Denis Zharkov <denis.zharkov@jetbrains.com>
Date: Tue, 12 May 2015 17:23:00 +0300
Subject: [PATCH] Formatter: no spaces after 'constructor' inside primary ctor

---
 .../kotlin/idea/formatter/kotlinSpacingRules.kt          | 2 ++
 idea/testData/formatter/PrimaryConstructor.after.kt      | 9 +++++++++
 idea/testData/formatter/PrimaryConstructor.kt            | 9 +++++++++
 3 files changed, 20 insertions(+)

diff --git a/idea/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt b/idea/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
index 8f2fd746dd3..3d61b487ed7 100644
--- a/idea/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
@@ -155,6 +155,8 @@ fun createSpacingBuilder(settings: CodeStyleSettings): KotlinSpacingBuilder {
                 }
             }
 
+            afterInside(CONSTRUCTOR_KEYWORD, PRIMARY_CONSTRUCTOR).spaces(0)
+
             aroundInside(DOT, DOT_QUALIFIED_EXPRESSION).spaces(0)
             aroundInside(SAFE_ACCESS, SAFE_ACCESS_EXPRESSION).spaces(0)
 
diff --git a/idea/testData/formatter/PrimaryConstructor.after.kt b/idea/testData/formatter/PrimaryConstructor.after.kt
index dae964048c0..c0e6d5542c2 100644
--- a/idea/testData/formatter/PrimaryConstructor.after.kt
+++ b/idea/testData/formatter/PrimaryConstructor.after.kt
@@ -26,3 +26,12 @@ class A9 // eol comment
 private // eol comment
 [ann] // eol comment
 ()
+
+class A10
+protected @ann constructor()
+
+class A11
+protected
+@ann
+constructor
+()
diff --git a/idea/testData/formatter/PrimaryConstructor.kt b/idea/testData/formatter/PrimaryConstructor.kt
index 803d3872b01..c66d9642cf7 100644
--- a/idea/testData/formatter/PrimaryConstructor.kt
+++ b/idea/testData/formatter/PrimaryConstructor.kt
@@ -25,3 +25,12 @@ class A9 // eol comment
 private // eol comment
 [ann] // eol comment
 ()
+
+class A10
+protected        @ann   constructor    ()
+
+class A11
+protected
+@ann
+constructor
+()