From aa4a20dddc348f5d9774d27413076dc5f39ce3d8 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Tue, 12 May 2015 18:12:48 +0300 Subject: [PATCH] Add missing 'constructor' to testData when it was necessary --- .../diagnostics/tests/annotations/atAnnotationResolve.kt | 2 +- .../diagnostics/tests/annotations/bracketsDeprecation.kt | 2 +- compiler/testData/diagnostics/tests/deprecated/typeUsage.kt | 2 +- .../tests/inline/nonPublicMember/inNonPublicClass.kt | 2 +- .../testData/diagnostics/tests/modifiers/IllegalModifiers.kt | 4 ++-- .../annotations/annotationApplicability/platformName.kt | 2 +- .../annotations/platformStatic/constructors.kt | 2 +- .../diagnostics/testsWithStdLib/native/constructor.kt | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/compiler/testData/diagnostics/tests/annotations/atAnnotationResolve.kt b/compiler/testData/diagnostics/tests/annotations/atAnnotationResolve.kt index 2a0718c2716..03d050ab017 100644 --- a/compiler/testData/diagnostics/tests/annotations/atAnnotationResolve.kt +++ b/compiler/testData/diagnostics/tests/annotations/atAnnotationResolve.kt @@ -1,7 +1,7 @@ // !DIAGNOSTICS: -UNUSED_PARAMETER annotation class Ann(val x: Int = 6) -@Ann(1) @Ann(2) @Ann(3) @private class A [Ann] () { +@Ann(1) @Ann(2) @Ann(3) @private class A [Ann] constructor() { @Ann(x = 5) fun foo() { 1 + @Ann(1) 1 * @Ann("") 6 diff --git a/compiler/testData/diagnostics/tests/annotations/bracketsDeprecation.kt b/compiler/testData/diagnostics/tests/annotations/bracketsDeprecation.kt index eb463662aae..42169a9ccbd 100644 --- a/compiler/testData/diagnostics/tests/annotations/bracketsDeprecation.kt +++ b/compiler/testData/diagnostics/tests/annotations/bracketsDeprecation.kt @@ -8,7 +8,7 @@ data class Q(val x: Int, val y: Int) fun bar2(): Array = null!! -[Ann Ann] class A [Ann] ([Ann] val prop: Int) { +[Ann Ann] class A [Ann] constructor([Ann] val prop: Int) { [Ann] val x = 1 [Ann] fun foo([Ann] x: Int) { [Ann] class B diff --git a/compiler/testData/diagnostics/tests/deprecated/typeUsage.kt b/compiler/testData/diagnostics/tests/deprecated/typeUsage.kt index a8765891d4c..04b012ebbcf 100644 --- a/compiler/testData/diagnostics/tests/deprecated/typeUsage.kt +++ b/compiler/testData/diagnostics/tests/deprecated/typeUsage.kt @@ -4,7 +4,7 @@ open class Obsolete { } deprecated("Class") -open class Obsolete2 [deprecated("Constructor")]() { +open class Obsolete2 [deprecated("Constructor")] constructor() { fun use() {} } diff --git a/compiler/testData/diagnostics/tests/inline/nonPublicMember/inNonPublicClass.kt b/compiler/testData/diagnostics/tests/inline/nonPublicMember/inNonPublicClass.kt index cb8750d6cd0..ec4840cff97 100644 --- a/compiler/testData/diagnostics/tests/inline/nonPublicMember/inNonPublicClass.kt +++ b/compiler/testData/diagnostics/tests/inline/nonPublicMember/inNonPublicClass.kt @@ -1,5 +1,5 @@ // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE -NOTHING_TO_INLINE -private class Z public (){ +private class Z public constructor(){ public val publicProperty:Int = 12 public fun publicFun() {} } diff --git a/compiler/testData/diagnostics/tests/modifiers/IllegalModifiers.kt b/compiler/testData/diagnostics/tests/modifiers/IllegalModifiers.kt index 2b7bdc8e2d9..d6c6f91412f 100644 --- a/compiler/testData/diagnostics/tests/modifiers/IllegalModifiers.kt +++ b/compiler/testData/diagnostics/tests/modifiers/IllegalModifiers.kt @@ -149,6 +149,6 @@ class IllegalModifiers10 in final vararg -reified () +reified constructor() -class IllegalModifiers11 private protected () +class IllegalModifiers11 private protected constructor() diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/platformName.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/platformName.kt index 391359c3045..4156fa9eafd 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/platformName.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/platformName.kt @@ -32,7 +32,7 @@ var vardef: Int = 1 set @platformName("C") -class C [platformName("primary")]() { +class C [platformName("primary")] constructor() { platformName("ctr") constructor(x: Int): this() {} @platformName("a") fun foo() {} diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/constructors.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/constructors.kt index 7d10497fe3a..dcdb51f9224 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/constructors.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/constructors.kt @@ -6,4 +6,4 @@ class A { } } -class C [platformStatic] () +class C [platformStatic] constructor() diff --git a/compiler/testData/diagnostics/testsWithStdLib/native/constructor.kt b/compiler/testData/diagnostics/testsWithStdLib/native/constructor.kt index edaddc56f48..947d5d6ca79 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/native/constructor.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/native/constructor.kt @@ -7,4 +7,4 @@ class A { native constructor(x: Int) } -class C [native]() +class C [native] constructor()