Java to Kotlin converter: no more 2 conversion modes for each test, just a few tests to test non-standard settings

generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt

@@ -78,8 +78,6 @@ import org.jetbrains.jet.resolve.calls.AbstractResolvedCallsTest
 import org.jetbrains.jet.plugin.refactoring.rename.AbstractRenameTest
 import org.jetbrains.jet.generators.tests.generator.SingleClassTestModel
 import org.jetbrains.jet.generators.tests.generator.TestClassModel
-import org.jetbrains.jet.j2k.test.AbstractJavaToKotlinConverterPluginTest
-import org.jetbrains.jet.j2k.test.AbstractJavaToKotlinConverterBasicTest
 import org.jetbrains.jet.plugin.conversion.copy.AbstractJavaToKotlinCopyPasteConversionTest
 import org.jetbrains.jet.shortenRefs.AbstractShortenRefsTest
 import org.jetbrains.jet.completion.handlers.AbstractSmartCompletionHandlerTest
@@ -114,6 +112,7 @@ import org.jetbrains.jet.plugin.stubs.AbstractLazyResolveByStubTest
 import org.jetbrains.jet.plugin.stubs.AbstractMultiFileHighlightingTest
 import org.jetbrains.jet.cfg.AbstractPseudoValueTest
 import org.jetbrains.jet.plugin.structureView.AbstractKotlinFileStructureTest
+import org.jetbrains.jet.j2k.test.AbstractJavaToKotlinConverterTest
 
 fun main(args: Array<String>) {
     System.setProperty("java.awt.headless", "true")
@@ -637,11 +636,7 @@ fun main(args: Array<String>) {
     }
 
     testGroup("j2k/tests/test", "j2k/tests/testData") {
-        testClass(javaClass<AbstractJavaToKotlinConverterPluginTest>()) {
-            model("ast", extension = "java")
-        }
-
-        testClass(javaClass<AbstractJavaToKotlinConverterBasicTest>()) {
+        testClass(javaClass<AbstractJavaToKotlinConverterTest>()) {
             model("ast", extension = "java")
         }
     }

idea/src/org/jetbrains/jet/plugin/actions/JavaToKotlinAction.java

@@ -28,7 +28,7 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiFile;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.j2k.Converter;
-import org.jetbrains.jet.j2k.J2kPackage;
+import org.jetbrains.jet.j2k.ConverterSettings;
 
 import java.util.List;
 
@@ -78,7 +78,7 @@ public class JavaToKotlinAction extends AnAction {
 
     @NotNull
     private static Converter prepareConverter(@NotNull Project project, @NotNull List<PsiFile> selectedJavaFiles) {
-        Converter converter = new Converter(project, J2kPackage.getPluginSettings());
+        Converter converter = new Converter(project, ConverterSettings.defaultSettings);
         converter.clearClassIdentifiers();
         for (PsiFile f : selectedJavaFiles) {
             if (f.getFileType() instanceof JavaFileType) {

idea/src/org/jetbrains/jet/plugin/conversion/copy/ConvertJavaCopyPastePostProcessor.kt

@@ -85,7 +85,7 @@ public class ConvertJavaCopyPastePostProcessor() : CopyPastePostProcessor<TextBl
     }
 
     private fun convertCopiedCodeToKotlin(code: CopiedCode, project: Project): String {
-        val converter = Converter(project, PluginSettings)
+        val converter = Converter(project, ConverterSettings.defaultSettings)
         val startOffsets = code.getStartOffsets()
         val endOffsets = code.getEndOffsets()
         assert(startOffsets.size == endOffsets.size) { "Must have the same size" }

j2k/src/org/jetbrains/jet/j2k/ConverterSettings.kt

@@ -17,23 +17,20 @@
 package org.jetbrains.jet.j2k
 
 public class ConverterSettings(
-        val forceNotNullTypes: Boolean,
-        val forceLocalVariableImmutability: Boolean,
-        val specifyLocalVariableTypeByDefault: Boolean,
-        val openByDefault: Boolean
-) {
+        var forceNotNullTypes: Boolean,
+        var forceLocalVariableImmutability: Boolean,
+        var specifyLocalVariableTypeByDefault: Boolean,
+        var openByDefault: Boolean) {
+
+    public fun copy(): ConverterSettings
+            = ConverterSettings(forceNotNullTypes, forceLocalVariableImmutability, specifyLocalVariableTypeByDefault, openByDefault)
+
+    class object {
+        public val defaultSettings: ConverterSettings = ConverterSettings(
+                forceNotNullTypes = true,
+                forceLocalVariableImmutability = true,
+                specifyLocalVariableTypeByDefault = false,
+                openByDefault = false
+        )
+    }
 }
-
-public val PluginSettings: ConverterSettings = ConverterSettings(
-        forceNotNullTypes = true,
-        forceLocalVariableImmutability = true,
-        specifyLocalVariableTypeByDefault = false,
-        openByDefault = false
-)
-
-public val TestSettings: ConverterSettings = ConverterSettings(
-        forceNotNullTypes = false,
-        forceLocalVariableImmutability = false,
-        specifyLocalVariableTypeByDefault = true,
-        openByDefault = true
-)

j2k/src/org/jetbrains/jet/j2k/JavaToKotlinTranslator.kt

@@ -77,7 +77,7 @@ public object JavaToKotlinTranslator {
         while (classLoader != null) {
             val loader = classLoader
             if (loader is URLClassLoader) {
-                for (url in loader.getURLs()!!) {
+                for (url in loader.getURLs()) {
                     if ("file" == url.getProtocol() && url.getFile()!!.endsWith("/annotations.jar")) {
                         return File(url.getFile()!!)
                     }
@@ -98,7 +98,7 @@ public object JavaToKotlinTranslator {
     fun generateKotlinCode(javaCode: String): String {
         val file = createFile(javaCode)
         if (file is PsiJavaFile) {
-            val converter = Converter(file.getProject(), TestSettings)
+            val converter = Converter(file.getProject(), ConverterSettings.defaultSettings)
             setClassIdentifiers(converter, file)
             return prettify(converter.convertFile(file).toKotlin())
         }

j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterTest.kt

@@ -23,8 +23,6 @@ import com.intellij.psi.PsiFile
 import org.jetbrains.jet.j2k.Converter
 import org.jetbrains.jet.j2k.JavaToKotlinTranslator
 import org.jetbrains.jet.j2k.ConverterSettings
-import org.jetbrains.jet.j2k.PluginSettings
-import org.jetbrains.jet.j2k.TestSettings
 import java.util.regex.Pattern
 import com.intellij.testFramework.LightPlatformTestCase
 import com.intellij.testFramework.LightIdeaTestCase
@@ -32,29 +30,40 @@ import com.intellij.openapi.projectRoots.Sdk
 import org.jetbrains.jet.plugin.PluginTestCaseBase
 import com.intellij.psi.codeStyle.CodeStyleManager
 import org.jetbrains.jet.JetTestUtils
-import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.command.WriteCommandAction
-import com.intellij.openapi.application.Result
-import java.io.BufferedReader
-import java.io.StringReader
-
-public abstract class AbstractJavaToKotlinConverterPluginTest() : AbstractJavaToKotlinConverterTest("ide.kt", PluginSettings)
-public abstract class AbstractJavaToKotlinConverterBasicTest() : AbstractJavaToKotlinConverterTest("kt", TestSettings)
-
-abstract class AbstractJavaToKotlinConverterTest(val kotlinFileExtension: String, val settings: ConverterSettings ) : LightIdeaTestCase() {
 
+abstract class AbstractJavaToKotlinConverterTest() : LightIdeaTestCase() {
     val testHeaderPattern = Pattern.compile("//(element|expression|statement|method|class|file|comp)\n")
 
     public fun doTest(javaPath: String) {
         val project = LightPlatformTestCase.getProject()!!
-        val converter = Converter(project, settings)
         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("")
+
+        fun parseBoolean(text: String): Boolean = when (text) {
+            "true" -> true
+            "false" -> false
+            else -> throw IllegalArgumentException("Unknown option value: $text")
+        }
+
+        var settings = ConverterSettings.defaultSettings.copy()
+        val directives = JetTestUtils.parseDirectives(javaCode)
+        for ((name, value) in directives) {
+            when (name) {
+                "forceNotNullTypes" -> settings.forceNotNullTypes = parseBoolean(value)
+                "forceLocalVariableImmutability" -> settings.forceLocalVariableImmutability = parseBoolean(value)
+                "specifyLocalVariableTypeByDefault" -> settings.specifyLocalVariableTypeByDefault = parseBoolean(value)
+                "openByDefault" -> settings.openByDefault = parseBoolean(value)
+                else -> throw IllegalArgumentException("Unknown option: $name")
+            }
+        }
+        val converter = Converter(project, settings)
+
         val rawConverted = when (prefix) {
             "element" -> elementToKotlin(converter, javaCode)
             "expression" -> expressionToKotlin(converter, javaCode)
@@ -72,7 +81,7 @@ abstract class AbstractJavaToKotlinConverterTest(val kotlinFileExtension: String
         }
 
         val actual = reformat(rawConverted, project, reformatInFun)
-        val kotlinPath = javaPath.replace(".java", ".$kotlinFileExtension")
+        val kotlinPath = javaPath.replace(".java", ".kt")
         val expectedFile = File(kotlinPath)
         JetTestUtils.assertEqualsToFile(expectedFile, actual)
     }

j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterTestGenerated.java

@@ -26,19 +26,19 @@ import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
 
-import org.jetbrains.jet.j2k.test.AbstractJavaToKotlinConverterBasicTest;
+import org.jetbrains.jet.j2k.test.AbstractJavaToKotlinConverterTest;
 
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("j2k/tests/testData/ast")
-@InnerTestClasses({JavaToKotlinConverterBasicTestGenerated.Annotations.class, JavaToKotlinConverterBasicTestGenerated.AnonymousBlock.class, JavaToKotlinConverterBasicTestGenerated.ArrayAccessExpression.class, JavaToKotlinConverterBasicTestGenerated.ArrayInitializerExpression.class, JavaToKotlinConverterBasicTestGenerated.ArrayType.class, JavaToKotlinConverterBasicTestGenerated.AssertStatement.class, JavaToKotlinConverterBasicTestGenerated.AssignmentExpression.class, JavaToKotlinConverterBasicTestGenerated.BinaryExpression.class, JavaToKotlinConverterBasicTestGenerated.BoxedType.class, JavaToKotlinConverterBasicTestGenerated.BreakStatement.class, JavaToKotlinConverterBasicTestGenerated.CallChainExpression.class, JavaToKotlinConverterBasicTestGenerated.Class.class, JavaToKotlinConverterBasicTestGenerated.ClassExpression.class, JavaToKotlinConverterBasicTestGenerated.ConditionalExpression.class, JavaToKotlinConverterBasicTestGenerated.Constructors.class, JavaToKotlinConverterBasicTestGenerated.ContinueStatement.class, JavaToKotlinConverterBasicTestGenerated.DeclarationStatement.class, JavaToKotlinConverterBasicTestGenerated.DoWhileStatement.class, JavaToKotlinConverterBasicTestGenerated.Enum.class, JavaToKotlinConverterBasicTestGenerated.Field.class, JavaToKotlinConverterBasicTestGenerated.For.class, JavaToKotlinConverterBasicTestGenerated.ForeachStatement.class, JavaToKotlinConverterBasicTestGenerated.Formatting.class, JavaToKotlinConverterBasicTestGenerated.Function.class, JavaToKotlinConverterBasicTestGenerated.Identifier.class, JavaToKotlinConverterBasicTestGenerated.IfStatement.class, JavaToKotlinConverterBasicTestGenerated.ImportStatement.class, JavaToKotlinConverterBasicTestGenerated.InProjectionType.class, JavaToKotlinConverterBasicTestGenerated.Inheritance.class, JavaToKotlinConverterBasicTestGenerated.IsOperator.class, JavaToKotlinConverterBasicTestGenerated.Issues.class, JavaToKotlinConverterBasicTestGenerated.KotlinExclusion.class, JavaToKotlinConverterBasicTestGenerated.LabelStatement.class, JavaToKotlinConverterBasicTestGenerated.List.class, JavaToKotlinConverterBasicTestGenerated.LiteralExpression.class, JavaToKotlinConverterBasicTestGenerated.LocalVariable.class, JavaToKotlinConverterBasicTestGenerated.MethodCallExpression.class, JavaToKotlinConverterBasicTestGenerated.Misc.class, JavaToKotlinConverterBasicTestGenerated.NewClassExpression.class, JavaToKotlinConverterBasicTestGenerated.ObjectLiteral.class, JavaToKotlinConverterBasicTestGenerated.OutProjectionType.class, JavaToKotlinConverterBasicTestGenerated.PackageStatement.class, JavaToKotlinConverterBasicTestGenerated.ParenthesizedExpression.class, JavaToKotlinConverterBasicTestGenerated.PolyadicExpression.class, JavaToKotlinConverterBasicTestGenerated.PostfixOperator.class, JavaToKotlinConverterBasicTestGenerated.PrefixOperator.class, JavaToKotlinConverterBasicTestGenerated.RawGenerics.class, JavaToKotlinConverterBasicTestGenerated.ReturnStatement.class, JavaToKotlinConverterBasicTestGenerated.StarProjectionType.class, JavaToKotlinConverterBasicTestGenerated.SuperExpression.class, JavaToKotlinConverterBasicTestGenerated.Switch.class, JavaToKotlinConverterBasicTestGenerated.SynchronizedStatement.class, JavaToKotlinConverterBasicTestGenerated.ThisExpression.class, JavaToKotlinConverterBasicTestGenerated.ThrowStatement.class, JavaToKotlinConverterBasicTestGenerated.Trait.class, JavaToKotlinConverterBasicTestGenerated.TryStatement.class, JavaToKotlinConverterBasicTestGenerated.TypeCastExpression.class, JavaToKotlinConverterBasicTestGenerated.TypeParameters.class, JavaToKotlinConverterBasicTestGenerated.VarArg.class, JavaToKotlinConverterBasicTestGenerated.WhileStatement.class})
-public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotlinConverterBasicTest {
+@InnerTestClasses({JavaToKotlinConverterTestGenerated.Annotations.class, JavaToKotlinConverterTestGenerated.AnonymousBlock.class, JavaToKotlinConverterTestGenerated.ArrayAccessExpression.class, JavaToKotlinConverterTestGenerated.ArrayInitializerExpression.class, JavaToKotlinConverterTestGenerated.ArrayType.class, JavaToKotlinConverterTestGenerated.AssertStatement.class, JavaToKotlinConverterTestGenerated.AssignmentExpression.class, JavaToKotlinConverterTestGenerated.BinaryExpression.class, JavaToKotlinConverterTestGenerated.BoxedType.class, JavaToKotlinConverterTestGenerated.BreakStatement.class, JavaToKotlinConverterTestGenerated.CallChainExpression.class, JavaToKotlinConverterTestGenerated.Class.class, JavaToKotlinConverterTestGenerated.ClassExpression.class, JavaToKotlinConverterTestGenerated.ConditionalExpression.class, JavaToKotlinConverterTestGenerated.Constructors.class, JavaToKotlinConverterTestGenerated.ContinueStatement.class, JavaToKotlinConverterTestGenerated.DeclarationStatement.class, JavaToKotlinConverterTestGenerated.DoWhileStatement.class, JavaToKotlinConverterTestGenerated.Enum.class, JavaToKotlinConverterTestGenerated.Field.class, JavaToKotlinConverterTestGenerated.For.class, JavaToKotlinConverterTestGenerated.ForeachStatement.class, JavaToKotlinConverterTestGenerated.Formatting.class, JavaToKotlinConverterTestGenerated.Function.class, JavaToKotlinConverterTestGenerated.Identifier.class, JavaToKotlinConverterTestGenerated.IfStatement.class, JavaToKotlinConverterTestGenerated.ImportStatement.class, JavaToKotlinConverterTestGenerated.InProjectionType.class, JavaToKotlinConverterTestGenerated.Inheritance.class, JavaToKotlinConverterTestGenerated.IsOperator.class, JavaToKotlinConverterTestGenerated.Issues.class, JavaToKotlinConverterTestGenerated.KotlinExclusion.class, JavaToKotlinConverterTestGenerated.LabelStatement.class, JavaToKotlinConverterTestGenerated.List.class, JavaToKotlinConverterTestGenerated.LiteralExpression.class, JavaToKotlinConverterTestGenerated.LocalVariable.class, JavaToKotlinConverterTestGenerated.MethodCallExpression.class, JavaToKotlinConverterTestGenerated.Misc.class, JavaToKotlinConverterTestGenerated.NewClassExpression.class, JavaToKotlinConverterTestGenerated.ObjectLiteral.class, JavaToKotlinConverterTestGenerated.OutProjectionType.class, JavaToKotlinConverterTestGenerated.PackageStatement.class, JavaToKotlinConverterTestGenerated.ParenthesizedExpression.class, JavaToKotlinConverterTestGenerated.PolyadicExpression.class, JavaToKotlinConverterTestGenerated.PostfixOperator.class, JavaToKotlinConverterTestGenerated.PrefixOperator.class, JavaToKotlinConverterTestGenerated.RawGenerics.class, JavaToKotlinConverterTestGenerated.ReturnStatement.class, JavaToKotlinConverterTestGenerated.Settings.class, JavaToKotlinConverterTestGenerated.StarProjectionType.class, JavaToKotlinConverterTestGenerated.SuperExpression.class, JavaToKotlinConverterTestGenerated.Switch.class, JavaToKotlinConverterTestGenerated.SynchronizedStatement.class, JavaToKotlinConverterTestGenerated.ThisExpression.class, JavaToKotlinConverterTestGenerated.ThrowStatement.class, JavaToKotlinConverterTestGenerated.Trait.class, JavaToKotlinConverterTestGenerated.TryStatement.class, JavaToKotlinConverterTestGenerated.TypeCastExpression.class, JavaToKotlinConverterTestGenerated.TypeParameters.class, JavaToKotlinConverterTestGenerated.VarArg.class, JavaToKotlinConverterTestGenerated.WhileStatement.class})
+public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConverterTest {
     public void testAllFilesPresentInAst() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast"), Pattern.compile("^(.+)\\.java$"), true);
     }
     
     @TestMetadata("j2k/tests/testData/ast/annotations")
-    public static class Annotations extends AbstractJavaToKotlinConverterBasicTest {
+    public static class Annotations extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInAnnotations() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/annotations"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -56,7 +56,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/anonymousBlock")
-    public static class AnonymousBlock extends AbstractJavaToKotlinConverterBasicTest {
+    public static class AnonymousBlock extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInAnonymousBlock() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/anonymousBlock"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -74,7 +74,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/arrayAccessExpression")
-    public static class ArrayAccessExpression extends AbstractJavaToKotlinConverterBasicTest {
+    public static class ArrayAccessExpression extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInArrayAccessExpression() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/arrayAccessExpression"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -97,7 +97,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/arrayInitializerExpression")
-    public static class ArrayInitializerExpression extends AbstractJavaToKotlinConverterBasicTest {
+    public static class ArrayInitializerExpression extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInArrayInitializerExpression() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/arrayInitializerExpression"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -165,7 +165,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/arrayType")
-    public static class ArrayType extends AbstractJavaToKotlinConverterBasicTest {
+    public static class ArrayType extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInArrayType() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/arrayType"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -223,7 +223,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/assertStatement")
-    public static class AssertStatement extends AbstractJavaToKotlinConverterBasicTest {
+    public static class AssertStatement extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInAssertStatement() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/assertStatement"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -246,7 +246,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/assignmentExpression")
-    public static class AssignmentExpression extends AbstractJavaToKotlinConverterBasicTest {
+    public static class AssignmentExpression extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInAssignmentExpression() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/assignmentExpression"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -281,6 +281,11 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
             doTest("j2k/tests/testData/ast/assignmentExpression/nullability.java");
         }
         
+        @TestMetadata("nullability-settings.java")
+        public void testNullability_settings() throws Exception {
+            doTest("j2k/tests/testData/ast/assignmentExpression/nullability-settings.java");
+        }
+        
         @TestMetadata("or.java")
         public void testOr() throws Exception {
             doTest("j2k/tests/testData/ast/assignmentExpression/or.java");
@@ -324,7 +329,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/binaryExpression")
-    public static class BinaryExpression extends AbstractJavaToKotlinConverterBasicTest {
+    public static class BinaryExpression extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInBinaryExpression() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/binaryExpression"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -417,7 +422,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/boxedType")
-    public static class BoxedType extends AbstractJavaToKotlinConverterBasicTest {
+    public static class BoxedType extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInBoxedType() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/boxedType"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -480,7 +485,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/breakStatement")
-    public static class BreakStatement extends AbstractJavaToKotlinConverterBasicTest {
+    public static class BreakStatement extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInBreakStatement() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/breakStatement"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -498,7 +503,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/callChainExpression")
-    public static class CallChainExpression extends AbstractJavaToKotlinConverterBasicTest {
+    public static class CallChainExpression extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInCallChainExpression() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/callChainExpression"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -518,6 +523,11 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
             doTest("j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.java");
         }
         
+        @TestMetadata("libraryMethodCallFromInstance-settings.java")
+        public void testLibraryMethodCallFromInstance_settings() throws Exception {
+            doTest("j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance-settings.java");
+        }
+        
         @TestMetadata("libraryStringFieldCall.java")
         public void testLibraryStringFieldCall() throws Exception {
             doTest("j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.java");
@@ -531,7 +541,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/class")
-    public static class Class extends AbstractJavaToKotlinConverterBasicTest {
+    public static class Class extends AbstractJavaToKotlinConverterTest {
         @TestMetadata("abstractClass.java")
         public void testAbstractClass() throws Exception {
             doTest("j2k/tests/testData/ast/class/abstractClass.java");
@@ -664,7 +674,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/classExpression")
-    public static class ClassExpression extends AbstractJavaToKotlinConverterBasicTest {
+    public static class ClassExpression extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInClassExpression() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/classExpression"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -687,7 +697,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/conditionalExpression")
-    public static class ConditionalExpression extends AbstractJavaToKotlinConverterBasicTest {
+    public static class ConditionalExpression extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInConditionalExpression() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/conditionalExpression"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -700,7 +710,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/constructors")
-    public static class Constructors extends AbstractJavaToKotlinConverterBasicTest {
+    public static class Constructors extends AbstractJavaToKotlinConverterTest {
         @TestMetadata("allCallsPrimary.java")
         public void testAllCallsPrimary() throws Exception {
             doTest("j2k/tests/testData/ast/constructors/allCallsPrimary.java");
@@ -778,7 +788,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/continueStatement")
-    public static class ContinueStatement extends AbstractJavaToKotlinConverterBasicTest {
+    public static class ContinueStatement extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInContinueStatement() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/continueStatement"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -796,7 +806,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/declarationStatement")
-    public static class DeclarationStatement extends AbstractJavaToKotlinConverterBasicTest {
+    public static class DeclarationStatement extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInDeclarationStatement() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/declarationStatement"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -834,7 +844,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/doWhileStatement")
-    public static class DoWhileStatement extends AbstractJavaToKotlinConverterBasicTest {
+    public static class DoWhileStatement extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInDoWhileStatement() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/doWhileStatement"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -862,7 +872,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/enum")
-    public static class Enum extends AbstractJavaToKotlinConverterBasicTest {
+    public static class Enum extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInEnum() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/enum"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -945,7 +955,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/field")
-    public static class Field extends AbstractJavaToKotlinConverterBasicTest {
+    public static class Field extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInField() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/field"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -993,7 +1003,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/for")
-    public static class For extends AbstractJavaToKotlinConverterBasicTest {
+    public static class For extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInFor() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/for"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -1056,7 +1066,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/foreachStatement")
-    public static class ForeachStatement extends AbstractJavaToKotlinConverterBasicTest {
+    public static class ForeachStatement extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInForeachStatement() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/foreachStatement"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -1084,7 +1094,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/formatting")
-    public static class Formatting extends AbstractJavaToKotlinConverterBasicTest {
+    public static class Formatting extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInFormatting() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/formatting"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -1112,7 +1122,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/function")
-    public static class Function extends AbstractJavaToKotlinConverterBasicTest {
+    public static class Function extends AbstractJavaToKotlinConverterTest {
         @TestMetadata("abstractMethod.java")
         public void testAbstractMethod() throws Exception {
             doTest("j2k/tests/testData/ast/function/abstractMethod.java");
@@ -1235,7 +1245,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/identifier")
-    public static class Identifier extends AbstractJavaToKotlinConverterBasicTest {
+    public static class Identifier extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInIdentifier() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/identifier"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -1258,7 +1268,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/ifStatement")
-    public static class IfStatement extends AbstractJavaToKotlinConverterBasicTest {
+    public static class IfStatement extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInIfStatement() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/ifStatement"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -1286,7 +1296,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/importStatement")
-    public static class ImportStatement extends AbstractJavaToKotlinConverterBasicTest {
+    public static class ImportStatement extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInImportStatement() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/importStatement"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -1319,7 +1329,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/inProjectionType")
-    public static class InProjectionType extends AbstractJavaToKotlinConverterBasicTest {
+    public static class InProjectionType extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInInProjectionType() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/inProjectionType"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -1332,7 +1342,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/inheritance")
-    public static class Inheritance extends AbstractJavaToKotlinConverterBasicTest {
+    public static class Inheritance extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInInheritance() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/inheritance"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -1360,7 +1370,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/isOperator")
-    public static class IsOperator extends AbstractJavaToKotlinConverterBasicTest {
+    public static class IsOperator extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInIsOperator() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/isOperator"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -1378,7 +1388,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/issues")
-    public static class Issues extends AbstractJavaToKotlinConverterBasicTest {
+    public static class Issues extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInIssues() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/issues"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -1536,7 +1546,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/kotlinExclusion")
-    public static class KotlinExclusion extends AbstractJavaToKotlinConverterBasicTest {
+    public static class KotlinExclusion extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInKotlinExclusion() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/kotlinExclusion"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -1549,7 +1559,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/labelStatement")
-    public static class LabelStatement extends AbstractJavaToKotlinConverterBasicTest {
+    public static class LabelStatement extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInLabelStatement() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/labelStatement"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -1562,7 +1572,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/list")
-    public static class List extends AbstractJavaToKotlinConverterBasicTest {
+    public static class List extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInList() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/list"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -1580,7 +1590,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/literalExpression")
-    public static class LiteralExpression extends AbstractJavaToKotlinConverterBasicTest {
+    public static class LiteralExpression extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInLiteralExpression() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/literalExpression"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -1618,7 +1628,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/localVariable")
-    public static class LocalVariable extends AbstractJavaToKotlinConverterBasicTest {
+    public static class LocalVariable extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInLocalVariable() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/localVariable"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -1631,7 +1641,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/methodCallExpression")
-    public static class MethodCallExpression extends AbstractJavaToKotlinConverterBasicTest {
+    public static class MethodCallExpression extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInMethodCallExpression() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/methodCallExpression"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -1659,7 +1669,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/misc")
-    public static class Misc extends AbstractJavaToKotlinConverterBasicTest {
+    public static class Misc extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInMisc() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/misc"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -1697,7 +1707,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/newClassExpression")
-    public static class NewClassExpression extends AbstractJavaToKotlinConverterBasicTest {
+    public static class NewClassExpression extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInNewClassExpression() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/newClassExpression"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -1760,7 +1770,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/objectLiteral")
-    public static class ObjectLiteral extends AbstractJavaToKotlinConverterBasicTest {
+    public static class ObjectLiteral extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInObjectLiteral() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/objectLiteral"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -1773,7 +1783,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/outProjectionType")
-    public static class OutProjectionType extends AbstractJavaToKotlinConverterBasicTest {
+    public static class OutProjectionType extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInOutProjectionType() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/outProjectionType"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -1786,7 +1796,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/packageStatement")
-    public static class PackageStatement extends AbstractJavaToKotlinConverterBasicTest {
+    public static class PackageStatement extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInPackageStatement() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/packageStatement"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -1799,7 +1809,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/parenthesizedExpression")
-    public static class ParenthesizedExpression extends AbstractJavaToKotlinConverterBasicTest {
+    public static class ParenthesizedExpression extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInParenthesizedExpression() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/parenthesizedExpression"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -1817,7 +1827,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/polyadicExpression")
-    public static class PolyadicExpression extends AbstractJavaToKotlinConverterBasicTest {
+    public static class PolyadicExpression extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInPolyadicExpression() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/polyadicExpression"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -1855,7 +1865,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/postfixOperator")
-    public static class PostfixOperator extends AbstractJavaToKotlinConverterBasicTest {
+    public static class PostfixOperator extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInPostfixOperator() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/postfixOperator"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -1873,7 +1883,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/prefixOperator")
-    public static class PrefixOperator extends AbstractJavaToKotlinConverterBasicTest {
+    public static class PrefixOperator extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInPrefixOperator() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/prefixOperator"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -1911,7 +1921,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/rawGenerics")
-    public static class RawGenerics extends AbstractJavaToKotlinConverterBasicTest {
+    public static class RawGenerics extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInRawGenerics() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/rawGenerics"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -1939,7 +1949,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/returnStatement")
-    public static class ReturnStatement extends AbstractJavaToKotlinConverterBasicTest {
+    public static class ReturnStatement extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInReturnStatement() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/returnStatement"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -1966,8 +1976,21 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
         
     }
     
+    @TestMetadata("j2k/tests/testData/ast/settings")
+    public static class Settings extends AbstractJavaToKotlinConverterTest {
+        public void testAllFilesPresentInSettings() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/settings"), Pattern.compile("^(.+)\\.java$"), true);
+        }
+        
+        @TestMetadata("specifyLocalVariableTypeByDefault.java")
+        public void testSpecifyLocalVariableTypeByDefault() throws Exception {
+            doTest("j2k/tests/testData/ast/settings/specifyLocalVariableTypeByDefault.java");
+        }
+        
+    }
+    
     @TestMetadata("j2k/tests/testData/ast/starProjectionType")
-    public static class StarProjectionType extends AbstractJavaToKotlinConverterBasicTest {
+    public static class StarProjectionType extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInStarProjectionType() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/starProjectionType"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -1980,7 +2003,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/superExpression")
-    public static class SuperExpression extends AbstractJavaToKotlinConverterBasicTest {
+    public static class SuperExpression extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInSuperExpression() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/superExpression"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -2003,7 +2026,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/switch")
-    public static class Switch extends AbstractJavaToKotlinConverterBasicTest {
+    public static class Switch extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInSwitch() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/switch"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -2036,7 +2059,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/synchronizedStatement")
-    public static class SynchronizedStatement extends AbstractJavaToKotlinConverterBasicTest {
+    public static class SynchronizedStatement extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInSynchronizedStatement() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/synchronizedStatement"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -2049,7 +2072,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/thisExpression")
-    public static class ThisExpression extends AbstractJavaToKotlinConverterBasicTest {
+    public static class ThisExpression extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInThisExpression() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/thisExpression"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -2067,7 +2090,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/throwStatement")
-    public static class ThrowStatement extends AbstractJavaToKotlinConverterBasicTest {
+    public static class ThrowStatement extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInThrowStatement() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/throwStatement"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -2080,7 +2103,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/trait")
-    public static class Trait extends AbstractJavaToKotlinConverterBasicTest {
+    public static class Trait extends AbstractJavaToKotlinConverterTest {
         @TestMetadata("abstactInterface.java")
         public void testAbstactInterface() throws Exception {
             doTest("j2k/tests/testData/ast/trait/abstactInterface.java");
@@ -2143,7 +2166,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/tryStatement")
-    public static class TryStatement extends AbstractJavaToKotlinConverterBasicTest {
+    public static class TryStatement extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInTryStatement() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/tryStatement"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -2171,7 +2194,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/typeCastExpression")
-    public static class TypeCastExpression extends AbstractJavaToKotlinConverterBasicTest {
+    public static class TypeCastExpression extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInTypeCastExpression() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/typeCastExpression"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -2219,7 +2242,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/typeParameters")
-    public static class TypeParameters extends AbstractJavaToKotlinConverterBasicTest {
+    public static class TypeParameters extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInTypeParameters() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/typeParameters"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -2259,6 +2282,11 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
             doTest("j2k/tests/testData/ast/typeParameters/genericParam.java");
         }
         
+        @TestMetadata("genericParam-settings.java")
+        public void testGenericParam_settings() throws Exception {
+            doTest("j2k/tests/testData/ast/typeParameters/genericParam-settings.java");
+        }
+        
         @TestMetadata("manyGenericParams.java")
         public void testManyGenericParams() throws Exception {
             doTest("j2k/tests/testData/ast/typeParameters/manyGenericParams.java");
@@ -2282,7 +2310,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/varArg")
-    public static class VarArg extends AbstractJavaToKotlinConverterBasicTest {
+    public static class VarArg extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInVarArg() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/varArg"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -2300,7 +2328,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     @TestMetadata("j2k/tests/testData/ast/whileStatement")
-    public static class WhileStatement extends AbstractJavaToKotlinConverterBasicTest {
+    public static class WhileStatement extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInWhileStatement() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/whileStatement"), Pattern.compile("^(.+)\\.java$"), true);
         }
@@ -2328,8 +2356,8 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
     }
     
     public static Test suite() {
-        TestSuite suite = new TestSuite("JavaToKotlinConverterBasicTestGenerated");
-        suite.addTestSuite(JavaToKotlinConverterBasicTestGenerated.class);
+        TestSuite suite = new TestSuite("JavaToKotlinConverterTestGenerated");
+        suite.addTestSuite(JavaToKotlinConverterTestGenerated.class);
         suite.addTestSuite(Annotations.class);
         suite.addTestSuite(AnonymousBlock.class);
         suite.addTestSuite(ArrayAccessExpression.class);
@@ -2378,6 +2406,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
         suite.addTestSuite(PrefixOperator.class);
         suite.addTestSuite(RawGenerics.class);
         suite.addTestSuite(ReturnStatement.class);
+        suite.addTestSuite(Settings.class);
         suite.addTestSuite(StarProjectionType.class);
         suite.addTestSuite(SuperExpression.class);
         suite.addTestSuite(Switch.class);

j2k/tests/testData/ast/annotations/jetbrainsNotNull.ide.kt

@@ -1,26 +0,0 @@
-package test
-
-public class Test(str: String) {
-    var myStr: String = "String2"
-
-    public fun sout(str: String) {
-        System.out.println(str)
-    }
-
-    public fun dummy(str: String): String {
-        return str
-    }
-
-    public fun test() {
-        sout("String")
-        val test = "String2"
-        sout(test)
-        sout(dummy(test))
-
-        Test(test)
-    }
-
-    {
-        myStr = str
-    }
-}

j2k/tests/testData/ast/annotations/jetbrainsNotNull.java

@@ -1,4 +1,6 @@
 //file
+// !forceNotNullTypes: false
+// !specifyLocalVariableTypeByDefault: true
 package test;
 
 import org.jetbrains.annotations.NotNull;

j2k/tests/testData/ast/annotations/jetbrainsNotNull.kt

@@ -1,19 +1,21 @@
+// !forceNotNullTypes: false
+// !specifyLocalVariableTypeByDefault: true
 package test
 
-public open class Test(str: String) {
+public class Test(str: String) {
     var myStr: String = "String2"
 
-    public open fun sout(str: String) {
+    public fun sout(str: String) {
         System.out?.println(str)
     }
 
-    public open fun dummy(str: String): String {
+    public fun dummy(str: String): String {
         return str
     }
 
-    public open fun test() {
+    public fun test() {
         sout("String")
-        var test: String = "String2"
+        val test: String = "String2"
         sout(test)
         sout(dummy(test))
 

j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.ide.kt

@@ -1,20 +0,0 @@
-package test
-
-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()
-        barNotNull.fooNullable.execute()
-        barNullable.fooNotNull.execute()
-        barNullable.fooNullable.execute()
-    }
-}

j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.java

@@ -1,4 +1,6 @@
 //file
+// !forceNotNullTypes: false
+// !specifyLocalVariableTypeByDefault: true
 package test;
 
 import org.jetbrains.annotations.NotNull;

j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.kt

@@ -1,17 +1,19 @@
+// !forceNotNullTypes: false
+// !specifyLocalVariableTypeByDefault: true
 package test
 
-open class Foo() {
-    open fun execute() {
+class Foo() {
+    fun execute() {
     }
 }
 
-open class Bar() {
+class Bar() {
     var fooNotNull: Foo = Foo()
     var fooNullable: Foo? = null
 }
 
-open class Test() {
-    public open fun test(barNotNull: Bar, barNullable: Bar?) {
+class Test() {
+    public fun test(barNotNull: Bar, barNullable: Bar?) {
         barNotNull.fooNotNull.execute()
         barNotNull.fooNullable?.execute()
         barNullable?.fooNotNull?.execute()

j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.ide.kt

@@ -1,6 +0,0 @@
-class Test() {
-    var str: String = 0
-    {
-        str = "Ola"
-    }
-}

j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.kt

@@ -1,5 +1,5 @@
-open class Test() {
-    var str: String? = null
+class Test() {
+    var str: String = 0
     {
         str = "Ola"
     }

j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.ide.kt

@@ -1,9 +0,0 @@
-class Test() {
-    var str: String = 0
-
-    class object {
-        {
-            str = "Ola"
-        }
-    }
-}

j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.kt

@@ -1,5 +1,5 @@
-open class Test() {
-    var str: String? = null
+class Test() {
+    var str: String = 0
 
     class object {
         {

j2k/tests/testData/ast/arrayAccessExpression/expressionIndex.ide.kt

@@ -1 +0,0 @@
-myArray[myLibrary.calculateIndex(100)]

j2k/tests/testData/ast/arrayAccessExpression/intIndex.ide.kt

@@ -1 +0,0 @@
-myArray[10]

j2k/tests/testData/ast/arrayAccessExpression/variableIndex.ide.kt

@@ -1 +0,0 @@
-myArray[i]

j2k/tests/testData/ast/arrayInitializerExpression/doubleArray.ide.kt

@@ -1 +0,0 @@
-val a = doubleArray(1.0, 2.0, 3.0)

j2k/tests/testData/ast/arrayInitializerExpression/doubleArray.kt

@@ -1 +1 @@
-var a: DoubleArray? = doubleArray(1.0, 2.0, 3.0)
+val a = doubleArray(1.0, 2.0, 3.0)

j2k/tests/testData/ast/arrayInitializerExpression/doubleArrayWithVariables.ide.kt

@@ -1,4 +0,0 @@
-val a = 0
-val b = 0
-val c = 0
-val ds = doubleArray((a).toDouble(), (b).toDouble(), (c).toDouble())

j2k/tests/testData/ast/arrayInitializerExpression/doubleArrayWithVariables.kt

@@ -1,4 +1,4 @@
-var a: Double = 0
-var b: Double = 0
-var c: Double = 0
-var ds: DoubleArray? = doubleArray((a).toDouble(), (b).toDouble(), (c).toDouble())
+val a = 0
+val b = 0
+val c = 0
+val ds = doubleArray((a).toDouble(), (b).toDouble(), (c).toDouble())

j2k/tests/testData/ast/arrayInitializerExpression/floatArray.ide.kt

@@ -1 +0,0 @@
-val a = floatArray(1.0, 2.0, 3.0)

j2k/tests/testData/ast/arrayInitializerExpression/floatArray.kt

@@ -1 +1 @@
-var a: FloatArray? = floatArray(1.0, 2.0, 3.0)
+val a = floatArray(1.0, 2.0, 3.0)

j2k/tests/testData/ast/arrayInitializerExpression/intArrayWithLength.ide.kt

@@ -1 +0,0 @@
-val a = IntArray(10)

j2k/tests/testData/ast/arrayInitializerExpression/intArrayWithLength.kt

@@ -1 +1 @@
-var a: IntArray? = IntArray(10)
+val a = IntArray(10)

j2k/tests/testData/ast/arrayInitializerExpression/javaLangDoubleArray.ide.kt

@@ -1 +0,0 @@
-val a = array<java.lang.Double>(1.0, 2.0, 3.0)

j2k/tests/testData/ast/arrayInitializerExpression/javaLangDoubleArray.kt

@@ -1 +1 @@
-var a: Array<java.lang.Double?>? = array<java.lang.Double?>(1.0, 2.0, 3.0)
+val a = array<java.lang.Double>(1.0, 2.0, 3.0)

j2k/tests/testData/ast/arrayInitializerExpression/javaLangFloatArray.ide.kt

@@ -1 +0,0 @@
-val a = array<java.lang.Float>(1.0, 2.0, 3.0)

j2k/tests/testData/ast/arrayInitializerExpression/javaLangFloatArray.kt

@@ -1 +1 @@
-var a: Array<java.lang.Float?>? = array<java.lang.Float?>(1.0, 2.0, 3.0)
+val a = array<java.lang.Float>(1.0, 2.0, 3.0)

j2k/tests/testData/ast/arrayInitializerExpression/newByte.ide.kt

@@ -1 +0,0 @@
-val a = byteArray(1, 2, 3)

j2k/tests/testData/ast/arrayInitializerExpression/newByte.kt

@@ -1 +1 @@
-var a: ByteArray? = byteArray(1, 2, 3)
+val a = byteArray(1, 2, 3)

j2k/tests/testData/ast/arrayInitializerExpression/newInt.ide.kt

@@ -1 +0,0 @@
-intArray(1, 2, 3)

j2k/tests/testData/ast/arrayInitializerExpression/objectArrayWithLength.ide.kt

@@ -1 +0,0 @@
-val a = arrayOfNulls<Any>(10)

j2k/tests/testData/ast/arrayInitializerExpression/objectArrayWithLength.kt

@@ -1 +1 @@
-var a: Array<Any?>? = arrayOfNulls<Any?>(10)
+val a = arrayOfNulls<Any>(10)

j2k/tests/testData/ast/arrayInitializerExpression/oneDim.ide.kt

@@ -1 +0,0 @@
-val a = intArray(1, 2, 3)

j2k/tests/testData/ast/arrayInitializerExpression/oneDim.kt

@@ -1 +1 @@
-var a: IntArray? = intArray(1, 2, 3)
+val a = intArray(1, 2, 3)

j2k/tests/testData/ast/arrayInitializerExpression/oneDimWithVariables.ide.kt

@@ -1,4 +0,0 @@
-val a = 0
-val b = 0
-val c = 0
-val `is` = intArray(a, b, c)

j2k/tests/testData/ast/arrayInitializerExpression/oneDimWithVariables.kt

@@ -1,4 +1,4 @@
-var a: Int = 0
-var b: Int = 0
-var c: Int = 0
-var `is`: IntArray? = intArray(a, b, c)
+val a = 0
+val b = 0
+val c = 0
+val `is` = intArray(a, b, c)

j2k/tests/testData/ast/arrayInitializerExpression/twoDim.ide.kt

@@ -1 +0,0 @@
-val a = array<IntArray>(intArray(1, 2, 3), intArray(4, 5, 6), intArray(7, 8, 9))

j2k/tests/testData/ast/arrayInitializerExpression/twoDim.kt

@@ -1 +1 @@
-var a: Array<IntArray?>? = array<IntArray?>(intArray(1, 2, 3), intArray(4, 5, 6), intArray(7, 8, 9))
+val a = array<IntArray>(intArray(1, 2, 3), intArray(4, 5, 6), intArray(7, 8, 9))

j2k/tests/testData/ast/arrayType/arrayInitializationStatement.ide.kt

@@ -1 +0,0 @@
-val d2 = array<IntArray>()

j2k/tests/testData/ast/arrayType/arrayInitializationStatement.kt

@@ -1 +1 @@
-var d2: Array<IntArray?>? = array<IntArray?>()
+val d2 = array<IntArray>()

j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension.ide.kt

@@ -1 +0,0 @@
-val d2 = arrayOfNulls<IntArray>(5)

j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension.kt

@@ -1 +1 @@
-var d2: Array<IntArray?>? = arrayOfNulls<IntArray?>(5)
+val d2 = arrayOfNulls<IntArray>(5)

j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension3d.ide.kt

@@ -1 +0,0 @@
-val d3 = Array<Array<IntArray>>(5, { arrayOfNulls<IntArray>(5) })

j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension3d.kt

@@ -1 +1 @@
-var d3: Array<Array<IntArray?>?>? = Array<Array<IntArray?>?>(5, { arrayOfNulls<IntArray?>(5) })
+val d3 = Array<Array<IntArray>>(5, { arrayOfNulls<IntArray>(5) })

j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimensionExplicit.ide.kt

@@ -1 +0,0 @@
-val d2 = Array<IntArray>(5, { IntArray(5) })

j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimensionExplicit.kt

@@ -1 +1 @@
-var d2: Array<IntArray?>? = Array<IntArray?>(5, { IntArray(5) })
+val d2 = Array<IntArray>(5, { IntArray(5) })

j2k/tests/testData/ast/arrayType/d2StringEmptyArray.ide.kt

@@ -1 +0,0 @@
-val ss = Array<Array<String>>(5, { arrayOfNulls<String>(5) })

j2k/tests/testData/ast/arrayType/d2StringEmptyArray.kt

@@ -1 +1 @@
-var ss: Array<Array<String?>?>? = Array<Array<String?>?>(5, { arrayOfNulls<String?>(5) })
+val ss = Array<Array<String>>(5, { arrayOfNulls<String>(5) })

j2k/tests/testData/ast/arrayType/d3StringEmptyArray.ide.kt

@@ -1 +0,0 @@
-val sss = Array<Array<Array<String>>>(5, { Array<Array<String>>(5, { arrayOfNulls<String>(5) }) })

j2k/tests/testData/ast/arrayType/d3StringEmptyArray.kt

@@ -1 +1 @@
-var sss: Array<Array<Array<String?>?>?>? = Array<Array<Array<String?>?>?>(5, { Array<Array<String?>?>(5, { arrayOfNulls<String?>(5) }) })
+val sss = Array<Array<Array<String>>>(5, { Array<Array<String>>(5, { arrayOfNulls<String>(5) }) })

j2k/tests/testData/ast/arrayType/longArray.ide.kt

@@ -1 +0,0 @@
-val a = longArray(1, 2, 3)

j2k/tests/testData/ast/arrayType/longArray.kt

@@ -1 +1 @@
-var a: LongArray? = longArray(1, 2, 3)
+val a = longArray(1, 2, 3)

j2k/tests/testData/ast/arrayType/methodArrayArgs.ide.kt

@@ -1,2 +0,0 @@
-fun fromArrayToCollection(a: Array<Foo>) {
-}

j2k/tests/testData/ast/arrayType/methodArrayArgs.kt

@@ -1,2 +1,2 @@
-fun fromArrayToCollection(a: Array<Foo?>?) {
+fun fromArrayToCollection(a: Array<Foo>) {
 }

j2k/tests/testData/ast/arrayType/newIntArray.ide.kt

@@ -1 +0,0 @@
-val a = intArray(1, 2, 3)

j2k/tests/testData/ast/arrayType/newIntArray.kt

@@ -1 +1 @@
-var a: IntArray? = intArray(1, 2, 3)
+val a = intArray(1, 2, 3)

j2k/tests/testData/ast/arrayType/newStringArray.ide.kt

@@ -1 +0,0 @@
-val a = array<String>("abc")

j2k/tests/testData/ast/arrayType/newStringArray.kt

@@ -1 +1 @@
-var a: Array<String?>? = array<String?>("abc")
+val a = array<String>("abc")

j2k/tests/testData/ast/assertStatement/onlyCondition.ide.kt

@@ -1 +0,0 @@
-assert(boolMethod())

j2k/tests/testData/ast/assertStatement/onlyConditionWithBraces.ide.kt

@@ -1 +0,0 @@
-assert((boolMethod()))

j2k/tests/testData/ast/assertStatement/withStringDetail.ide.kt

@@ -1 +0,0 @@
-assert(true) { "string details" }

j2k/tests/testData/ast/assignmentExpression/and.ide.kt

@@ -1 +0,0 @@
-x = x and 2

j2k/tests/testData/ast/assignmentExpression/assignment.ide.kt

@@ -1 +0,0 @@
-x = 2

j2k/tests/testData/ast/assignmentExpression/divideAssign.ide.kt

@@ -1 +0,0 @@
-x /= 2

j2k/tests/testData/ast/assignmentExpression/minusAssign.ide.kt

@@ -1 +0,0 @@
-x -= 2

j2k/tests/testData/ast/assignmentExpression/multiplyAssign.ide.kt

@@ -1 +0,0 @@
-x *= 2

j2k/tests/testData/ast/assignmentExpression/nullability-settings.java

@@ -0,0 +1,12 @@
+//file
+// !forceNotNullTypes: false
+// !specifyLocalVariableTypeByDefault: true
+import java.util.BitSet;
+
+class Foo {
+  void foo(BitSet o) {
+    BitSet o2 = o;
+    int foo = 0;
+    foo = o2.size();
+  }
+}

j2k/tests/testData/ast/assignmentExpression/nullability-settings.kt

@@ -0,0 +1,11 @@
+// !forceNotNullTypes: false
+// !specifyLocalVariableTypeByDefault: true
+import java.util.BitSet
+
+class Foo() {
+    fun foo(o: BitSet?) {
+        val o2: BitSet? = o
+        val foo: Int = 0
+        foo = o2?.size()!!
+    }
+}

j2k/tests/testData/ast/assignmentExpression/nullability.ide.kt

@@ -1,9 +0,0 @@
-import java.util.BitSet
-
-class Foo() {
-    fun foo(o: BitSet) {
-        val o2 = o
-        val foo = 0
-        foo = o2.size()
-    }
-}

j2k/tests/testData/ast/assignmentExpression/nullability.kt

@@ -1,9 +1,9 @@
 import java.util.BitSet
 
-open class Foo() {
-    open fun foo(o: BitSet?) {
-        var o2: BitSet? = o
-        var foo: Int = 0
-        foo = o2?.size()!!
+class Foo() {
+    fun foo(o: BitSet) {
+        val o2 = o
+        val foo = 0
+        foo = o2.size()
     }
 }

j2k/tests/testData/ast/assignmentExpression/or.ide.kt

@@ -1 +0,0 @@
-x = x or 2

j2k/tests/testData/ast/assignmentExpression/plusAssign.ide.kt

@@ -1 +0,0 @@
-x += 2

j2k/tests/testData/ast/assignmentExpression/reminder.ide.kt

@@ -1 +0,0 @@
-x %= 2

j2k/tests/testData/ast/assignmentExpression/shiftLeft.ide.kt

@@ -1 +0,0 @@
-x = x shl 2

j2k/tests/testData/ast/assignmentExpression/shiftRight.ide.kt

@@ -1 +0,0 @@
-x = x shr 2

j2k/tests/testData/ast/assignmentExpression/simpleAssignment.ide.kt

@@ -1 +0,0 @@
-i = 1

j2k/tests/testData/ast/assignmentExpression/unsignedRightShift.ide.kt

@@ -1 +0,0 @@
-x = x ushr 2

j2k/tests/testData/ast/assignmentExpression/xor.ide.kt

@@ -1 +0,0 @@
-x = x xor 2

j2k/tests/testData/ast/binaryExpression/and.ide.kt

@@ -1 +0,0 @@
-x and 2

j2k/tests/testData/ast/binaryExpression/conditionalAnd.ide.kt

@@ -1 +0,0 @@
-true && false

j2k/tests/testData/ast/binaryExpression/conditionalOr.ide.kt

@@ -1 +0,0 @@
-true || false

j2k/tests/testData/ast/binaryExpression/divide.ide.kt

@@ -1 +0,0 @@
-1 / 2

j2k/tests/testData/ast/binaryExpression/greaterThan.ide.kt

@@ -1 +0,0 @@
-1 > 2

j2k/tests/testData/ast/binaryExpression/greaterThanEqual.ide.kt

@@ -1 +0,0 @@
-1 >= 2

j2k/tests/testData/ast/binaryExpression/lessThan.ide.kt

@@ -1 +0,0 @@
-1 < 2

j2k/tests/testData/ast/binaryExpression/lessThanEqual.ide.kt

@@ -1 +0,0 @@
-1 <= 2

j2k/tests/testData/ast/binaryExpression/minus.ide.kt

@@ -1 +0,0 @@
-1 - 2

j2k/tests/testData/ast/binaryExpression/multiply.ide.kt

@@ -1 +0,0 @@
-1 * 2

j2k/tests/testData/ast/binaryExpression/or.ide.kt

@@ -1 +0,0 @@
-x or 2

j2k/tests/testData/ast/binaryExpression/plus.ide.kt

@@ -1 +0,0 @@
-1 + 2

j2k/tests/testData/ast/binaryExpression/remainder.ide.kt

@@ -1 +0,0 @@
-1 % 2

j2k/tests/testData/ast/binaryExpression/shiftLeft.ide.kt

@@ -1 +0,0 @@
-x shl 2

j2k/tests/testData/ast/binaryExpression/shiftRight.ide.kt

@@ -1 +0,0 @@
-x shr 2

j2k/tests/testData/ast/binaryExpression/unsignedRightShift.ide.kt

@@ -1 +0,0 @@
-x.ushr(2)