diff --git a/j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterTest.kt b/j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterTest.kt index 3b444edf8f4..4ae6cbc0edb 100644 --- a/j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterTest.kt +++ b/j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterTest.kt @@ -18,8 +18,6 @@ package org.jetbrains.jet.j2k.test import java.io.File import com.intellij.openapi.util.io.FileUtil -import com.intellij.psi.PsiJavaFile -import com.intellij.psi.PsiFile import org.jetbrains.jet.j2k.Converter import org.jetbrains.jet.j2k.JavaToKotlinTranslator import org.jetbrains.jet.j2k.ConverterSettings @@ -61,9 +59,13 @@ abstract class AbstractJavaToKotlinConverterTest() : LightIdeaTestCase() { val javaFile = File(javaPath) val fileContents = FileUtil.loadFile(javaFile, true) val matcher = testHeaderPattern.matcher(fileContents) - matcher.find() - val prefix = matcher.group().trim().substring(2) - val javaCode = matcher.replaceFirst("") + + val (prefix, javaCode) = if (matcher.find()) { + Pair(matcher.group().trim().substring(2), matcher.replaceFirst("")) + } + else { + Pair("file", fileContents) + } fun parseBoolean(text: String): Boolean = when (text) { "true" -> true diff --git a/j2k/tests/testData/ast/annotations/annotationUsages.java b/j2k/tests/testData/ast/annotations/annotationUsages.java index 0ef69bb0679..aad3c52ffa0 100644 --- a/j2k/tests/testData/ast/annotations/annotationUsages.java +++ b/j2k/tests/testData/ast/annotations/annotationUsages.java @@ -1,4 +1,3 @@ -//file import javaApi.*; @Anon1(value = {"a"}, stringArray = {"b"}, intArray = {1, 2}, string = "x") diff --git a/j2k/tests/testData/ast/annotations/jetbrainsNotNull.java b/j2k/tests/testData/ast/annotations/jetbrainsNotNull.java index ac921fdf2de..719ea5ddece 100644 --- a/j2k/tests/testData/ast/annotations/jetbrainsNotNull.java +++ b/j2k/tests/testData/ast/annotations/jetbrainsNotNull.java @@ -1,4 +1,3 @@ -//file // !forceNotNullTypes: false // !specifyLocalVariableTypeByDefault: true package test; diff --git a/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.java b/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.java index 81ebf7b0368..0944b5f96a2 100644 --- a/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.java +++ b/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.java @@ -1,4 +1,3 @@ -//file // !forceNotNullTypes: false // !specifyLocalVariableTypeByDefault: true package test; diff --git a/j2k/tests/testData/ast/annotations/jetbrainsNullable.java b/j2k/tests/testData/ast/annotations/jetbrainsNullable.java index 7a270b2b76d..dd017d87bb7 100644 --- a/j2k/tests/testData/ast/annotations/jetbrainsNullable.java +++ b/j2k/tests/testData/ast/annotations/jetbrainsNullable.java @@ -1,4 +1,3 @@ -//file // !specifyLocalVariableTypeByDefault: true package test; diff --git a/j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.java b/j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.java index 292bbf96142..fba735a5ff0 100644 --- a/j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.java +++ b/j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.java @@ -1,4 +1,3 @@ -//file class Test { String str; { diff --git a/j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.java b/j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.java index 7ccb0496303..c86774f1642 100644 --- a/j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.java +++ b/j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.java @@ -1,4 +1,3 @@ -//file class Test { String str; static { diff --git a/j2k/tests/testData/ast/assignmentExpression/nullability-settings.java b/j2k/tests/testData/ast/assignmentExpression/nullability-settings.java index 7e3e7cae347..933ce771a98 100644 --- a/j2k/tests/testData/ast/assignmentExpression/nullability-settings.java +++ b/j2k/tests/testData/ast/assignmentExpression/nullability-settings.java @@ -1,4 +1,3 @@ -//file // !forceNotNullTypes: false // !specifyLocalVariableTypeByDefault: true import java.util.BitSet; diff --git a/j2k/tests/testData/ast/assignmentExpression/nullability.java b/j2k/tests/testData/ast/assignmentExpression/nullability.java index 53d58640137..0cc857d9476 100644 --- a/j2k/tests/testData/ast/assignmentExpression/nullability.java +++ b/j2k/tests/testData/ast/assignmentExpression/nullability.java @@ -1,4 +1,3 @@ -//file import java.util.BitSet; class Foo { diff --git a/j2k/tests/testData/ast/boxedType/Boxing.java b/j2k/tests/testData/ast/boxedType/Boxing.java index 66bdbd72fe6..57648c23044 100644 --- a/j2k/tests/testData/ast/boxedType/Boxing.java +++ b/j2k/tests/testData/ast/boxedType/Boxing.java @@ -1,4 +1,3 @@ -//file import java.util.ArrayList; import java.util.List; diff --git a/j2k/tests/testData/ast/boxedType/kt-671.java b/j2k/tests/testData/ast/boxedType/kt-671.java index 9cd9a275a31..c0ba6a8bc30 100644 --- a/j2k/tests/testData/ast/boxedType/kt-671.java +++ b/j2k/tests/testData/ast/boxedType/kt-671.java @@ -1,4 +1,3 @@ -//file package demo; class Test { diff --git a/j2k/tests/testData/ast/callChainExpression/libraryFieldCall.java b/j2k/tests/testData/ast/callChainExpression/libraryFieldCall.java index 6e9cd081638..2278e35a1bc 100644 --- a/j2k/tests/testData/ast/callChainExpression/libraryFieldCall.java +++ b/j2k/tests/testData/ast/callChainExpression/libraryFieldCall.java @@ -1,4 +1,3 @@ -//file class Library { final static java.io.PrintStream ourOut; } diff --git a/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.java b/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.java index 1b77d13c7d4..265696edc72 100644 --- a/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.java +++ b/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.java @@ -1,4 +1,3 @@ -//file class Library { static void call() {} diff --git a/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance-settings.java b/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance-settings.java index a7f32754bd0..6c3318b19cc 100644 --- a/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance-settings.java +++ b/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance-settings.java @@ -1,4 +1,3 @@ -//file // !forceNotNullTypes: false // !specifyLocalVariableTypeByDefault: true class Library { diff --git a/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.java b/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.java index d874e24e06a..3a22446070d 100644 --- a/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.java +++ b/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.java @@ -1,4 +1,3 @@ -//file class Library { void call() {} diff --git a/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.java b/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.java index bd434be3156..67d826da1d9 100644 --- a/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.java +++ b/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.java @@ -1,4 +1,3 @@ -//file class Library { final public String myString; } diff --git a/j2k/tests/testData/ast/class/ClassShadowing.java b/j2k/tests/testData/ast/class/ClassShadowing.java index 667534f4722..9cd425af6ea 100644 --- a/j2k/tests/testData/ast/class/ClassShadowing.java +++ b/j2k/tests/testData/ast/class/ClassShadowing.java @@ -1,4 +1,3 @@ -//file package test; public class Short { diff --git a/j2k/tests/testData/ast/class/innerClassInInterface.java b/j2k/tests/testData/ast/class/innerClassInInterface.java index 9e5d2fa1dbf..7e3c0932f59 100644 --- a/j2k/tests/testData/ast/class/innerClassInInterface.java +++ b/j2k/tests/testData/ast/class/innerClassInInterface.java @@ -1,4 +1,3 @@ -//file interface A { class B {} } \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/innerEnum.java b/j2k/tests/testData/ast/class/innerEnum.java index ae26b82b66b..32a36e1fc17 100644 --- a/j2k/tests/testData/ast/class/innerEnum.java +++ b/j2k/tests/testData/ast/class/innerEnum.java @@ -1,4 +1,3 @@ -//file class A { enum E { A, diff --git a/j2k/tests/testData/ast/class/innerInterface.java b/j2k/tests/testData/ast/class/innerInterface.java index 5031f3345b2..b2c4054074f 100644 --- a/j2k/tests/testData/ast/class/innerInterface.java +++ b/j2k/tests/testData/ast/class/innerInterface.java @@ -1,4 +1,3 @@ -//file class A { interface I {} } \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/kt-639.java b/j2k/tests/testData/ast/class/kt-639.java index ff0db9e2496..102ae0c907b 100644 --- a/j2k/tests/testData/ast/class/kt-639.java +++ b/j2k/tests/testData/ast/class/kt-639.java @@ -1,4 +1,3 @@ -//file package demo; import java.util.HashMap; diff --git a/j2k/tests/testData/ast/class/privateInit.java b/j2k/tests/testData/ast/class/privateInit.java index c89945a7756..5a65a0cc32b 100644 --- a/j2k/tests/testData/ast/class/privateInit.java +++ b/j2k/tests/testData/ast/class/privateInit.java @@ -1,4 +1,3 @@ -//file public class MyClass { private void init(int arg1, int arg2, int arg3) { } diff --git a/j2k/tests/testData/ast/comments/comments.java b/j2k/tests/testData/ast/comments/comments.java index 61c1099cc74..fda8b62d833 100644 --- a/j2k/tests/testData/ast/comments/comments.java +++ b/j2k/tests/testData/ast/comments/comments.java @@ -1,4 +1,3 @@ -//file package foo; // we use package 'foo' // imports: diff --git a/j2k/tests/testData/ast/comments/comments2.java b/j2k/tests/testData/ast/comments/comments2.java index b9de99b91ed..16723f3aca7 100644 --- a/j2k/tests/testData/ast/comments/comments2.java +++ b/j2k/tests/testData/ast/comments/comments2.java @@ -1,4 +1,3 @@ -//file package foo; class A { diff --git a/j2k/tests/testData/ast/comments/commentsForConstructors.java b/j2k/tests/testData/ast/comments/commentsForConstructors.java index ecea80abbe6..00afdebc0ef 100644 --- a/j2k/tests/testData/ast/comments/commentsForConstructors.java +++ b/j2k/tests/testData/ast/comments/commentsForConstructors.java @@ -1,4 +1,3 @@ -//file class A { private int v; diff --git a/j2k/tests/testData/ast/comments/fieldWithEndOfLineComment.java b/j2k/tests/testData/ast/comments/fieldWithEndOfLineComment.java index 340ae032186..573fb92735d 100644 --- a/j2k/tests/testData/ast/comments/fieldWithEndOfLineComment.java +++ b/j2k/tests/testData/ast/comments/fieldWithEndOfLineComment.java @@ -1,4 +1,3 @@ -//file class A { private boolean isOpen = true; // ideally should be atomic boolean } \ No newline at end of file diff --git a/j2k/tests/testData/ast/comments/fieldsInitializedFromParams.java b/j2k/tests/testData/ast/comments/fieldsInitializedFromParams.java index efcc082ae6f..a45ff637206 100644 --- a/j2k/tests/testData/ast/comments/fieldsInitializedFromParams.java +++ b/j2k/tests/testData/ast/comments/fieldsInitializedFromParams.java @@ -1,4 +1,3 @@ -//file class C { private final int p1; // field p1 diff --git a/j2k/tests/testData/ast/constructors/allCallsPrimary.java b/j2k/tests/testData/ast/constructors/allCallsPrimary.java index a74961b4ebb..bb4159456fd 100644 --- a/j2k/tests/testData/ast/constructors/allCallsPrimary.java +++ b/j2k/tests/testData/ast/constructors/allCallsPrimary.java @@ -1,4 +1,3 @@ -//file package pack class C { diff --git a/j2k/tests/testData/ast/constructors/allCallsPrimary2.java b/j2k/tests/testData/ast/constructors/allCallsPrimary2.java index 5dd89c1b11b..45b045051bc 100644 --- a/j2k/tests/testData/ast/constructors/allCallsPrimary2.java +++ b/j2k/tests/testData/ast/constructors/allCallsPrimary2.java @@ -1,4 +1,3 @@ -//file class C { final int myArg1; int myArg2; diff --git a/j2k/tests/testData/ast/constructors/artificialPrimary.java b/j2k/tests/testData/ast/constructors/artificialPrimary.java index f617f1045c0..e952f701b3c 100644 --- a/j2k/tests/testData/ast/constructors/artificialPrimary.java +++ b/j2k/tests/testData/ast/constructors/artificialPrimary.java @@ -1,4 +1,3 @@ -//file public class Test { private final String s; boolean b; diff --git a/j2k/tests/testData/ast/constructors/chain.java b/j2k/tests/testData/ast/constructors/chain.java index 26c7e2920f2..29574ce4999 100644 --- a/j2k/tests/testData/ast/constructors/chain.java +++ b/j2k/tests/testData/ast/constructors/chain.java @@ -1,4 +1,3 @@ -//file class C { C(int arg1, int arg2, int arg3) { } diff --git a/j2k/tests/testData/ast/constructors/customerBuilder.java b/j2k/tests/testData/ast/constructors/customerBuilder.java index 7fe1320a3ca..4f99ad3c63d 100644 --- a/j2k/tests/testData/ast/constructors/customerBuilder.java +++ b/j2k/tests/testData/ast/constructors/customerBuilder.java @@ -1,4 +1,3 @@ -//file package org.test.customer class Customer { diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams1.java b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams1.java index f40d7fa457b..39970bd6448 100644 --- a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams1.java +++ b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams1.java @@ -1,4 +1,3 @@ -//file class C { private final int p1; private final int myP2; diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams2.java b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams2.java index a9045a7d86e..8a9be228f31 100644 --- a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams2.java +++ b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams2.java @@ -1,4 +1,3 @@ -//file class C { private final int field; diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams3.java b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams3.java index 91e78c15041..70f1601df65 100644 --- a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams3.java +++ b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams3.java @@ -1,4 +1,3 @@ -//file class C { private final int p; diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams4.java b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams4.java index a4f252e6ab7..c164223c935 100644 --- a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams4.java +++ b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams4.java @@ -1,4 +1,3 @@ -//file class C { public int p; diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams5.java b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams5.java index bd361f9f23d..35e1f8fa42d 100644 --- a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams5.java +++ b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams5.java @@ -1,4 +1,3 @@ -//file class C { public int p; diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams6.java b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams6.java index 8727c3e26fe..c7f28a7a16d 100644 --- a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams6.java +++ b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams6.java @@ -1,4 +1,3 @@ -//file class C { public Object x; diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams7.java b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams7.java index c28829ef740..741b749ba64 100644 --- a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams7.java +++ b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams7.java @@ -1,4 +1,3 @@ -//file class C { public Object x; diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams8.java b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams8.java index 819d2a4ec82..21b6b4e1396 100644 --- a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams8.java +++ b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams8.java @@ -1,4 +1,3 @@ -//file class Base { Base(Object o, int l){} } diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams9.java b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams9.java index 11674dd0814..8f02554c38f 100644 --- a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams9.java +++ b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams9.java @@ -1,4 +1,3 @@ -//file class C { private final String string; diff --git a/j2k/tests/testData/ast/constructors/genericIdentifier.java b/j2k/tests/testData/ast/constructors/genericIdentifier.java index 35d5006aa48..c77f997a1c6 100644 --- a/j2k/tests/testData/ast/constructors/genericIdentifier.java +++ b/j2k/tests/testData/ast/constructors/genericIdentifier.java @@ -1,4 +1,3 @@ -//file public class Identifier { private final T myName; private boolean myHasDollar; diff --git a/j2k/tests/testData/ast/constructors/identifier.java b/j2k/tests/testData/ast/constructors/identifier.java index 8170fd48d42..929628643c8 100644 --- a/j2k/tests/testData/ast/constructors/identifier.java +++ b/j2k/tests/testData/ast/constructors/identifier.java @@ -1,4 +1,3 @@ -//file public class Identifier { private final String myName; private boolean myHasDollar; diff --git a/j2k/tests/testData/ast/constructors/methodCallInFactoryFun.java b/j2k/tests/testData/ast/constructors/methodCallInFactoryFun.java index 1318d7a11a4..d60ade8e838 100644 --- a/j2k/tests/testData/ast/constructors/methodCallInFactoryFun.java +++ b/j2k/tests/testData/ast/constructors/methodCallInFactoryFun.java @@ -1,4 +1,3 @@ -//file class C { private final int arg1; private final int arg2; diff --git a/j2k/tests/testData/ast/constructors/noPrimary.java b/j2k/tests/testData/ast/constructors/noPrimary.java index 5ec7ea277f3..29e31f2243c 100644 --- a/j2k/tests/testData/ast/constructors/noPrimary.java +++ b/j2k/tests/testData/ast/constructors/noPrimary.java @@ -1,4 +1,3 @@ -//file class C { C(int arg1, int arg2, int arg3) { } diff --git a/j2k/tests/testData/ast/constructors/parameterDefaults1.java b/j2k/tests/testData/ast/constructors/parameterDefaults1.java index 2c0c7e591d2..5e9c6fdbeae 100644 --- a/j2k/tests/testData/ast/constructors/parameterDefaults1.java +++ b/j2k/tests/testData/ast/constructors/parameterDefaults1.java @@ -1,4 +1,3 @@ -//file package pack class C { diff --git a/j2k/tests/testData/ast/constructors/parameterDefaults2.java b/j2k/tests/testData/ast/constructors/parameterDefaults2.java index eb3fadee570..0e5860a53bf 100644 --- a/j2k/tests/testData/ast/constructors/parameterDefaults2.java +++ b/j2k/tests/testData/ast/constructors/parameterDefaults2.java @@ -1,4 +1,3 @@ -//file package pack class C { diff --git a/j2k/tests/testData/ast/constructors/parameterDefaults3.java b/j2k/tests/testData/ast/constructors/parameterDefaults3.java index f33df88c51b..9ad1c959125 100644 --- a/j2k/tests/testData/ast/constructors/parameterDefaults3.java +++ b/j2k/tests/testData/ast/constructors/parameterDefaults3.java @@ -1,4 +1,3 @@ -//file package pack class C { diff --git a/j2k/tests/testData/ast/constructors/parameterDefaults4.java b/j2k/tests/testData/ast/constructors/parameterDefaults4.java index 1eef93b42a8..8e4262ec236 100644 --- a/j2k/tests/testData/ast/constructors/parameterDefaults4.java +++ b/j2k/tests/testData/ast/constructors/parameterDefaults4.java @@ -1,4 +1,3 @@ -//file package pack class C { diff --git a/j2k/tests/testData/ast/constructors/parameterDefaults5.java b/j2k/tests/testData/ast/constructors/parameterDefaults5.java index 333b78bfd9f..0d59a2a18c7 100644 --- a/j2k/tests/testData/ast/constructors/parameterDefaults5.java +++ b/j2k/tests/testData/ast/constructors/parameterDefaults5.java @@ -1,4 +1,3 @@ -//file package pack class C { diff --git a/j2k/tests/testData/ast/constructors/parameterModification.java b/j2k/tests/testData/ast/constructors/parameterModification.java index 7570b83cd3f..647330f1b23 100644 --- a/j2k/tests/testData/ast/constructors/parameterModification.java +++ b/j2k/tests/testData/ast/constructors/parameterModification.java @@ -1,4 +1,3 @@ -//file class C { private int field; diff --git a/j2k/tests/testData/ast/constructors/privateConstructors.java b/j2k/tests/testData/ast/constructors/privateConstructors.java index 55cd4fca926..5330b0205bb 100644 --- a/j2k/tests/testData/ast/constructors/privateConstructors.java +++ b/j2k/tests/testData/ast/constructors/privateConstructors.java @@ -1,4 +1,3 @@ -//file class C { private C(int arg1, int arg2, int arg3) { } diff --git a/j2k/tests/testData/ast/constructors/qualifiedRefInFactoryFun.java b/j2k/tests/testData/ast/constructors/qualifiedRefInFactoryFun.java index fd5ddcf15b5..cc919856cd2 100644 --- a/j2k/tests/testData/ast/constructors/qualifiedRefInFactoryFun.java +++ b/j2k/tests/testData/ast/constructors/qualifiedRefInFactoryFun.java @@ -1,4 +1,3 @@ -//file class C { private final int arg1; private final int arg2; diff --git a/j2k/tests/testData/ast/constructors/secondaryConstructorsInInnerClass.java b/j2k/tests/testData/ast/constructors/secondaryConstructorsInInnerClass.java index d3280676583..42e85b01620 100644 --- a/j2k/tests/testData/ast/constructors/secondaryConstructorsInInnerClass.java +++ b/j2k/tests/testData/ast/constructors/secondaryConstructorsInInnerClass.java @@ -1,4 +1,3 @@ -//file class Outer { private class Inner1 { public Inner1(){} diff --git a/j2k/tests/testData/ast/constructors/secondaryConstructorsInNestedClass.java b/j2k/tests/testData/ast/constructors/secondaryConstructorsInNestedClass.java index a2918ae3cf6..b2cb0de501b 100644 --- a/j2k/tests/testData/ast/constructors/secondaryConstructorsInNestedClass.java +++ b/j2k/tests/testData/ast/constructors/secondaryConstructorsInNestedClass.java @@ -1,4 +1,3 @@ -//file class Outer { private static class Nested1 { public Nested1(){} diff --git a/j2k/tests/testData/ast/constructors/secondaryConstructorsVisibility.java b/j2k/tests/testData/ast/constructors/secondaryConstructorsVisibility.java index b362d5715e6..552401459a8 100644 --- a/j2k/tests/testData/ast/constructors/secondaryConstructorsVisibility.java +++ b/j2k/tests/testData/ast/constructors/secondaryConstructorsVisibility.java @@ -1,4 +1,3 @@ -//file class A { public A() {} diff --git a/j2k/tests/testData/ast/constructors/staticFieldRefInFactoryFun.java b/j2k/tests/testData/ast/constructors/staticFieldRefInFactoryFun.java index 55b910a35fb..5e3aaf5f310 100644 --- a/j2k/tests/testData/ast/constructors/staticFieldRefInFactoryFun.java +++ b/j2k/tests/testData/ast/constructors/staticFieldRefInFactoryFun.java @@ -1,4 +1,3 @@ -//file class C { private static int staticField1 = 0; private static int staticField2 = 0; diff --git a/j2k/tests/testData/ast/constructors/withManyDefaultParams.java b/j2k/tests/testData/ast/constructors/withManyDefaultParams.java index 659c10b522c..d346a4a6593 100644 --- a/j2k/tests/testData/ast/constructors/withManyDefaultParams.java +++ b/j2k/tests/testData/ast/constructors/withManyDefaultParams.java @@ -1,4 +1,3 @@ -//file public class Test { private final String myName; boolean a; diff --git a/j2k/tests/testData/ast/equals/Equals1.java b/j2k/tests/testData/ast/equals/Equals1.java index c5d20c949db..347ecfd541d 100644 --- a/j2k/tests/testData/ast/equals/Equals1.java +++ b/j2k/tests/testData/ast/equals/Equals1.java @@ -1,4 +1,3 @@ -//file interface I { } diff --git a/j2k/tests/testData/ast/equals/Equals2.java b/j2k/tests/testData/ast/equals/Equals2.java index 7873ac396ab..43f8b1bbe70 100644 --- a/j2k/tests/testData/ast/equals/Equals2.java +++ b/j2k/tests/testData/ast/equals/Equals2.java @@ -1,4 +1,3 @@ -//file class C{ boolean foo1(String s1, String s2) { return s1.equals(s2) diff --git a/j2k/tests/testData/ast/equals/Equals3.java b/j2k/tests/testData/ast/equals/Equals3.java index 9ed7ce377bd..570ec33f7ab 100644 --- a/j2k/tests/testData/ast/equals/Equals3.java +++ b/j2k/tests/testData/ast/equals/Equals3.java @@ -1,4 +1,3 @@ -//file class C{ public boolean equals(C c) { return false; diff --git a/j2k/tests/testData/ast/equals/Equals4.java b/j2k/tests/testData/ast/equals/Equals4.java index b4857ed8b83..21bfd455675 100644 --- a/j2k/tests/testData/ast/equals/Equals4.java +++ b/j2k/tests/testData/ast/equals/Equals4.java @@ -1,4 +1,3 @@ -//file class C{ boolean foo(String s1, String s2, String s3, String s4) { return s1.equals(s2) == !s3.equals(s4) diff --git a/j2k/tests/testData/ast/equals/ObjectsEquals.java b/j2k/tests/testData/ast/equals/ObjectsEquals.java index ec8b9725087..d6c9d5c60f3 100644 --- a/j2k/tests/testData/ast/equals/ObjectsEquals.java +++ b/j2k/tests/testData/ast/equals/ObjectsEquals.java @@ -1,4 +1,3 @@ -//file import java.util.Objects; interface I { diff --git a/j2k/tests/testData/ast/field/classChildExtendsBase.java b/j2k/tests/testData/ast/field/classChildExtendsBase.java index a41cdc7caf5..94d40fbfea4 100644 --- a/j2k/tests/testData/ast/field/classChildExtendsBase.java +++ b/j2k/tests/testData/ast/field/classChildExtendsBase.java @@ -1,4 +1,3 @@ -//file class Base { private String myFirst; } diff --git a/j2k/tests/testData/ast/field/conversion.java b/j2k/tests/testData/ast/field/conversion.java index ca94e3434b5..53b914c2ff4 100644 --- a/j2k/tests/testData/ast/field/conversion.java +++ b/j2k/tests/testData/ast/field/conversion.java @@ -1,4 +1,3 @@ -//file class A { private Integer i = getByte(); diff --git a/j2k/tests/testData/ast/field/internalField.java b/j2k/tests/testData/ast/field/internalField.java index 3ab3bbf9c70..3c3f6a6f633 100644 --- a/j2k/tests/testData/ast/field/internalField.java +++ b/j2k/tests/testData/ast/field/internalField.java @@ -1,4 +1,3 @@ -//file class C { Foo f; } \ No newline at end of file diff --git a/j2k/tests/testData/ast/field/privateField.java b/j2k/tests/testData/ast/field/privateField.java index 3004fe6d82a..958031a23b4 100644 --- a/j2k/tests/testData/ast/field/privateField.java +++ b/j2k/tests/testData/ast/field/privateField.java @@ -1,4 +1,3 @@ -//file class C { private Foo f; } diff --git a/j2k/tests/testData/ast/field/protectedField.java b/j2k/tests/testData/ast/field/protectedField.java index 3acad7c3c6e..100199e107f 100644 --- a/j2k/tests/testData/ast/field/protectedField.java +++ b/j2k/tests/testData/ast/field/protectedField.java @@ -1,4 +1,3 @@ -//file class C { protected Foo f; } \ No newline at end of file diff --git a/j2k/tests/testData/ast/field/publicField.java b/j2k/tests/testData/ast/field/publicField.java index 51fb27cb5bc..1944ff6914a 100644 --- a/j2k/tests/testData/ast/field/publicField.java +++ b/j2k/tests/testData/ast/field/publicField.java @@ -1,4 +1,3 @@ -//file class C { public Foo f; } \ No newline at end of file diff --git a/j2k/tests/testData/ast/field/specifyType.java b/j2k/tests/testData/ast/field/specifyType.java index 14a0e0cf7db..df0dfd3b35e 100644 --- a/j2k/tests/testData/ast/field/specifyType.java +++ b/j2k/tests/testData/ast/field/specifyType.java @@ -1,4 +1,3 @@ -//file import org.jetbrains.annotations.Nullable; import java.util.*; diff --git a/j2k/tests/testData/ast/field/valOrVar.java b/j2k/tests/testData/ast/field/valOrVar.java index 02ccbef2060..7769d1eee78 100644 --- a/j2k/tests/testData/ast/field/valOrVar.java +++ b/j2k/tests/testData/ast/field/valOrVar.java @@ -1,4 +1,3 @@ -//file class A { private final int field1 = 0; private int field2 = 0; diff --git a/j2k/tests/testData/ast/field/valWithInit.java b/j2k/tests/testData/ast/field/valWithInit.java index 794312d2f65..4e007d357ce 100644 --- a/j2k/tests/testData/ast/field/valWithInit.java +++ b/j2k/tests/testData/ast/field/valWithInit.java @@ -1,4 +1,3 @@ -//file class C { final Foo f = new Foo(1, 2); } \ No newline at end of file diff --git a/j2k/tests/testData/ast/field/varWithInit.java b/j2k/tests/testData/ast/field/varWithInit.java index 633e9d94f9a..07f05b3bc3f 100644 --- a/j2k/tests/testData/ast/field/varWithInit.java +++ b/j2k/tests/testData/ast/field/varWithInit.java @@ -1,4 +1,3 @@ -//file class C { Foo f = new Foo(1, 2); } \ No newline at end of file diff --git a/j2k/tests/testData/ast/field/varWithoutInit.java b/j2k/tests/testData/ast/field/varWithoutInit.java index 3ab3bbf9c70..3c3f6a6f633 100644 --- a/j2k/tests/testData/ast/field/varWithoutInit.java +++ b/j2k/tests/testData/ast/field/varWithoutInit.java @@ -1,4 +1,3 @@ -//file class C { Foo f; } \ No newline at end of file diff --git a/j2k/tests/testData/ast/for/forThroughListIndices.java b/j2k/tests/testData/ast/for/forThroughListIndices.java index c35b548b2ee..686b4e8597e 100644 --- a/j2k/tests/testData/ast/for/forThroughListIndices.java +++ b/j2k/tests/testData/ast/for/forThroughListIndices.java @@ -1,4 +1,3 @@ -//file import java.util.List; import java.util.ArrayList; diff --git a/j2k/tests/testData/ast/for/forThroughNonArrayIndices.java b/j2k/tests/testData/ast/for/forThroughNonArrayIndices.java index b4d4122ce2f..dc59b541349 100644 --- a/j2k/tests/testData/ast/for/forThroughNonArrayIndices.java +++ b/j2k/tests/testData/ast/for/forThroughNonArrayIndices.java @@ -1,4 +1,3 @@ -//file class X { public int length = 5; } diff --git a/j2k/tests/testData/ast/for/forThroughNonCollectionIndices.java b/j2k/tests/testData/ast/for/forThroughNonCollectionIndices.java index 955b4b227fe..099e56155e7 100644 --- a/j2k/tests/testData/ast/for/forThroughNonCollectionIndices.java +++ b/j2k/tests/testData/ast/for/forThroughNonCollectionIndices.java @@ -1,4 +1,3 @@ -//file class X { public int size() { return 5; } } diff --git a/j2k/tests/testData/ast/issues/kt-807.java b/j2k/tests/testData/ast/issues/kt-807.java index c1462ed4b14..ee451c00266 100644 --- a/j2k/tests/testData/ast/issues/kt-807.java +++ b/j2k/tests/testData/ast/issues/kt-807.java @@ -1,4 +1,3 @@ -//file import java.io.*; class FileRead {