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
@@ -6,13 +6,13 @@ FILE fqName:<root> fileName:/javaAnnotation.kt
FUN name:test2 visibility:public modality:FINAL <> () returnType:kotlin.Unit flags:
annotations:
CALL 'constructor JavaAnn(String = ..., Int = ...)' type=JavaAnn origin=null
value: CONST String type=kotlin.String value=abc
value: CONST String type=kotlin.String value="abc"
i: CONST Int type=kotlin.Int value=123
BLOCK_BODY
FUN name:test3 visibility:public modality:FINAL <> () returnType:kotlin.Unit flags:
annotations:
CALL 'constructor JavaAnn(String = ..., Int = ...)' type=JavaAnn origin=null
value: CONST String type=kotlin.String value=abc
value: CONST String type=kotlin.String value="abc"
i: CONST Int type=kotlin.Int value=123
BLOCK_BODY