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
@@ -32,11 +32,10 @@ FILE fqName:<root> fileName:/variablesWithAnnotations.kt
VAR name:testVal type:kotlin.String flags:val
annotations:
CALL 'constructor TestAnn(String)' type=TestAnn origin=null
x: CONST String type=kotlin.String value=foo/testVal
CONST String type=kotlin.String value=testVal
x: CONST String type=kotlin.String value="foo/testVal"
CONST String type=kotlin.String value="testVal"
VAR name:testVar type:kotlin.String flags:var
annotations:
CALL 'constructor TestAnn(String)' type=TestAnn origin=null
x: CONST String type=kotlin.String value=foo/testVar
CONST String type=kotlin.String value=testVar
x: CONST String type=kotlin.String value="foo/testVar"
CONST String type=kotlin.String value="testVar"