From c5677f0428809c38ddc1b7529c6ee108d83555fd Mon Sep 17 00:00:00 2001
From: Ilya Zorin <geraltencore@gmail.com>
Date: Fri, 6 Jan 2017 16:55:27 +0300
Subject: [PATCH] Format spaces around ::

---
 .../jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt  | 2 ++
 idea/testData/formatter/FunctionReferenceOperator.after.kt | 7 +++++++
 idea/testData/formatter/FunctionReferenceOperator.kt       | 7 +++++++
 .../jetbrains/kotlin/formatter/FormatterTestGenerated.java | 6 ++++++
 4 files changed, 22 insertions(+)
 create mode 100644 idea/testData/formatter/FunctionReferenceOperator.after.kt
 create mode 100644 idea/testData/formatter/FunctionReferenceOperator.kt

diff --git a/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
index 10dbac21e46..04f5f808220 100644
--- a/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
+++ b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
@@ -252,6 +252,8 @@ fun createSpacingBuilder(settings: CodeStyleSettings, builderUtil: KotlinSpacing
 
             between(WHEN_ENTRY, WHEN_ENTRY).lineBreakInCode()
 
+            around(COLONCOLON).spaces(0)
+
             around(BY_KEYWORD).spaces(1)
             betweenInside(IDENTIFIER, PROPERTY_DELEGATE, PROPERTY).spaces(1)
         }
diff --git a/idea/testData/formatter/FunctionReferenceOperator.after.kt b/idea/testData/formatter/FunctionReferenceOperator.after.kt
new file mode 100644
index 00000000000..bf019214717
--- /dev/null
+++ b/idea/testData/formatter/FunctionReferenceOperator.after.kt
@@ -0,0 +1,7 @@
+class Foo {
+    fun bar() {}
+}
+
+fun baz() {
+    Foo::bar
+}
diff --git a/idea/testData/formatter/FunctionReferenceOperator.kt b/idea/testData/formatter/FunctionReferenceOperator.kt
new file mode 100644
index 00000000000..5db5d406bf7
--- /dev/null
+++ b/idea/testData/formatter/FunctionReferenceOperator.kt
@@ -0,0 +1,7 @@
+class Foo {
+    fun bar() {}
+}
+
+fun baz() {
+    Foo   ::   bar
+}
diff --git a/idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java b/idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java
index 5c73ebefa9d..81d4a61f246 100644
--- a/idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java
@@ -326,6 +326,12 @@ public class FormatterTestGenerated extends AbstractFormatterTest {
             doTest(fileName);
         }
 
+        @TestMetadata("FunctionReferenceOperator.after.kt")
+        public void testFunctionReferenceOperator() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/FunctionReferenceOperator.after.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("FunctionWithInference.after.kt")
         public void testFunctionWithInference() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/FunctionWithInference.after.kt");