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

FIR: Reimplement conflicts checker to detect conflicts in different files

Browse Source 
also pass correct ScopeSession to checkers
fixes some IC tests
This commit is contained in:
Ilya Chernikov
2021-02-17 21:49:07 +01:00
parent 3e458a1efb
commit 51a1cec08b
21 changed files with 379 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/redeclarations/RedeclaringPrivateToFile.fir.kt
Vendored
+8 -8
View File
@@ -7,8 +7,8 @@ interface B : A
private fun validFun() {}
private val validVal = 1
private fun invalidFun0() {}
private val invalidProp0 = 1
<!CONFLICTING_OVERLOADS!>private fun invalidFun0()<!> {}
<!REDECLARATION!>private val invalidProp0 = 1<!>
// NB invalidFun0 and invalidProp0 are conflicting overloads, since the following is an ambiguity:
fun useInvalidFun0() = invalidFun0()
@@ -20,7 +20,7 @@ fun useInvalidProp0() = invalidProp0
<!CONFLICTING_OVERLOADS!>private fun invalidFun2()<!> {}
<!CONFLICTING_OVERLOADS!>public fun invalidFun2()<!> {}
public fun invalidFun3() {}
<!CONFLICTING_OVERLOADS!>public fun invalidFun3()<!> {}
<!CONFLICTING_OVERLOADS!>private fun invalidFun4()<!> {}
<!CONFLICTING_OVERLOADS!>public fun invalidFun4()<!> {}
@@ -34,16 +34,16 @@ package a
private fun validFun() {}
private val validVal = 1
private fun invalidFun0() {}
<!CONFLICTING_OVERLOADS!>private fun invalidFun0()<!> {}
private val invalidProp0 = 1
<!REDECLARATION!>private val invalidProp0 = 1<!>
internal fun invalidFun3() {}
internal fun invalidFun4() {}
<!CONFLICTING_OVERLOADS!>internal fun invalidFun3()<!> {}
<!CONFLICTING_OVERLOADS!>internal fun invalidFun4()<!> {}
// FILE: c.kt
package a
public fun invalidFun0() {}
public val invalidProp0 = 1
public val invalidProp0 = 1