diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt index 38d3f1eb24c..4335aad49f6 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt @@ -80,6 +80,8 @@ internal class Fir2IrVisitor( private val booleanType = FirImplicitBooleanTypeRef(session, null).toIrType(session, declarationStorage) + private val stringType = FirImplicitStringTypeRef(session, null).toIrType(session, declarationStorage) + private fun ModuleDescriptor.findPackageFragmentForFile(file: FirFile): PackageFragmentDescriptor = getPackage(file.packageFqName).fragments.first() @@ -1070,6 +1072,15 @@ internal class Fir2IrVisitor( } } + override fun visitStringConcatenationCall(stringConcatenationCall: FirStringConcatenationCall, data: Any?): IrElement { + return stringConcatenationCall.convertWithOffsets { startOffset, endOffset -> + IrStringConcatenationImpl( + startOffset, endOffset, stringType, + stringConcatenationCall.arguments.map { it.toIrExpression() } + ) + } + } + override fun visitTypeOperatorCall(typeOperatorCall: FirTypeOperatorCall, data: Any?): IrElement { return typeOperatorCall.convertWithOffsets { startOffset, endOffset -> val irTypeOperand = typeOperatorCall.conversionTypeRef.toIrType(session, declarationStorage) diff --git a/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/ConversionUtils.kt b/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/ConversionUtils.kt index 99c8abaa73f..715a42c0302 100644 --- a/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/ConversionUtils.kt +++ b/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/ConversionUtils.kt @@ -304,14 +304,13 @@ internal fun Array.toInterpolatingCall( } result = when { result == null -> nextArgument - callCreated && result is FirFunctionCallImpl -> result.apply { + callCreated && result is FirStringConcatenationCallImpl -> result.apply { arguments += nextArgument } else -> { callCreated = true - FirFunctionCallImpl(session, base).apply { - calleeReference = FirSimpleNamedReference(session, base, OperatorNameConventions.PLUS) - explicitReceiver = result + FirStringConcatenationCallImpl(session, base).apply { + arguments += result!! arguments += nextArgument } } diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/for.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/for.txt index 5dbe26c0421..8f38c9bc945 100644 --- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/for.txt +++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/for.txt @@ -43,7 +43,7 @@ FILE: for.kt lval : = #.next#() lval x: = #.component1() lval y: = #.component2() - println#(String(x = ).plus#(x#, String( y = ), y#)) + println#((String(x = ), x#, String( y = ), y#)) } } diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt index 12ef3030ca1..294cdf697f0 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt @@ -641,6 +641,11 @@ class FirRenderer(builder: StringBuilder) : FirVisitorVoid() { print(")") } + override fun visitStringConcatenationCall(stringConcatenationCall: FirStringConcatenationCall) { + print("") + visitCall(stringConcatenationCall) + } + override fun visitTypeOperatorCall(typeOperatorCall: FirTypeOperatorCall) { print("(") typeOperatorCall.argument.accept(this) diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirStringConcatenationCall.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirStringConcatenationCall.kt new file mode 100644 index 00000000000..49fa0960ad1 --- /dev/null +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirStringConcatenationCall.kt @@ -0,0 +1,13 @@ +/* + * Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.fir.expressions + +import org.jetbrains.kotlin.fir.visitors.FirVisitor + +interface FirStringConcatenationCall : FirCall { + override fun accept(visitor: FirVisitor, data: D): R = + visitor.visitStringConcatenationCall(this, data) +} \ No newline at end of file diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirStringConcatenationCallImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirStringConcatenationCallImpl.kt new file mode 100644 index 00000000000..1b3afb91e59 --- /dev/null +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirStringConcatenationCallImpl.kt @@ -0,0 +1,19 @@ +/* + * Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.fir.expressions.impl + +import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.expressions.FirStringConcatenationCall +import org.jetbrains.kotlin.fir.types.FirTypeRef +import org.jetbrains.kotlin.fir.types.impl.FirImplicitStringTypeRef + +class FirStringConcatenationCallImpl( + session: FirSession, + psi: PsiElement? +) : FirAbstractCall(session, psi), FirStringConcatenationCall { + override var typeRef: FirTypeRef = FirImplicitStringTypeRef(session, psi) +} \ No newline at end of file diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirImplicitBuiltinTypeRef.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirImplicitBuiltinTypeRef.kt index 7373cf7ff42..3c65d93b585 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirImplicitBuiltinTypeRef.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirImplicitBuiltinTypeRef.kt @@ -63,3 +63,8 @@ class FirImplicitNothingTypeRef( psi: PsiElement? ) : FirImplicitBuiltinTypeRef(session, psi, StandardClassIds.Nothing) +class FirImplicitStringTypeRef( + session: FirSession, + psi: PsiElement? +) : FirImplicitBuiltinTypeRef(session, psi, StandardClassIds.String) + diff --git a/compiler/fir/tree/visitors/org/jetbrains/kotlin/fir/visitors/FirTransformerGenerated.kt b/compiler/fir/tree/visitors/org/jetbrains/kotlin/fir/visitors/FirTransformerGenerated.kt index a7a6b3ffb71..013af8107dd 100644 --- a/compiler/fir/tree/visitors/org/jetbrains/kotlin/fir/visitors/FirTransformerGenerated.kt +++ b/compiler/fir/tree/visitors/org/jetbrains/kotlin/fir/visitors/FirTransformerGenerated.kt @@ -232,6 +232,10 @@ abstract class FirTransformer : FirVisitor { + return transformCall(stringConcatenationCall, data) + } + open fun transformClassReferenceExpression(classReferenceExpression: FirClassReferenceExpression, data: D): CompositeTransformResult { return transformExpression(classReferenceExpression, data) } @@ -668,6 +672,10 @@ abstract class FirTransformer : FirVisitor { + return transformStringConcatenationCall(stringConcatenationCall, data) + } + final override fun visitSuperReference(superReference: FirSuperReference, data: D): CompositeTransformResult { return transformSuperReference(superReference, data) } diff --git a/compiler/fir/tree/visitors/org/jetbrains/kotlin/fir/visitors/FirVisitorGenerated.kt b/compiler/fir/tree/visitors/org/jetbrains/kotlin/fir/visitors/FirVisitorGenerated.kt index d8cd91a7007..785969a3a55 100644 --- a/compiler/fir/tree/visitors/org/jetbrains/kotlin/fir/visitors/FirVisitorGenerated.kt +++ b/compiler/fir/tree/visitors/org/jetbrains/kotlin/fir/visitors/FirVisitorGenerated.kt @@ -232,6 +232,10 @@ abstract class FirVisitor { return visitOperatorCall(typeOperatorCall, data) } + open fun visitStringConcatenationCall(stringConcatenationCall: FirStringConcatenationCall, data: D): R { + return visitCall(stringConcatenationCall, data) + } + open fun visitClassReferenceExpression(classReferenceExpression: FirClassReferenceExpression, data: D): R { return visitExpression(classReferenceExpression, data) } diff --git a/compiler/fir/tree/visitors/org/jetbrains/kotlin/fir/visitors/FirVisitorVoidGenerated.kt b/compiler/fir/tree/visitors/org/jetbrains/kotlin/fir/visitors/FirVisitorVoidGenerated.kt index 275f77e0688..fd14fc6ebbc 100644 --- a/compiler/fir/tree/visitors/org/jetbrains/kotlin/fir/visitors/FirVisitorVoidGenerated.kt +++ b/compiler/fir/tree/visitors/org/jetbrains/kotlin/fir/visitors/FirVisitorVoidGenerated.kt @@ -232,6 +232,10 @@ abstract class FirVisitorVoid : FirVisitor() { visitOperatorCall(typeOperatorCall, null) } + open fun visitStringConcatenationCall(stringConcatenationCall: FirStringConcatenationCall) { + visitCall(stringConcatenationCall, null) + } + open fun visitClassReferenceExpression(classReferenceExpression: FirClassReferenceExpression) { visitExpression(classReferenceExpression, null) } @@ -668,6 +672,10 @@ abstract class FirVisitorVoid : FirVisitor() { visitStatement(statement) } + final override fun visitStringConcatenationCall(stringConcatenationCall: FirStringConcatenationCall, data: Nothing?) { + visitStringConcatenationCall(stringConcatenationCall) + } + final override fun visitSuperReference(superReference: FirSuperReference, data: Nothing?) { visitSuperReference(superReference) } diff --git a/compiler/testData/ir/irText/declarations/constValInitializers.fir.txt b/compiler/testData/ir/irText/declarations/constValInitializers.fir.txt index 57f492a3b8a..8ada3697560 100644 --- a/compiler/testData/ir/irText/declarations/constValInitializers.fir.txt +++ b/compiler/testData/ir/irText/declarations/constValInitializers.fir.txt @@ -59,8 +59,9 @@ FILE fqName: fileName:/constValInitializers.kt PROPERTY name:STR4 visibility:public modality:FINAL [const,val] FIELD PROPERTY_BACKING_FIELD name:STR4 type:kotlin.String visibility:public [final,static] EXPRESSION_BODY - CALL 'public final fun plus (other: kotlin.Any?): kotlin.String declared in kotlin.String' type=kotlin.String origin=null - other: CALL 'public final fun (): kotlin.String declared in ' type=kotlin.String origin=null + STRING_CONCATENATION type=kotlin.String + CALL 'public final fun (): kotlin.String declared in ' type=kotlin.String origin=null + CALL 'public final fun (): kotlin.String declared in ' type=kotlin.String origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.String correspondingProperty: PROPERTY name:STR4 visibility:public modality:FINAL [const,val] BLOCK_BODY diff --git a/compiler/testData/ir/irText/expressions/kt28006.fir.txt b/compiler/testData/ir/irText/expressions/kt28006.fir.txt index d86238024c9..cfafedc5fe8 100644 --- a/compiler/testData/ir/irText/expressions/kt28006.fir.txt +++ b/compiler/testData/ir/irText/expressions/kt28006.fir.txt @@ -38,7 +38,8 @@ FILE fqName: fileName:/kt28006.kt PROPERTY name:testConst3 visibility:public modality:FINAL [const,val] FIELD PROPERTY_BACKING_FIELD name:testConst3 type:kotlin.String visibility:public [final,static] EXPRESSION_BODY - ERROR_CALL 'Cannot bind 2 arguments to plus call with 1 parameters' type=kotlin.String + STRING_CONCATENATION type=kotlin.String + CONST String type=kotlin.String value="\uD83E" CONST String type=kotlin.String value="\uDD17" CALL 'public final fun (): kotlin.String declared in ' type=kotlin.String origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.String @@ -49,8 +50,9 @@ FILE fqName: fileName:/kt28006.kt PROPERTY name:testConst4 visibility:public modality:FINAL [const,val] FIELD PROPERTY_BACKING_FIELD name:testConst4 type:kotlin.String visibility:public [final,static] EXPRESSION_BODY - CALL 'public final fun plus (other: kotlin.Any?): kotlin.String declared in kotlin.String' type=kotlin.String origin=null - other: CALL 'public final fun (): kotlin.String declared in ' type=kotlin.String origin=null + STRING_CONCATENATION type=kotlin.String + CALL 'public final fun (): kotlin.String declared in ' type=kotlin.String origin=null + CALL 'public final fun (): kotlin.String declared in ' type=kotlin.String origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.String correspondingProperty: PROPERTY name:testConst4 visibility:public modality:FINAL [const,val] BLOCK_BODY @@ -60,21 +62,24 @@ FILE fqName: fileName:/kt28006.kt VALUE_PARAMETER name:x index:0 type:kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun test1 (x: kotlin.Int): kotlin.String declared in ' - ERROR_CALL 'Cannot bind 2 arguments to plus call with 1 parameters' type=kotlin.String - CONST String type=kotlin.String value="\uDD17" - GET_VAR 'x: kotlin.Int declared in .test1' type=kotlin.Int origin=null - FUN name:test2 visibility:public modality:FINAL <> (x:kotlin.Int) returnType:IrErrorType - VALUE_PARAMETER name:x index:0 type:kotlin.Int - BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun test2 (x: kotlin.Int): IrErrorType declared in ' - ERROR_CALL 'Unresolved reference: #' type=IrErrorType + STRING_CONCATENATION type=kotlin.String CONST String type=kotlin.String value="\uD83E" CONST String type=kotlin.String value="\uDD17" - FUN name:test3 visibility:public modality:FINAL <> (x:kotlin.Int) returnType:IrErrorType + GET_VAR 'x: kotlin.Int declared in .test1' type=kotlin.Int origin=null + FUN name:test2 visibility:public modality:FINAL <> (x:kotlin.Int) returnType:kotlin.String VALUE_PARAMETER name:x index:0 type:kotlin.Int BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun test3 (x: kotlin.Int): IrErrorType declared in ' - ERROR_CALL 'Unresolved reference: #' type=IrErrorType + RETURN type=kotlin.Nothing from='public final fun test2 (x: kotlin.Int): kotlin.String declared in ' + STRING_CONCATENATION type=kotlin.String + GET_VAR 'x: kotlin.Int declared in .test2' type=kotlin.Int origin=null + CONST String type=kotlin.String value="\uD83E" + CONST String type=kotlin.String value="\uDD17" + FUN name:test3 visibility:public modality:FINAL <> (x:kotlin.Int) returnType:kotlin.String + VALUE_PARAMETER name:x index:0 type:kotlin.Int + BLOCK_BODY + RETURN type=kotlin.Nothing from='public final fun test3 (x: kotlin.Int): kotlin.String declared in ' + STRING_CONCATENATION type=kotlin.String + GET_VAR 'x: kotlin.Int declared in .test3' type=kotlin.Int origin=null CONST String type=kotlin.String value="\uD83E" CONST String type=kotlin.String value="\uDD17" GET_VAR 'x: kotlin.Int declared in .test3' type=kotlin.Int origin=null diff --git a/compiler/testData/ir/irText/expressions/objectReferenceInFieldInitializer.fir.txt b/compiler/testData/ir/irText/expressions/objectReferenceInFieldInitializer.fir.txt index 8af0b9a8b4f..0a4c287d1e7 100644 --- a/compiler/testData/ir/irText/expressions/objectReferenceInFieldInitializer.fir.txt +++ b/compiler/testData/ir/irText/expressions/objectReferenceInFieldInitializer.fir.txt @@ -19,8 +19,9 @@ FILE fqName: fileName:/objectReferenceInFieldInitializer.kt PROPERTY name:b visibility:private modality:FINAL [val] FIELD PROPERTY_BACKING_FIELD name:b type:kotlin.String visibility:private [final] EXPRESSION_BODY - CALL 'public final fun plus (other: kotlin.Any?): kotlin.String declared in kotlin.String' type=kotlin.String origin=null - other: CALL 'private final fun (): kotlin.String declared in .A' type=kotlin.String origin=null + STRING_CONCATENATION type=kotlin.String + CONST String type=kotlin.String value="1234" + CALL 'private final fun (): kotlin.String declared in .A' type=kotlin.String origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:private modality:FINAL <> ($this:.A) returnType:kotlin.String correspondingProperty: PROPERTY name:b visibility:private modality:FINAL [val] $this: VALUE_PARAMETER name: type:.A diff --git a/compiler/testData/ir/irText/expressions/stringTemplates.fir.txt b/compiler/testData/ir/irText/expressions/stringTemplates.fir.txt index 32232ba4d89..c89db5e6d61 100644 --- a/compiler/testData/ir/irText/expressions/stringTemplates.fir.txt +++ b/compiler/testData/ir/irText/expressions/stringTemplates.fir.txt @@ -60,7 +60,8 @@ FILE fqName: fileName:/stringTemplates.kt PROPERTY name:test6 visibility:public modality:FINAL [val] FIELD PROPERTY_BACKING_FIELD name:test6 type:kotlin.String visibility:public [final,static] EXPRESSION_BODY - ERROR_CALL 'Cannot bind 2 arguments to plus call with 1 parameters' type=kotlin.String + STRING_CONCATENATION type=kotlin.String + CALL 'public final fun (): kotlin.String declared in ' type=kotlin.String origin=null CONST String type=kotlin.String value=" " CALL 'public final fun foo (): kotlin.String declared in ' type=kotlin.String origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.String diff --git a/compiler/testData/ir/irText/regressions/coercionInLoop.fir.txt b/compiler/testData/ir/irText/regressions/coercionInLoop.fir.txt index c38c9eb94d7..a1ffa0b70ff 100644 --- a/compiler/testData/ir/irText/regressions/coercionInLoop.fir.txt +++ b/compiler/testData/ir/irText/regressions/coercionInLoop.fir.txt @@ -19,8 +19,9 @@ FILE fqName: fileName:/coercionInLoop.kt GET_VAR 'var i: kotlin.Int [var] declared in .box' type=kotlin.Int origin=null arg1: ERROR_CALL 'Unresolved reference: #' type=IrErrorType then: RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in ' - CALL 'public final fun plus (other: kotlin.Any?): kotlin.String declared in kotlin.String' type=kotlin.String origin=null - other: GET_VAR 'var i: kotlin.Int [var] declared in .box' type=kotlin.Int origin=null + STRING_CONCATENATION type=kotlin.String + CONST String type=kotlin.String value="Fail " + GET_VAR 'var i: kotlin.Int [var] declared in .box' type=kotlin.Int origin=null VAR name: type:kotlin.Int [val] GET_VAR 'var i: kotlin.Int [var] declared in .box' type=kotlin.Int origin=null ERROR_CALL 'Unresolved reference: R|/i|' type=IrErrorType