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

[Test] Ensure that properties cannot be used as operators

Browse Source 
In some cases the combination of property + invoke was incorrectly allowed

^KT-62349
This commit is contained in:
Alejandro Serrano Mena
2023-10-06 10:56:43 +02:00
committed by Space Team
parent a909a28f29
commit 166b99181b
7 changed files with 194 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java
Generated
+6
View File
@@ -24300,6 +24300,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
runTest("compiler/testData/diagnostics/tests/operatorsOverloading/plusAssignOnVarAndCollections.kt");
}
@Test
@TestMetadata("PropertyInvoke.kt")
public void testPropertyInvoke() throws Exception {
runTest("compiler/testData/diagnostics/tests/operatorsOverloading/PropertyInvoke.kt");
}
@Test
@TestMetadata("unresolvedOperator.kt")
public void testUnresolvedOperator() throws Exception {
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java
Generated
+6
View File
@@ -24300,6 +24300,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
runTest("compiler/testData/diagnostics/tests/operatorsOverloading/plusAssignOnVarAndCollections.kt");
}
@Test
@TestMetadata("PropertyInvoke.kt")
public void testPropertyInvoke() throws Exception {
runTest("compiler/testData/diagnostics/tests/operatorsOverloading/PropertyInvoke.kt");
}
@Test
@TestMetadata("unresolvedOperator.kt")
public void testUnresolvedOperator() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java
Generated
+6
View File
@@ -24300,6 +24300,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
runTest("compiler/testData/diagnostics/tests/operatorsOverloading/plusAssignOnVarAndCollections.kt");
}
@Test
@TestMetadata("PropertyInvoke.kt")
public void testPropertyInvoke() throws Exception {
runTest("compiler/testData/diagnostics/tests/operatorsOverloading/PropertyInvoke.kt");
}
@Test
@TestMetadata("unresolvedOperator.kt")
public void testUnresolvedOperator() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java
Generated
+6
View File
@@ -24306,6 +24306,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
runTest("compiler/testData/diagnostics/tests/operatorsOverloading/plusAssignOnVarAndCollections.kt");
}
@Test
@TestMetadata("PropertyInvoke.kt")
public void testPropertyInvoke() throws Exception {
runTest("compiler/testData/diagnostics/tests/operatorsOverloading/PropertyInvoke.kt");
}
@Test
@TestMetadata("unresolvedOperator.kt")
public void testUnresolvedOperator() throws Exception {
compiler/testData/diagnostics/tests/operatorsOverloading/PropertyInvoke.fir.kt
Vendored
+82
View File
@@ -0,0 +1,82 @@
class I { }
operator fun I.invoke(): E = E()
operator fun I.invoke(x: Int): E = E()
operator fun I.invoke(x: Int, y: Int): E = E()
// operators over variables
class A { }
var a = A()
val A.inc: I get() = I()
fun useInc() { a<!PROPERTY_AS_OPERATOR, RESULT_TYPE_MISMATCH!>++<!> }
val A.dec: I get() = I()
fun useDec() { a<!PROPERTY_AS_OPERATOR, RESULT_TYPE_MISMATCH!>--<!> }
val A.plusAssign: I get() = I()
fun usePlusAssign() { a <!PROPERTY_AS_OPERATOR!>+=<!> 1 }
val A.minusAssign: I get() = I()
fun useMinusAssign() { a <!PROPERTY_AS_OPERATOR!>-=<!> 1 }
val A.timesAssign: I get() = I()
fun useTimesAssign() { a <!PROPERTY_AS_OPERATOR!>*=<!> 1 }
val A.divAssign: I get() = I()
fun useDivAssign() { a <!PROPERTY_AS_OPERATOR!>/=<!> 1 }
val A.remAssign: I get() = I()
fun useRemAssign() { a <!PROPERTY_AS_OPERATOR!>%=<!> 1 }
// operators over values
class E { }
val e = E()
val E.unaryPlus: I get() = I()
val useUnaryPlus = <!PROPERTY_AS_OPERATOR!>+<!>e
val E.unaryMinus: I get() = I()
val useUnaryMinus = <!PROPERTY_AS_OPERATOR!>-<!>e
val E.not: I get() = I()
val useNot = <!PROPERTY_AS_OPERATOR!>!<!>e
val E.plus: I get() = I()
val usePlus = e <!PROPERTY_AS_OPERATOR!>+<!> 1
val E.minus: I get() = I()
val useMinus = e <!PROPERTY_AS_OPERATOR!>-<!> 1
val E.times: I get() = I()
val useTimes = e <!PROPERTY_AS_OPERATOR!>*<!> 1
val E.div: I get() = I()
val useDiv = e <!PROPERTY_AS_OPERATOR!>/<!> 1
val E.rem: I get() = I()
val useRem = e <!PROPERTY_AS_OPERATOR!>%<!> 1
val E.get: I get() = I()
val useGet = <!PROPERTY_AS_OPERATOR!>e[1]<!>
val E.set: I get() = I()
fun useSet() { <!PROPERTY_AS_OPERATOR!>e[1]<!> = 3 }
val E.contains: I get() = I()
val useContains = 1 <!PROPERTY_AS_OPERATOR!>in<!> e
val useNotContains = 1 <!PROPERTY_AS_OPERATOR!>!in<!> e
val E.invoke: I get() = I()
val useInvoke = <!NONE_APPLICABLE!>e<!>()
val E.rangeTo: I get() = I()
val useRangeTo = e <!PROPERTY_AS_OPERATOR!>..<!> 3
val E.rangeUntil: I get() = I()
val useRangeUntil = e <!PROPERTY_AS_OPERATOR!>..<<!> 3
val E.compareTo: I get() = I()
val useCompareTo = e <!PROPERTY_AS_OPERATOR!>><!> 2
compiler/testData/diagnostics/tests/operatorsOverloading/PropertyInvoke.kt
Vendored
+82
View File
@@ -0,0 +1,82 @@
class I { }
operator fun I.invoke(): E = E()
operator fun I.invoke(x: Int): E = E()
operator fun I.invoke(x: Int, y: Int): E = E()
// operators over variables
class A { }
var a = A()
val A.inc: I get() = I()
fun useInc() { a<!PROPERTY_AS_OPERATOR, RESULT_TYPE_MISMATCH!>++<!> }
val A.dec: I get() = I()
fun useDec() { a<!PROPERTY_AS_OPERATOR, RESULT_TYPE_MISMATCH!>--<!> }
val A.plusAssign: I get() = I()
fun usePlusAssign() { a <!ASSIGNMENT_OPERATOR_SHOULD_RETURN_UNIT, PROPERTY_AS_OPERATOR!>+=<!> 1 }
val A.minusAssign: I get() = I()
fun useMinusAssign() { a <!ASSIGNMENT_OPERATOR_SHOULD_RETURN_UNIT, PROPERTY_AS_OPERATOR!>-=<!> 1 }
val A.timesAssign: I get() = I()
fun useTimesAssign() { a <!ASSIGNMENT_OPERATOR_SHOULD_RETURN_UNIT, PROPERTY_AS_OPERATOR!>*=<!> 1 }
val A.divAssign: I get() = I()
fun useDivAssign() { a <!ASSIGNMENT_OPERATOR_SHOULD_RETURN_UNIT, PROPERTY_AS_OPERATOR!>/=<!> 1 }
val A.remAssign: I get() = I()
fun useRemAssign() { a <!ASSIGNMENT_OPERATOR_SHOULD_RETURN_UNIT, PROPERTY_AS_OPERATOR!>%=<!> 1 }
// operators over values
class E { }
val e = E()
val E.unaryPlus: I get() = I()
val useUnaryPlus = <!PROPERTY_AS_OPERATOR!>+<!>e
val E.unaryMinus: I get() = I()
val useUnaryMinus = <!PROPERTY_AS_OPERATOR!>-<!>e
val E.not: I get() = I()
val useNot = <!PROPERTY_AS_OPERATOR!>!<!>e
val E.plus: I get() = I()
val usePlus = e <!PROPERTY_AS_OPERATOR!>+<!> 1
val E.minus: I get() = I()
val useMinus = e <!PROPERTY_AS_OPERATOR!>-<!> 1
val E.times: I get() = I()
val useTimes = e <!PROPERTY_AS_OPERATOR!>*<!> 1
val E.div: I get() = I()
val useDiv = e <!PROPERTY_AS_OPERATOR!>/<!> 1
val E.rem: I get() = I()
val useRem = e <!PROPERTY_AS_OPERATOR!>%<!> 1
val E.get: I get() = I()
val useGet = <!PROPERTY_AS_OPERATOR!>e[1]<!>
val E.set: I get() = I()
fun useSet() { <!PROPERTY_AS_OPERATOR!>e[1]<!> = 3 }
val E.contains: I get() = I()
val useContains = 1 <!PROPERTY_AS_OPERATOR, RESULT_TYPE_MISMATCH!>in<!> e
val useNotContains = 1 <!PROPERTY_AS_OPERATOR, RESULT_TYPE_MISMATCH!>!in<!> e
val E.invoke: I get() = I()
val useInvoke = <!DEBUG_INFO_MISSING_UNRESOLVED, FUNCTION_EXPECTED!>e<!>()
val E.rangeTo: I get() = I()
val useRangeTo = e <!PROPERTY_AS_OPERATOR!>..<!> 3
val E.rangeUntil: I get() = I()
val useRangeUntil = e <!PROPERTY_AS_OPERATOR!>..<<!> 3
val E.compareTo: I get() = I()
val useCompareTo = e <!COMPARE_TO_TYPE_MISMATCH, PROPERTY_AS_OPERATOR!>><!> 2
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
Generated
+6
View File
@@ -26180,6 +26180,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
runTest("compiler/testData/diagnostics/tests/operatorsOverloading/plusAssignOnVarAndCollections.kt");
}
@Test
@TestMetadata("PropertyInvoke.kt")
public void testPropertyInvoke() throws Exception {
runTest("compiler/testData/diagnostics/tests/operatorsOverloading/PropertyInvoke.kt");
}
@Test
@TestMetadata("unresolvedOperator.kt")
public void testUnresolvedOperator() throws Exception {