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

New J2K: Add escaping of class symbol names in code builder

Browse Source
This commit is contained in:
Ilya Kirillov
2018-12-24 12:26:25 +03:00
committed by Ilya Kirillov
parent 11da99a1d0
commit de26e2cfe7
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/newSrc/org/jetbrains/kotlin/j2k/NewCodeBuilder.kt
+5 -7
View File
@@ -115,8 +115,7 @@ class NewCodeBuilder {
} }
override fun visitClassAccessExpression(classAccessExpression: JKClassAccessExpression) { override fun visitClassAccessExpression(classAccessExpression: JKClassAccessExpression) {
//TODO handle class Access in seperate conversion? printer.printWithNoIndent(classAccessExpression.identifier.displayName().escaped())
printer.printWithNoIndent(classAccessExpression.identifier.fqName!!.substringAfter("java.lang."))
} }
override fun visitFile(file: JKFile) { override fun visitFile(file: JKFile) {
@@ -582,8 +581,7 @@ class NewCodeBuilder {
private fun renderType(type: JKType) { private fun renderType(type: JKType) {
if (type is JKNoTypeImpl) return if (type is JKNoTypeImpl) return
when (type) { when (type) {
is JKClassType -> printer.printWithNoIndent(type.classReference.displayName()) is JKClassType -> printer.printWithNoIndent(type.classReference.displayName().escapedAsQualifiedName())
is JKUnresolvedClassType -> printer.printWithNoIndent(type.name)
is JKContextType -> return is JKContextType -> return
is JKStarProjectionType -> is JKStarProjectionType ->
printer.printWithNoIndent("*") printer.printWithNoIndent("*")
@@ -615,7 +613,7 @@ class NewCodeBuilder {
if (javaNewExpression.isAnonymousClass()) { if (javaNewExpression.isAnonymousClass()) {
printer.printWithNoIndent("object : ") printer.printWithNoIndent("object : ")
} }
printer.printWithNoIndent(javaNewExpression.classSymbol.displayName()) printer.printWithNoIndent(javaNewExpression.classSymbol.displayName().escapedAsQualifiedName())
javaNewExpression.typeArgumentList.accept(this) javaNewExpression.typeArgumentList.accept(this)
if (javaNewExpression.constructorIsPresent() || !javaNewExpression.isAnonymousClass()) { if (javaNewExpression.constructorIsPresent() || !javaNewExpression.isAnonymousClass()) {
printer.par(ROUND) { printer.par(ROUND) {
@@ -673,7 +671,7 @@ class NewCodeBuilder {
} }
override fun visitFieldAccessExpression(fieldAccessExpression: JKFieldAccessExpression) { override fun visitFieldAccessExpression(fieldAccessExpression: JKFieldAccessExpression) {
printer.printWithNoIndent(FqName(fieldAccessExpression.identifier.fqName).shortName().asString()) printer.printWithNoIndent(fieldAccessExpression.identifier.name.escaped())
} }
override fun visitArrayAccessExpression(arrayAccessExpression: JKArrayAccessExpression) { override fun visitArrayAccessExpression(arrayAccessExpression: JKArrayAccessExpression) {
@@ -796,7 +794,7 @@ class NewCodeBuilder {
override fun visitAnnotation(annotation: JKAnnotation) { override fun visitAnnotation(annotation: JKAnnotation) {
printer.printWithNoIndent("@") printer.printWithNoIndent("@")
printer.printWithNoIndent(annotation.classSymbol.displayName()) printer.printWithNoIndent(annotation.classSymbol.displayName().escapedAsQualifiedName())
if (annotation.arguments.expressions.isNotEmpty()) { if (annotation.arguments.expressions.isNotEmpty()) {
printer.par { printer.par {
annotation.arguments.accept(this) annotation.arguments.accept(this)