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

"Inapplicable operator modifier" and "Inapplicable infix modifier" are now errors

Browse Source 
Original commit: 3fa506fd45
This commit is contained in:
Yan Zhulanow
2015-12-25 18:35:02 +03:00
parent 8a1a5f2bb1
commit 63282ffa9a
5 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/new.kt
+4
View File
@@ -19,8 +19,10 @@ abstract class A {
fun finalFlagRemovedFun() {} fun finalFlagRemovedFun() {}
final fun finalFlagUnchangedFun() {} final fun finalFlagUnchangedFun() {}
@Suppress("INAPPLICABLE_INFIX_MODIFIER")
infix fun infixFlagAddedFun() {} infix fun infixFlagAddedFun() {}
fun infixFlagRemovedFun() {} fun infixFlagRemovedFun() {}
@Suppress("INAPPLICABLE_INFIX_MODIFIER")
infix fun infixFlagUnchangedFun() {} infix fun infixFlagUnchangedFun() {}
inline fun inlineFlagAddedFun() {} inline fun inlineFlagAddedFun() {}
@@ -45,8 +47,10 @@ abstract class A {
fun openFlagRemovedFun() {} fun openFlagRemovedFun() {}
open fun openFlagUnchangedFun() {} open fun openFlagUnchangedFun() {}
@Suppress("INAPPLICABLE_OPERATOR_MODIFIER")
operator fun operatorFlagAddedFun() {} operator fun operatorFlagAddedFun() {}
fun operatorFlagRemovedFun() {} fun operatorFlagRemovedFun() {}
@Suppress("INAPPLICABLE_OPERATOR_MODIFIER")
operator fun operatorFlagUnchangedFun() {} operator fun operatorFlagUnchangedFun() {}
private val privateFlagAddedVal = "" private val privateFlagAddedVal = ""
jps/jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/old.kt
+4
View File
@@ -20,7 +20,9 @@ abstract class A {
final fun finalFlagUnchangedFun() {} final fun finalFlagUnchangedFun() {}
fun infixFlagAddedFun() {} fun infixFlagAddedFun() {}
@Suppress("INAPPLICABLE_INFIX_MODIFIER")
infix fun infixFlagRemovedFun() {} infix fun infixFlagRemovedFun() {}
@Suppress("INAPPLICABLE_INFIX_MODIFIER")
infix fun infixFlagUnchangedFun() {} infix fun infixFlagUnchangedFun() {}
fun inlineFlagAddedFun() {} fun inlineFlagAddedFun() {}
@@ -46,7 +48,9 @@ abstract class A {
open fun openFlagUnchangedFun() {} open fun openFlagUnchangedFun() {}
fun operatorFlagAddedFun() {} fun operatorFlagAddedFun() {}
@Suppress("INAPPLICABLE_OPERATOR_MODIFIER")
operator fun operatorFlagRemovedFun() {} operator fun operatorFlagRemovedFun() {}
@Suppress("INAPPLICABLE_OPERATOR_MODIFIER")
operator fun operatorFlagUnchangedFun() {} operator fun operatorFlagUnchangedFun() {}
val privateFlagAddedVal = "" val privateFlagAddedVal = ""
jps/jps-plugin/testData/comparison/packageMembers/membersFlagsChanged/new.kt
+4
View File
@@ -8,8 +8,10 @@ external fun externalFlagAddedFun()
fun externalFlagRemovedFun() {} fun externalFlagRemovedFun() {}
external fun externalFlagUnchangedFun() external fun externalFlagUnchangedFun()
@Suppress("INAPPLICABLE_INFIX_MODIFIER")
infix fun infixFlagAddedFun() {} infix fun infixFlagAddedFun() {}
fun infixFlagRemovedFun() {} fun infixFlagRemovedFun() {}
@Suppress("INAPPLICABLE_INFIX_MODIFIER")
infix fun infixFlagUnchangedFun() {} infix fun infixFlagUnchangedFun() {}
inline fun inlineFlagAddedFun() {} inline fun inlineFlagAddedFun() {}
@@ -23,8 +25,10 @@ internal fun internalFlagAddedFun() {}
fun internalFlagRemovedFun() {} fun internalFlagRemovedFun() {}
internal fun internalFlagUnchangedFun() {} internal fun internalFlagUnchangedFun() {}
@Suppress("INAPPLICABLE_OPERATOR_MODIFIER")
operator fun operatorFlagAddedFun() {} operator fun operatorFlagAddedFun() {}
fun operatorFlagRemovedFun() {} fun operatorFlagRemovedFun() {}
@Suppress("INAPPLICABLE_OPERATOR_MODIFIER")
operator fun operatorFlagUnchangedFun() {} operator fun operatorFlagUnchangedFun() {}
private val privateFlagAddedVal = "" private val privateFlagAddedVal = ""
jps/jps-plugin/testData/comparison/packageMembers/membersFlagsChanged/old.kt
+4
View File
@@ -9,7 +9,9 @@ external fun externalFlagRemovedFun()
external fun externalFlagUnchangedFun() external fun externalFlagUnchangedFun()
fun infixFlagAddedFun() {} fun infixFlagAddedFun() {}
@Suppress("INAPPLICABLE_INFIX_MODIFIER")
infix fun infixFlagRemovedFun() {} infix fun infixFlagRemovedFun() {}
@Suppress("INAPPLICABLE_INFIX_MODIFIER")
infix fun infixFlagUnchangedFun() {} infix fun infixFlagUnchangedFun() {}
fun inlineFlagAddedFun() {} fun inlineFlagAddedFun() {}
@@ -24,7 +26,9 @@ internal fun internalFlagRemovedFun() {}
internal fun internalFlagUnchangedFun() {} internal fun internalFlagUnchangedFun() {}
fun operatorFlagAddedFun() {} fun operatorFlagAddedFun() {}
@Suppress("INAPPLICABLE_OPERATOR_MODIFIER")
operator fun operatorFlagRemovedFun() {} operator fun operatorFlagRemovedFun() {}
@Suppress("INAPPLICABLE_OPERATOR_MODIFIER")
operator fun operatorFlagUnchangedFun() {} operator fun operatorFlagUnchangedFun() {}
val privateFlagAddedVal = "" val privateFlagAddedVal = ""
jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt
+1 -1
View File
@@ -13,7 +13,7 @@ import kotlin.reflect./*p:kotlin.reflect*/KProperty
} }
/*p:foo.bar*/operator fun /*p:foo.bar*/D2.getValue(t: /*p:foo.bar*/Any?, p: KProperty<*>) = /*p:kotlin(Int)*/1 /*p:foo.bar*/operator fun /*p:foo.bar*/D2.getValue(t: /*p:foo.bar*/Any?, p: KProperty<*>) = /*p:kotlin(Int)*/1
/*p:foo.bar*/operator fun /*p:foo.bar*/D2.propertyDelegated(p: /*p:foo.bar*/Any?) {} /*p:foo.bar*/fun /*p:foo.bar*/D2.propertyDelegated(p: /*p:foo.bar*/Any?) {}
/*p:foo.bar*/class D3 : /*p:foo.bar*/D2() { /*p:foo.bar*/class D3 : /*p:foo.bar*/D2() {
fun propertyDelegated(p: /*c:foo.bar.D3 c:foo.bar.D2 p:foo.bar*/Any?) {} fun propertyDelegated(p: /*c:foo.bar.D3 c:foo.bar.D2 p:foo.bar*/Any?) {}