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

Migrate diagnostic names for header/impl

Browse Source
This commit is contained in:
Stanislav Erokhin
2017-09-14 23:51:51 +03:00
committed by Mikhail Glukhikh
parent d20ba5d082
commit 2b186909d4
32 changed files with 115 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/multiplatform/enum/constructorInHeaderEnum.kt
Vendored
+2 -2
View File
@@ -2,12 +2,12 @@
// MODULE: m1-common
// FILE: common.kt
expect enum class En<!HEADER_ENUM_CONSTRUCTOR!>(x: Int)<!> {
expect enum class En<!EXPECTED_ENUM_CONSTRUCTOR!>(x: Int)<!> {
E1,
E2(42),
;
<!HEADER_ENUM_CONSTRUCTOR!>constructor(s: String)<!>
<!EXPECTED_ENUM_CONSTRUCTOR!>constructor(s: String)<!>
}
expect enum class En2 {
compiler/testData/diagnostics/tests/multiplatform/enum/enumEntryWithBody.kt
Vendored
+3 -3
View File
@@ -4,8 +4,8 @@
expect enum class En {
E1,
<!HEADER_ENUM_ENTRY_WITH_BODY!>E2 {
<!HEADER_DECLARATION_WITH_BODY!>fun foo()<!> = ""
<!EXPECTED_ENUM_ENTRY_WITH_BODY!>E2 {
<!EXPECTED_DECLARATION_WITH_BODY!>fun foo()<!> = ""
},<!>
<!HEADER_ENUM_ENTRY_WITH_BODY!>E3 { };<!>
<!EXPECTED_ENUM_ENTRY_WITH_BODY!>E3 { };<!>
}
compiler/testData/diagnostics/tests/multiplatform/headerClass/explicitConstructorDelegation.kt
Vendored
+2 -2
View File
@@ -4,11 +4,11 @@
expect open class A {
constructor(s: String)
constructor(n: Number) : <!HEADER_CLASS_CONSTRUCTOR_DELEGATION_CALL!>this<!>("A")
constructor(n: Number) : <!EXPECTED_CLASS_CONSTRUCTOR_DELEGATION_CALL!>this<!>("A")
}
expect class B : A {
constructor(i: Int)
constructor() : <!HEADER_CLASS_CONSTRUCTOR_DELEGATION_CALL!>super<!>("B")
constructor() : <!EXPECTED_CLASS_CONSTRUCTOR_DELEGATION_CALL!>super<!>("B")
}
compiler/testData/diagnostics/tests/multiplatform/headerClass/genericClassImplTypeAlias.kt
Vendored
+8 -8
View File
@@ -1,4 +1,4 @@
// !DIAGNOSTICS: -IMPLEMENTATION_WITHOUT_HEADER
// !DIAGNOSTICS: -ACTUAL_WITHOUT_EXPECT
// !LANGUAGE: +MultiPlatformProjects
// MODULE: m1-common
// FILE: common.kt
@@ -18,14 +18,14 @@ expect interface C10<L>
// FILE: jvm.kt
actual typealias C1 = String
<!IMPL_TYPE_ALIAS_TO_CLASS_WITH_DECLARATION_SITE_VARIANCE!>actual typealias C2<<!UNUSED_TYPEALIAS_PARAMETER!>A<!>> = List<String><!>
<!IMPL_TYPE_ALIAS_TO_CLASS_WITH_DECLARATION_SITE_VARIANCE!>actual typealias C3<B> = List<B><!>
<!ACTUAL_TYPE_ALIAS_TO_CLASS_WITH_DECLARATION_SITE_VARIANCE!>actual typealias C2<<!UNUSED_TYPEALIAS_PARAMETER!>A<!>> = List<String><!>
<!ACTUAL_TYPE_ALIAS_TO_CLASS_WITH_DECLARATION_SITE_VARIANCE!>actual typealias C3<B> = List<B><!>
actual typealias C4<D, E> = MutableMap<D, E>
<!IMPL_TYPE_ALIAS_WITH_COMPLEX_SUBSTITUTION!>actual typealias C5<F, G> = MutableMap<G, F><!>
<!ACTUAL_TYPE_ALIAS_WITH_COMPLEX_SUBSTITUTION!>actual typealias C5<F, G> = MutableMap<G, F><!>
actual typealias C6<H> = MutableList<H>
<!IMPL_TYPE_ALIAS_WITH_USE_SITE_VARIANCE!>actual typealias C7<I> = MutableList<out I><!>
<!IMPL_TYPE_ALIAS_WITH_USE_SITE_VARIANCE!>actual typealias C8<<!UNUSED_TYPEALIAS_PARAMETER!>J<!>> = MutableList<*><!>
<!IMPL_TYPE_ALIAS_WITH_USE_SITE_VARIANCE!>actual typealias C9<K> = MutableList<in K><!>
<!ACTUAL_TYPE_ALIAS_WITH_USE_SITE_VARIANCE!>actual typealias C7<I> = MutableList<out I><!>
<!ACTUAL_TYPE_ALIAS_WITH_USE_SITE_VARIANCE!>actual typealias C8<<!UNUSED_TYPEALIAS_PARAMETER!>J<!>> = MutableList<*><!>
<!ACTUAL_TYPE_ALIAS_WITH_USE_SITE_VARIANCE!>actual typealias C9<K> = MutableList<in K><!>
typealias Tmp<K> = MutableList<K>
<!IMPL_TYPE_ALIAS_NOT_TO_CLASS!>actual typealias C10<L> = Tmp<L><!>
<!ACTUAL_TYPE_ALIAS_NOT_TO_CLASS!>actual typealias C10<L> = Tmp<L><!>
compiler/testData/diagnostics/tests/multiplatform/headerClass/headerClassWithFunctionBody.kt
Vendored
+9 -9
View File
@@ -2,28 +2,28 @@
// MODULE: m1-common
// FILE: common.kt
expect class Foo(
<!HEADER_CLASS_CONSTRUCTOR_PROPERTY_PARAMETER!>val constructorProperty: String<!>,
<!EXPECTED_CLASS_CONSTRUCTOR_PROPERTY_PARAMETER!>val constructorProperty: String<!>,
constructorParameter: String
) {
<!HEADER_DECLARATION_WITH_BODY!>init<!> {
<!EXPECTED_DECLARATION_WITH_BODY!>init<!> {
<!UNUSED_EXPRESSION, UNUSED_EXPRESSION!>"no"<!>
}
<!HEADER_DECLARATION_WITH_BODY!>constructor(s: String)<!> {
<!EXPECTED_DECLARATION_WITH_BODY!>constructor(s: String)<!> {
<!UNUSED_EXPRESSION!>"no"<!>
}
constructor() : <!HEADER_CLASS_CONSTRUCTOR_DELEGATION_CALL!>this<!>("no")
constructor() : <!EXPECTED_CLASS_CONSTRUCTOR_DELEGATION_CALL!>this<!>("no")
val prop: String = <!HEADER_PROPERTY_INITIALIZER!>"no"<!>
val prop: String = <!EXPECTED_PROPERTY_INITIALIZER!>"no"<!>
var getSet: String
<!HEADER_DECLARATION_WITH_BODY!>get()<!> = "no"
<!HEADER_DECLARATION_WITH_BODY!>set(value)<!> {}
<!EXPECTED_DECLARATION_WITH_BODY!>get()<!> = "no"
<!EXPECTED_DECLARATION_WITH_BODY!>set(value)<!> {}
fun defaultArg(<!HEADER_DECLARATION_WITH_DEFAULT_PARAMETER!>value: String = "no"<!>)
fun defaultArg(<!EXPECTED_DECLARATION_WITH_DEFAULT_PARAMETER!>value: String = "no"<!>)
<!HEADER_DECLARATION_WITH_BODY!>fun functionWithBody(x: Int): Int<!> {
<!EXPECTED_DECLARATION_WITH_BODY!>fun functionWithBody(x: Int): Int<!> {
return x + 1
}
}
compiler/testData/diagnostics/tests/multiplatform/headerClass/nestedClassesWithErrors.kt
Vendored
+3 -3
View File
@@ -4,7 +4,7 @@
expect class B {
class N {
<!HEADER_DECLARATION_WITH_BODY, JVM:HEADER_DECLARATION_WITH_BODY!>fun body()<!> {}
<!EXPECTED_DECLARATION_WITH_BODY, JVM:EXPECTED_DECLARATION_WITH_BODY!>fun body()<!> {}
<!WRONG_MODIFIER_TARGET, JVM:WRONG_MODIFIER_TARGET!>expect<!> fun extraHeader()
}
}
@@ -39,8 +39,8 @@ actual class C {
actual inner class I
}
actual class <!HEADER_CLASS_MEMBERS_ARE_NOT_IMPLEMENTED!>D<!>
actual class <!NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS!>D<!>
actual class E {
class <!IMPL_MISSING!>N<!>
class <!ACTUAL_MISSING!>N<!>
}
compiler/testData/diagnostics/tests/multiplatform/headerClass/noImplKeywordOnMember.kt
Vendored
+1 -1
View File
@@ -10,5 +10,5 @@ expect class Foo {
// FILE: jvm.kt
actual class Foo {
<!IMPL_MISSING!>fun bar(): String<!> = "bar"
<!ACTUAL_MISSING!>fun bar(): String<!> = "bar"
}
compiler/testData/diagnostics/tests/multiplatform/modifierApplicability.kt
Vendored
+2 -2
View File
@@ -23,7 +23,7 @@ fun foo() {
// FILE: jvm.kt
class Outer actual constructor() {
actual class <!IMPLEMENTATION_WITHOUT_HEADER!>Nested<!>
actual class <!ACTUAL_WITHOUT_EXPECT!>Nested<!>
<!WRONG_MODIFIER_TARGET!>actual<!> init {}
}
@@ -31,5 +31,5 @@ class Outer actual constructor() {
fun foo() {
<!WRONG_MODIFIER_TARGET!>actual<!> fun localFun() {}
<!WRONG_MODIFIER_TARGET!>actual<!> var <!UNUSED_VARIABLE!>x<!> = 42
<!WRONG_MODIFIER_TARGET!>actual<!> class <!IMPLEMENTATION_WITHOUT_HEADER!>Bar<!>
<!WRONG_MODIFIER_TARGET!>actual<!> class <!ACTUAL_WITHOUT_EXPECT!>Bar<!>
}
compiler/testData/diagnostics/tests/multiplatform/topLevelFun/defaultArguments.kt
Vendored
+1 -1
View File
@@ -2,4 +2,4 @@
// MODULE: m1-common
// FILE: common.kt
expect fun foo(x: Int, <!HEADER_DECLARATION_WITH_DEFAULT_PARAMETER!>y: String = ""<!>)
expect fun foo(x: Int, <!EXPECTED_DECLARATION_WITH_DEFAULT_PARAMETER!>y: String = ""<!>)
compiler/testData/diagnostics/tests/multiplatform/topLevelFun/headerAndImplInDIfferentPackages.kt
Vendored
+3 -3
View File
@@ -3,16 +3,16 @@
// FILE: common.kt
package common
<!JS:HEADER_WITHOUT_IMPLEMENTATION, JVM:HEADER_WITHOUT_IMPLEMENTATION!>expect fun foo()<!>
<!JS:NO_ACTUAL_FOR_EXPECT, JVM:NO_ACTUAL_FOR_EXPECT!>expect fun foo()<!>
// MODULE: m2-jvm(m1-common)
// FILE: jvm.kt
package jvm
<!IMPLEMENTATION_WITHOUT_HEADER!>actual fun foo()<!> {}
<!ACTUAL_WITHOUT_EXPECT!>actual fun foo()<!> {}
// MODULE: m3-js(m1-common)
// FILE: js.kt
package js
<!IMPLEMENTATION_WITHOUT_HEADER!>actual fun foo()<!> {}
<!ACTUAL_WITHOUT_EXPECT!>actual fun foo()<!> {}
compiler/testData/diagnostics/tests/multiplatform/topLevelFun/headerDeclarationWithBody.kt
Vendored
+2 -2
View File
@@ -4,6 +4,6 @@
<!CONFLICTING_OVERLOADS!>expect fun foo()<!>
<!CONFLICTING_OVERLOADS, HEADER_DECLARATION_WITH_BODY!>expect fun foo()<!> {}
<!CONFLICTING_OVERLOADS, EXPECTED_DECLARATION_WITH_BODY!>expect fun foo()<!> {}
<!HEADER_DECLARATION_WITH_BODY!>expect fun bar()<!> {}
<!EXPECTED_DECLARATION_WITH_BODY!>expect fun bar()<!> {}
compiler/testData/diagnostics/tests/multiplatform/topLevelFun/implDeclarationWithoutBody.kt
Vendored
+1 -1
View File
@@ -9,4 +9,4 @@ expect fun foo()
<!NON_MEMBER_FUNCTION_NO_BODY!>actual fun foo()<!>
<!NON_MEMBER_FUNCTION_NO_BODY, IMPLEMENTATION_WITHOUT_HEADER!>actual fun bar()<!>
<!NON_MEMBER_FUNCTION_NO_BODY, ACTUAL_WITHOUT_EXPECT!>actual fun bar()<!>
compiler/testData/diagnostics/tests/multiplatform/topLevelFun/implWithoutHeader.kt
Vendored
+1 -1
View File
@@ -2,4 +2,4 @@
// MODULE: m1-jvm
// FILE: jvm.kt
<!IMPLEMENTATION_WITHOUT_HEADER!>actual fun foo()<!> { }
<!ACTUAL_WITHOUT_EXPECT!>actual fun foo()<!> { }
compiler/testData/diagnostics/tests/multiplatform/topLevelFun/inlineFun.kt
Vendored
+1 -1
View File
@@ -8,7 +8,7 @@ expect fun nonInlineFun()
// MODULE: m2-jvm(m1-common)
// FILE: jvm.kt
<!IMPLEMENTATION_WITHOUT_HEADER!>actual fun inlineFun()<!> { }
<!ACTUAL_WITHOUT_EXPECT!>actual fun inlineFun()<!> { }
actual fun nonInlineFun() { }
// MODULE: m3-js(m1-common)
compiler/testData/diagnostics/tests/multiplatform/topLevelFun/valueParameterModifiers.kt
Vendored
+4 -4
View File
@@ -18,10 +18,10 @@ expect fun f8(vararg x: Any)
// FILE: jvm.kt
actual inline fun f1(noinline s: () -> String) {}
<!IMPLEMENTATION_WITHOUT_HEADER!>actual inline fun f2(noinline s: () -> String)<!> {}
<!ACTUAL_WITHOUT_EXPECT!>actual inline fun f2(noinline s: () -> String)<!> {}
actual inline fun f3(s: () -> String) {}
actual inline fun f4(crossinline s: () -> String) {}
<!IMPLEMENTATION_WITHOUT_HEADER!>actual inline fun f5(crossinline s: () -> String)<!> {}
<!ACTUAL_WITHOUT_EXPECT!>actual inline fun f5(crossinline s: () -> String)<!> {}
actual inline fun f6(s: () -> String) {}
<!IMPLEMENTATION_WITHOUT_HEADER!>actual fun f7(vararg x: Any)<!> {}
<!IMPLEMENTATION_WITHOUT_HEADER!>actual fun f8(x: Any)<!> {}
<!ACTUAL_WITHOUT_EXPECT!>actual fun f7(vararg x: Any)<!> {}
<!ACTUAL_WITHOUT_EXPECT!>actual fun f8(x: Any)<!> {}
compiler/testData/diagnostics/tests/multiplatform/topLevelProperty/differentKindsOfProperties.kt
Vendored
+5 -5
View File
@@ -17,14 +17,14 @@ expect var varWithPlatformGetSet: String
<!WRONG_MODIFIER_TARGET!>expect<!> get
<!WRONG_MODIFIER_TARGET!>expect<!> set
expect val backingFieldVal: String = <!HEADER_PROPERTY_INITIALIZER!>"no"<!>
expect var backingFieldVar: String = <!HEADER_PROPERTY_INITIALIZER!>"no"<!>
expect val backingFieldVal: String = <!EXPECTED_PROPERTY_INITIALIZER!>"no"<!>
expect var backingFieldVar: String = <!EXPECTED_PROPERTY_INITIALIZER!>"no"<!>
expect val customAccessorVal: String
<!HEADER_DECLARATION_WITH_BODY!>get()<!> = "no"
<!EXPECTED_DECLARATION_WITH_BODY!>get()<!> = "no"
expect var customAccessorVar: String
<!HEADER_DECLARATION_WITH_BODY!>get()<!> = "no"
<!HEADER_DECLARATION_WITH_BODY!>set(value)<!> {}
<!EXPECTED_DECLARATION_WITH_BODY!>get()<!> = "no"
<!EXPECTED_DECLARATION_WITH_BODY!>set(value)<!> {}
expect <!CONST_VAL_WITHOUT_INITIALIZER!>const<!> val constVal: Int
compiler/testData/diagnostics/tests/sourceCompatibility/noMultiplatformProjects.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
<!UNSUPPORTED_FEATURE!>expect<!> fun foo1()
<!UNSUPPORTED_FEATURE!>expect<!> val bar1 = <!HEADER_PROPERTY_INITIALIZER!>42<!>
<!UNSUPPORTED_FEATURE!>expect<!> val bar1 = <!EXPECTED_PROPERTY_INITIALIZER!>42<!>
<!UNSUPPORTED_FEATURE!>expect<!> class Baz1
<!UNSUPPORTED_FEATURE!>actual<!> fun foo2() = 42