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

New J2K: Remove extra JKKtModifier.INTERNAL because there is already JKVisibilityModifier.INTERNAL

Browse Source
This commit is contained in:
Ilya Kirillov
2018-11-13 18:32:16 +03:00
committed by Ilya Kirillov
parent 4f30283744
commit eb0182c5a9
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/newSrc/org/jetbrains/kotlin/j2k/NewCodeBuilder.kt
+2 -2
View File
@@ -141,7 +141,8 @@ class NewCodeBuilder {
printer.printWithNoIndent( printer.printWithNoIndent(
when (accessModifier.visibility) { when (accessModifier.visibility) {
JKAccessModifier.Visibility.PUBLIC -> "public" JKAccessModifier.Visibility.PUBLIC -> "public"
JKAccessModifier.Visibility.PACKAGE_PRIVATE, JKAccessModifier.Visibility.INTERNAL -> "internal" JKAccessModifier.Visibility.INTERNAL -> "internal"
JKAccessModifier.Visibility.PACKAGE_PRIVATE -> ""
// JKAccessModifier.Visibility.PACKAGE_PRIVATE -> "internal /* package_local! */" // JKAccessModifier.Visibility.PACKAGE_PRIVATE -> "internal /* package_local! */"
JKAccessModifier.Visibility.PROTECTED -> "protected" JKAccessModifier.Visibility.PROTECTED -> "protected"
JKAccessModifier.Visibility.PRIVATE -> "private" JKAccessModifier.Visibility.PRIVATE -> "private"
@@ -174,7 +175,6 @@ class NewCodeBuilder {
override fun visitKtModifier(ktModifier: JKKtModifier) { override fun visitKtModifier(ktModifier: JKKtModifier) {
printer.printWithNoIndent( printer.printWithNoIndent(
when (ktModifier.type) { when (ktModifier.type) {
JKKtModifier.KtModifierType.INTERNAL -> "internal"
JKKtModifier.KtModifierType.ABSTRACT -> "abstract" JKKtModifier.KtModifierType.ABSTRACT -> "abstract"
JKKtModifier.KtModifierType.INNER -> "inner" JKKtModifier.KtModifierType.INNER -> "inner"
JKKtModifier.KtModifierType.OPEN -> "open" JKKtModifier.KtModifierType.OPEN -> "open"
j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ModifiersConversion.kt
+1 -4
View File
@@ -8,10 +8,7 @@ package org.jetbrains.kotlin.j2k.conversions
import org.jetbrains.kotlin.j2k.ConversionContext import org.jetbrains.kotlin.j2k.ConversionContext
import org.jetbrains.kotlin.j2k.ast.Mutability import org.jetbrains.kotlin.j2k.ast.Mutability
import org.jetbrains.kotlin.j2k.tree.* import org.jetbrains.kotlin.j2k.tree.*
import org.jetbrains.kotlin.j2k.tree.impl.JKKtConstructorImpl import org.jetbrains.kotlin.j2k.tree.impl.*
import org.jetbrains.kotlin.j2k.tree.impl.JKKtModifierImpl
import org.jetbrains.kotlin.j2k.tree.impl.mutability
import org.jetbrains.kotlin.j2k.tree.impl.visibility
class ModifiersConversion(private val context: ConversionContext) : RecursiveApplicableConversionBase() { class ModifiersConversion(private val context: ConversionContext) : RecursiveApplicableConversionBase() {
j2k/newSrc/org/jetbrains/kotlin/j2k/tree/k.kt
+9
View File
@@ -42,6 +42,15 @@ interface JKKtAssignmentStatement : JKStatement {
interface JKKtCall : JKMethodCallExpression interface JKKtCall : JKMethodCallExpression
interface JKKtModifier : JKModifier {
val type: KtModifierType
enum class KtModifierType {
ACTUAL, ABSTRACT, ANNOTATION, COMPANION, CONST, CROSSINLINE, DATA, ENUM, EXPECT, EXTERNAL, FINAL, INFIX, INLINE, INNER,
LATEINIT, NOINLINE, OPEN, OPERATOR, OUT, OVERRIDE, REIFIED, SEALED, SUSPEND, TAILREC, VARARG, PRIVATE, PROTECTED
}
}
interface JKKtMethodCallExpression : JKMethodCallExpression interface JKKtMethodCallExpression : JKMethodCallExpression
interface JKKtAlsoCallExpression : JKKtMethodCallExpression { interface JKKtAlsoCallExpression : JKKtMethodCallExpression {