Fixed KT-6235 Get rid of `` for identifier "type" in converter

#KT-6235 Fixed
This commit is contained in:
Valentin Kipyatkov
2014-11-13 18:04:24 +03:00
parent 51a5125987
commit a15edf716a
3 changed files with 6 additions and 7 deletions
@@ -18,7 +18,8 @@ package org.jetbrains.jet.j2k.ast
import org.jetbrains.jet.j2k.CodeBuilder
import com.intellij.psi.PsiNameIdentifierOwner
import org.jetbrains.jet.j2k.CodeConverter
import org.jetbrains.jet.lexer.JetKeywordToken
import org.jetbrains.jet.lexer.JetTokens
fun PsiNameIdentifierOwner.declarationIdentifier(): Identifier {
val name = getName()
@@ -35,7 +36,7 @@ class Identifier(
get() = name.isEmpty()
private fun toKotlin(): String {
if (quotingNeeded && ONLY_KOTLIN_KEYWORDS.contains(name) || name.contains("$")) {
if (quotingNeeded && KEYWORDS.contains(name) || name.contains("$")) {
return quote(name)
}
@@ -53,9 +54,7 @@ class Identifier(
class object {
val Empty = Identifier("")
val ONLY_KOTLIN_KEYWORDS: Set<String> = setOf(
"package", "as", "type", "val", "var", "fun", "is", "in", "object", "when", "trait", "This"
)
private val KEYWORDS = JetTokens.KEYWORDS.getTypes().map { (it as JetKeywordToken).getValue() }.toSet()
fun toKotlin(name: String): String = Identifier(name).toKotlin()
}
@@ -1,5 +1,5 @@
val `as`: Int
val `type`: Int
val type: Int
val `val`: Int
val `var`: Int
val `fun`: Int
@@ -1,6 +1,6 @@
// ERROR: Unresolved reference: `as`
package test
import `as`.`type`.`val`.`var`.`fun`.`is`.`in`.`object`.`when`.`trait`.`This`
import `as`.type.`val`.`var`.`fun`.`is`.`in`.`object`.`when`.`trait`.`This`
class Test