azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

psi2ir: Merge constant entries in string template expressions

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/ir/irText/declarations/annotations/fieldsWithAnnotations.txt
Vendored
+4 -4
View File
@@ -31,9 +31,9 @@ FILE fqName:<root> fileName:/fieldsWithAnnotations.kt
FIELD PROPERTY_BACKING_FIELD name:testVal type:kotlin.String visibility:public flags:final,static
annotations:
CALL 'constructor TestAnn(String)' type=TestAnn origin=null
x: CONST String type=kotlin.String value=testVal.field
x: CONST String type=kotlin.String value="testVal.field"
EXPRESSION_BODY
CONST String type=kotlin.String value=a val
CONST String type=kotlin.String value="a val"
FUN DEFAULT_PROPERTY_ACCESSOR name:<get-testVal> visibility:public modality:FINAL <> () returnType:kotlin.String flags:
correspondingProperty: PROPERTY name:testVal visibility:public modality:FINAL flags:val
BLOCK_BODY
@@ -43,9 +43,9 @@ FILE fqName:<root> fileName:/fieldsWithAnnotations.kt
FIELD PROPERTY_BACKING_FIELD name:testVar type:kotlin.String visibility:public flags:static
annotations:
CALL 'constructor TestAnn(String)' type=TestAnn origin=null
x: CONST String type=kotlin.String value=testVar.field
x: CONST String type=kotlin.String value="testVar.field"
EXPRESSION_BODY
CONST String type=kotlin.String value=a var
CONST String type=kotlin.String value="a var"
FUN DEFAULT_PROPERTY_ACCESSOR name:<get-testVar> visibility:public modality:FINAL <> () returnType:kotlin.String flags:
correspondingProperty: PROPERTY name:testVar visibility:public modality:FINAL flags:var
BLOCK_BODY