Correctly apply annotation wrap before modifier keyword

#KT-20314 Fixed

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

@@ -792,7 +792,14 @@ private fun getWrappingStrategyForItemList(wrapType: Int, itemTypes: TokenSet, w
     val itemWrap = Wrap.createWrap(wrapType, wrapFirstElement)
     return object : WrappingStrategy {
         override fun getWrap(childElement: ASTNode): Wrap? {
-            return if (childElement.elementType in itemTypes) itemWrap else null
+            val thisType = childElement.elementType
+            val prevType = getPrevWithoutWhitespace(childElement)?.elementType
+            return if (thisType in itemTypes || prevType in itemTypes &&
+                       thisType != KtTokens.EOL_COMMENT && prevType != KtTokens.EOL_COMMENT
+                    )
+                itemWrap
+            else
+                null
         }
     }
 }

idea/testData/copyPaste/conversion/FieldWithNoModifierAndNoSemicolon.expected.kt

@@ -1,3 +1,4 @@
 package to
 
-@Volatile internal var field = 1
+@Volatile
+internal var field = 1

idea/testData/formatter/ClassAnnotationWrapping.after.kt

@@ -1,4 +1,8 @@
 @Deprecated("Foo")
 @Deprecated("Bar")
 class Foo {
-}
+}
+
+@Deprecated("Foo")
+public class Q {
+}

idea/testData/formatter/ClassAnnotationWrapping.kt

@@ -1,2 +1,5 @@
 @Deprecated("Foo") @Deprecated("Bar") class Foo {
+}
+
+@Deprecated("Foo") public class Q {
 }

idea/testData/intentions/changeVisibility/private/onAnnotation.kt.after

@@ -1,5 +1,6 @@
 annotation class Small(val i: Int, val s: String)
 
-@Sma<caret>ll(1, "2") private fun test1() {
+@Small(1, "2")
+private fun test1() {
 
 }

idea/testData/intentions/changeVisibility/private/onAnnotationParameter.kt.after

@@ -1,5 +1,6 @@
 annotation class Small(val i: Int, val s: String)
 
-@Small(<caret>1, "2") private fun test1() {
+@Small(1, "2")
+private fun test1() {
 
 }

idea/testData/quickfix/addAnnotationTarget/basic1.kt.after

@@ -1,6 +1,7 @@
 // "Add annotation target" "true"
 
-@Target(AnnotationTarget.TYPE) annotation class Foo
+@Target(AnnotationTarget.TYPE)
+annotation class Foo
 
 class Test {
     fun foo(): @Foo Int = 1

idea/testData/quickfix/addAnnotationTarget/basic4.kt.after

@@ -1,6 +1,7 @@
 // "Add annotation target" "true"
 
-@Target(AnnotationTarget.TYPE, AnnotationTarget.CLASS, AnnotationTarget.FUNCTION) annotation class Foo
+@Target(AnnotationTarget.TYPE, AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
+annotation class Foo
 
 @Foo
 class Test {

idea/testData/quickfix/modifiers/openMemberInFinalClass4.kt.after

@@ -1,4 +1,5 @@
 // "Make 'A' open" "true"
-@Deprecated("") open class A() {
+@Deprecated("")
+open class A() {
     open fun foo() {}
 }

idea/testData/refactoring/extractSuperclass/reformatModifierList.kt.after

@@ -3,11 +3,13 @@ annotation class Concat
 
 abstract class A {
     // INFO: {"checked": "true", "toAbstract": "true"}
-    @Concat abstract var extraction: Int
+    @Concat
+    abstract var extraction: Int
 }
 
 // SIBLING:
 class Abstraction : A() {
     // INFO: {"checked": "true", "toAbstract": "true"}
-    @Concat override var extraction = 0
+    @Concat
+    override var extraction = 0
 }

idea/testData/refactoring/pullUp/k2k/reformatModifierList.kt.after

@@ -2,10 +2,12 @@ annotation class Concat
 
 abstract class A {
     // INFO: {"checked": "true", "toAbstract": "true"}
-    @Concat abstract var extraction: Int
+    @Concat
+    abstract var extraction: Int
 }
 
 class Abstraction : A() {
     // INFO: {"checked": "true", "toAbstract": "true"}
-    @Concat override var extraction = 0
+    @Concat
+    override var extraction = 0
 }

j2k/testData/fileOrElement/annotations/annotationUsages.kt

@@ -13,7 +13,8 @@ import javaApi.*
 @Anon8(classes = arrayOf(String::class, StringBuilder::class))
 internal class C {
     @Anon5(1)
-    @Deprecated("") private val field1 = 0
+    @Deprecated("")
+    private val field1 = 0
 
     @Anon5(1)
     private val field2 = 0

j2k/testData/fileOrElement/annotations/modifiersToAnnotationsFromPropertyAccessors.kt

@@ -7,6 +7,11 @@ class WithModifiersOnAccessors {
     @get:Strictfp
     var strict = 0.0
 
-    @Synchronized private fun methSync() {}
-    @Strictfp protected fun methStrict() {}
+    @Synchronized
+    private fun methSync() {
+    }
+
+    @Strictfp
+    protected fun methStrict() {
+    }
 }

ultimate/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyAnnotationConfig.kt.after

@@ -10,7 +10,8 @@ import org.springframework.context.annotation.ComponentScan
 @Component
 open class FooBean {
     @Autowired lateinit var bean: BarBean
-    @Autowired lateinit var barBean<caret>: BarBean
+    @Autowired
+    lateinit var barBean<caret>: BarBean
 }
 
 @Component

ultimate/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyXmlConfig.kt.after

@@ -7,7 +7,8 @@ import org.springframework.beans.factory.annotation.Autowired
 
 open class FooBean {
     @Autowired lateinit var bean: BarBean
-    @Autowired lateinit var barBean<caret>: BarBean
+    @Autowired
+    lateinit var barBean<caret>: BarBean
 }
 
 open class BarBean

ultimate/testData/spring/core/generate/autowiredDependencies/multiplePropertiesAnnotationConfig.kt.after

@@ -11,8 +11,10 @@ import org.springframework.context.annotation.ComponentScan
 @Component
 open class FooBean {
     @Qualifier("application")
-    @Autowired lateinit var application: Application
-    @Autowired lateinit var barBean<caret>: BarBean
+    @Autowired
+    lateinit var application: Application
+    @Autowired
+    lateinit var barBean<caret>: BarBean
 
 }
 

ultimate/testData/spring/core/generate/autowiredDependencies/multiplePropertiesXmlConfig.kt.after

@@ -6,8 +6,10 @@ package a
 import org.springframework.beans.factory.annotation.Autowired
 
 open class FooBean {
-    @Autowired lateinit var barBean: BarBean
-    @Autowired lateinit var fooBean: FooBean
+    @Autowired
+    lateinit var barBean: BarBean
+    @Autowired
+    lateinit var fooBean<caret>: FooBean
 
 }
 

ultimate/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierAnnotationConfig.kt.after

@@ -11,7 +11,8 @@ import org.springframework.context.annotation.ComponentScan
 @Component
 open class FooBean {
     @Qualifier("barBean")
-    @Autowired lateinit var barBean<caret>: BarBean
+    @Autowired
+    lateinit var barBean<caret>: BarBean
 
 }
 

ultimate/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierXmlConfig.kt.after

@@ -8,7 +8,8 @@ import org.springframework.beans.factory.annotation.Qualifier
 
 open class FooBean {
     @Qualifier("barBean")
-    @Autowired lateinit var barBean<caret>: BarBean
+    @Autowired
+    lateinit var barBean<caret>: BarBean
 
 }
 

ultimate/testData/spring/core/generate/autowiredDependencies/singlePropertyAnnotationConfig.kt.after

@@ -9,7 +9,8 @@ import org.springframework.context.annotation.ComponentScan
 
 @Component
 open class FooBean {
-    @Autowired lateinit var barBean<caret>: BarBean
+    @Autowired
+    lateinit var barBean<caret>: BarBean
 
 }
 

ultimate/testData/spring/core/generate/autowiredDependencies/singlePropertyXmlConfig.kt.after

@@ -6,7 +6,8 @@ package a
 import org.springframework.beans.factory.annotation.Autowired
 
 open class FooBean {
-    @Autowired lateinit var barBean<caret>: BarBean
+    @Autowired
+    lateinit var barBean<caret>: BarBean
 
 }