From d69c61c972d080f9aad15d44f657a5c4dbe24830 Mon Sep 17 00:00:00 2001 From: Pavel Talanov Date: Mon, 9 Dec 2013 19:59:49 +0400 Subject: [PATCH] Converter: Preserve white spaces for top members (classes, package statements, comments) --- j2k/src/org/jetbrains/jet/j2k/Converter.kt | 14 +++++--------- j2k/src/org/jetbrains/jet/j2k/ast/File.kt | 18 +++++++++--------- j2k/src/org/jetbrains/jet/j2k/ast/Imports.kt | 2 +- j2k/src/org/jetbrains/jet/j2k/ast/Util.kt | 6 +++++- .../jetbrainsNotNullChainExpr.ide.kt | 2 ++ .../annotations/jetbrainsNotNullChainExpr.jav | 2 +- .../annotations/jetbrainsNotNullChainExpr.kt | 2 ++ .../ast/assignmentExpression/nullability.jav | 2 +- .../libraryFieldCall.ide.kt | 1 + .../callChainExpression/libraryFieldCall.kt | 1 + .../libraryMethodCall.ide.kt | 1 + .../callChainExpression/libraryMethodCall.kt | 1 + .../libraryMethodCallFromInstance.ide.kt | 1 + .../libraryMethodCallFromInstance.kt | 1 + .../libraryStringFieldCall.ide.kt | 1 + .../libraryStringFieldCall.kt | 1 + .../testData/ast/class/ClassShadowing.ide.kt | 1 + j2k/tests/testData/ast/class/ClassShadowing.kt | 1 + j2k/tests/testData/ast/class/kt-639.ide.kt | 1 + j2k/tests/testData/ast/class/kt-639.kt | 1 + .../ast/constructors/allCallsPrimary.ide.kt | 1 + .../ast/constructors/allCallsPrimary.kt | 1 + .../ast/constructors/allCallsPrimary2.ide.kt | 1 + .../ast/constructors/allCallsPrimary2.kt | 1 + .../ast/constructors/customerBuilder.ide.kt | 2 ++ .../ast/constructors/customerBuilder.kt | 2 ++ .../ast/constructors/genericIdentifier.ide.kt | 1 + .../ast/constructors/genericIdentifier.kt | 1 + .../ast/constructors/identifier.ide.kt | 1 + .../testData/ast/constructors/identifier.kt | 1 + .../constructors/withManyDefaultParams.ide.kt | 1 + .../ast/constructors/withManyDefaultParams.kt | 1 + .../ast/field/classChildExtendsBase.ide.kt | 1 + .../ast/field/classChildExtendsBase.kt | 1 + .../testData/ast/field/privateField.ide.kt | 2 +- j2k/tests/testData/ast/field/privateField.kt | 2 +- .../extendsBaseWhichExtendsObject.ide.kt | 1 + .../function/extendsBaseWhichExtendsObject.kt | 1 + .../ast/function/overrideAndOpen.ide.kt | 2 ++ .../testData/ast/function/overrideAndOpen.kt | 2 ++ .../ast/identifier/finalFieldReference.ide.kt | 2 ++ .../ast/identifier/finalFieldReference.kt | 2 ++ .../ast/importStatement/importWithKeywords.jav | 2 +- .../classOneExtendsBaseGeneric.ide.kt | 1 + .../inheritance/classOneExtendsBaseGeneric.kt | 1 + .../classOneExtendsBaseWithOneParam.ide.kt | 1 + .../classOneExtendsBaseWithOneParam.kt | 1 + .../classOneExtendsBaseWithZeroParams.ide.kt | 1 + .../classOneExtendsBaseWithZeroParams.kt | 1 + ...aseWithZeroParamsNonEmptyConstructor.ide.kt | 1 + ...ndsBaseWithZeroParamsNonEmptyConstructor.kt | 1 + j2k/tests/testData/ast/issues/arrayLength.jav | 2 +- j2k/tests/testData/ast/issues/comments.ide.kt | 9 ++++++++- j2k/tests/testData/ast/issues/comments.jav | 4 ++++ j2k/tests/testData/ast/issues/comments.kt | 9 ++++++++- j2k/tests/testData/ast/issues/kt-1048.ide.kt | 1 + j2k/tests/testData/ast/issues/kt-1048.kt | 1 + j2k/tests/testData/ast/issues/kt-638.ide.kt | 1 + j2k/tests/testData/ast/issues/kt-638.kt | 1 + j2k/tests/testData/ast/issues/kt-696.ide.kt | 1 + j2k/tests/testData/ast/issues/kt-696.jav | 2 +- j2k/tests/testData/ast/issues/kt-696.kt | 1 + .../testData/ast/issues/kt-809-string.ide.kt | 3 +++ j2k/tests/testData/ast/issues/kt-809-string.kt | 3 +++ j2k/tests/testData/ast/issues/kt-809.ide.kt | 3 +++ j2k/tests/testData/ast/issues/kt-809.kt | 3 +++ .../testData/ast/issues/kt-820-field.ide.kt | 2 ++ j2k/tests/testData/ast/issues/kt-820-field.kt | 2 ++ j2k/tests/testData/ast/issues/kt-820.ide.kt | 2 ++ j2k/tests/testData/ast/issues/kt-820.kt | 2 ++ j2k/tests/testData/ast/issues/kt-824.ide.kt | 2 ++ j2k/tests/testData/ast/issues/kt-824.kt | 2 ++ j2k/tests/testData/ast/issues/kt-836.ide.kt | 5 ++++- j2k/tests/testData/ast/issues/kt-836.kt | 5 ++++- .../testData/ast/issues/qualifyStatic.ide.kt | 2 +- j2k/tests/testData/ast/issues/qualifyStatic.kt | 2 +- .../testData/ast/kotlinExclusion/kt-656.ide.kt | 1 + .../testData/ast/kotlinExclusion/kt-656.kt | 1 + .../methodCallExpression/genericMethod.ide.kt | 1 + .../ast/methodCallExpression/genericMethod.kt | 1 + .../newClassByFullName.ide.kt | 1 + .../newClassExpression/newClassByFullName.kt | 1 + .../newClassExpression/newInnerClass.ide.kt | 1 + .../ast/newClassExpression/newInnerClass.kt | 1 + .../newListAndNewMember.ide.kt | 1 + .../newClassExpression/newListAndNewMember.kt | 1 + .../newStaticInnerClass.ide.kt | 1 + .../newClassExpression/newStaticInnerClass.kt | 1 + .../testData/ast/objectLiteral/MyFrame.ide.kt | 1 + .../testData/ast/objectLiteral/MyFrame.kt | 1 + .../testData/ast/rawGenerics/kt-540-map.jav | 2 +- .../rawGenerics/kt-540-rawGenericClass.ide.kt | 1 + .../ast/rawGenerics/kt-540-rawGenericClass.kt | 1 + .../ast/rawGenerics/rawGenericMethod.ide.kt | 1 + .../ast/rawGenerics/rawGenericMethod.kt | 1 + .../superExpression/classAdotSuperFoo.ide.kt | 1 + .../ast/superExpression/classAdotSuperFoo.kt | 1 + .../ast/superExpression/classAextendsB.ide.kt | 1 + .../ast/superExpression/classAextendsB.kt | 1 + .../ast/thisExpression/classAdotThisFoo.ide.kt | 1 + .../ast/thisExpression/classAdotThisFoo.kt | 1 + 101 files changed, 162 insertions(+), 34 deletions(-) diff --git a/j2k/src/org/jetbrains/jet/j2k/Converter.kt b/j2k/src/org/jetbrains/jet/j2k/Converter.kt index fb26febc97d..94703784c0b 100644 --- a/j2k/src/org/jetbrains/jet/j2k/Converter.kt +++ b/j2k/src/org/jetbrains/jet/j2k/Converter.kt @@ -58,7 +58,7 @@ public class Converter(val project: Project, val settings: ConverterSettings) { return kElement?.toKotlin() ?: "" } - public fun convertTopElement(element: PsiElement?): Node? = when(element) { + public fun convertTopElement(element: PsiElement?): Element? = when(element) { is PsiJavaFile -> convertFile(element) is PsiClass -> convertClass(element) is PsiMethod -> convertMethod(element) @@ -68,18 +68,14 @@ public class Converter(val project: Project, val settings: ConverterSettings) { is PsiComment -> Comment(element.getText()!!) is PsiImportList -> convertImportList(element) is PsiImportStatementBase -> convertImport(element) + is PsiPackageStatement -> PackageStatement(quoteKeywords(element.getPackageName() ?: "")) + is PsiWhiteSpace -> WhiteSpace(element.getText()!!) else -> null } public fun convertFile(javaFile: PsiJavaFile): File { - val body = ArrayList() - for (element in javaFile.getChildren()) { - val node = convertTopElement(element) - if (node != null) { - body.add(node) - } - } - return File(quoteKeywords(javaFile.getPackageName()), body, createMainFunction(javaFile)) + val fileMembers = FileMemberList(javaFile.getChildren() .map { convertTopElement(it) } .filterNotNull()) + return File(fileMembers, createMainFunction(javaFile)) } public fun convertAnonymousClass(anonymousClass: PsiAnonymousClass): AnonymousClass { diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/File.kt b/j2k/src/org/jetbrains/jet/j2k/ast/File.kt index 7da7fb662e5..a49d97c1eea 100644 --- a/j2k/src/org/jetbrains/jet/j2k/ast/File.kt +++ b/j2k/src/org/jetbrains/jet/j2k/ast/File.kt @@ -16,16 +16,16 @@ package org.jetbrains.jet.j2k.ast -public class File(val packageName: String, - val body: List, - val mainFunction: String) : Node { +class FileMemberList(elements: List): WhiteSpaceSeparatedElementList(elements, WhiteSpace.NewLine, false) + +class PackageStatement(val packageName: String): Element { + override fun toKotlin(): String = "package " + packageName +} + +public class File(val body: FileMemberList, + val mainFunction: String) : Element { override fun toKotlin(): String { - val common = body.filterNot { it is Element && it.isEmpty() }.toKotlin("\n") + mainFunction - if (packageName.isEmpty()) { - return common - } - - return "package " + packageName + "\n" + common + return body.toKotlin() + mainFunction } } diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/Imports.kt b/j2k/src/org/jetbrains/jet/j2k/ast/Imports.kt index c054e93b540..a5716190d9a 100644 --- a/j2k/src/org/jetbrains/jet/j2k/ast/Imports.kt +++ b/j2k/src/org/jetbrains/jet/j2k/ast/Imports.kt @@ -24,7 +24,7 @@ import org.jetbrains.jet.util.QualifiedNamesUtil import org.jetbrains.jet.lang.resolve.java.mapping.JavaToKotlinClassMap -public class Import(val name: String) : Node { +public class Import(val name: String) : Element { public override fun toKotlin() = "import " + name } diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/Util.kt b/j2k/src/org/jetbrains/jet/j2k/ast/Util.kt index dba3f3817a9..bfe09e4dc04 100644 --- a/j2k/src/org/jetbrains/jet/j2k/ast/Util.kt +++ b/j2k/src/org/jetbrains/jet/j2k/ast/Util.kt @@ -48,7 +48,8 @@ public fun Expression.withPrefix(prefix: String): String = if (isEmpty()) "" els open class WhiteSpaceSeparatedElementList( val elements: List, - val minimalWhiteSpace: WhiteSpace + val minimalWhiteSpace: WhiteSpace, + val ensureSurroundedByWhiteSpace: Boolean = true ) { val nonEmptyElements = elements.filterNot { it.isEmpty() } @@ -62,6 +63,9 @@ open class WhiteSpaceSeparatedElementList( } private fun List.surroundWithWhiteSpaces(): List { + if (!ensureSurroundedByWhiteSpace) { + return this + } val result = ArrayList() result.add(minimalWhiteSpace) result.addAll(this) diff --git a/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.ide.kt b/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.ide.kt index 133f1efe193..cdefa482919 100644 --- a/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.ide.kt +++ b/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.ide.kt @@ -4,10 +4,12 @@ class Foo() { fun execute() { } } + class Bar() { var fooNotNull: Foo = Foo() var fooNullable: Foo = null } + class Test() { public fun test(barNotNull: Bar, barNullable: Bar) { barNotNull.fooNotNull.execute() diff --git a/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.jav b/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.jav index 1f12378054a..d9f5e3196bf 100644 --- a/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.jav +++ b/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.jav @@ -20,4 +20,4 @@ class Test { barNullable.fooNotNull.execute(); barNullable.fooNullable.execute(); } -} +} \ No newline at end of file diff --git a/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.kt b/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.kt index 94b554573f8..601a4c7f4d4 100644 --- a/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.kt +++ b/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.kt @@ -4,10 +4,12 @@ open class Foo() { open fun execute() { } } + open class Bar() { var fooNotNull: Foo = Foo() var fooNullable: Foo? = null } + open class Test() { public open fun test(barNotNull: Bar, barNullable: Bar?) { barNotNull.fooNotNull.execute() diff --git a/j2k/tests/testData/ast/assignmentExpression/nullability.jav b/j2k/tests/testData/ast/assignmentExpression/nullability.jav index 3de96bd8228..53d58640137 100644 --- a/j2k/tests/testData/ast/assignmentExpression/nullability.jav +++ b/j2k/tests/testData/ast/assignmentExpression/nullability.jav @@ -7,4 +7,4 @@ class Foo { int foo = 0; foo = o2.size(); } -} +} \ No newline at end of file diff --git a/j2k/tests/testData/ast/callChainExpression/libraryFieldCall.ide.kt b/j2k/tests/testData/ast/callChainExpression/libraryFieldCall.ide.kt index 7337542b05a..3f517922d0c 100644 --- a/j2k/tests/testData/ast/callChainExpression/libraryFieldCall.ide.kt +++ b/j2k/tests/testData/ast/callChainExpression/libraryFieldCall.ide.kt @@ -3,6 +3,7 @@ class Library() { val ourOut: java.io.PrintStream = 0 } } + class User() { fun main() { Library.ourOut.print() diff --git a/j2k/tests/testData/ast/callChainExpression/libraryFieldCall.kt b/j2k/tests/testData/ast/callChainExpression/libraryFieldCall.kt index 9fe389aac2d..1090546e2af 100644 --- a/j2k/tests/testData/ast/callChainExpression/libraryFieldCall.kt +++ b/j2k/tests/testData/ast/callChainExpression/libraryFieldCall.kt @@ -3,6 +3,7 @@ open class Library() { val ourOut: java.io.PrintStream? = null } } + open class User() { open fun main() { Library.ourOut?.print() diff --git a/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.ide.kt b/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.ide.kt index b81169c7655..e4407881c7d 100644 --- a/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.ide.kt +++ b/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.ide.kt @@ -8,6 +8,7 @@ class Library() { } } } + class User() { fun main() { Library.call() diff --git a/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.kt b/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.kt index e45cfcdd5a2..806a1b12b77 100644 --- a/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.kt +++ b/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.kt @@ -8,6 +8,7 @@ open class Library() { } } } + open class User() { open fun main() { Library.call() diff --git a/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.ide.kt b/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.ide.kt index b05fb65e85e..8d52a4e5c27 100644 --- a/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.ide.kt +++ b/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.ide.kt @@ -6,6 +6,7 @@ class Library() { return "" } } + class User() { fun main() { val lib = Library() diff --git a/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.kt b/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.kt index a174ca78c09..07c65e393bb 100644 --- a/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.kt +++ b/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.kt @@ -6,6 +6,7 @@ open class Library() { return "" } } + open class User() { open fun main() { var lib: Library? = Library() diff --git a/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.ide.kt b/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.ide.kt index 779ef502792..59ec0eff040 100644 --- a/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.ide.kt +++ b/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.ide.kt @@ -1,6 +1,7 @@ class Library() { public val myString: String = 0 } + class User() { fun main() { Library.myString.isEmpty() diff --git a/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.kt b/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.kt index d706a513df6..11116328203 100644 --- a/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.kt +++ b/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.kt @@ -1,6 +1,7 @@ open class Library() { public val myString: String? = null } + open class User() { open fun main() { Library.myString?.isEmpty() diff --git a/j2k/tests/testData/ast/class/ClassShadowing.ide.kt b/j2k/tests/testData/ast/class/ClassShadowing.ide.kt index c8b213e44ae..947af1776a0 100644 --- a/j2k/tests/testData/ast/class/ClassShadowing.ide.kt +++ b/j2k/tests/testData/ast/class/ClassShadowing.ide.kt @@ -7,6 +7,7 @@ public class Short() { } } } + class Test() { class object { public fun test() { diff --git a/j2k/tests/testData/ast/class/ClassShadowing.kt b/j2k/tests/testData/ast/class/ClassShadowing.kt index 29908bb66cf..9b6e159efef 100644 --- a/j2k/tests/testData/ast/class/ClassShadowing.kt +++ b/j2k/tests/testData/ast/class/ClassShadowing.kt @@ -7,6 +7,7 @@ public open class Short() { } } } + open class Test() { class object { public open fun test() { diff --git a/j2k/tests/testData/ast/class/kt-639.ide.kt b/j2k/tests/testData/ast/class/kt-639.ide.kt index 58ef2afdc1b..59b051dc42b 100644 --- a/j2k/tests/testData/ast/class/kt-639.ide.kt +++ b/j2k/tests/testData/ast/class/kt-639.ide.kt @@ -14,6 +14,7 @@ class Test() { } } } + class User() { fun main() { val m = HashMap(1) diff --git a/j2k/tests/testData/ast/class/kt-639.kt b/j2k/tests/testData/ast/class/kt-639.kt index c91d2b16289..0d8b30302a5 100644 --- a/j2k/tests/testData/ast/class/kt-639.kt +++ b/j2k/tests/testData/ast/class/kt-639.kt @@ -14,6 +14,7 @@ open class Test() { } } } + open class User() { open fun main() { var m: HashMap? = HashMap(1) diff --git a/j2k/tests/testData/ast/constructors/allCallsPrimary.ide.kt b/j2k/tests/testData/ast/constructors/allCallsPrimary.ide.kt index fcf083a9e77..59223e27a74 100644 --- a/j2k/tests/testData/ast/constructors/allCallsPrimary.ide.kt +++ b/j2k/tests/testData/ast/constructors/allCallsPrimary.ide.kt @@ -12,6 +12,7 @@ class C(arg1: Int, arg2: Int, arg3: Int) { } } } + public class User() { class object { public fun main() { diff --git a/j2k/tests/testData/ast/constructors/allCallsPrimary.kt b/j2k/tests/testData/ast/constructors/allCallsPrimary.kt index 2fea1e3464b..5deb3efcd4e 100644 --- a/j2k/tests/testData/ast/constructors/allCallsPrimary.kt +++ b/j2k/tests/testData/ast/constructors/allCallsPrimary.kt @@ -12,6 +12,7 @@ open class C(arg1: Int, arg2: Int, arg3: Int) { } } } + public open class User() { class object { public open fun main() { diff --git a/j2k/tests/testData/ast/constructors/allCallsPrimary2.ide.kt b/j2k/tests/testData/ast/constructors/allCallsPrimary2.ide.kt index 25ff360f172..1b1bef0f85c 100644 --- a/j2k/tests/testData/ast/constructors/allCallsPrimary2.ide.kt +++ b/j2k/tests/testData/ast/constructors/allCallsPrimary2.ide.kt @@ -26,6 +26,7 @@ class C(arg1: Int) { } } } + public class User() { class object { public fun main() { diff --git a/j2k/tests/testData/ast/constructors/allCallsPrimary2.kt b/j2k/tests/testData/ast/constructors/allCallsPrimary2.kt index cdb8c9e71df..d48ebd06330 100644 --- a/j2k/tests/testData/ast/constructors/allCallsPrimary2.kt +++ b/j2k/tests/testData/ast/constructors/allCallsPrimary2.kt @@ -26,6 +26,7 @@ open class C(arg1: Int) { } } } + public open class User() { class object { public open fun main() { diff --git a/j2k/tests/testData/ast/constructors/customerBuilder.ide.kt b/j2k/tests/testData/ast/constructors/customerBuilder.ide.kt index 0da3fc218bb..204713f7bba 100644 --- a/j2k/tests/testData/ast/constructors/customerBuilder.ide.kt +++ b/j2k/tests/testData/ast/constructors/customerBuilder.ide.kt @@ -24,6 +24,7 @@ class Customer(first: String, last: String) { doSmthAfter() } } + class CustomerBuilder() { public var _firstName: String = "Homer" public var _lastName: String = "Simpson" @@ -42,6 +43,7 @@ class CustomerBuilder() { return Customer(_firstName, _lastName) } } + public class User() { class object { public fun main() { diff --git a/j2k/tests/testData/ast/constructors/customerBuilder.kt b/j2k/tests/testData/ast/constructors/customerBuilder.kt index e44b7f5e001..7c8fc460a0a 100644 --- a/j2k/tests/testData/ast/constructors/customerBuilder.kt +++ b/j2k/tests/testData/ast/constructors/customerBuilder.kt @@ -24,6 +24,7 @@ open class Customer(first: String?, last: String?) { doSmthAfter() } } + open class CustomerBuilder() { public var _firstName: String? = "Homer" public var _lastName: String? = "Simpson" @@ -42,6 +43,7 @@ open class CustomerBuilder() { return Customer(_firstName, _lastName) } } + public open class User() { class object { public open fun main() { diff --git a/j2k/tests/testData/ast/constructors/genericIdentifier.ide.kt b/j2k/tests/testData/ast/constructors/genericIdentifier.ide.kt index a1702366bda..245768fc8fa 100644 --- a/j2k/tests/testData/ast/constructors/genericIdentifier.ide.kt +++ b/j2k/tests/testData/ast/constructors/genericIdentifier.ide.kt @@ -32,6 +32,7 @@ public class Identifier(_myName: T, _myHasDollar: Boolean) { } } } + public class User() { class object { public fun main() { diff --git a/j2k/tests/testData/ast/constructors/genericIdentifier.kt b/j2k/tests/testData/ast/constructors/genericIdentifier.kt index 4947a90dec4..aa178ffd8e3 100644 --- a/j2k/tests/testData/ast/constructors/genericIdentifier.kt +++ b/j2k/tests/testData/ast/constructors/genericIdentifier.kt @@ -32,6 +32,7 @@ public open class Identifier(_myName: T?, _myHasDollar: Boolean) { } } } + public open class User() { class object { public open fun main() { diff --git a/j2k/tests/testData/ast/constructors/identifier.ide.kt b/j2k/tests/testData/ast/constructors/identifier.ide.kt index 8cb0c31237d..acb4921e3a0 100644 --- a/j2k/tests/testData/ast/constructors/identifier.ide.kt +++ b/j2k/tests/testData/ast/constructors/identifier.ide.kt @@ -32,6 +32,7 @@ public class Identifier(_myName: String, _myHasDollar: Boolean) { } } } + public class User() { class object { public fun main() { diff --git a/j2k/tests/testData/ast/constructors/identifier.kt b/j2k/tests/testData/ast/constructors/identifier.kt index 7d92c5c4f0c..f7867fa0dac 100644 --- a/j2k/tests/testData/ast/constructors/identifier.kt +++ b/j2k/tests/testData/ast/constructors/identifier.kt @@ -32,6 +32,7 @@ public open class Identifier(_myName: String?, _myHasDollar: Boolean) { } } } + public open class User() { class object { public open fun main() { diff --git a/j2k/tests/testData/ast/constructors/withManyDefaultParams.ide.kt b/j2k/tests/testData/ast/constructors/withManyDefaultParams.ide.kt index 02e5c0b6574..753f35d0367 100644 --- a/j2k/tests/testData/ast/constructors/withManyDefaultParams.ide.kt +++ b/j2k/tests/testData/ast/constructors/withManyDefaultParams.ide.kt @@ -37,6 +37,7 @@ public class Test(_myName: String, _a: Boolean, _b: Double, _c: Float, _d: Long, } } } + public class User() { class object { public fun main() { diff --git a/j2k/tests/testData/ast/constructors/withManyDefaultParams.kt b/j2k/tests/testData/ast/constructors/withManyDefaultParams.kt index 39fad35fc99..769593f33fc 100644 --- a/j2k/tests/testData/ast/constructors/withManyDefaultParams.kt +++ b/j2k/tests/testData/ast/constructors/withManyDefaultParams.kt @@ -37,6 +37,7 @@ public open class Test(_myName: String?, _a: Boolean, _b: Double, _c: Float, _d: } } } + public open class User() { class object { public open fun main() { diff --git a/j2k/tests/testData/ast/field/classChildExtendsBase.ide.kt b/j2k/tests/testData/ast/field/classChildExtendsBase.ide.kt index 861c200ada5..13bc6b8db49 100644 --- a/j2k/tests/testData/ast/field/classChildExtendsBase.ide.kt +++ b/j2k/tests/testData/ast/field/classChildExtendsBase.ide.kt @@ -1,6 +1,7 @@ class Base() { private var myFirst: String = 0 } + class Child() : Base() { private var mySecond: String = 0 } \ No newline at end of file diff --git a/j2k/tests/testData/ast/field/classChildExtendsBase.kt b/j2k/tests/testData/ast/field/classChildExtendsBase.kt index 6c082ad22b7..86fab901b1b 100644 --- a/j2k/tests/testData/ast/field/classChildExtendsBase.kt +++ b/j2k/tests/testData/ast/field/classChildExtendsBase.kt @@ -1,6 +1,7 @@ open class Base() { private var myFirst: String? = null } + open class Child() : Base() { private var mySecond: String? = null } \ No newline at end of file diff --git a/j2k/tests/testData/ast/field/privateField.ide.kt b/j2k/tests/testData/ast/field/privateField.ide.kt index f321996b3fe..35667ea9ae5 100644 --- a/j2k/tests/testData/ast/field/privateField.ide.kt +++ b/j2k/tests/testData/ast/field/privateField.ide.kt @@ -1,3 +1,3 @@ class C() { private var f: Foo = 0 -} \ No newline at end of file +} diff --git a/j2k/tests/testData/ast/field/privateField.kt b/j2k/tests/testData/ast/field/privateField.kt index e6b40a96bad..dfd3a293f6b 100644 --- a/j2k/tests/testData/ast/field/privateField.kt +++ b/j2k/tests/testData/ast/field/privateField.kt @@ -1,3 +1,3 @@ open class C() { private var f: Foo? = null -} \ No newline at end of file +} diff --git a/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.ide.kt b/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.ide.kt index f107c6e7200..5fdb3b33eea 100644 --- a/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.ide.kt +++ b/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.ide.kt @@ -21,6 +21,7 @@ class Test() : Base() { super.finalize() } } + class Base() { public fun hashCode(): Int { return System.identityHashCode(this) diff --git a/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.kt b/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.kt index 87f2ac5e24d..200dbdc0d74 100644 --- a/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.kt +++ b/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.kt @@ -21,6 +21,7 @@ open class Test() : Base() { super.finalize() } } + open class Base() { public open fun hashCode(): Int { return System.identityHashCode(this) diff --git a/j2k/tests/testData/ast/function/overrideAndOpen.ide.kt b/j2k/tests/testData/ast/function/overrideAndOpen.ide.kt index d24ce93ae65..6827fe9f063 100644 --- a/j2k/tests/testData/ast/function/overrideAndOpen.ide.kt +++ b/j2k/tests/testData/ast/function/overrideAndOpen.ide.kt @@ -2,10 +2,12 @@ class A() { fun foo() { } } + class B() : A() { override fun foo() { } } + class C() : B() { override fun foo() { } diff --git a/j2k/tests/testData/ast/function/overrideAndOpen.kt b/j2k/tests/testData/ast/function/overrideAndOpen.kt index cc552fe8379..2d48968249a 100644 --- a/j2k/tests/testData/ast/function/overrideAndOpen.kt +++ b/j2k/tests/testData/ast/function/overrideAndOpen.kt @@ -2,10 +2,12 @@ open class A() { open fun foo() { } } + open class B() : A() { override fun foo() { } } + open class C() : B() { override fun foo() { } diff --git a/j2k/tests/testData/ast/identifier/finalFieldReference.ide.kt b/j2k/tests/testData/ast/identifier/finalFieldReference.ide.kt index c126ffbde45..eac4f2d944c 100644 --- a/j2k/tests/testData/ast/identifier/finalFieldReference.ide.kt +++ b/j2k/tests/testData/ast/identifier/finalFieldReference.ide.kt @@ -1,7 +1,9 @@ class `$$$$$`() { } + class `$`() { } + class `$$`(`$$$$`: `$$$$$`) : `$`() { val `$$$`: `$$$$$` diff --git a/j2k/tests/testData/ast/identifier/finalFieldReference.kt b/j2k/tests/testData/ast/identifier/finalFieldReference.kt index 32ccdc95222..981547da7c2 100644 --- a/j2k/tests/testData/ast/identifier/finalFieldReference.kt +++ b/j2k/tests/testData/ast/identifier/finalFieldReference.kt @@ -1,7 +1,9 @@ open class `$$$$$`() { } + open class `$`() { } + open class `$$`(`$$$$`: `$$$$$`?) : `$`() { val `$$$`: `$$$$$`? diff --git a/j2k/tests/testData/ast/importStatement/importWithKeywords.jav b/j2k/tests/testData/ast/importStatement/importWithKeywords.jav index e65da94d928..10f4a3ae578 100644 --- a/j2k/tests/testData/ast/importStatement/importWithKeywords.jav +++ b/j2k/tests/testData/ast/importStatement/importWithKeywords.jav @@ -3,4 +3,4 @@ package test; import as.type.val.var.fun.is.in.object.when.trait.This; -class Test {} +class Test {} \ No newline at end of file diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.ide.kt b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.ide.kt index c59a2861c90..c816a4b07f1 100644 --- a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.ide.kt +++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.ide.kt @@ -1,5 +1,6 @@ class Base(name: T) { } + class One(name: T, second: K) : Base(name) { private var mySecond: K = 0 diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.kt b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.kt index d1a79a88fc9..3b3bffeb37d 100644 --- a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.kt +++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.kt @@ -1,5 +1,6 @@ open class Base(name: T?) { } + open class One(name: T?, second: K?) : Base(name) { private var mySecond: K? = null diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.ide.kt b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.ide.kt index a7ed390e22c..0ec4afc7103 100644 --- a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.ide.kt +++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.ide.kt @@ -1,4 +1,5 @@ class Base(name: String) { } + class One(name: String, second: String) : Base(name) { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.kt b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.kt index aedde863e0e..7265fbc4c48 100644 --- a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.kt +++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.kt @@ -1,4 +1,5 @@ open class Base(name: String?) { } + open class One(name: String?, second: String?) : Base(name) { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.ide.kt b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.ide.kt index ce93d19cfe5..d1f5b5a64da 100644 --- a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.ide.kt +++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.ide.kt @@ -1,4 +1,5 @@ class Base() { } + class One() : Base() { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.kt b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.kt index 94f907016db..7265e0be4da 100644 --- a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.kt +++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.kt @@ -1,4 +1,5 @@ open class Base() { } + open class One() : Base() { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.ide.kt b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.ide.kt index 052aa7006ed..e619b963c41 100644 --- a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.ide.kt +++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.ide.kt @@ -1,5 +1,6 @@ class Base(name: String) { } + class One(name: String, second: String) : Base(name) { private var mySecond: String = 0 diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt index 89bbbb3fa6c..2c6d388b3c6 100644 --- a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt +++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt @@ -1,5 +1,6 @@ open class Base(name: String?) { } + open class One(name: String?, second: String?) : Base(name) { private var mySecond: String? = null diff --git a/j2k/tests/testData/ast/issues/arrayLength.jav b/j2k/tests/testData/ast/issues/arrayLength.jav index a08f83805fe..ad6dbc70973 100644 --- a/j2k/tests/testData/ast/issues/arrayLength.jav +++ b/j2k/tests/testData/ast/issues/arrayLength.jav @@ -3,4 +3,4 @@ class Test { public static int foo(String[] args) { return args.length; } -} +} \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/comments.ide.kt b/j2k/tests/testData/ast/issues/comments.ide.kt index 4e6b25e7e7f..503bb1b50e6 100644 --- a/j2k/tests/testData/ast/issues/comments.ide.kt +++ b/j2k/tests/testData/ast/issues/comments.ide.kt @@ -1,7 +1,14 @@ // This is an end-of-line comment + /* This is a block comment */ + + +/*doc comment of class*/ +//one line comment of class +//another one +/*another doc*/ class C() { // This is a class comment @@ -56,4 +63,4 @@ class C() { /*two*/ /*comments*//*line*/ var z: Int = 0 -} \ No newline at end of file +} diff --git a/j2k/tests/testData/ast/issues/comments.jav b/j2k/tests/testData/ast/issues/comments.jav index 1ba21924138..147e7ed195e 100644 --- a/j2k/tests/testData/ast/issues/comments.jav +++ b/j2k/tests/testData/ast/issues/comments.jav @@ -6,6 +6,10 @@ This is a block comment */ +/*doc comment of class*/ +//one line comment of class +//another one +/*another doc*/ class C { // This is a class comment diff --git a/j2k/tests/testData/ast/issues/comments.kt b/j2k/tests/testData/ast/issues/comments.kt index 4e7a846602e..c2a12e8e943 100644 --- a/j2k/tests/testData/ast/issues/comments.kt +++ b/j2k/tests/testData/ast/issues/comments.kt @@ -1,7 +1,14 @@ // This is an end-of-line comment + /* This is a block comment */ + + +/*doc comment of class*/ +//one line comment of class +//another one +/*another doc*/ open class C() { // This is a class comment @@ -56,4 +63,4 @@ open class C() { /*two*/ /*comments*//*line*/ var z: Int = 0 -} \ No newline at end of file +} diff --git a/j2k/tests/testData/ast/issues/kt-1048.ide.kt b/j2k/tests/testData/ast/issues/kt-1048.ide.kt index 3963a9169a3..ad199e56856 100644 --- a/j2k/tests/testData/ast/issues/kt-1048.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-1048.ide.kt @@ -2,6 +2,7 @@ import java.util.HashMap class G(t: T) { } + public class Java() { fun test() { val m = HashMap() diff --git a/j2k/tests/testData/ast/issues/kt-1048.kt b/j2k/tests/testData/ast/issues/kt-1048.kt index 91ae0c06003..ed2caa4722d 100644 --- a/j2k/tests/testData/ast/issues/kt-1048.kt +++ b/j2k/tests/testData/ast/issues/kt-1048.kt @@ -2,6 +2,7 @@ import java.util.HashMap open class G(t: T?) { } + public open class Java() { open fun test() { var m: HashMap? = HashMap() diff --git a/j2k/tests/testData/ast/issues/kt-638.ide.kt b/j2k/tests/testData/ast/issues/kt-638.ide.kt index 45ffdcbf65e..99183a98379 100644 --- a/j2k/tests/testData/ast/issues/kt-638.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-638.ide.kt @@ -32,6 +32,7 @@ public class Identifier(_myName: T, _myHasDollar: Boolean) { } } } + public class User() { class object { public fun main(args: Array) { diff --git a/j2k/tests/testData/ast/issues/kt-638.kt b/j2k/tests/testData/ast/issues/kt-638.kt index ddcc0017819..2497bf8f81d 100644 --- a/j2k/tests/testData/ast/issues/kt-638.kt +++ b/j2k/tests/testData/ast/issues/kt-638.kt @@ -32,6 +32,7 @@ public open class Identifier(_myName: T?, _myHasDollar: Boolean) { } } } + public open class User() { class object { public open fun main(args: Array?) { diff --git a/j2k/tests/testData/ast/issues/kt-696.ide.kt b/j2k/tests/testData/ast/issues/kt-696.ide.kt index 03e9185181c..e1b0319f277 100644 --- a/j2k/tests/testData/ast/issues/kt-696.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-696.ide.kt @@ -13,6 +13,7 @@ class Base() { return getJavaClass.getName() + '@' + Integer.toHexString(hashCode()) } } + class Child() : Base() { override fun hashCode(): Int { return super.hashCode() diff --git a/j2k/tests/testData/ast/issues/kt-696.jav b/j2k/tests/testData/ast/issues/kt-696.jav index bf9610f0a7f..f10af61c13f 100644 --- a/j2k/tests/testData/ast/issues/kt-696.jav +++ b/j2k/tests/testData/ast/issues/kt-696.jav @@ -33,4 +33,4 @@ class Child extends Base { public String toString() { return super.toString(); } -} +} \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-696.kt b/j2k/tests/testData/ast/issues/kt-696.kt index e69949e2a1c..4fcf09c4ca1 100644 --- a/j2k/tests/testData/ast/issues/kt-696.kt +++ b/j2k/tests/testData/ast/issues/kt-696.kt @@ -13,6 +13,7 @@ open class Base() { return getJavaClass.getName() + '@' + Integer.toHexString(hashCode()) } } + open class Child() : Base() { override fun hashCode(): Int { return super.hashCode() diff --git a/j2k/tests/testData/ast/issues/kt-809-string.ide.kt b/j2k/tests/testData/ast/issues/kt-809-string.ide.kt index ea61fae6a2b..adb62983557 100644 --- a/j2k/tests/testData/ast/issues/kt-809-string.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-809-string.ide.kt @@ -3,13 +3,16 @@ package demo class Container() { var myString: String = "1" } + class One() { class object { var myContainer: Container = Container() } } + class StringContainer(s: String) { } + class Test() { fun putString(s: String) { } diff --git a/j2k/tests/testData/ast/issues/kt-809-string.kt b/j2k/tests/testData/ast/issues/kt-809-string.kt index fa038c8da75..8940c23fb19 100644 --- a/j2k/tests/testData/ast/issues/kt-809-string.kt +++ b/j2k/tests/testData/ast/issues/kt-809-string.kt @@ -3,13 +3,16 @@ package demo open class Container() { var myString: String? = "1" } + open class One() { class object { var myContainer: Container? = Container() } } + open class StringContainer(s: String?) { } + open class Test() { open fun putString(s: String?) { } diff --git a/j2k/tests/testData/ast/issues/kt-809.ide.kt b/j2k/tests/testData/ast/issues/kt-809.ide.kt index 9705cb9ef2d..663b3f3e6f2 100644 --- a/j2k/tests/testData/ast/issues/kt-809.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-809.ide.kt @@ -3,13 +3,16 @@ package demo class Container() { var myInt: Int = 1 } + class One() { class object { var myContainer: Container = Container() } } + class IntContainer(i: Int) { } + class Test() { fun putInt(i: Int) { } diff --git a/j2k/tests/testData/ast/issues/kt-809.kt b/j2k/tests/testData/ast/issues/kt-809.kt index dab58dadf3a..a973e8a2ae8 100644 --- a/j2k/tests/testData/ast/issues/kt-809.kt +++ b/j2k/tests/testData/ast/issues/kt-809.kt @@ -3,13 +3,16 @@ package demo open class Container() { var myInt: Int = 1 } + open class One() { class object { var myContainer: Container? = Container() } } + open class IntContainer(i: Int) { } + open class Test() { open fun putInt(i: Int) { } diff --git a/j2k/tests/testData/ast/issues/kt-820-field.ide.kt b/j2k/tests/testData/ast/issues/kt-820-field.ide.kt index 21fd4b307ac..83bc0ee2951 100644 --- a/j2k/tests/testData/ast/issues/kt-820-field.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-820-field.ide.kt @@ -3,11 +3,13 @@ package demo class Container() { var myInt: Int = 1 } + class One() { class object { var myContainer: Container = Container() } } + class Test() { var b: Byte = One.myContainer.myInt.toByte() } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-820-field.kt b/j2k/tests/testData/ast/issues/kt-820-field.kt index dab2a693849..1c333aac4c1 100644 --- a/j2k/tests/testData/ast/issues/kt-820-field.kt +++ b/j2k/tests/testData/ast/issues/kt-820-field.kt @@ -3,11 +3,13 @@ package demo open class Container() { var myInt: Int = 1 } + open class One() { class object { var myContainer: Container? = Container() } } + open class Test() { var b: Byte = One.myContainer?.myInt!!.toByte() } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-820.ide.kt b/j2k/tests/testData/ast/issues/kt-820.ide.kt index f480216c8c8..e654ea3b795 100644 --- a/j2k/tests/testData/ast/issues/kt-820.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-820.ide.kt @@ -3,11 +3,13 @@ package demo class Container() { var myInt: Int = 1 } + class One() { class object { var myContainer: Container = Container() } } + class Test() { fun test() { val b = One.myContainer.myInt.toByte() diff --git a/j2k/tests/testData/ast/issues/kt-820.kt b/j2k/tests/testData/ast/issues/kt-820.kt index 0fd08b78df5..22b4c0166f6 100644 --- a/j2k/tests/testData/ast/issues/kt-820.kt +++ b/j2k/tests/testData/ast/issues/kt-820.kt @@ -3,11 +3,13 @@ package demo open class Container() { var myInt: Int = 1 } + open class One() { class object { var myContainer: Container? = Container() } } + open class Test() { open fun test() { var b: Byte = One.myContainer?.myInt!!.toByte() diff --git a/j2k/tests/testData/ast/issues/kt-824.ide.kt b/j2k/tests/testData/ast/issues/kt-824.ide.kt index 700f07a4c60..6c87ff10a6a 100644 --- a/j2k/tests/testData/ast/issues/kt-824.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-824.ide.kt @@ -3,11 +3,13 @@ package demo class Container() { var myBoolean: Boolean = true } + class One() { class object { var myContainer: Container = Container() } } + class Test() { fun test() { if (One.myContainer.myBoolean) diff --git a/j2k/tests/testData/ast/issues/kt-824.kt b/j2k/tests/testData/ast/issues/kt-824.kt index 9b2565a4006..d7d84410f5c 100644 --- a/j2k/tests/testData/ast/issues/kt-824.kt +++ b/j2k/tests/testData/ast/issues/kt-824.kt @@ -3,11 +3,13 @@ package demo open class Container() { var myBoolean: Boolean = true } + open class One() { class object { var myContainer: Container? = Container() } } + open class Test() { open fun test() { if (One.myContainer?.myBoolean!!) diff --git a/j2k/tests/testData/ast/issues/kt-836.ide.kt b/j2k/tests/testData/ast/issues/kt-836.ide.kt index 9d8fab784f2..f40b1d8b173 100644 --- a/j2k/tests/testData/ast/issues/kt-836.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-836.ide.kt @@ -13,6 +13,8 @@ public class Language(code: String) : Serializable { this.code = code } } + + class Base() { fun test() { } @@ -20,10 +22,11 @@ class Base() { return "BASE" } } + class Child() : Base() { override fun test() { } override fun toString(): String { return "Child" } -} \ No newline at end of file +} diff --git a/j2k/tests/testData/ast/issues/kt-836.kt b/j2k/tests/testData/ast/issues/kt-836.kt index 0f3b35b7aba..c36bb16c8d7 100644 --- a/j2k/tests/testData/ast/issues/kt-836.kt +++ b/j2k/tests/testData/ast/issues/kt-836.kt @@ -13,6 +13,8 @@ public open class Language(code: String?) : Serializable { this.code = code } } + + open class Base() { open fun test() { } @@ -20,10 +22,11 @@ open class Base() { return "BASE" } } + open class Child() : Base() { override fun test() { } override fun toString(): String? { return "Child" } -} \ No newline at end of file +} diff --git a/j2k/tests/testData/ast/issues/qualifyStatic.ide.kt b/j2k/tests/testData/ast/issues/qualifyStatic.ide.kt index 78187e0669e..5ce49641e3f 100644 --- a/j2k/tests/testData/ast/issues/qualifyStatic.ide.kt +++ b/j2k/tests/testData/ast/issues/qualifyStatic.ide.kt @@ -4,4 +4,4 @@ abstract class MyCalendar() : Calendar() { public fun foo() { val i = Calendar.ALL_STYLES } -} \ No newline at end of file +} diff --git a/j2k/tests/testData/ast/issues/qualifyStatic.kt b/j2k/tests/testData/ast/issues/qualifyStatic.kt index 4c50d0fe284..d1f9a79fe7d 100644 --- a/j2k/tests/testData/ast/issues/qualifyStatic.kt +++ b/j2k/tests/testData/ast/issues/qualifyStatic.kt @@ -4,4 +4,4 @@ abstract class MyCalendar() : Calendar() { public open fun foo() { var i: Int = Calendar.ALL_STYLES } -} \ No newline at end of file +} diff --git a/j2k/tests/testData/ast/kotlinExclusion/kt-656.ide.kt b/j2k/tests/testData/ast/kotlinExclusion/kt-656.ide.kt index 6455539e102..c01283f0bc7 100644 --- a/j2k/tests/testData/ast/kotlinExclusion/kt-656.ide.kt +++ b/j2k/tests/testData/ast/kotlinExclusion/kt-656.ide.kt @@ -10,6 +10,7 @@ class Test() : java.lang.Iterable { return j } } + class FullTest() : java.lang.Iterable { override fun iterator(): java.util.Iterator { return null diff --git a/j2k/tests/testData/ast/kotlinExclusion/kt-656.kt b/j2k/tests/testData/ast/kotlinExclusion/kt-656.kt index e8ae1dd7919..02897cab103 100644 --- a/j2k/tests/testData/ast/kotlinExclusion/kt-656.kt +++ b/j2k/tests/testData/ast/kotlinExclusion/kt-656.kt @@ -10,6 +10,7 @@ open class Test() : java.lang.Iterable { return j } } + open class FullTest() : java.lang.Iterable { override fun iterator(): java.util.Iterator? { return null diff --git a/j2k/tests/testData/ast/methodCallExpression/genericMethod.ide.kt b/j2k/tests/testData/ast/methodCallExpression/genericMethod.ide.kt index 1c3ff7e2399..78ff43f2a98 100644 --- a/j2k/tests/testData/ast/methodCallExpression/genericMethod.ide.kt +++ b/j2k/tests/testData/ast/methodCallExpression/genericMethod.ide.kt @@ -4,6 +4,7 @@ class Map() { fun put(k: K, v: V) { } } + class U() { fun test() { val m = Map() diff --git a/j2k/tests/testData/ast/methodCallExpression/genericMethod.kt b/j2k/tests/testData/ast/methodCallExpression/genericMethod.kt index 3b89a606a4d..55d7266c79e 100644 --- a/j2k/tests/testData/ast/methodCallExpression/genericMethod.kt +++ b/j2k/tests/testData/ast/methodCallExpression/genericMethod.kt @@ -4,6 +4,7 @@ open class Map() { open fun put(k: K?, v: V?) { } } + open class U() { open fun test() { var m: Map? = Map() diff --git a/j2k/tests/testData/ast/newClassExpression/newClassByFullName.ide.kt b/j2k/tests/testData/ast/newClassExpression/newClassByFullName.ide.kt index 2b64b2eddbb..1b616709337 100644 --- a/j2k/tests/testData/ast/newClassExpression/newClassByFullName.ide.kt +++ b/j2k/tests/testData/ast/newClassExpression/newClassByFullName.ide.kt @@ -2,6 +2,7 @@ package org.test class Library() { } + class User() { fun main() { val lib = Library() diff --git a/j2k/tests/testData/ast/newClassExpression/newClassByFullName.kt b/j2k/tests/testData/ast/newClassExpression/newClassByFullName.kt index 5b8f962effa..612268c52af 100644 --- a/j2k/tests/testData/ast/newClassExpression/newClassByFullName.kt +++ b/j2k/tests/testData/ast/newClassExpression/newClassByFullName.kt @@ -2,6 +2,7 @@ package org.test open class Library() { } + open class User() { open fun main() { var lib: Library? = Library() diff --git a/j2k/tests/testData/ast/newClassExpression/newInnerClass.ide.kt b/j2k/tests/testData/ast/newClassExpression/newInnerClass.ide.kt index f01f86df89d..1c97a6b0252 100644 --- a/j2k/tests/testData/ast/newClassExpression/newInnerClass.ide.kt +++ b/j2k/tests/testData/ast/newClassExpression/newInnerClass.ide.kt @@ -4,6 +4,7 @@ class OuterClass() { class InnerClass() { } } + class User() { fun main() { val outerObject = OuterClass() diff --git a/j2k/tests/testData/ast/newClassExpression/newInnerClass.kt b/j2k/tests/testData/ast/newClassExpression/newInnerClass.kt index fe233ffe21a..90d61e81bde 100644 --- a/j2k/tests/testData/ast/newClassExpression/newInnerClass.kt +++ b/j2k/tests/testData/ast/newClassExpression/newInnerClass.kt @@ -4,6 +4,7 @@ open class OuterClass() { open class InnerClass() { } } + open class User() { open fun main() { var outerObject: OuterClass? = OuterClass() diff --git a/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.ide.kt b/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.ide.kt index 81a23f07903..74be47a1ab9 100644 --- a/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.ide.kt +++ b/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.ide.kt @@ -4,6 +4,7 @@ import java.util.LinkedList class Member() { } + class User() { fun main() { val members = LinkedList() diff --git a/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.kt b/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.kt index 7fd271d1d6a..cdecd897627 100644 --- a/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.kt +++ b/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.kt @@ -4,6 +4,7 @@ import java.util.LinkedList open class Member() { } + open class User() { open fun main() { var members: MutableList? = LinkedList() diff --git a/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.ide.kt b/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.ide.kt index 93dc97665ab..d36322ed9f5 100644 --- a/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.ide.kt +++ b/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.ide.kt @@ -6,6 +6,7 @@ class Foo() { } } } + class User() { fun main() { val boo = Foo.Bar() diff --git a/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.kt b/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.kt index aba9556e77d..3e1ecc0d656 100644 --- a/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.kt +++ b/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.kt @@ -6,6 +6,7 @@ open class Foo() { } } } + open class User() { open fun main() { var boo: Foo.Bar? = Foo.Bar() diff --git a/j2k/tests/testData/ast/objectLiteral/MyFrame.ide.kt b/j2k/tests/testData/ast/objectLiteral/MyFrame.ide.kt index e6c74c7fc9a..c461d53dc4c 100644 --- a/j2k/tests/testData/ast/objectLiteral/MyFrame.ide.kt +++ b/j2k/tests/testData/ast/objectLiteral/MyFrame.ide.kt @@ -4,6 +4,7 @@ class WindowAdapter() { public fun windowClosing() { } } + public class Client() : Frame() { { val a = object : WindowAdapter() { diff --git a/j2k/tests/testData/ast/objectLiteral/MyFrame.kt b/j2k/tests/testData/ast/objectLiteral/MyFrame.kt index 19751dff0a4..9cb5ce6ee83 100644 --- a/j2k/tests/testData/ast/objectLiteral/MyFrame.kt +++ b/j2k/tests/testData/ast/objectLiteral/MyFrame.kt @@ -4,6 +4,7 @@ open class WindowAdapter() { public open fun windowClosing() { } } + public class Client() : Frame() { { var a: WindowAdapter? = object : WindowAdapter() { diff --git a/j2k/tests/testData/ast/rawGenerics/kt-540-map.jav b/j2k/tests/testData/ast/rawGenerics/kt-540-map.jav index f00b8ec6fcd..50695ae2a58 100644 --- a/j2k/tests/testData/ast/rawGenerics/kt-540-map.jav +++ b/j2k/tests/testData/ast/rawGenerics/kt-540-map.jav @@ -9,4 +9,4 @@ class Test { HashMap rawMap = new HashMap(); HashMap superRawMap = new HashMap(); } -} +} \ No newline at end of file diff --git a/j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.ide.kt b/j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.ide.kt index c01e2c1cb94..73b9e947035 100644 --- a/j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.ide.kt +++ b/j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.ide.kt @@ -5,6 +5,7 @@ class Collection(e: E) { System.out.println(e) } } + class Test() { fun main() { val raw1 = Collection(1) diff --git a/j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.kt b/j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.kt index 903ae923d9e..bce28ddeae4 100644 --- a/j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.kt +++ b/j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.kt @@ -5,6 +5,7 @@ open class Collection(e: E?) { System.out?.println(e) } } + open class Test() { open fun main() { var raw1: Collection<*>? = Collection(1) diff --git a/j2k/tests/testData/ast/rawGenerics/rawGenericMethod.ide.kt b/j2k/tests/testData/ast/rawGenerics/rawGenericMethod.ide.kt index 74785132b1d..d866f64fa78 100644 --- a/j2k/tests/testData/ast/rawGenerics/rawGenericMethod.ide.kt +++ b/j2k/tests/testData/ast/rawGenerics/rawGenericMethod.ide.kt @@ -4,6 +4,7 @@ class TestT() { fun getT() { } } + class U() { fun main() { val t = TestT() diff --git a/j2k/tests/testData/ast/rawGenerics/rawGenericMethod.kt b/j2k/tests/testData/ast/rawGenerics/rawGenericMethod.kt index 51bab3c7699..f8afcf4122b 100644 --- a/j2k/tests/testData/ast/rawGenerics/rawGenericMethod.kt +++ b/j2k/tests/testData/ast/rawGenerics/rawGenericMethod.kt @@ -4,6 +4,7 @@ open class TestT() { open fun getT() { } } + open class U() { open fun main() { var t: TestT? = TestT() diff --git a/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.ide.kt b/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.ide.kt index 2e22c03bc29..3ed8769e54b 100644 --- a/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.ide.kt +++ b/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.ide.kt @@ -1,6 +1,7 @@ class Base() { fun foo() } + class A() : Base() { class C() { fun test() { diff --git a/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.kt b/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.kt index 04754d0f13e..c2c90468330 100644 --- a/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.kt +++ b/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.kt @@ -1,6 +1,7 @@ open class Base() { open fun foo() } + open class A() : Base() { open class C() { open fun test() { diff --git a/j2k/tests/testData/ast/superExpression/classAextendsB.ide.kt b/j2k/tests/testData/ast/superExpression/classAextendsB.ide.kt index 026423c3d48..4ceeedfcf65 100644 --- a/j2k/tests/testData/ast/superExpression/classAextendsB.ide.kt +++ b/j2k/tests/testData/ast/superExpression/classAextendsB.ide.kt @@ -3,6 +3,7 @@ class B(i: Int) { return 1 } } + class A() : B(10) { override fun call(): Int { diff --git a/j2k/tests/testData/ast/superExpression/classAextendsB.kt b/j2k/tests/testData/ast/superExpression/classAextendsB.kt index e72376a9b48..1c51f741e79 100644 --- a/j2k/tests/testData/ast/superExpression/classAextendsB.kt +++ b/j2k/tests/testData/ast/superExpression/classAextendsB.kt @@ -3,6 +3,7 @@ open class B(i: Int) { return 1 } } + open class A() : B(10) { override fun call(): Int { diff --git a/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.ide.kt b/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.ide.kt index 5ea8636214a..9cd50bbe58d 100644 --- a/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.ide.kt +++ b/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.ide.kt @@ -2,6 +2,7 @@ class Base() { fun foo() { } } + class A() : Base() { class C() { fun test() { diff --git a/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.kt b/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.kt index 245de9e0a39..c4209b42701 100644 --- a/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.kt +++ b/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.kt @@ -2,6 +2,7 @@ open class Base() { open fun foo() { } } + open class A() : Base() { open class C() { open fun test() {