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

[FIR] Implement PACKAGE_OR_CLASSIFIER_REDECLARATION

Browse Source 
Fix REDECLARATION positioning
This commit is contained in:
Ivan Kochurkin
2021-07-23 23:49:43 +03:00
committed by Space
parent 1c678be0d3
commit fd92b851a2
60 changed files with 166 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/cli/jvm/firMultiplatformCompilationWithError.out
Vendored
+2 -2
View File
@@ -11,10 +11,10 @@ compiler or generated code. Use it at your own risk!
warning: ATTENTION!
This build uses in-dev FIR:
-Xuse-fir
compiler/testData/cli/jvm/firMultiplatformCompilationWithError/jvm.kt:1:1: error: actual class 'A' has no corresponding members for expected class members:
compiler/testData/cli/jvm/firMultiplatformCompilationWithError/jvm.kt:1:18: error: actual class 'A' has no corresponding members for expected class members:
/A.foo
actual interface A
^
^
COMPILATION_ERROR
compiler/testData/diagnostics/tests/classObjects/classObjectRedeclaration.fir.kt
Vendored
-20
View File
@@ -1,20 +0,0 @@
// !DIAGNOSTICS: -DUPLICATE_CLASS_NAMES
package test
class A {
<!REDECLARATION!>object Companion<!>
companion <!REDECLARATION!>object<!>
}
class B {
companion <!REDECLARATION!>object Named<!>
<!REDECLARATION!>object Named<!>
}
class C {
<!REDECLARATION!>class Named<!>
companion <!REDECLARATION!>object Named<!>
}
compiler/testData/diagnostics/tests/classObjects/classObjectRedeclaration.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// !DIAGNOSTICS: -DUPLICATE_CLASS_NAMES
package test
compiler/testData/diagnostics/tests/dataClasses/repeatedProperties.fir.kt
Vendored
+3 -3
View File
@@ -1,9 +1,9 @@
data class A1(<!REDECLARATION!>val x: Int<!>, val y: String, <!REDECLARATION!>val x: Int<!>) {
data class A1(val <!REDECLARATION!>x<!>: Int, val y: String, val <!REDECLARATION!>x<!>: Int) {
val z = ""
}
data class A2(<!REDECLARATION!>val x: Int<!>, val y: String) {
<!REDECLARATION!>val x = ""<!>
data class A2(val <!REDECLARATION!>x<!>: Int, val y: String) {
val <!REDECLARATION!>x<!> = ""
}
data class A3(<!REDECLARATION!>val<!SYNTAX!><!> :Int<!>, <!REDECLARATION!>val<!SYNTAX!><!> : Int<!>)
compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.fir.kt
Vendored
-5
View File
@@ -1,5 +0,0 @@
class C {
companion <!REDECLARATION!>object<!> {}
<!REDECLARATION!>val Companion = C<!>
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
class C {
companion <!REDECLARATION!>object<!> {}
compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.fir.kt
Vendored
+2 -2
View File
@@ -1,8 +1,8 @@
class B {
companion <!REDECLARATION!>object A<!> {
companion object <!REDECLARATION!>A<!> {
}
<!REDECLARATION!>val A = this<!>
val <!REDECLARATION!>A<!> = this
}
class C {
compiler/testData/diagnostics/tests/multiplatform/headerClass/actualClassWithDefaultValuesInAnnotationViaTypealias.fir.kt
Vendored
+1 -1
View File
@@ -45,4 +45,4 @@ actual annotation class Foo5
actual annotation class Foo6(val s: String = "value")
<!NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS!>actual typealias Foo7 = Bar2<!>
actual typealias <!NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS!>Foo7<!> = Bar2
compiler/testData/diagnostics/tests/multiplatform/headerClass/actualClassWithDifferentConstructors.fir.kt
Vendored
+3 -3
View File
@@ -34,9 +34,9 @@ actual class Foo1(val s: String)
actual class Foo2(val p: String = "value", i: Int)
actual typealias Foo3 = JavaFoo
<!NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS!>actual class Bar1(val s: String)<!>
<!NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS!>actual class Bar2(val p: String = "value", i: Int)<!>
<!NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS!>actual typealias Bar3 = JavaBar<!>
actual class <!NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS!>Bar1<!>(val s: String)
actual class <!NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS!>Bar2<!>(val p: String = "value", i: Int)
actual typealias <!NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS!>Bar3<!> = JavaBar
actual class Bar4(val s: String) {
constructor() : this("")
}
compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithWeakIncompatibilities.fir.kt
Vendored
+2 -2
View File
@@ -23,6 +23,6 @@ interface Foo1
fun foo2(): Int = 0
<!ACTUAL_WITHOUT_EXPECT, REDECLARATION!>actual class Foo3<!>
<!ACTUAL_WITHOUT_EXPECT!>actual class <!PACKAGE_OR_CLASSIFIER_REDECLARATION!>Foo3<!><!>
<!REDECLARATION!>class Foo3<!>
class <!PACKAGE_OR_CLASSIFIER_REDECLARATION!>Foo3<!>
compiler/testData/diagnostics/tests/multiplatform/headerClass/nestedClassesWithErrors.fir.kt
Vendored
+1 -1
View File
@@ -39,7 +39,7 @@ actual class C {
actual inner class I
}
<!NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS!>actual class D<!>
actual class <!NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS!>D<!>
actual class E {
class N
compiler/testData/diagnostics/tests/multiplatform/implDynamic.fir.kt
Vendored
+2 -2
View File
@@ -18,7 +18,7 @@ expect class Foo {
// TODO: do not suppress UNSUPPORTED once JS files in multi-platform tests are analyzed with JS analyzer facade
<!NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS!>actual class Foo {
actual class <!NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS!>Foo<!> {
<!ACTUAL_WITHOUT_EXPECT!>actual constructor(p: dynamic) {}<!>
<!ACTUAL_WITHOUT_EXPECT!>actual fun f1(s: dynamic): dynamic = null!!<!>
@@ -26,4 +26,4 @@ expect class Foo {
<!ACTUAL_WITHOUT_EXPECT!>actual fun f2(s: dynamic): MutableMap<Boolean?, Foo> = null!!<!>
<!ACTUAL_WITHOUT_EXPECT!>actual fun <T : Set<Number>> f3(t: T): dynamic = null!!<!>
}<!>
}
compiler/testData/diagnostics/tests/multiplatform/inlineClasses/expectActualInlineClass.fir.kt
Vendored
+1 -1
View File
@@ -20,7 +20,7 @@ expect inline class NonInlineActual(val x: Int)
actual inline class Foo1(val x: Int) {
actual fun bar(): String = "Hello"
}
<!NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS!>actual inline class Foo2(val x: String)<!>
actual inline class <!NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS!>Foo2<!>(val x: String)
actual <!ABSENCE_OF_PRIMARY_CONSTRUCTOR_FOR_INLINE_CLASS!>inline<!> class Foo3
<!ACTUAL_WITHOUT_EXPECT!>actual inline class NonInlineExpect(val x: Int)<!>
compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalValsInClass.fir.kt
Vendored
-4
View File
@@ -1,4 +0,0 @@
class Aaa() {
<!REDECLARATION!>val a = 1<!>
<!REDECLARATION!>val a = 1<!>
}
compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalValsInClass.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
class Aaa() {
val <!REDECLARATION!>a<!> = 1
val <!REDECLARATION!>a<!> = 1
compiler/testData/diagnostics/tests/overload/ConflictingOverloadsValsDifferentTypeInClass.fir.kt
Vendored
-4
View File
@@ -1,4 +0,0 @@
class Aaa() {
<!REDECLARATION!>val a = 1<!>
<!REDECLARATION!>val a = ""<!>
}
compiler/testData/diagnostics/tests/overload/ConflictingOverloadsValsDifferentTypeInClass.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
class Aaa() {
val <!REDECLARATION!>a<!> = 1
val <!REDECLARATION!>a<!> = ""
compiler/testData/diagnostics/tests/redeclarations/ClassRedeclarationInDifferentFiles.fir.kt
Vendored
-12
View File
@@ -1,12 +0,0 @@
// FIR_IDE_IGNORE
// FILE: f1.kt
package test
<!REDECLARATION!>class A<!>
class F1
// FILE: f2.kt
package test
<!REDECLARATION!>class A<!>
class F2
compiler/testData/diagnostics/tests/redeclarations/ClassRedeclarationInDifferentFiles.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// FIR_IDE_IGNORE
// FILE: f1.kt
package test
compiler/testData/diagnostics/tests/redeclarations/ConflictingExtensionProperties.fir.kt
Vendored
-4
View File
@@ -1,4 +0,0 @@
package foo
<!REDECLARATION!>val Int.foo: Int get() = 2<!>
<!REDECLARATION!>val Int.foo: Int get() = 3<!>
compiler/testData/diagnostics/tests/redeclarations/ConflictingExtensionProperties.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
package foo
val Int.<!REDECLARATION!>foo<!>: Int get() = 2
compiler/testData/diagnostics/tests/redeclarations/PropertyAndInnerClass.fir.kt
Vendored
-13
View File
@@ -1,13 +0,0 @@
public class A() {
<!REDECLARATION!>public val FOO: String = "test"<!>
<!REDECLARATION!>public class FOO() { }<!>
}
public class B() {
companion object {
<!REDECLARATION!>public val FOO: String = "test"<!>
<!REDECLARATION!>public class FOO() { }<!>
}
}
compiler/testData/diagnostics/tests/redeclarations/PropertyAndInnerClass.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
public class A() {
public val <!REDECLARATION!>FOO<!>: String = "test"
compiler/testData/diagnostics/tests/redeclarations/RedeclarationInDefaultObject.fir.kt
Vendored
-6
View File
@@ -1,6 +0,0 @@
class A {
companion object B {
<!REDECLARATION!>class G<!>
<!REDECLARATION!>val G = 1<!>
}
}
compiler/testData/diagnostics/tests/redeclarations/RedeclarationInDefaultObject.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
class A {
companion object B {
class <!REDECLARATION!>G<!>
compiler/testData/diagnostics/tests/redeclarations/RedeclarationInMultiFile.fir.kt
Vendored
-9
View File
@@ -1,9 +0,0 @@
// FILE: a.kt
<!REDECLARATION!>val a : Int = 1<!>
<!CONFLICTING_OVERLOADS!>fun f()<!> {
}
// FILE: b.kt
<!REDECLARATION!>val a : Int = 1<!>
<!CONFLICTING_OVERLOADS!>fun f()<!> {
}
compiler/testData/diagnostics/tests/redeclarations/RedeclarationInMultiFile.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// FILE: a.kt
val <!REDECLARATION!>a<!> : Int = 1
<!CONFLICTING_OVERLOADS!>fun f()<!> {
compiler/testData/diagnostics/tests/redeclarations/Redeclarations.fir.kt
Vendored
+3 -3
View File
@@ -1,14 +1,14 @@
// FILE: a.kt
package redeclarations
<!REDECLARATION!>object A<!> {
object <!PACKAGE_OR_CLASSIFIER_REDECLARATION!>A<!> {
val x : Int = 0
val A = 1
}
<!REDECLARATION!>class A {}<!>
class <!PACKAGE_OR_CLASSIFIER_REDECLARATION!>A<!> {}
<!REDECLARATION!>val A = 1<!>
val <!REDECLARATION!>A<!> = 1
// FILE: b.kt
package redeclarations.A
compiler/testData/diagnostics/tests/redeclarations/RedeclarationsInObjects.fir.kt
Vendored
-9
View File
@@ -1,9 +0,0 @@
// !DIAGNOSTICS: -DUPLICATE_CLASS_NAMES
// KT-3525
object B {
<!REDECLARATION!>class C<!>
<!REDECLARATION!>class C<!>
<!REDECLARATION!>val a : Int = 1<!>
<!REDECLARATION!>val a : Int = 1<!>
}
compiler/testData/diagnostics/tests/redeclarations/RedeclarationsInObjects.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// !DIAGNOSTICS: -DUPLICATE_CLASS_NAMES
// KT-3525
object B {
compiler/testData/diagnostics/tests/redeclarations/RedeclaringPrivateToFile.fir.kt
Vendored
+2 -2
View File
@@ -8,7 +8,7 @@ private fun validFun() {}
private val validVal = 1
<!CONFLICTING_OVERLOADS!>private fun invalidFun0()<!> {}
<!REDECLARATION!>private val invalidProp0 = 1<!>
private val <!REDECLARATION!>invalidProp0<!> = 1
// NB invalidFun0 and invalidProp0 are conflicting overloads, since the following is an ambiguity:
fun useInvalidFun0() = invalidFun0()
@@ -36,7 +36,7 @@ private val validVal = 1
<!CONFLICTING_OVERLOADS!>private fun invalidFun0()<!> {}
<!REDECLARATION!>private val invalidProp0 = 1<!>
private val <!REDECLARATION!>invalidProp0<!> = 1
<!CONFLICTING_OVERLOADS!>internal fun invalidFun3()<!> {}
<!CONFLICTING_OVERLOADS!>internal fun invalidFun4()<!> {}
compiler/testData/diagnostics/tests/redeclarations/TopLevelPropertyVsClassifier.fir.kt
Vendored
+10 -10
View File
@@ -1,13 +1,13 @@
<!REDECLARATION!>val Test1 = null<!>
<!REDECLARATION!>class Test1<!>
val <!REDECLARATION!>Test1<!> = null
class <!REDECLARATION!>Test1<!>
<!REDECLARATION!>val Test2 = null<!>
<!REDECLARATION!>interface Test2<!>
val <!REDECLARATION!>Test2<!> = null
interface <!REDECLARATION!>Test2<!>
<!REDECLARATION!>val Test3 = null<!>
<!REDECLARATION!>object Test3<!>
val <!REDECLARATION!>Test3<!> = null
object <!REDECLARATION!>Test3<!>
<!REDECLARATION!>val Test4 = null<!>
<!REDECLARATION!>class Test4<!>
<!REDECLARATION!>interface Test4<!>
<!REDECLARATION!>object Test4<!>
val <!REDECLARATION!>Test4<!> = null
class <!PACKAGE_OR_CLASSIFIER_REDECLARATION!>Test4<!>
interface <!PACKAGE_OR_CLASSIFIER_REDECLARATION!>Test4<!>
object <!PACKAGE_OR_CLASSIFIER_REDECLARATION!>Test4<!>
compiler/testData/diagnostics/tests/redeclarations/TypeAliasVsClass.fir.kt
Vendored
-18
View File
@@ -1,18 +0,0 @@
// !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER -TOPLEVEL_TYPEALIASES_ONLY
// FILE: file1.kt
<!REDECLARATION!>class SomeClass<!>
<!REDECLARATION!>typealias SomeClass = Any<!>
<!REDECLARATION!>typealias SomeClass = Any<!>
<!REDECLARATION!>typealias SomeClass = Any<!>
class Outer {
<!REDECLARATION!>class Nested<!>
<!REDECLARATION!>typealias Nested = Any<!>
<!REDECLARATION!>typealias Nested = Any<!>
<!REDECLARATION!>typealias Nested = Any<!>
}
// FILE: file2.kt
<!REDECLARATION!>typealias SomeClass = Any<!>
compiler/testData/diagnostics/tests/redeclarations/TypeAliasVsClass.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER -TOPLEVEL_TYPEALIASES_ONLY
// FILE: file1.kt
class <!PACKAGE_OR_CLASSIFIER_REDECLARATION!>SomeClass<!>
compiler/testData/diagnostics/tests/redeclarations/TypeAliasVsProperty.fir.kt
Vendored
+4 -4
View File
@@ -1,13 +1,13 @@
// !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER -TOPLEVEL_TYPEALIASES_ONLY
// FILE: file1.kt
<!REDECLARATION!>typealias Test = String<!>
typealias <!REDECLARATION!>Test<!> = String
<!REDECLARATION!>val Test = 42<!>
val <!REDECLARATION!>Test<!> = 42
class Outer {
<!REDECLARATION!>typealias Test = String<!>
typealias <!REDECLARATION!>Test<!> = String
<!REDECLARATION!>val Test = 42<!>
val <!REDECLARATION!>Test<!> = 42
}
typealias Test2 = String
compiler/testData/diagnostics/tests/redeclarations/kt2438.fir.kt
Vendored
-22
View File
@@ -1,22 +0,0 @@
// !DIAGNOSTICS: -DUPLICATE_CLASS_NAMES
//KT-2438 Prohibit inner classes with the same name
package kt2438
class B {
<!REDECLARATION!>class C<!>
<!REDECLARATION!>class C<!>
}
class A {
<!REDECLARATION!>class B<!>
companion object {
<!REDECLARATION!>class B<!>
<!REDECLARATION!>class B<!>
}
<!REDECLARATION!>class B<!>
}
compiler/testData/diagnostics/tests/redeclarations/kt2438.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// !DIAGNOSTICS: -DUPLICATE_CLASS_NAMES
//KT-2438 Prohibit inner classes with the same name
compiler/testData/diagnostics/tests/redeclarations/kt470.fir.kt
Vendored
-37
View File
@@ -1,37 +0,0 @@
<!REDECLARATION!>val a : Int = 1<!>
<!REDECLARATION!>val a : Int = 1<!>
<!REDECLARATION!>val a : Int = 1<!>
<!REDECLARATION!>val b : Int = 1<!>
<!REDECLARATION!>val b : Int = 1<!>
<!REDECLARATION!>val b : Int = 1<!>
<!REDECLARATION!>val b : Int = 1<!>
<!CONFLICTING_OVERLOADS!>fun foo()<!> {} // and here too
<!CONFLICTING_OVERLOADS!>fun foo()<!> {} // and here
<!CONFLICTING_OVERLOADS!>fun foo()<!> {} // and here
<!CONFLICTING_OVERLOADS!>fun foo()<!> {} // and here
<!CONFLICTING_OVERLOADS!>fun bar()<!> {} // and here
<!CONFLICTING_OVERLOADS!>fun bar()<!> {} // and here
<!CONFLICTING_OVERLOADS!>fun bar()<!> {} // and here
class A {
<!REDECLARATION!>val a : Int = 1<!>
<!REDECLARATION!>val a : Int = 1<!>
<!REDECLARATION!>val a : Int = 1<!>
<!REDECLARATION!>val b : Int = 1<!>
<!REDECLARATION!>val b : Int = 1<!>
<!REDECLARATION!>val b : Int = 1<!>
<!REDECLARATION!>val b : Int = 1<!>
<!CONFLICTING_OVERLOADS!>fun foo()<!> {} // and here too
<!CONFLICTING_OVERLOADS!>fun foo()<!> {} // and here
<!CONFLICTING_OVERLOADS!>fun foo()<!> {} // and here
<!CONFLICTING_OVERLOADS!>fun foo()<!> {} // and here
<!CONFLICTING_OVERLOADS!>fun bar()<!> {} // and here
<!CONFLICTING_OVERLOADS!>fun bar()<!> {} // and here
<!CONFLICTING_OVERLOADS!>fun bar()<!> {} // and here
}
compiler/testData/diagnostics/tests/redeclarations/kt470.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
val <!REDECLARATION!>a<!> : Int = 1
val <!REDECLARATION!>a<!> : Int = 1
val <!REDECLARATION!>a<!> : Int = 1
compiler/testData/diagnostics/tests/regressions/Jet11.fir.kt
Vendored
-4
View File
@@ -1,4 +0,0 @@
// JET-11 Redeclaration & Forward reference for classes cause an exception
<!REDECLARATION!>open class NoC<!>
class NoC1 : NoC()
<!REDECLARATION!>open class NoC<!>
compiler/testData/diagnostics/tests/regressions/Jet11.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// JET-11 Redeclaration & Forward reference for classes cause an exception
open class <!PACKAGE_OR_CLASSIFIER_REDECLARATION!>NoC<!>
class NoC1 : NoC()
compiler/testData/diagnostics/tests/secondaryConstructors/redeclarationsOfConstructorsIgnored.fir.kt
Vendored
-11
View File
@@ -1,11 +0,0 @@
<!REDECLARATION!>class A<!>
<!REDECLARATION!>class A {
constructor()
}<!>
class B
class Outer {
class B {
constructor()
}
}
compiler/testData/diagnostics/tests/secondaryConstructors/redeclarationsOfConstructorsIgnored.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
class <!PACKAGE_OR_CLASSIFIER_REDECLARATION!>A<!>
class <!PACKAGE_OR_CLASSIFIER_REDECLARATION!>A<!> {
constructor()
compiler/testData/diagnostics/tests/typealias/privateInFile.fir.kt
Vendored
+2 -2
View File
@@ -19,5 +19,5 @@ private val test1co: C.Companion = <!INITIALIZER_TYPE_MISMATCH, NO_COMPANION_OBJ
private val test2: TA = <!INITIALIZER_TYPE_MISMATCH!>TA(<!NO_VALUE_FOR_PARAMETER!>)<!><!>
private val test2co = TA
<!REDECLARATION!>private class C<!>
<!REDECLARATION!>private typealias TA = Int<!>
private class <!PACKAGE_OR_CLASSIFIER_REDECLARATION!>C<!>
private typealias <!PACKAGE_OR_CLASSIFIER_REDECLARATION!>TA<!> = Int