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

Refactoring: rename parameter to argument for annotation diagnostics

Browse Source
This commit is contained in:
Mikhail Zarechenskiy
2018-03-07 14:38:01 +03:00
parent baf16895f2
commit 4ebd11a7ae
34 changed files with 91 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/booleanLocalVal.kt
Vendored
+1 -1
View File
@@ -2,5 +2,5 @@ annotation class Ann(vararg val i: Boolean)
fun foo() {
val bool1 = true
@Ann(<!ANNOTATION_PARAMETER_MUST_BE_CONST!>bool1<!>) val <!UNUSED_VARIABLE!>a<!> = bool1
@Ann(<!ANNOTATION_ARGUMENT_MUST_BE_CONST!>bool1<!>) val <!UNUSED_VARIABLE!>a<!> = bool1
}
compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/compareAndEquals.kt
Vendored
+5 -5
View File
@@ -7,10 +7,10 @@ fun foo() {
val a4 = a1 > a2
@Ann(
<!ANNOTATION_PARAMETER_MUST_BE_CONST!>a1<!>,
<!ANNOTATION_PARAMETER_MUST_BE_CONST!>a2<!>,
<!ANNOTATION_PARAMETER_MUST_BE_CONST!>a3<!>,
<!ANNOTATION_PARAMETER_MUST_BE_CONST!>a1 > a2<!>,
<!ANNOTATION_PARAMETER_MUST_BE_CONST!>a1 == a2<!>
<!ANNOTATION_ARGUMENT_MUST_BE_CONST!>a1<!>,
<!ANNOTATION_ARGUMENT_MUST_BE_CONST!>a2<!>,
<!ANNOTATION_ARGUMENT_MUST_BE_CONST!>a3<!>,
<!ANNOTATION_ARGUMENT_MUST_BE_CONST!>a1 > a2<!>,
<!ANNOTATION_ARGUMENT_MUST_BE_CONST!>a1 == a2<!>
) val b = 1
}
compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.kt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
annotation class AnnE(val i: MyEnum)
@AnnE(<!ANNOTATION_PARAMETER_MUST_BE_ENUM_CONST!>e<!>)
@AnnE(<!ANNOTATION_ARGUMENT_MUST_BE_ENUM_CONST!>e<!>)
class Test
val e: MyEnum = MyEnum.A
compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/javaProperties.kt
Vendored
+5 -5
View File
@@ -14,12 +14,12 @@ public class Test {
annotation class Ann(vararg val i: Int)
@Ann(
<!ANNOTATION_PARAMETER_MUST_BE_CONST!>Test.i1<!>,
<!ANNOTATION_ARGUMENT_MUST_BE_CONST!>Test.i1<!>,
Test.i2,
<!ANNOTATION_PARAMETER_MUST_BE_CONST!>Test.i3<!>,
<!ANNOTATION_ARGUMENT_MUST_BE_CONST!>Test.i3<!>,
Test.i4,
<!ANNOTATION_PARAMETER_MUST_BE_CONST!>Test.i5<!>,
<!ANNOTATION_PARAMETER_MUST_BE_CONST!>Test.i6<!>,
<!ANNOTATION_PARAMETER_MUST_BE_CONST!>Test().i7<!>
<!ANNOTATION_ARGUMENT_MUST_BE_CONST!>Test.i5<!>,
<!ANNOTATION_ARGUMENT_MUST_BE_CONST!>Test.i6<!>,
<!ANNOTATION_ARGUMENT_MUST_BE_CONST!>Test().i7<!>
)
class A
compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/kotlinProperties.kt
Vendored
+4 -4
View File
@@ -1,12 +1,12 @@
annotation class Ann(vararg val i: Int)
@Ann(
<!ANNOTATION_PARAMETER_MUST_BE_CONST!>i1<!>,
<!ANNOTATION_ARGUMENT_MUST_BE_CONST!>i1<!>,
i2,
<!ANNOTATION_PARAMETER_MUST_BE_CONST!>i3<!>,
<!ANNOTATION_ARGUMENT_MUST_BE_CONST!>i3<!>,
i4,
<!ANNOTATION_PARAMETER_MUST_BE_CONST!>i5<!>,
<!ANNOTATION_PARAMETER_MUST_BE_CONST!>i6<!>
<!ANNOTATION_ARGUMENT_MUST_BE_CONST!>i5<!>,
<!ANNOTATION_ARGUMENT_MUST_BE_CONST!>i6<!>
)
class Test
compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/standaloneInExpression.kt
Vendored
+4 -4
View File
@@ -4,15 +4,15 @@ enum class MyEnum {
A
}
@AnnE(<!ANNOTATION_PARAMETER_MUST_BE_CONST!>"1" + MyEnum.A<!>)
@AnnE(<!ANNOTATION_ARGUMENT_MUST_BE_CONST!>"1" + MyEnum.A<!>)
class Test
@AnnE(<!ANNOTATION_PARAMETER_MUST_BE_CONST!>"1" + MyEnum::class<!>)
@AnnE(<!ANNOTATION_ARGUMENT_MUST_BE_CONST!>"1" + MyEnum::class<!>)
class Test2
@AnnE(<!ANNOTATION_PARAMETER_MUST_BE_CONST!>"1" + AnnE("23")<!>)
@AnnE(<!ANNOTATION_ARGUMENT_MUST_BE_CONST!>"1" + AnnE("23")<!>)
class Test3
@AnnE(<!ANNOTATION_PARAMETER_MUST_BE_CONST!>"1" + arrayOf("23", "34")<!>)
@AnnE(<!ANNOTATION_ARGUMENT_MUST_BE_CONST!>"1" + arrayOf("23", "34")<!>)
class Test4
compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/strings.kt
Vendored
+10 -10
View File
@@ -12,17 +12,17 @@ fun foo() {
val a5 = 1.0
@Ann(
<!ANNOTATION_PARAMETER_MUST_BE_CONST!>a1<!>,
<!ANNOTATION_PARAMETER_MUST_BE_CONST!>a2<!>,
<!ANNOTATION_PARAMETER_MUST_BE_CONST!>a3<!>,
<!ANNOTATION_ARGUMENT_MUST_BE_CONST!>a1<!>,
<!ANNOTATION_ARGUMENT_MUST_BE_CONST!>a2<!>,
<!ANNOTATION_ARGUMENT_MUST_BE_CONST!>a3<!>,
"$topLevel",
<!ANNOTATION_PARAMETER_MUST_BE_CONST!>"$a1"<!>,
<!ANNOTATION_PARAMETER_MUST_BE_CONST!>"$a1 $topLevel"<!>,
<!ANNOTATION_PARAMETER_MUST_BE_CONST!>"$a4"<!>,
<!ANNOTATION_PARAMETER_MUST_BE_CONST!>"$a5"<!>,
<!ANNOTATION_PARAMETER_MUST_BE_CONST!>a1 + a2<!>,
<!ANNOTATION_PARAMETER_MUST_BE_CONST!>"a" + a2<!>,
<!ANNOTATION_ARGUMENT_MUST_BE_CONST!>"$a1"<!>,
<!ANNOTATION_ARGUMENT_MUST_BE_CONST!>"$a1 $topLevel"<!>,
<!ANNOTATION_ARGUMENT_MUST_BE_CONST!>"$a4"<!>,
<!ANNOTATION_ARGUMENT_MUST_BE_CONST!>"$a5"<!>,
<!ANNOTATION_ARGUMENT_MUST_BE_CONST!>a1 + a2<!>,
<!ANNOTATION_ARGUMENT_MUST_BE_CONST!>"a" + a2<!>,
"a" + topLevel,
<!ANNOTATION_PARAMETER_MUST_BE_CONST!>"a" + a4<!>
<!ANNOTATION_ARGUMENT_MUST_BE_CONST!>"a" + a4<!>
) val b = 1
}