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

Highlight only declarations, without body, on platform signature clashes

Browse Source
This commit is contained in:
Andrey Breslav
2014-05-28 12:35:50 +04:00
parent 3575c375e3
commit 22c47c2f82
43 changed files with 95 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/checker/duplicateJvmSignature/functionAndProperty/class.kt
+2 -2
View File
@@ -1,4 +1,4 @@
class C {
<error>val x = 1</error>
<error>fun getX() = 1</error>
<error>val x</error> = 1
<error>fun getX()</error> = 1
}
idea/testData/checker/duplicateJvmSignature/functionAndProperty/classObject.kt
+2 -2
View File
@@ -1,6 +1,6 @@
class C {
class object {
<error>val x = 1</error>
<error>fun getX() = 1</error>
<error>val x</error> = 1
<error>fun getX()</error> = 1
}
}
idea/testData/checker/duplicateJvmSignature/functionAndProperty/localClass.kt
+2 -2
View File
@@ -1,6 +1,6 @@
fun foo() {
class C {
<error>val x = 1</error>
<error>fun getX() = 1</error>
<error>val x</error> = 1
<error>fun getX()</error> = 1
}
}
idea/testData/checker/duplicateJvmSignature/functionAndProperty/nestedClass.kt
+2 -2
View File
@@ -1,6 +1,6 @@
class B {
class C {
<error>val x = 1</error>
<error>fun getX() = 1</error>
<error>val x</error> = 1
<error>fun getX()</error> = 1
}
}
idea/testData/checker/duplicateJvmSignature/functionAndProperty/object.kt
+2 -2
View File
@@ -1,4 +1,4 @@
object C {
<error>val x = 1</error>
<error>fun getX() = 1</error>
<error>val x</error> = 1
<error>fun getX()</error> = 1
}
idea/testData/checker/duplicateJvmSignature/functionAndProperty/objectExpression.kt
+2 -2
View File
@@ -1,5 +1,5 @@
fun foo() =
object {
<error>val x = 1</error>
<error>fun getX() = 1</error>
<error>val x</error> = 1
<error>fun getX()</error> = 1
}
idea/testData/checker/duplicateJvmSignature/functionAndProperty/topLevel.kt
+2 -2
View File
@@ -1,2 +1,2 @@
<error>val x = 1</error>
<error>fun getX() = 1</error>
<error>val x</error> = 1
<error>fun getX()</error> = 1
idea/testData/checker/duplicateJvmSignature/traitImpl/twoTraits.kt
+1 -1
View File
@@ -7,5 +7,5 @@ trait T2 {
get() = 1
}
<error>class C : T1, T2</error> {
class <error>C</error> : T1, T2 {
}