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

[K1] Fix string offsets to include quotes in the same way it's done in FIR

Browse Source
This commit is contained in:
Artem Kobzar
2024-02-02 14:43:46 +00:00
committed by Space Team
parent 434470a4f5
commit 4f521aa05c
42 changed files with 147 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/ir/sourceRanges/declarations/delegatedProperties.txt
Vendored
+1 -1
View File
@@ -27,7 +27,7 @@
@10:44..12:5 EXPRESSION_BODY
@10:44..12:5 CALL 'public final fun observable <T> (initialValue: T of kotlin.properties.Delegates.observable, onChange: kotlin.Function3<@[ParameterName(name = "property")] kotlin.reflect.KProperty<*>, @[ParameterName(name = "oldValue")] T of kotlin.properties.Delegates.observable, @[ParameterName(name = "newValue")] T of kotlin.properties.Delegates.observable, kotlin.Unit>): kotlin.properties.ReadWriteProperty<kotlin.Any?, T of kotlin.properties.Delegates.observable> [inline] declared in kotlin.properties.Delegates' type=kotlin.properties.ReadWriteProperty<kotlin.Any?, kotlin.String> origin=null
@10:34..43 GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Delegates modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.properties.Delegates
@10:56..62 CONST String type=kotlin.String value="<none>"
@10:55..63 CONST String type=kotlin.String value="<none>"
@10:65..12:5 FUN_EXPR type=kotlin.Function3<@[ParameterName(name = "property")] kotlin.reflect.KProperty<*>, @[ParameterName(name = "oldValue")] kotlin.String, @[ParameterName(name = "newValue")] kotlin.String, kotlin.Unit> origin=LAMBDA
@10:65..12:5 FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> (prop:kotlin.reflect.KProperty<*>, old:kotlin.String, new:kotlin.String) returnType:kotlin.Unit
@10:67..71 VALUE_PARAMETER name:prop index:0 type:kotlin.reflect.KProperty<*>
compiler/testData/ir/sourceRanges/extensionLambdaCall.fir.txt
Vendored
-7
View File
@@ -1,7 +0,0 @@
@0:0..4:0 FILE fqName:<root> fileName:/extensionLambdaCall.kt
@0:0..3:1 FUN name:lookAtMe visibility:public modality:FINAL <> (f:@[ExtensionFunctionType] kotlin.Function1<kotlin.String, kotlin.Unit>) returnType:kotlin.Unit
@0:13..33 VALUE_PARAMETER name:f index:0 type:@[ExtensionFunctionType] kotlin.Function1<kotlin.String, kotlin.Unit>
@0:35..3:1 BLOCK_BODY
@2:12..15 CALL 'public abstract fun invoke (p1: P1 of kotlin.Function1): R of kotlin.Function1 [operator] declared in kotlin.Function1' type=kotlin.Unit origin=INVOKE
@2:12..13 GET_VAR 'f: @[ExtensionFunctionType] kotlin.Function1<kotlin.String, kotlin.Unit> declared in <root>.lookAtMe' type=@[ExtensionFunctionType] kotlin.Function1<kotlin.String, kotlin.Unit> origin=VARIABLE_AS_FUNCTION
@1:4..9 CONST String type=kotlin.String value="123"
compiler/testData/ir/sourceRanges/extensionLambdaCall.kt
Vendored
+2
View File
@@ -1,3 +1,5 @@
// FIR_IDENTICAL
fun lookAtMe(f: String.() -> Unit) {
"123".
f()
compiler/testData/ir/sourceRanges/extensionLambdaCall.txt
Vendored
+7 -7
View File
@@ -1,7 +1,7 @@
@0:0..4:0 FILE fqName:<root> fileName:/extensionLambdaCall.kt
@0:0..3:1 FUN name:lookAtMe visibility:public modality:FINAL <> (f:@[ExtensionFunctionType] kotlin.Function1<kotlin.String, kotlin.Unit>) returnType:kotlin.Unit
@0:13..33 VALUE_PARAMETER name:f index:0 type:@[ExtensionFunctionType] kotlin.Function1<kotlin.String, kotlin.Unit>
@0:35..3:1 BLOCK_BODY
@2:12..15 CALL 'public abstract fun invoke (p1: P1 of kotlin.Function1): R of kotlin.Function1 [operator] declared in kotlin.Function1' type=kotlin.Unit origin=INVOKE
@2:12..13 GET_VAR 'f: @[ExtensionFunctionType] kotlin.Function1<kotlin.String, kotlin.Unit> declared in <root>.lookAtMe' type=@[ExtensionFunctionType] kotlin.Function1<kotlin.String, kotlin.Unit> origin=VARIABLE_AS_FUNCTION
@1:5..8 CONST String type=kotlin.String value="123"
@0:0..6:0 FILE fqName:<root> fileName:/extensionLambdaCall.kt
@2:0..5:1 FUN name:lookAtMe visibility:public modality:FINAL <> (f:@[ExtensionFunctionType] kotlin.Function1<kotlin.String, kotlin.Unit>) returnType:kotlin.Unit
@2:13..33 VALUE_PARAMETER name:f index:0 type:@[ExtensionFunctionType] kotlin.Function1<kotlin.String, kotlin.Unit>
@2:35..5:1 BLOCK_BODY
@4:12..15 CALL 'public abstract fun invoke (p1: P1 of kotlin.Function1): R of kotlin.Function1 [operator] declared in kotlin.Function1' type=kotlin.Unit origin=INVOKE
@4:12..13 GET_VAR 'f: @[ExtensionFunctionType] kotlin.Function1<kotlin.String, kotlin.Unit> declared in <root>.lookAtMe' type=@[ExtensionFunctionType] kotlin.Function1<kotlin.String, kotlin.Unit> origin=VARIABLE_AS_FUNCTION
@3:4..9 CONST String type=kotlin.String value="123"
compiler/testData/ir/sourceRanges/multiLineCall.txt
Vendored
+4 -4
View File
@@ -8,23 +8,23 @@
@8:7..10:1 FUN name:test visibility:public modality:FINAL <> () returnType:kotlin.String [inline]
@8:26..10:1 BLOCK_BODY
@9:4..16 RETURN type=kotlin.Nothing from='public final fun test (): kotlin.String [inline] declared in <root>'
@9:12..15 CONST String type=kotlin.String value="123"
@9:11..16 CONST String type=kotlin.String value="123"
@12:7..14:1 FUN name:test visibility:public modality:FINAL <> ($receiver:kotlin.String) returnType:kotlin.String [inline]
@12:11..17 VALUE_PARAMETER name:<this> type:kotlin.String
@12:33..14:1 BLOCK_BODY
@13:4..16 RETURN type=kotlin.Nothing from='public final fun test (): kotlin.String [inline] declared in <root>'
@13:12..15 CONST String type=kotlin.String value="123"
@13:11..16 CONST String type=kotlin.String value="123"
@16:0..18:1 FUN name:fail visibility:public modality:FINAL <> ($receiver:kotlin.String) returnType:kotlin.String
@16:4..10 VALUE_PARAMETER name:<this> type:kotlin.String
@16:26..18:1 BLOCK_BODY
@17:4..32 THROW type=kotlin.Nothing
@17:10..32 CONSTRUCTOR_CALL 'public constructor <init> (p0: @[FlexibleNullability] kotlin.Any?) declared in java.lang.AssertionError' type=java.lang.AssertionError origin=null
@17:26..30 CONST String type=kotlin.String value="fail"
@17:25..31 CONST String type=kotlin.String value="fail"
@20:0..23:1 FUN name:bar visibility:public modality:FINAL <> () returnType:kotlin.Unit
@20:10..23:1 BLOCK_BODY
@22:4..8 TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
@22:4..8 CALL 'public final fun <get-test> (): kotlin.String declared in <root>' type=kotlin.String origin=GET_PROPERTY
@21:5..8 CONST String type=kotlin.String value="123"
@21:4..9 CONST String type=kotlin.String value="123"
@25:0..26:16 PROPERTY name:test visibility:public modality:FINAL [val]
@26:4..16 FUN name:<get-test> visibility:public modality:FINAL <> ($receiver:kotlin.String) returnType:kotlin.String
@25:4..10 VALUE_PARAMETER name:<this> type:kotlin.String