Implement option for wrapping parameter annotations

idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinCommonBlock.kt

@@ -332,7 +332,15 @@ abstract class KotlinCommonBlock(
                 if (parentElementType === KtNodeTypes.FUN ||
                     parentElementType === KtNodeTypes.PRIMARY_CONSTRUCTOR ||
                     parentElementType === KtNodeTypes.SECONDARY_CONSTRUCTOR) {
-                    return getWrappingStrategyForItemList(commonSettings.METHOD_PARAMETERS_WRAP, KtNodeTypes.VALUE_PARAMETER)
+                    val wrap = Wrap.createWrap(commonSettings.METHOD_PARAMETERS_WRAP, false)
+                    return object : WrappingStrategy {
+                        override fun getWrap(childElement: ASTNode): Wrap? {
+                            return if (childElement.elementType === KtNodeTypes.VALUE_PARAMETER && !childElement.startsWithAnnotation())
+                                wrap
+                            else
+                                null
+                        }
+                    }
                 }
             }
 
@@ -343,12 +351,44 @@ abstract class KotlinCommonBlock(
                         if (childElement.psi is KtSuperTypeListEntry) wrap else null
                 }
             }
+
+            elementType === KtNodeTypes.MODIFIER_LIST ->
+                when (node.treeParent.elementType) {
+                    KtNodeTypes.VALUE_PARAMETER ->
+                        return getWrappingStrategyForItemList(commonSettings.PARAMETER_ANNOTATION_WRAP,
+                                                              KtNodeTypes.ANNOTATION_ENTRY,
+                                                              !node.treeParent.isFirstParameter())
+                }
+
+            elementType === KtNodeTypes.VALUE_PARAMETER ->
+                return wrapAfterAnnotation(commonSettings.PARAMETER_ANNOTATION_WRAP)
         }
 
         return WrappingStrategy.NoWrapping
     }
 }
 
+private fun ASTNode.startsWithAnnotation() = firstChildNode?.firstChildNode?.elementType == KtNodeTypes.ANNOTATION_ENTRY
+
+private fun ASTNode.isFirstParameter(): Boolean = treePrev.elementType == KtTokens.LPAR
+
+private fun wrapAfterAnnotation(wrapType: Int): WrappingStrategy {
+    return object : WrappingStrategy {
+        override fun getWrap(childElement: ASTNode): Wrap? {
+            var prevLeaf = childElement.treePrev
+            while (prevLeaf?.elementType == TokenType.WHITE_SPACE) {
+                prevLeaf = prevLeaf.treePrev
+            }
+            if (prevLeaf?.elementType == KtNodeTypes.MODIFIER_LIST) {
+                if (prevLeaf?.lastChildNode?.elementType == KtNodeTypes.ANNOTATION_ENTRY) {
+                    return Wrap.createWrap(wrapType, true)
+                }
+            }
+            return null
+        }
+    }
+}
+
 private val INDENT_RULES = arrayOf<NodeIndentStrategy>(
         strategy("No indent for braces in blocks")
                 .within(KtNodeTypes.BLOCK, KtNodeTypes.CLASS_BODY, KtNodeTypes.FUNCTION_LITERAL)
@@ -502,8 +542,8 @@ private fun getPrevWithoutWhitespaceAndComments(pNode: ASTNode?): ASTNode? {
     return node
 }
 
-private fun getWrappingStrategyForItemList(wrapType: Int, itemType: IElementType): WrappingStrategy {
-    val itemWrap = Wrap.createWrap(wrapType, false)
+private fun getWrappingStrategyForItemList(wrapType: Int, itemType: IElementType, wrapFirstElement: Boolean = false): WrappingStrategy {
+    val itemWrap = Wrap.createWrap(wrapType, wrapFirstElement)
     return object : WrappingStrategy {
         override fun getWrap(childElement: ASTNode): Wrap? {
             return if (childElement.elementType === itemType) itemWrap else null

idea/src/org/jetbrains/kotlin/idea/formatter/KotlinFormattingModelBuilder.java

@@ -16,10 +16,7 @@
 
 package org.jetbrains.kotlin.idea.formatter;
 
-import com.intellij.formatting.FormattingModel;
-import com.intellij.formatting.FormattingModelBuilder;
-import com.intellij.formatting.FormattingModelProvider;
-import com.intellij.formatting.Indent;
+import com.intellij.formatting.*;
 import com.intellij.lang.ASTNode;
 import com.intellij.openapi.editor.impl.DocumentImpl;
 import com.intellij.openapi.util.TextRange;

idea/src/org/jetbrains/kotlin/idea/formatter/KotlinLanguageCodeStyleSettingsProvider.kt

@@ -47,7 +47,7 @@ class KotlinLanguageCodeStyleSettingsProvider : LanguageCodeStyleSettingsProvide
                        }        catch (e: Exception) {            return 0        }        finally {           if (true) {               return 1           }           else {               return 2           }        }    }
                    private val f = {(a: Int)->a*2}
 
-                   fun longMethod(param1: Int,
+                   fun longMethod(@Named("param1") param1: Int,
                     param2: String) {
                    }
                }
@@ -236,6 +236,7 @@ class KotlinLanguageCodeStyleSettingsProvider : LanguageCodeStyleSettingsProvide
                         "CALL_PARAMETERS_WRAP",
                         "METHOD_PARAMETERS_WRAP",
                         "EXTENDS_LIST_WRAP",
+                        "PARAMETER_ANNOTATION_WRAP",
                         "METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE",
                         "METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE",
                         "CALL_PARAMETERS_LPAREN_ON_NEXT_LINE",

idea/testData/formatter/ParameterAnnotationWrap.after.kt

@@ -0,0 +1,7 @@
+fun foo(@Deprecated("x")
+        x: Int,
+        @Deprecated("y")
+        @Deprecated("z")
+        y: Int)
+
+// SET_INT: PARAMETER_ANNOTATION_WRAP = 2

idea/testData/formatter/ParameterAnnotationWrap.kt

@@ -0,0 +1,3 @@
+fun foo(@Deprecated("x") x: Int, @Deprecated("y") @Deprecated("z") y: Int)
+
+// SET_INT: PARAMETER_ANNOTATION_WRAP = 2

idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java

@@ -554,6 +554,12 @@ public class FormatterTestGenerated extends AbstractFormatterTest {
             doTest(fileName);
         }
 
+        @TestMetadata("ParameterAnnotationWrap.after.kt")
+        public void testParameterAnnotationWrap() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/ParameterAnnotationWrap.after.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("ParameterDocComments.after.kt")
         public void testParameterDocComments() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/ParameterDocComments.after.kt");