From 1b6f6e8bf7fde392c94322bb4b8730814f3eb710 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Fri, 12 Jan 2018 11:46:15 +0100
Subject: [PATCH] Don't indent block comments of typealiases

 #KT-22230 Fixed
---
 .../jetbrains/kotlin/idea/formatter/KotlinCommonBlock.kt    | 5 ++++-
 idea/testData/formatter/KT22230.after.kt                    | 4 ++++
 idea/testData/formatter/KT22230.kt                          | 4 ++++
 .../jetbrains/kotlin/formatter/FormatterTestGenerated.java  | 6 ++++++
 4 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 idea/testData/formatter/KT22230.after.kt
 create mode 100644 idea/testData/formatter/KT22230.kt

diff --git a/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinCommonBlock.kt b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinCommonBlock.kt
index 492961c4200..495ffd23417 100644
--- a/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinCommonBlock.kt
+++ b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinCommonBlock.kt
@@ -723,7 +723,10 @@ private val INDENT_RULES = arrayOf(
 
     strategy("Type aliases")
         .within(KtNodeTypes.TYPEALIAS)
-        .notForType(KtTokens.TYPE_ALIAS_KEYWORD, KtTokens.EOL_COMMENT, KtNodeTypes.MODIFIER_LIST)
+        .notForType(
+            KtTokens.TYPE_ALIAS_KEYWORD, KtTokens.EOL_COMMENT, KtNodeTypes.MODIFIER_LIST, KtTokens.BLOCK_COMMENT,
+            KtTokens.DOC_COMMENT
+        )
         .set(Indent.getContinuationIndent())
 )
 
diff --git a/idea/testData/formatter/KT22230.after.kt b/idea/testData/formatter/KT22230.after.kt
new file mode 100644
index 00000000000..487528883ca
--- /dev/null
+++ b/idea/testData/formatter/KT22230.after.kt
@@ -0,0 +1,4 @@
+/**
+ * doc
+ */
+typealias Runnable = java.lang.Runnable
\ No newline at end of file
diff --git a/idea/testData/formatter/KT22230.kt b/idea/testData/formatter/KT22230.kt
new file mode 100644
index 00000000000..487528883ca
--- /dev/null
+++ b/idea/testData/formatter/KT22230.kt
@@ -0,0 +1,4 @@
+/**
+ * doc
+ */
+typealias Runnable = java.lang.Runnable
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java b/idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java
index cb523cca77c..a52af1740ae 100644
--- a/idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java
@@ -549,6 +549,12 @@ public class FormatterTestGenerated extends AbstractFormatterTest {
             doTest(fileName);
         }
 
+        @TestMetadata("KT22230.after.kt")
+        public void testKT22230() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/KT22230.after.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("KeepLineBreak.after.kt")
         public void testKeepLineBreak() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/KeepLineBreak.after.kt");