diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirLightTreeJvmIrSourceRangesTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirLightTreeJvmIrSourceRangesTestGenerated.java index c34a91ea53d..cd5ab3adb37 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirLightTreeJvmIrSourceRangesTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirLightTreeJvmIrSourceRangesTestGenerated.java @@ -61,6 +61,12 @@ public class FirLightTreeJvmIrSourceRangesTestGenerated extends AbstractFirLight runTest("compiler/testData/ir/sourceRanges/kt24258.kt"); } + @Test + @TestMetadata("operators.kt") + public void testOperators() throws Exception { + runTest("compiler/testData/ir/sourceRanges/operators.kt"); + } + @Test @TestMetadata("postfixIncrementDecrement.kt") public void testPostfixIncrementDecrement() throws Exception { diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirPsiJvmIrSourceRangesTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirPsiJvmIrSourceRangesTestGenerated.java index a41774533c8..69305d5dcd6 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirPsiJvmIrSourceRangesTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirPsiJvmIrSourceRangesTestGenerated.java @@ -61,6 +61,12 @@ public class FirPsiJvmIrSourceRangesTestGenerated extends AbstractFirPsiJvmIrSou runTest("compiler/testData/ir/sourceRanges/kt24258.kt"); } + @Test + @TestMetadata("operators.kt") + public void testOperators() throws Exception { + runTest("compiler/testData/ir/sourceRanges/operators.kt"); + } + @Test @TestMetadata("postfixIncrementDecrement.kt") public void testPostfixIncrementDecrement() throws Exception { diff --git a/compiler/testData/ir/sourceRanges/operators.fir.txt b/compiler/testData/ir/sourceRanges/operators.fir.txt new file mode 100644 index 00000000000..2a68bff8a45 --- /dev/null +++ b/compiler/testData/ir/sourceRanges/operators.fir.txt @@ -0,0 +1,25 @@ +@0:0..8:0 FILE fqName: fileName:/operators.kt + @2:0..27 PROPERTY name:addExpr visibility:public modality:FINAL [val] + @2:0..27 FIELD PROPERTY_BACKING_FIELD name:addExpr type:kotlin.Int visibility:private [final,static] + @2:20..27 EXPRESSION_BODY + @2:20..27 CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=PLUS + @2:14..19 CONST Int type=kotlin.Int value=12345 + @2:22..27 CONST Int type=kotlin.Int value=67890 + @2:0..27 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Int + @2:0..27 BLOCK_BODY + @2:0..27 RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in ' + @2:0..27 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:addExpr type:kotlin.Int visibility:private [final,static]' type=kotlin.Int origin=null + @3:0..28 PROPERTY name:bangBangExpr visibility:public modality:FINAL [val] + @3:0..28 FIELD PROPERTY_BACKING_FIELD name:bangBangExpr type:kotlin.Int visibility:private [final,static] + @3:19..28 EXPRESSION_BODY + @3:19..28 CALL 'public final fun CHECK_NOT_NULL (arg0: T0 of kotlin.internal.ir.CHECK_NOT_NULL?): {T0 of kotlin.internal.ir.CHECK_NOT_NULL & Any} declared in kotlin.internal.ir' type=kotlin.Int origin=EXCLEXCL + @3:19..26 CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=GET_PROPERTY + @3:0..28 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Int + @3:0..28 BLOCK_BODY + @3:0..28 RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in ' + @3:0..28 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:bangBangExpr type:kotlin.Int visibility:private [final,static]' type=kotlin.Int origin=null + @5:0..6:13 PROPERTY name:x visibility:public modality:FINAL [val] + @5:0..6:13 FUN name: visibility:public modality:FINAL <> () returnType:kotlin.Int + @6:12..13 BLOCK_BODY + @6:13..13 RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in ' + @6:12..13 CONST Int type=kotlin.Int value=5 diff --git a/compiler/testData/ir/sourceRanges/operators.kt b/compiler/testData/ir/sourceRanges/operators.kt new file mode 100644 index 00000000000..91b818d0be8 --- /dev/null +++ b/compiler/testData/ir/sourceRanges/operators.kt @@ -0,0 +1,8 @@ +// ISSUE: KT-60111 + +val addExpr = 12345 + 67890 +val bangBangExpr = addExpr!! + +val x : Int + get() = 5 + diff --git a/compiler/testData/ir/sourceRanges/operators.txt b/compiler/testData/ir/sourceRanges/operators.txt new file mode 100644 index 00000000000..0e93d972100 --- /dev/null +++ b/compiler/testData/ir/sourceRanges/operators.txt @@ -0,0 +1,23 @@ +@0:0..8:0 FILE fqName: fileName:/operators.kt + @2:0..27 PROPERTY name:addExpr visibility:public modality:FINAL [val] + @2:0..27 FIELD PROPERTY_BACKING_FIELD name:addExpr type:kotlin.Int visibility:private [final,static] + @2:14..27 EXPRESSION_BODY + @2:14..27 CONST Int type=kotlin.Int value=80235 + @2:0..27 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Int + @2:0..27 BLOCK_BODY + @2:0..27 RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in ' + @2:0..27 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:addExpr type:kotlin.Int visibility:private [final,static]' type=kotlin.Int origin=null + @3:0..28 PROPERTY name:bangBangExpr visibility:public modality:FINAL [val] + @3:0..28 FIELD PROPERTY_BACKING_FIELD name:bangBangExpr type:kotlin.Int visibility:private [final,static] + @3:26..28 EXPRESSION_BODY + @3:26..28 CALL 'public final fun CHECK_NOT_NULL (arg0: T0 of kotlin.internal.ir.CHECK_NOT_NULL?): {T0 of kotlin.internal.ir.CHECK_NOT_NULL & Any} declared in kotlin.internal.ir' type=kotlin.Int origin=EXCLEXCL + @3:19..26 CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=GET_PROPERTY + @3:0..28 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Int + @3:0..28 BLOCK_BODY + @3:0..28 RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in ' + @3:0..28 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:bangBangExpr type:kotlin.Int visibility:private [final,static]' type=kotlin.Int origin=null + @5:0..6:13 PROPERTY name:x visibility:public modality:FINAL [val] + @6:4..13 FUN name: visibility:public modality:FINAL <> () returnType:kotlin.Int + @6:12..13 BLOCK_BODY + @6:13..13 RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in ' + @6:12..13 CONST Int type=kotlin.Int value=5 diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ir/ClassicJvmIrSourceRangesTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ir/ClassicJvmIrSourceRangesTestGenerated.java index 45c4e64869b..7ed58ea85b5 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ir/ClassicJvmIrSourceRangesTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ir/ClassicJvmIrSourceRangesTestGenerated.java @@ -61,6 +61,12 @@ public class ClassicJvmIrSourceRangesTestGenerated extends AbstractClassicJvmIrS runTest("compiler/testData/ir/sourceRanges/kt24258.kt"); } + @Test + @TestMetadata("operators.kt") + public void testOperators() throws Exception { + runTest("compiler/testData/ir/sourceRanges/operators.kt"); + } + @Test @TestMetadata("postfixIncrementDecrement.kt") public void testPostfixIncrementDecrement() throws Exception {