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

[FIR] Check conflicts between nested classes' constructors and member functions

Browse Source 
For an example of an object with
an implicit primary constructor,
see `FirPsiOldFrontendDiagnosticsTestGenerated.testSingletonAndFunctionSameName`.

^KT-62005 Fixed


Merge-request: KT-MR-12242
Merged-by: Nikolay Lunyak <Nikolay.Lunyak@jetbrains.com>
This commit is contained in:
Nikolay Lunyak
2023-09-18 11:41:42 +00:00
committed by Space Team
parent 777df2d923
commit 93958ec73d
12 changed files with 95 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/redeclarations/kt2438.kt
Vendored
+6 -2
View File
@@ -7,17 +7,21 @@ package kt2438
class B {
class <!REDECLARATION!>C<!>
class <!REDECLARATION!>C<!>
class <!CONFLICTING_OVERLOADS, REDECLARATION!>D<!>
class <!CONFLICTING_OVERLOADS, REDECLARATION!>D<!>
<!CONFLICTING_OVERLOADS!>fun D()<!> {}
}
class A {
class <!REDECLARATION!>B<!>
companion object {
class <!REDECLARATION!>B<!>
class <!REDECLARATION!>B<!>
}
class <!REDECLARATION!>B<!>
}
compiler/testData/diagnostics/tests/redeclarations/kt2438.txt
Vendored
+16
View File
@@ -46,6 +46,7 @@ package kt2438 {
public final class B {
public constructor B()
public final fun D(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
@@ -63,5 +64,20 @@ package kt2438 {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public final class D {
public constructor D()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public final class D {
public constructor D()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
}