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
@@ -21,13 +21,13 @@ FILE fqName:<root> fileName:/variableAsFunctionCall.kt
RETURN type=kotlin.Nothing from='test2(String.() -> Unit): Unit'
CALL 'invoke(String): Unit' type=kotlin.Unit origin=INVOKE
$this: GET_VAR 'value-parameter f: String.() -> Unit' type=kotlin.String.() -> kotlin.Unit origin=VARIABLE_AS_FUNCTION
p1: CONST String type=kotlin.String value=hello
p1: CONST String type=kotlin.String value="hello"
FUN name:test3 visibility:public modality:FINAL <> () returnType:kotlin.String flags:
BLOCK_BODY
RETURN type=kotlin.Nothing from='test3(): String'
CALL 'invoke(): String' type=kotlin.String origin=null
$this: CALL 'k() on String: () -> String' type=() -> kotlin.String origin=null
$receiver: CONST String type=kotlin.String value=hello
$receiver: CONST String type=kotlin.String value="hello"
FUN name:test4 visibility:public modality:FINAL <> (ns:kotlin.String?) returnType:kotlin.String? flags:
VALUE_PARAMETER name:ns index:0 type:kotlin.String? flags:
BLOCK_BODY