azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement option for wrapping method annotations

Browse Source
This commit is contained in:
Dmitry Jemerov
2017-06-22 19:59:18 +02:00
parent a379a814ba
commit 5f9a33564a
47 changed files with 111 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinCommonBlock.kt
+6
View File
@@ -359,6 +359,9 @@ abstract class KotlinCommonBlock(
return getWrappingStrategyForItemList(commonSettings.CLASS_ANNOTATION_WRAP,
KtNodeTypes.ANNOTATION_ENTRY)
is KtNamedFunction ->
return getWrappingStrategyForItemList(commonSettings.METHOD_ANNOTATION_WRAP,
KtNodeTypes.ANNOTATION_ENTRY)
}
elementType === KtNodeTypes.VALUE_PARAMETER ->
@@ -366,6 +369,9 @@ abstract class KotlinCommonBlock(
node.psi is KtClassOrObject ->
return wrapAfterAnnotation(commonSettings.CLASS_ANNOTATION_WRAP)
node.psi is KtNamedFunction ->
return wrapAfterAnnotation(commonSettings.METHOD_ANNOTATION_WRAP)
}
return WrappingStrategy.NoWrapping
idea/src/org/jetbrains/kotlin/idea/formatter/KotlinLanguageCodeStyleSettingsProvider.kt
+2 -1
View File
@@ -34,7 +34,7 @@ class KotlinLanguageCodeStyleSettingsProvider : LanguageCodeStyleSettingsProvide
val test =
12
fun foo1(i1: Int, i2: Int, i3: Int) : Int {
@Deprecated("Foo") fun foo1(i1: Int, i2: Int, i3: Int) : Int {
when (i1) {
is Number -> 0
else -> 1
@@ -236,6 +236,7 @@ class KotlinLanguageCodeStyleSettingsProvider : LanguageCodeStyleSettingsProvide
"CALL_PARAMETERS_WRAP",
"METHOD_PARAMETERS_WRAP",
"EXTENDS_LIST_WRAP",
"METHOD_ANNOTATION_WRAP",
"CLASS_ANNOTATION_WRAP",
"PARAMETER_ANNOTATION_WRAP",
"METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE",
idea/testData/copyPaste/conversion/AddImportsWithExplicitImports.expected.kt
Vendored
+3 -1
View File
@@ -4,6 +4,8 @@ internal class C {
private fun memberFun(file: File) {}
companion object {
@JvmStatic fun main(args: Array<String>) {}
@JvmStatic
fun main(args: Array<String>) {
}
}
}
idea/testData/copyPaste/conversion/FileWithNoPackageStatement.expected.kt
Vendored
+2 -1
View File
@@ -1,7 +1,8 @@
package to
object JavaClass {
@JvmStatic fun main(args: Array<String>) {
@JvmStatic
fun main(args: Array<String>) {
println("Hello, world!")
}
}
idea/testData/formatter/MethodAnnotationWrapping.after.kt
Vendored
+4
View File
@@ -0,0 +1,4 @@
@Deprecated("Foo")
@Deprecated("Bar")
fun foo() {
}
idea/testData/formatter/MethodAnnotationWrapping.kt
Vendored
+2
View File
@@ -0,0 +1,2 @@
@Deprecated("Foo") @Deprecated("Bar") fun foo() {
}
idea/testData/formatter/modifierList/funAnnotationBeforeAnnotation.after.kt
Vendored
+2 -1
View File
@@ -1,4 +1,5 @@
@annot
@foo fun foo() {
@foo
fun foo() {
}
idea/testData/formatter/modifierList/funAnnotationEntryBeforeAnnotation.after.kt
Vendored
+2 -1
View File
@@ -1,4 +1,5 @@
annot()
@foo fun foo() {
@foo
fun foo() {
}
idea/testData/formatter/modifierList/funAnnotationEntryBeforeAnnotation.kt
Vendored
+2 -1
View File
@@ -1,4 +1,5 @@
annot()
@foo fun foo() {
@foo
fun foo() {
}
idea/testData/formatter/modifierList/funModifierBeforeAnnotation.after.kt
Vendored
+2 -1
View File
@@ -1,4 +1,5 @@
public
@foo fun foo() {
@foo
fun foo() {
}
idea/testData/formatter/modifierList/funModifierBeforeAnnotation.kt
Vendored
+2 -1
View File
@@ -1,4 +1,5 @@
public
@foo fun foo() {
@foo
fun foo() {
}
idea/testData/intentions/convertPropertyToFunction/unchangedElements.kt.after
Vendored
+2 -1
View File
@@ -3,7 +3,8 @@
annotation class X(val s: String)
class A(val n: Int) {
internal @X("1") fun <T : Number> T.getFoo(): Boolean = toInt() - n > 1
internal @X("1")
fun <T : Number> T.getFoo(): Boolean = toInt() - n > 1
}
fun test() {
idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressNoArgsTheSameLine.kt.after
Vendored
+2 -1
View File
@@ -1,3 +1,4 @@
// "Suppress 'REDUNDANT_NULLABLE' for fun foo" "true"
@Suppress("REDUNDANT_NULLABLE") fun foo(): String?<caret>? = null
@Suppress("REDUNDANT_NULLABLE")
fun foo(): String?? = null
idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressNoArgsTheSameLineBare.kt.after
Vendored
+2 -1
View File
@@ -1,3 +1,4 @@
// "Suppress 'REDUNDANT_NULLABLE' for fun foo" "true"
@Suppress("REDUNDANT_NULLABLE") fun foo(): String?<caret>? = null
@Suppress("REDUNDANT_NULLABLE")
fun foo(): String?? = null
idea/testData/refactoring/copy/kt18149/after/refactor/copy2/test.kt
Vendored
+2 -1
View File
@@ -42,7 +42,8 @@ class Variety<C> {
private fun privateFun() = 0
fun <T> genFunB(p: T): T = p
fun <T> genFunC(p: T): C where T : C = p
@MemAnn fun annotatedFun() = 0
@MemAnn
fun annotatedFun() = 0
final fun finalFun() = 0
// property
var publicProp = 0
idea/testData/refactoring/pullUp/j2k/fromClassToClass.kt.after
Vendored
+2 -1
View File
@@ -21,7 +21,8 @@ abstract class A {
var X = "1" + "2"
// INFO: {"checked": "true"}
@JvmStatic fun foo2(n: Int): String {
@JvmStatic
fun foo2(n: Int): String {
return "_" + n + "_"
}
}
idea/testData/refactoring/pullUp/j2k/fromClassToClassAndMakeAbstract.kt.after
Vendored
+2 -1
View File
@@ -19,7 +19,8 @@ abstract class A {
var X = "1" + "2"
// INFO: {"checked": "true", "toAbstract": "true"}
@JvmStatic fun foo2(n: Int): String {
@JvmStatic
fun foo2(n: Int): String {
return "_" + n + "_"
}
}
idea/testData/refactoring/pullUp/j2k/fromClassToInterface.kt.after
Vendored
+2 -1
View File
@@ -15,7 +15,8 @@ interface A {
var X = "1" + "2"
// INFO: {"checked": "true"}
@JvmStatic fun foo2(n: Int): String {
@JvmStatic
fun foo2(n: Int): String {
return "_" + n + "_"
}
}
idea/testData/refactoring/pullUp/j2k/fromClassToNestedClass.kt.after
Vendored
+2 -1
View File
@@ -23,7 +23,8 @@ class T {
var X = "1" + "2"
// INFO: {"checked": "true"}
@JvmStatic fun foo2(n: Int): String {
@JvmStatic
fun foo2(n: Int): String {
return "_" + n + "_"
}
}
idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java
+6
View File
@@ -494,6 +494,12 @@ public class FormatterTestGenerated extends AbstractFormatterTest {
doTest(fileName);
}
@TestMetadata("MethodAnnotationWrapping.after.kt")
public void testMethodAnnotationWrapping() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/MethodAnnotationWrapping.after.kt");
doTest(fileName);
}
@TestMetadata("MethodCall.after.kt")
public void testMethodCall() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/MethodCall.after.kt");