diff --git a/plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/nj2k/externalCodeProcessing/ExternalUsagesFixer.kt b/plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/nj2k/externalCodeProcessing/ExternalUsagesFixer.kt index 9de11c1d6620..140218869c5e 100644 --- a/plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/nj2k/externalCodeProcessing/ExternalUsagesFixer.kt +++ b/plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/nj2k/externalCodeProcessing/ExternalUsagesFixer.kt @@ -120,7 +120,7 @@ class ExternalUsagesFixer(private val usages: List) { ShortenReferencesFacility.getInstance().shorten(annotation) } - data class JKMemberInfoWithUsages( + data class JKMemberInfoWithUsages( val member: JKMemberData, val javaUsages: List, val kotlinUsages: List diff --git a/plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/nj2k/externalCodeProcessing/NewExternalCodeProcessing.kt b/plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/nj2k/externalCodeProcessing/NewExternalCodeProcessing.kt index 6e622817eb36..003b30b9abdd 100644 --- a/plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/nj2k/externalCodeProcessing/NewExternalCodeProcessing.kt +++ b/plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/nj2k/externalCodeProcessing/NewExternalCodeProcessing.kt @@ -53,7 +53,7 @@ class NewExternalCodeProcessing( } context(KtAnalysisSession) - fun getMember(element: JKDeclaration): JKMemberData? = members[element.psi()?.buildKey()] + fun getMember(element: JKDeclaration): JKMemberData? = members[element.psi()?.buildKey()] context(KtAnalysisSession) fun getMember(element: KtNamedDeclaration): JKMemberData? { diff --git a/plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/nj2k/printing/JKCodeBuilder.kt b/plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/nj2k/printing/JKCodeBuilder.kt index 92369d8c0c9f..8e43183c6b32 100644 --- a/plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/nj2k/printing/JKCodeBuilder.kt +++ b/plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/nj2k/printing/JKCodeBuilder.kt @@ -268,7 +268,7 @@ class JKCodeBuilder(context: NewJ2kConverterContext) { override fun visitIsExpressionRaw(isExpression: JKIsExpression) { isExpression.expression.accept(this) - printer.printWithSurroundingSpaces(if (isExpression.isNegated) "!is" else "is") + printer.printWithSurroundingSpaces(if (isExpression.isNegated) "!is" else "is") isExpression.type.accept(this) } diff --git a/plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/nj2k/tree/operators.kt b/plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/nj2k/tree/operators.kt index 0fd261ec3f50..64eb3a6c27c3 100644 --- a/plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/nj2k/tree/operators.kt +++ b/plugins/kotlin/j2k/shared/src/org/jetbrains/kotlin/nj2k/tree/operators.kt @@ -64,11 +64,11 @@ interface JKOperatorToken { val GTGTEQ = JKJavaOperatorToken(JavaTokenType.GTGTEQ) val GTGTGTEQ = JKJavaOperatorToken(JavaTokenType.GTGTGTEQ) - val ARITHMETIC_OPERATORS = listOf(PLUS, MINUS, DIV, MUL, PERC) + val ARITHMETIC_OPERATORS = listOf(PLUS, MINUS, DIV, MUL, PERC) - val BITWISE_LOGICAL_OPERATORS = listOf(AND, OR, XOR) + val BITWISE_LOGICAL_OPERATORS = listOf(AND, OR, XOR) - val SHIFT_OPERATORS = listOf(SHL, SHR, USHR) + val SHIFT_OPERATORS = listOf(SHL, SHR, USHR) private val elementTypeToToken: Map = mapOf( JavaTokenType.DIV to DIV,