diff --git a/j2k/src/org/jetbrains/kotlin/j2k/Converter.kt b/j2k/src/org/jetbrains/kotlin/j2k/Converter.kt index 738adbd4093..eb7e2d1ce38 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/Converter.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/Converter.kt @@ -317,7 +317,7 @@ class Converter private constructor( else { val isVal = field.isVal(referenceSearcher) val typeToDeclare = variableTypeToDeclare(field, - settings.specifyFieldTypeByDefault || modifiers.isPublic || modifiers.isProtected, + settings.specifyFieldTypeByDefault, isVal && modifiers.isPrivate) val propertyType = typeToDeclare ?: typeConverter.convertVariableType(field) diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ast/Modifier.kt b/j2k/src/org/jetbrains/kotlin/j2k/ast/Modifier.kt index a262d8aff5e..82c6c12a858 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/ast/Modifier.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/ast/Modifier.kt @@ -57,10 +57,7 @@ class Modifiers(modifiers: Collection) : Element() { fun contains(modifier: Modifier): Boolean = modifiers.contains(modifier) - val isPublic: Boolean get() = contains(Modifier.PUBLIC) val isPrivate: Boolean get() = contains(Modifier.PRIVATE) - val isProtected: Boolean get() = contains(Modifier.PROTECTED) - val isInternal: Boolean get() = contains(Modifier.INTERNAL) fun accessModifier(): Modifier? = modifiers.firstOrNull { it in ACCESS_MODIFIERS } diff --git a/j2k/testData/fileOrElement/annotations/annotationInterface3.kt b/j2k/testData/fileOrElement/annotations/annotationInterface3.kt index ea9a23a0404..d40df1923f6 100644 --- a/j2k/testData/fileOrElement/annotations/annotationInterface3.kt +++ b/j2k/testData/fileOrElement/annotations/annotationInterface3.kt @@ -8,7 +8,7 @@ annotation internal class Anon(val value: String) { companion object { - val field: E = E.A + val field = E.A } } diff --git a/j2k/testData/fileOrElement/class/notUtilityClass.kt b/j2k/testData/fileOrElement/class/notUtilityClass.kt index e792e26c7b4..364bd7f1de7 100644 --- a/j2k/testData/fileOrElement/class/notUtilityClass.kt +++ b/j2k/testData/fileOrElement/class/notUtilityClass.kt @@ -1,6 +1,6 @@ internal open class Base { companion object { - val CONSTANT: Int = 10 + val CONSTANT = 10 } } diff --git a/j2k/testData/fileOrElement/class/utilityClass1.kt b/j2k/testData/fileOrElement/class/utilityClass1.kt index 424d737e919..21be1031c97 100644 --- a/j2k/testData/fileOrElement/class/utilityClass1.kt +++ b/j2k/testData/fileOrElement/class/utilityClass1.kt @@ -5,5 +5,5 @@ internal object Util { fun util2() { } - val CONSTANT: Int = 10 + val CONSTANT = 10 } diff --git a/j2k/testData/fileOrElement/class/utilityClass2.kt b/j2k/testData/fileOrElement/class/utilityClass2.kt index ff81bea9ed1..141a8ac0043 100644 --- a/j2k/testData/fileOrElement/class/utilityClass2.kt +++ b/j2k/testData/fileOrElement/class/utilityClass2.kt @@ -6,5 +6,5 @@ internal object Util { fun util2() { } - val CONSTANT: Int = 10 + val CONSTANT = 10 } diff --git a/j2k/testData/fileOrElement/class/utilityClass3.kt b/j2k/testData/fileOrElement/class/utilityClass3.kt index 424d737e919..21be1031c97 100644 --- a/j2k/testData/fileOrElement/class/utilityClass3.kt +++ b/j2k/testData/fileOrElement/class/utilityClass3.kt @@ -5,5 +5,5 @@ internal object Util { fun util2() { } - val CONSTANT: Int = 10 + val CONSTANT = 10 } diff --git a/j2k/testData/fileOrElement/comments/comments2.kt b/j2k/testData/fileOrElement/comments/comments2.kt index 14e002b11fe..6f7e7889e95 100644 --- a/j2k/testData/fileOrElement/comments/comments2.kt +++ b/j2k/testData/fileOrElement/comments/comments2.kt @@ -23,6 +23,6 @@ internal class A { companion object { - /*it's public*//*and static*//*and final*/ val C: Int = 1 + /*it's public*//*and static*//*and final*/ val C = 1 } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/constructors/customerBuilder.kt b/j2k/testData/fileOrElement/constructors/customerBuilder.kt index 7eb8bf4b730..7961c9da0c4 100644 --- a/j2k/testData/fileOrElement/constructors/customerBuilder.kt +++ b/j2k/testData/fileOrElement/constructors/customerBuilder.kt @@ -15,8 +15,8 @@ internal class Customer internal constructor(val firstName: String, val lastName } internal class CustomerBuilder { - var _firstName: String = "Homer" - var _lastName: String = "Simpson" + var _firstName = "Homer" + var _lastName = "Simpson" fun WithFirstName(firstName: String): CustomerBuilder { _firstName = firstName diff --git a/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults.kt b/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults.kt index 3aef7e81102..5a52f045ded 100644 --- a/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults.kt +++ b/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults.kt @@ -3,7 +3,7 @@ internal class A JvmOverloads internal constructor(nested: A.Nested = A.Nested(A internal class Nested internal constructor(p: Int) { companion object { - val FIELD: Int = 0 + val FIELD = 0 } } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults2.kt b/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults2.kt index a32ed72883a..c4b5d80b067 100644 --- a/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults2.kt +++ b/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults2.kt @@ -6,7 +6,7 @@ internal class A JvmOverloads internal constructor(nested: Nested = Nested(Neste internal class Nested internal constructor(p: Int) { companion object { - val FIELD: Int = 0 + val FIELD = 0 } } } diff --git a/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults3.kt b/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults3.kt index 80c94531db0..acf106f1127 100644 --- a/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults3.kt +++ b/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults3.kt @@ -8,7 +8,7 @@ internal class A JvmOverloads internal constructor(nested: Nested = Nested(Neste internal class Nested internal constructor(p: Int) { companion object { - val FIELD: Int = 0 + val FIELD = 0 } } } diff --git a/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults4.kt b/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults4.kt index de90041c1af..f192ecc1213 100644 --- a/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults4.kt +++ b/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults4.kt @@ -8,7 +8,7 @@ internal class A JvmOverloads internal constructor(nested: Nested = Nested(Neste internal class Nested internal constructor(p: Int) { companion object { - val FIELD: Int = 0 + val FIELD = 0 } } } diff --git a/j2k/testData/fileOrElement/constructors/nestedClassNameInSuperParameters.kt b/j2k/testData/fileOrElement/constructors/nestedClassNameInSuperParameters.kt index 5fbcb64dfda..b62f4ef67af 100644 --- a/j2k/testData/fileOrElement/constructors/nestedClassNameInSuperParameters.kt +++ b/j2k/testData/fileOrElement/constructors/nestedClassNameInSuperParameters.kt @@ -3,7 +3,7 @@ internal open class Base internal constructor(nested: Base.Nested) { internal class Nested internal constructor(p: Int) { companion object { - val FIELD: Int = 0 + val FIELD = 0 } } } diff --git a/j2k/testData/fileOrElement/dropAccessors/AccessInGetterWithThis.kt b/j2k/testData/fileOrElement/dropAccessors/AccessInGetterWithThis.kt index 6e15dccf50a..431df98427c 100644 --- a/j2k/testData/fileOrElement/dropAccessors/AccessInGetterWithThis.kt +++ b/j2k/testData/fileOrElement/dropAccessors/AccessInGetterWithThis.kt @@ -1,3 +1,3 @@ class AAA { - val x: Int = 42 + val x = 42 } diff --git a/j2k/testData/fileOrElement/dropAccessors/DifferentFieldName.kt b/j2k/testData/fileOrElement/dropAccessors/DifferentFieldName.kt index 0942672f666..ed00f9f205c 100644 --- a/j2k/testData/fileOrElement/dropAccessors/DifferentFieldName.kt +++ b/j2k/testData/fileOrElement/dropAccessors/DifferentFieldName.kt @@ -1,5 +1,5 @@ class AAA { - var x: Int = 42 + var x = 42 private set fun foo(other: AAA) { diff --git a/j2k/testData/fileOrElement/dropAccessors/DifferentFieldNameAndSuperClass.kt b/j2k/testData/fileOrElement/dropAccessors/DifferentFieldNameAndSuperClass.kt index c874a782c22..f108ff27f51 100644 --- a/j2k/testData/fileOrElement/dropAccessors/DifferentFieldNameAndSuperClass.kt +++ b/j2k/testData/fileOrElement/dropAccessors/DifferentFieldNameAndSuperClass.kt @@ -1,5 +1,5 @@ open class Base internal constructor(x: Int) { - var x: Int = 42 + var x = 42 protected set init { diff --git a/j2k/testData/fileOrElement/dropAccessors/DifferentProtectedFieldName.kt b/j2k/testData/fileOrElement/dropAccessors/DifferentProtectedFieldName.kt index 0329d77b8af..5de970a19e4 100644 --- a/j2k/testData/fileOrElement/dropAccessors/DifferentProtectedFieldName.kt +++ b/j2k/testData/fileOrElement/dropAccessors/DifferentProtectedFieldName.kt @@ -1,5 +1,5 @@ open class AAA { - var x: Int = 42 + var x = 42 protected set fun foo(other: AAA) { diff --git a/j2k/testData/fileOrElement/dropAccessors/DropGetter.kt b/j2k/testData/fileOrElement/dropAccessors/DropGetter.kt index 6e15dccf50a..431df98427c 100644 --- a/j2k/testData/fileOrElement/dropAccessors/DropGetter.kt +++ b/j2k/testData/fileOrElement/dropAccessors/DropGetter.kt @@ -1,3 +1,3 @@ class AAA { - val x: Int = 42 + val x = 42 } diff --git a/j2k/testData/fileOrElement/dropAccessors/DropGetterAndSetter.kt b/j2k/testData/fileOrElement/dropAccessors/DropGetterAndSetter.kt index b24ea0bd173..977e1db6790 100644 --- a/j2k/testData/fileOrElement/dropAccessors/DropGetterAndSetter.kt +++ b/j2k/testData/fileOrElement/dropAccessors/DropGetterAndSetter.kt @@ -1,3 +1,3 @@ class AAA { - var x: Int = 42 + var x = 42 } diff --git a/j2k/testData/fileOrElement/dropAccessors/DropGetterForMutable.kt b/j2k/testData/fileOrElement/dropAccessors/DropGetterForMutable.kt index 53462ec057f..7147109e371 100644 --- a/j2k/testData/fileOrElement/dropAccessors/DropGetterForMutable.kt +++ b/j2k/testData/fileOrElement/dropAccessors/DropGetterForMutable.kt @@ -1,5 +1,5 @@ class AAA { - var x: Int = 42 + var x = 42 private set fun foo() { diff --git a/j2k/testData/fileOrElement/dropAccessors/FalseSetter.kt b/j2k/testData/fileOrElement/dropAccessors/FalseSetter.kt index c486409ce26..4d7aaa28c11 100644 --- a/j2k/testData/fileOrElement/dropAccessors/FalseSetter.kt +++ b/j2k/testData/fileOrElement/dropAccessors/FalseSetter.kt @@ -1,5 +1,5 @@ class AAA { - var x: Int = 42 + var x = 42 private set fun setX(x: Int) { diff --git a/j2k/testData/fileOrElement/dropAccessors/GetterAndSetterNamesDifferent.kt b/j2k/testData/fileOrElement/dropAccessors/GetterAndSetterNamesDifferent.kt index d6cea756ec0..f428da22e97 100644 --- a/j2k/testData/fileOrElement/dropAccessors/GetterAndSetterNamesDifferent.kt +++ b/j2k/testData/fileOrElement/dropAccessors/GetterAndSetterNamesDifferent.kt @@ -1,5 +1,5 @@ class AAA { - var x: Int = 42 + var x = 42 private set fun setY(x: Int) { diff --git a/j2k/testData/fileOrElement/dropAccessors/GetterSetterUsages.kt b/j2k/testData/fileOrElement/dropAccessors/GetterSetterUsages.kt index 3be033fe630..1553c6985fd 100644 --- a/j2k/testData/fileOrElement/dropAccessors/GetterSetterUsages.kt +++ b/j2k/testData/fileOrElement/dropAccessors/GetterSetterUsages.kt @@ -1,5 +1,5 @@ class AAA { - var x: Int = 42 + var x = 42 fun foo() { x = x + 1 diff --git a/j2k/testData/fileOrElement/dropAccessors/InCompanionObject.kt b/j2k/testData/fileOrElement/dropAccessors/InCompanionObject.kt index 4119dede5d5..162875603a6 100644 --- a/j2k/testData/fileOrElement/dropAccessors/InCompanionObject.kt +++ b/j2k/testData/fileOrElement/dropAccessors/InCompanionObject.kt @@ -5,6 +5,6 @@ class AAA { companion object { - var x: Int = 42 + var x = 42 } } diff --git a/j2k/testData/fileOrElement/dropAccessors/InObject.kt b/j2k/testData/fileOrElement/dropAccessors/InObject.kt index 436ca0bfebc..ed43f97de13 100644 --- a/j2k/testData/fileOrElement/dropAccessors/InObject.kt +++ b/j2k/testData/fileOrElement/dropAccessors/InObject.kt @@ -1,7 +1,7 @@ object AAA { - var x: Int = 42 - var y: Int = 0 - val z: Int = 0 + var x = 42 + var y = 0 + val z = 0 fun setZ(z: Int) { Other.z = z @@ -9,5 +9,5 @@ object AAA { } internal object Other { - var z: Int = 0 + var z = 0 } diff --git a/j2k/testData/fileOrElement/dropAccessors/JavaKeywordPropertyName.kt b/j2k/testData/fileOrElement/dropAccessors/JavaKeywordPropertyName.kt index 69e3ec7976a..3be000e1c02 100644 --- a/j2k/testData/fileOrElement/dropAccessors/JavaKeywordPropertyName.kt +++ b/j2k/testData/fileOrElement/dropAccessors/JavaKeywordPropertyName.kt @@ -1,5 +1,5 @@ internal class C { - val default: Int = 0 + val default = 0 internal fun foo() { println(default) diff --git a/j2k/testData/fileOrElement/dropAccessors/KeywordPropertyName.kt b/j2k/testData/fileOrElement/dropAccessors/KeywordPropertyName.kt index 7b126e2be34..80ad58a074a 100644 --- a/j2k/testData/fileOrElement/dropAccessors/KeywordPropertyName.kt +++ b/j2k/testData/fileOrElement/dropAccessors/KeywordPropertyName.kt @@ -1,5 +1,5 @@ internal class C { - val `this`: Int = 0 + val `this` = 0 internal fun foo() { println(`this`) diff --git a/j2k/testData/fileOrElement/field/specifyType.kt b/j2k/testData/fileOrElement/field/specifyType.kt index 45350cc088a..d911a714cad 100644 --- a/j2k/testData/fileOrElement/field/specifyType.kt +++ b/j2k/testData/fileOrElement/field/specifyType.kt @@ -3,8 +3,8 @@ import java.util.* internal class A { private val field1 = ArrayList() internal val field2: List = ArrayList() - val field3: Int = 0 - protected val field4: Int = 0 + val field3 = 0 + protected val field4 = 0 private var field5: List = ArrayList() internal var field6: List = ArrayList() diff --git a/j2k/testData/fileOrElement/for/forThroughNonArrayIndices.kt b/j2k/testData/fileOrElement/for/forThroughNonArrayIndices.kt index 9a3007773b9..63e0c02c82a 100644 --- a/j2k/testData/fileOrElement/for/forThroughNonArrayIndices.kt +++ b/j2k/testData/fileOrElement/for/forThroughNonArrayIndices.kt @@ -1,5 +1,5 @@ internal class X { - var length: Int = 5 + var length = 5 } internal class C { diff --git a/j2k/testData/fileOrElement/function/java8MRKFunctionExpectedType.kt b/j2k/testData/fileOrElement/function/java8MRKFunctionExpectedType.kt index 9ee418c870f..d854457bbf9 100644 --- a/j2k/testData/fileOrElement/function/java8MRKFunctionExpectedType.kt +++ b/j2k/testData/fileOrElement/function/java8MRKFunctionExpectedType.kt @@ -9,7 +9,7 @@ internal class Test { } companion object { - var field: Java8Class = Java8Class() + var field = Java8Class() fun staticFun(): Java8Class { return Java8Class() } diff --git a/j2k/testData/fileOrElement/function/java8MRSamConstructor.kt b/j2k/testData/fileOrElement/function/java8MRSamConstructor.kt index 1b822e0363a..3eb5e443fa1 100644 --- a/j2k/testData/fileOrElement/function/java8MRSamConstructor.kt +++ b/j2k/testData/fileOrElement/function/java8MRSamConstructor.kt @@ -15,7 +15,7 @@ internal class Test { } companion object { - var field: Java8Class = Java8Class() + var field = Java8Class() fun staticFun(): Java8Class { return Java8Class() } diff --git a/j2k/testData/fileOrElement/issues/kt-837.kt b/j2k/testData/fileOrElement/issues/kt-837.kt index 14746cb5e9e..fbe328f0161 100644 --- a/j2k/testData/fileOrElement/issues/kt-837.kt +++ b/j2k/testData/fileOrElement/issues/kt-837.kt @@ -9,8 +9,8 @@ class Language(protected var code: String) : Serializable { } companion object { - var ENGLISH: Language = Language("en") - var SWEDISH: Language = Language("sv") + var ENGLISH = Language("en") + var SWEDISH = Language("sv") private val serialVersionUID = -2442762969929206780L } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/overloads/AccessorToDrop.kt b/j2k/testData/fileOrElement/overloads/AccessorToDrop.kt index 071c81c29ac..f1562f016e8 100644 --- a/j2k/testData/fileOrElement/overloads/AccessorToDrop.kt +++ b/j2k/testData/fileOrElement/overloads/AccessorToDrop.kt @@ -1,5 +1,5 @@ internal class A { - var field: Int = 0 + var field = 0 fun setField() { field = 0 diff --git a/j2k/testData/fileOrElement/trait/interfaceWithFields.kt b/j2k/testData/fileOrElement/trait/interfaceWithFields.kt index ce7fe720e31..09d585c72d9 100644 --- a/j2k/testData/fileOrElement/trait/interfaceWithFields.kt +++ b/j2k/testData/fileOrElement/trait/interfaceWithFields.kt @@ -1,7 +1,7 @@ internal interface INode { companion object { - val IN: String = "in" - val AT: String = "@" - val COMMA_WITH_SPACE: String = COMMA + SPACE + val IN = "in" + val AT = "@" + val COMMA_WITH_SPACE = COMMA + SPACE } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/trait/interfaceWithStaticFields.kt b/j2k/testData/fileOrElement/trait/interfaceWithStaticFields.kt index 8a05c8f96fe..38478bdeb3d 100644 --- a/j2k/testData/fileOrElement/trait/interfaceWithStaticFields.kt +++ b/j2k/testData/fileOrElement/trait/interfaceWithStaticFields.kt @@ -1,7 +1,7 @@ interface INode { companion object { - val IN: String = "in" - val AT: String = "@" - val COMMA_WITH_SPACE: String = COMMA + SPACE + val IN = "in" + val AT = "@" + val COMMA_WITH_SPACE = COMMA + SPACE } } \ No newline at end of file diff --git a/j2k/testData/multiFile/FieldToProperty/JavaClass.kt b/j2k/testData/multiFile/FieldToProperty/JavaClass.kt index 8883e955ece..efc61ba1f4a 100644 --- a/j2k/testData/multiFile/FieldToProperty/JavaClass.kt +++ b/j2k/testData/multiFile/FieldToProperty/JavaClass.kt @@ -1,8 +1,8 @@ package test internal open class JavaClass { - var field: Int = 0 + var field = 0 - var property: Int = 0 + var property = 0 protected set } \ No newline at end of file diff --git a/j2k/testData/multiFile/GetterAndSetterUsages/1.kt b/j2k/testData/multiFile/GetterAndSetterUsages/1.kt index d3db3e6f58e..c9b4a91a22a 100644 --- a/j2k/testData/multiFile/GetterAndSetterUsages/1.kt +++ b/j2k/testData/multiFile/GetterAndSetterUsages/1.kt @@ -1,5 +1,5 @@ class AAA { - var x: Int = 42 + var x = 42 fun foo() { x = x + 1 diff --git a/j2k/testData/multiFile/GetterAndSetterUsages/2.kt b/j2k/testData/multiFile/GetterAndSetterUsages/2.kt index 46131db01ae..f17917e5348 100644 --- a/j2k/testData/multiFile/GetterAndSetterUsages/2.kt +++ b/j2k/testData/multiFile/GetterAndSetterUsages/2.kt @@ -4,6 +4,6 @@ internal class B { YY += "a" } - var YY: String = "" + var YY = "" private set } \ No newline at end of file diff --git a/j2k/testData/multiFile/ToCompanionObject/ClassWithStatics.kt b/j2k/testData/multiFile/ToCompanionObject/ClassWithStatics.kt index af906ee06da..c65be26612d 100644 --- a/j2k/testData/multiFile/ToCompanionObject/ClassWithStatics.kt +++ b/j2k/testData/multiFile/ToCompanionObject/ClassWithStatics.kt @@ -9,8 +9,8 @@ internal open class ClassWithStatics { fun staticMethod(p: Int) { } - val staticField: Int = 1 + val staticField = 1 - var value: Int = 0 + var value = 0 } } \ No newline at end of file diff --git a/j2k/testData/multiFile/ToObject/Utils.kt b/j2k/testData/multiFile/ToObject/Utils.kt index 2042426d9be..f9732f004b8 100644 --- a/j2k/testData/multiFile/ToObject/Utils.kt +++ b/j2k/testData/multiFile/ToObject/Utils.kt @@ -8,5 +8,5 @@ internal object Utils { return 1 } - val staticField: Int = 1 + val staticField = 1 }