psi2ir: Merge constant entries in string template expressions

This is required to handle UCNs properly, see KT-28006.

 #KT-28006
This commit is contained in:
Dmitry Petrov
2018-11-06 18:00:35 +03:00
parent 6bb5e028a5
commit bd1491ac8a
84 changed files with 476 additions and 351 deletions
@@ -31,7 +31,7 @@ FILE fqName:<root> fileName:/valueParametersWithAnnotations.kt
VALUE_PARAMETER name:x index:0 type:kotlin.Int flags:
annotations:
CALL 'constructor TestAnn(String)' type=TestAnn origin=null
x: CONST String type=kotlin.String value=testFun.x
x: CONST String type=kotlin.String value="testFun.x"
BLOCK_BODY
CLASS CLASS name:TestClassConstructor1 modality:FINAL visibility:public flags: superTypes:[kotlin.Any]
$this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:TestClassConstructor1 flags:
@@ -39,7 +39,7 @@ FILE fqName:<root> fileName:/valueParametersWithAnnotations.kt
VALUE_PARAMETER name:x index:0 type:kotlin.Int flags:
annotations:
CALL 'constructor TestAnn(String)' type=TestAnn origin=null
x: CONST String type=kotlin.String value=TestClassConstructor1.x
x: CONST String type=kotlin.String value="TestClassConstructor1.x"
BLOCK_BODY
DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
INSTANCE_INITIALIZER_CALL classDescriptor='TestClassConstructor1'