Fix compiler errors in nj2k detected after changes in NI
This commit is contained in:
@@ -235,16 +235,7 @@ class JavaToJKTreeBuilder constructor(
|
|||||||
fun IElementType.toJK(): JKOperator = JKJavaOperatorImpl.tokenToOperator[this] ?: error("Unsupported token-type: $this")
|
fun IElementType.toJK(): JKOperator = JKJavaOperatorImpl.tokenToOperator[this] ?: error("Unsupported token-type: $this")
|
||||||
|
|
||||||
fun PsiPrefixExpression.toJK(): JKExpression {
|
fun PsiPrefixExpression.toJK(): JKExpression {
|
||||||
return JKPrefixExpressionImpl(operand.toJK(), operationSign.tokenType.toJK()).let {
|
return JKPrefixExpressionImpl(operand.toJK(), operationSign.tokenType.toJK()).also {
|
||||||
if (it.operator.token in listOf(JavaTokenType.PLUS, JavaTokenType.MINUS)
|
|
||||||
&& it.expression is JKLiteralExpression
|
|
||||||
) {
|
|
||||||
JKJavaLiteralExpressionImpl(
|
|
||||||
it.operator.token.text + (it.expression as JKLiteralExpression).literal,
|
|
||||||
(it.expression as JKLiteralExpression).type
|
|
||||||
)
|
|
||||||
} else it
|
|
||||||
}.also {
|
|
||||||
it.assignNonCodeElements(this)
|
it.assignNonCodeElements(this)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -93,8 +93,9 @@ private class DebugTreePrinter : JKVisitorVoid {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun printSymbol(symbol: JKSymbol) {
|
fun printSymbol(symbol: JKSymbol) {
|
||||||
if (symbol is JKUniverseSymbol<*>) {
|
val target = symbol.target
|
||||||
printer.printWithNoIndent(symbol.target.describe())
|
if (target is JKTreeElement) {
|
||||||
|
printer.printWithNoIndent(target.describe())
|
||||||
} else {
|
} else {
|
||||||
printer.printWithNoIndent("Psi")
|
printer.printWithNoIndent("Psi")
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user