diff --git a/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt index 61b03ab9152..b92163e44b6 100644 --- a/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt +++ b/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) { System.setProperty("java.awt.headless", "true") @@ -637,11 +636,7 @@ fun main(args: Array) { } testGroup("j2k/tests/test", "j2k/tests/testData") { - testClass(javaClass()) { - model("ast", extension = "java") - } - - testClass(javaClass()) { + testClass(javaClass()) { model("ast", extension = "java") } } diff --git a/idea/src/org/jetbrains/jet/plugin/actions/JavaToKotlinAction.java b/idea/src/org/jetbrains/jet/plugin/actions/JavaToKotlinAction.java index c26e6d88dba..e434f58b207 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/JavaToKotlinAction.java +++ b/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 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) { diff --git a/idea/src/org/jetbrains/jet/plugin/conversion/copy/ConvertJavaCopyPastePostProcessor.kt b/idea/src/org/jetbrains/jet/plugin/conversion/copy/ConvertJavaCopyPastePostProcessor.kt index 5fde9de51a4..4ad242f2c06 100644 --- a/idea/src/org/jetbrains/jet/plugin/conversion/copy/ConvertJavaCopyPastePostProcessor.kt +++ b/idea/src/org/jetbrains/jet/plugin/conversion/copy/ConvertJavaCopyPastePostProcessor.kt @@ -85,7 +85,7 @@ public class ConvertJavaCopyPastePostProcessor() : CopyPastePostProcessor 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) } diff --git a/j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterPluginTestGenerated.java b/j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterPluginTestGenerated.java deleted file mode 100644 index 79f7fcbdcf4..00000000000 --- a/j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterPluginTestGenerated.java +++ /dev/null @@ -1,2395 +0,0 @@ -/* - * Copyright 2010-2014 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.jet.j2k.test; - -import junit.framework.Assert; -import junit.framework.Test; -import junit.framework.TestSuite; - -import java.io.File; -import java.util.regex.Pattern; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; - -import org.jetbrains.jet.j2k.test.AbstractJavaToKotlinConverterPluginTest; - -/** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ -@SuppressWarnings("all") -@TestMetadata("j2k/tests/testData/ast") -@InnerTestClasses({JavaToKotlinConverterPluginTestGenerated.Annotations.class, JavaToKotlinConverterPluginTestGenerated.AnonymousBlock.class, JavaToKotlinConverterPluginTestGenerated.ArrayAccessExpression.class, JavaToKotlinConverterPluginTestGenerated.ArrayInitializerExpression.class, JavaToKotlinConverterPluginTestGenerated.ArrayType.class, JavaToKotlinConverterPluginTestGenerated.AssertStatement.class, JavaToKotlinConverterPluginTestGenerated.AssignmentExpression.class, JavaToKotlinConverterPluginTestGenerated.BinaryExpression.class, JavaToKotlinConverterPluginTestGenerated.BoxedType.class, JavaToKotlinConverterPluginTestGenerated.BreakStatement.class, JavaToKotlinConverterPluginTestGenerated.CallChainExpression.class, JavaToKotlinConverterPluginTestGenerated.Class.class, JavaToKotlinConverterPluginTestGenerated.ClassExpression.class, JavaToKotlinConverterPluginTestGenerated.ConditionalExpression.class, JavaToKotlinConverterPluginTestGenerated.Constructors.class, JavaToKotlinConverterPluginTestGenerated.ContinueStatement.class, JavaToKotlinConverterPluginTestGenerated.DeclarationStatement.class, JavaToKotlinConverterPluginTestGenerated.DoWhileStatement.class, JavaToKotlinConverterPluginTestGenerated.Enum.class, JavaToKotlinConverterPluginTestGenerated.Field.class, JavaToKotlinConverterPluginTestGenerated.For.class, JavaToKotlinConverterPluginTestGenerated.ForeachStatement.class, JavaToKotlinConverterPluginTestGenerated.Formatting.class, JavaToKotlinConverterPluginTestGenerated.Function.class, JavaToKotlinConverterPluginTestGenerated.Identifier.class, JavaToKotlinConverterPluginTestGenerated.IfStatement.class, JavaToKotlinConverterPluginTestGenerated.ImportStatement.class, JavaToKotlinConverterPluginTestGenerated.InProjectionType.class, JavaToKotlinConverterPluginTestGenerated.Inheritance.class, JavaToKotlinConverterPluginTestGenerated.IsOperator.class, JavaToKotlinConverterPluginTestGenerated.Issues.class, JavaToKotlinConverterPluginTestGenerated.KotlinExclusion.class, JavaToKotlinConverterPluginTestGenerated.LabelStatement.class, JavaToKotlinConverterPluginTestGenerated.List.class, JavaToKotlinConverterPluginTestGenerated.LiteralExpression.class, JavaToKotlinConverterPluginTestGenerated.LocalVariable.class, JavaToKotlinConverterPluginTestGenerated.MethodCallExpression.class, JavaToKotlinConverterPluginTestGenerated.Misc.class, JavaToKotlinConverterPluginTestGenerated.NewClassExpression.class, JavaToKotlinConverterPluginTestGenerated.ObjectLiteral.class, JavaToKotlinConverterPluginTestGenerated.OutProjectionType.class, JavaToKotlinConverterPluginTestGenerated.PackageStatement.class, JavaToKotlinConverterPluginTestGenerated.ParenthesizedExpression.class, JavaToKotlinConverterPluginTestGenerated.PolyadicExpression.class, JavaToKotlinConverterPluginTestGenerated.PostfixOperator.class, JavaToKotlinConverterPluginTestGenerated.PrefixOperator.class, JavaToKotlinConverterPluginTestGenerated.RawGenerics.class, JavaToKotlinConverterPluginTestGenerated.ReturnStatement.class, JavaToKotlinConverterPluginTestGenerated.StarProjectionType.class, JavaToKotlinConverterPluginTestGenerated.SuperExpression.class, JavaToKotlinConverterPluginTestGenerated.Switch.class, JavaToKotlinConverterPluginTestGenerated.SynchronizedStatement.class, JavaToKotlinConverterPluginTestGenerated.ThisExpression.class, JavaToKotlinConverterPluginTestGenerated.ThrowStatement.class, JavaToKotlinConverterPluginTestGenerated.Trait.class, JavaToKotlinConverterPluginTestGenerated.TryStatement.class, JavaToKotlinConverterPluginTestGenerated.TypeCastExpression.class, JavaToKotlinConverterPluginTestGenerated.TypeParameters.class, JavaToKotlinConverterPluginTestGenerated.VarArg.class, JavaToKotlinConverterPluginTestGenerated.WhileStatement.class}) -public class JavaToKotlinConverterPluginTestGenerated extends AbstractJavaToKotlinConverterPluginTest { - 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 AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("jetbrainsNotNull.java") - public void testJetbrainsNotNull() throws Exception { - doTest("j2k/tests/testData/ast/annotations/jetbrainsNotNull.java"); - } - - @TestMetadata("jetbrainsNotNullChainExpr.java") - public void testJetbrainsNotNullChainExpr() throws Exception { - doTest("j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/anonymousBlock") - public static class AnonymousBlock extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("oneAnonBlock.java") - public void testOneAnonBlock() throws Exception { - doTest("j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.java"); - } - - @TestMetadata("oneStaticAnonBlock.java") - public void testOneStaticAnonBlock() throws Exception { - doTest("j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/arrayAccessExpression") - public static class ArrayAccessExpression extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("expressionIndex.java") - public void testExpressionIndex() throws Exception { - doTest("j2k/tests/testData/ast/arrayAccessExpression/expressionIndex.java"); - } - - @TestMetadata("intIndex.java") - public void testIntIndex() throws Exception { - doTest("j2k/tests/testData/ast/arrayAccessExpression/intIndex.java"); - } - - @TestMetadata("variableIndex.java") - public void testVariableIndex() throws Exception { - doTest("j2k/tests/testData/ast/arrayAccessExpression/variableIndex.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/arrayInitializerExpression") - public static class ArrayInitializerExpression extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("doubleArray.java") - public void testDoubleArray() throws Exception { - doTest("j2k/tests/testData/ast/arrayInitializerExpression/doubleArray.java"); - } - - @TestMetadata("doubleArrayWithVariables.java") - public void testDoubleArrayWithVariables() throws Exception { - doTest("j2k/tests/testData/ast/arrayInitializerExpression/doubleArrayWithVariables.java"); - } - - @TestMetadata("floatArray.java") - public void testFloatArray() throws Exception { - doTest("j2k/tests/testData/ast/arrayInitializerExpression/floatArray.java"); - } - - @TestMetadata("intArrayWithLength.java") - public void testIntArrayWithLength() throws Exception { - doTest("j2k/tests/testData/ast/arrayInitializerExpression/intArrayWithLength.java"); - } - - @TestMetadata("javaLangDoubleArray.java") - public void testJavaLangDoubleArray() throws Exception { - doTest("j2k/tests/testData/ast/arrayInitializerExpression/javaLangDoubleArray.java"); - } - - @TestMetadata("javaLangFloatArray.java") - public void testJavaLangFloatArray() throws Exception { - doTest("j2k/tests/testData/ast/arrayInitializerExpression/javaLangFloatArray.java"); - } - - @TestMetadata("newByte.java") - public void testNewByte() throws Exception { - doTest("j2k/tests/testData/ast/arrayInitializerExpression/newByte.java"); - } - - @TestMetadata("newInt.java") - public void testNewInt() throws Exception { - doTest("j2k/tests/testData/ast/arrayInitializerExpression/newInt.java"); - } - - @TestMetadata("objectArrayWithLength.java") - public void testObjectArrayWithLength() throws Exception { - doTest("j2k/tests/testData/ast/arrayInitializerExpression/objectArrayWithLength.java"); - } - - @TestMetadata("oneDim.java") - public void testOneDim() throws Exception { - doTest("j2k/tests/testData/ast/arrayInitializerExpression/oneDim.java"); - } - - @TestMetadata("oneDimWithVariables.java") - public void testOneDimWithVariables() throws Exception { - doTest("j2k/tests/testData/ast/arrayInitializerExpression/oneDimWithVariables.java"); - } - - @TestMetadata("twoDim.java") - public void testTwoDim() throws Exception { - doTest("j2k/tests/testData/ast/arrayInitializerExpression/twoDim.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/arrayType") - public static class ArrayType extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("arrayInitializationStatement.java") - public void testArrayInitializationStatement() throws Exception { - doTest("j2k/tests/testData/ast/arrayType/arrayInitializationStatement.java"); - } - - @TestMetadata("arrayInitializationStatementWithDimension.java") - public void testArrayInitializationStatementWithDimension() throws Exception { - doTest("j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension.java"); - } - - @TestMetadata("arrayInitializationStatementWithDimension3d.java") - public void testArrayInitializationStatementWithDimension3d() throws Exception { - doTest("j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension3d.java"); - } - - @TestMetadata("arrayInitializationStatementWithDimensionExplicit.java") - public void testArrayInitializationStatementWithDimensionExplicit() throws Exception { - doTest("j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimensionExplicit.java"); - } - - @TestMetadata("d2StringEmptyArray.java") - public void testD2StringEmptyArray() throws Exception { - doTest("j2k/tests/testData/ast/arrayType/d2StringEmptyArray.java"); - } - - @TestMetadata("d3StringEmptyArray.java") - public void testD3StringEmptyArray() throws Exception { - doTest("j2k/tests/testData/ast/arrayType/d3StringEmptyArray.java"); - } - - @TestMetadata("longArray.java") - public void testLongArray() throws Exception { - doTest("j2k/tests/testData/ast/arrayType/longArray.java"); - } - - @TestMetadata("methodArrayArgs.java") - public void testMethodArrayArgs() throws Exception { - doTest("j2k/tests/testData/ast/arrayType/methodArrayArgs.java"); - } - - @TestMetadata("newIntArray.java") - public void testNewIntArray() throws Exception { - doTest("j2k/tests/testData/ast/arrayType/newIntArray.java"); - } - - @TestMetadata("newStringArray.java") - public void testNewStringArray() throws Exception { - doTest("j2k/tests/testData/ast/arrayType/newStringArray.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/assertStatement") - public static class AssertStatement extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("onlyCondition.java") - public void testOnlyCondition() throws Exception { - doTest("j2k/tests/testData/ast/assertStatement/onlyCondition.java"); - } - - @TestMetadata("onlyConditionWithBraces.java") - public void testOnlyConditionWithBraces() throws Exception { - doTest("j2k/tests/testData/ast/assertStatement/onlyConditionWithBraces.java"); - } - - @TestMetadata("withStringDetail.java") - public void testWithStringDetail() throws Exception { - doTest("j2k/tests/testData/ast/assertStatement/withStringDetail.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/assignmentExpression") - public static class AssignmentExpression extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("and.java") - public void testAnd() throws Exception { - doTest("j2k/tests/testData/ast/assignmentExpression/and.java"); - } - - @TestMetadata("assignment.java") - public void testAssignment() throws Exception { - doTest("j2k/tests/testData/ast/assignmentExpression/assignment.java"); - } - - @TestMetadata("divideAssign.java") - public void testDivideAssign() throws Exception { - doTest("j2k/tests/testData/ast/assignmentExpression/divideAssign.java"); - } - - @TestMetadata("minusAssign.java") - public void testMinusAssign() throws Exception { - doTest("j2k/tests/testData/ast/assignmentExpression/minusAssign.java"); - } - - @TestMetadata("multiplyAssign.java") - public void testMultiplyAssign() throws Exception { - doTest("j2k/tests/testData/ast/assignmentExpression/multiplyAssign.java"); - } - - @TestMetadata("nullability.java") - public void testNullability() throws Exception { - doTest("j2k/tests/testData/ast/assignmentExpression/nullability.java"); - } - - @TestMetadata("or.java") - public void testOr() throws Exception { - doTest("j2k/tests/testData/ast/assignmentExpression/or.java"); - } - - @TestMetadata("plusAssign.java") - public void testPlusAssign() throws Exception { - doTest("j2k/tests/testData/ast/assignmentExpression/plusAssign.java"); - } - - @TestMetadata("reminder.java") - public void testReminder() throws Exception { - doTest("j2k/tests/testData/ast/assignmentExpression/reminder.java"); - } - - @TestMetadata("shiftLeft.java") - public void testShiftLeft() throws Exception { - doTest("j2k/tests/testData/ast/assignmentExpression/shiftLeft.java"); - } - - @TestMetadata("shiftRight.java") - public void testShiftRight() throws Exception { - doTest("j2k/tests/testData/ast/assignmentExpression/shiftRight.java"); - } - - @TestMetadata("simpleAssignment.java") - public void testSimpleAssignment() throws Exception { - doTest("j2k/tests/testData/ast/assignmentExpression/simpleAssignment.java"); - } - - @TestMetadata("unsignedRightShift.java") - public void testUnsignedRightShift() throws Exception { - doTest("j2k/tests/testData/ast/assignmentExpression/unsignedRightShift.java"); - } - - @TestMetadata("xor.java") - public void testXor() throws Exception { - doTest("j2k/tests/testData/ast/assignmentExpression/xor.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/binaryExpression") - public static class BinaryExpression extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("and.java") - public void testAnd() throws Exception { - doTest("j2k/tests/testData/ast/binaryExpression/and.java"); - } - - @TestMetadata("conditionalAnd.java") - public void testConditionalAnd() throws Exception { - doTest("j2k/tests/testData/ast/binaryExpression/conditionalAnd.java"); - } - - @TestMetadata("conditionalOr.java") - public void testConditionalOr() throws Exception { - doTest("j2k/tests/testData/ast/binaryExpression/conditionalOr.java"); - } - - @TestMetadata("divide.java") - public void testDivide() throws Exception { - doTest("j2k/tests/testData/ast/binaryExpression/divide.java"); - } - - @TestMetadata("greaterThan.java") - public void testGreaterThan() throws Exception { - doTest("j2k/tests/testData/ast/binaryExpression/greaterThan.java"); - } - - @TestMetadata("greaterThanEqual.java") - public void testGreaterThanEqual() throws Exception { - doTest("j2k/tests/testData/ast/binaryExpression/greaterThanEqual.java"); - } - - @TestMetadata("lessThan.java") - public void testLessThan() throws Exception { - doTest("j2k/tests/testData/ast/binaryExpression/lessThan.java"); - } - - @TestMetadata("lessThanEqual.java") - public void testLessThanEqual() throws Exception { - doTest("j2k/tests/testData/ast/binaryExpression/lessThanEqual.java"); - } - - @TestMetadata("minus.java") - public void testMinus() throws Exception { - doTest("j2k/tests/testData/ast/binaryExpression/minus.java"); - } - - @TestMetadata("multiply.java") - public void testMultiply() throws Exception { - doTest("j2k/tests/testData/ast/binaryExpression/multiply.java"); - } - - @TestMetadata("or.java") - public void testOr() throws Exception { - doTest("j2k/tests/testData/ast/binaryExpression/or.java"); - } - - @TestMetadata("plus.java") - public void testPlus() throws Exception { - doTest("j2k/tests/testData/ast/binaryExpression/plus.java"); - } - - @TestMetadata("remainder.java") - public void testRemainder() throws Exception { - doTest("j2k/tests/testData/ast/binaryExpression/remainder.java"); - } - - @TestMetadata("shiftLeft.java") - public void testShiftLeft() throws Exception { - doTest("j2k/tests/testData/ast/binaryExpression/shiftLeft.java"); - } - - @TestMetadata("shiftRight.java") - public void testShiftRight() throws Exception { - doTest("j2k/tests/testData/ast/binaryExpression/shiftRight.java"); - } - - @TestMetadata("unsignedRightShift.java") - public void testUnsignedRightShift() throws Exception { - doTest("j2k/tests/testData/ast/binaryExpression/unsignedRightShift.java"); - } - - @TestMetadata("xor.java") - public void testXor() throws Exception { - doTest("j2k/tests/testData/ast/binaryExpression/xor.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/boxedType") - public static class BoxedType extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("boolean.java") - public void testBoolean() throws Exception { - doTest("j2k/tests/testData/ast/boxedType/boolean.java"); - } - - @TestMetadata("Boxing.java") - public void testBoxing() throws Exception { - doTest("j2k/tests/testData/ast/boxedType/Boxing.java"); - } - - @TestMetadata("byte.java") - public void testByte() throws Exception { - doTest("j2k/tests/testData/ast/boxedType/byte.java"); - } - - @TestMetadata("character.java") - public void testCharacter() throws Exception { - doTest("j2k/tests/testData/ast/boxedType/character.java"); - } - - @TestMetadata("double.java") - public void testDouble() throws Exception { - doTest("j2k/tests/testData/ast/boxedType/double.java"); - } - - @TestMetadata("float.java") - public void testFloat() throws Exception { - doTest("j2k/tests/testData/ast/boxedType/float.java"); - } - - @TestMetadata("integer.java") - public void testInteger() throws Exception { - doTest("j2k/tests/testData/ast/boxedType/integer.java"); - } - - @TestMetadata("kt-671.java") - public void testKt_671() throws Exception { - doTest("j2k/tests/testData/ast/boxedType/kt-671.java"); - } - - @TestMetadata("long.java") - public void testLong() throws Exception { - doTest("j2k/tests/testData/ast/boxedType/long.java"); - } - - @TestMetadata("object.java") - public void testObject() throws Exception { - doTest("j2k/tests/testData/ast/boxedType/object.java"); - } - - @TestMetadata("short.java") - public void testShort() throws Exception { - doTest("j2k/tests/testData/ast/boxedType/short.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/breakStatement") - public static class BreakStatement extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("breakWithLabel.java") - public void testBreakWithLabel() throws Exception { - doTest("j2k/tests/testData/ast/breakStatement/breakWithLabel.java"); - } - - @TestMetadata("breakWithoutLabel.java") - public void testBreakWithoutLabel() throws Exception { - doTest("j2k/tests/testData/ast/breakStatement/breakWithoutLabel.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/callChainExpression") - public static class CallChainExpression extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("libraryFieldCall.java") - public void testLibraryFieldCall() throws Exception { - doTest("j2k/tests/testData/ast/callChainExpression/libraryFieldCall.java"); - } - - @TestMetadata("libraryMethodCall.java") - public void testLibraryMethodCall() throws Exception { - doTest("j2k/tests/testData/ast/callChainExpression/libraryMethodCall.java"); - } - - @TestMetadata("libraryMethodCallFromInstance.java") - public void testLibraryMethodCallFromInstance() throws Exception { - doTest("j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.java"); - } - - @TestMetadata("libraryStringFieldCall.java") - public void testLibraryStringFieldCall() throws Exception { - doTest("j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.java"); - } - - @TestMetadata("sout.java") - public void testSout() throws Exception { - doTest("j2k/tests/testData/ast/callChainExpression/sout.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/class") - public static class Class extends AbstractJavaToKotlinConverterPluginTest { - @TestMetadata("abstractClass.java") - public void testAbstractClass() throws Exception { - doTest("j2k/tests/testData/ast/class/abstractClass.java"); - } - - @TestMetadata("abstractClassShape.java") - public void testAbstractClassShape() throws Exception { - doTest("j2k/tests/testData/ast/class/abstractClassShape.java"); - } - - public void testAllFilesPresentInClass() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/class"), Pattern.compile("^(.+)\\.java$"), true); - } - - @TestMetadata("class.java") - public void testClass() throws Exception { - doTest("j2k/tests/testData/ast/class/class.java"); - } - - @TestMetadata("ClassShadowing.java") - public void testClassShadowing() throws Exception { - doTest("j2k/tests/testData/ast/class/ClassShadowing.java"); - } - - @TestMetadata("classWithEmptyMethods.java") - public void testClassWithEmptyMethods() throws Exception { - doTest("j2k/tests/testData/ast/class/classWithEmptyMethods.java"); - } - - @TestMetadata("classWithFields.java") - public void testClassWithFields() throws Exception { - doTest("j2k/tests/testData/ast/class/classWithFields.java"); - } - - @TestMetadata("classWithMultiplyFields.java") - public void testClassWithMultiplyFields() throws Exception { - doTest("j2k/tests/testData/ast/class/classWithMultiplyFields.java"); - } - - @TestMetadata("emptyClass.java") - public void testEmptyClass() throws Exception { - doTest("j2k/tests/testData/ast/class/emptyClass.java"); - } - - @TestMetadata("extendsOneClassAndImplementsOneInterface.java") - public void testExtendsOneClassAndImplementsOneInterface() throws Exception { - doTest("j2k/tests/testData/ast/class/extendsOneClassAndImplementsOneInterface.java"); - } - - @TestMetadata("extendsOneClassAndImplementsSeveralInterfaces.java") - public void testExtendsOneClassAndImplementsSeveralInterfaces() throws Exception { - doTest("j2k/tests/testData/ast/class/extendsOneClassAndImplementsSeveralInterfaces.java"); - } - - @TestMetadata("finalClass.java") - public void testFinalClass() throws Exception { - doTest("j2k/tests/testData/ast/class/finalClass.java"); - } - - @TestMetadata("genericClass.java") - public void testGenericClass() throws Exception { - doTest("j2k/tests/testData/ast/class/genericClass.java"); - } - - @TestMetadata("innerEmptyClass.java") - public void testInnerEmptyClass() throws Exception { - doTest("j2k/tests/testData/ast/class/innerEmptyClass.java"); - } - - @TestMetadata("innerStaticClass.java") - public void testInnerStaticClass() throws Exception { - doTest("j2k/tests/testData/ast/class/innerStaticClass.java"); - } - - @TestMetadata("internalClass.java") - public void testInternalClass() throws Exception { - doTest("j2k/tests/testData/ast/class/internalClass.java"); - } - - @TestMetadata("kt-639.java") - public void testKt_639() throws Exception { - doTest("j2k/tests/testData/ast/class/kt-639.java"); - } - - @TestMetadata("oneStaticFieldOneNonStatic.java") - public void testOneStaticFieldOneNonStatic() throws Exception { - doTest("j2k/tests/testData/ast/class/oneStaticFieldOneNonStatic.java"); - } - - @TestMetadata("oneStaticMethod.java") - public void testOneStaticMethod() throws Exception { - doTest("j2k/tests/testData/ast/class/oneStaticMethod.java"); - } - - @TestMetadata("oneStaticMethodOneNonStatic.java") - public void testOneStaticMethodOneNonStatic() throws Exception { - doTest("j2k/tests/testData/ast/class/oneStaticMethodOneNonStatic.java"); - } - - @TestMetadata("pivateClass.java") - public void testPivateClass() throws Exception { - doTest("j2k/tests/testData/ast/class/pivateClass.java"); - } - - @TestMetadata("privateInit.java") - public void testPrivateInit() throws Exception { - doTest("j2k/tests/testData/ast/class/privateInit.java"); - } - - @TestMetadata("protectedClass.java") - public void testProtectedClass() throws Exception { - doTest("j2k/tests/testData/ast/class/protectedClass.java"); - } - - @TestMetadata("publicClass.java") - public void testPublicClass() throws Exception { - doTest("j2k/tests/testData/ast/class/publicClass.java"); - } - - @TestMetadata("simpleInheritance.java") - public void testSimpleInheritance() throws Exception { - doTest("j2k/tests/testData/ast/class/simpleInheritance.java"); - } - - @TestMetadata("twoStaticMethod.java") - public void testTwoStaticMethod() throws Exception { - doTest("j2k/tests/testData/ast/class/twoStaticMethod.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/classExpression") - public static class ClassExpression extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("complexExample.java") - public void testComplexExample() throws Exception { - doTest("j2k/tests/testData/ast/classExpression/complexExample.java"); - } - - @TestMetadata("objectClass.java") - public void testObjectClass() throws Exception { - doTest("j2k/tests/testData/ast/classExpression/objectClass.java"); - } - - @TestMetadata("stringClass.java") - public void testStringClass() throws Exception { - doTest("j2k/tests/testData/ast/classExpression/stringClass.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/conditionalExpression") - public static class ConditionalExpression extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("simpleConditionalExpression.java") - public void testSimpleConditionalExpression() throws Exception { - doTest("j2k/tests/testData/ast/conditionalExpression/simpleConditionalExpression.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/constructors") - public static class Constructors extends AbstractJavaToKotlinConverterPluginTest { - @TestMetadata("allCallsPrimary.java") - public void testAllCallsPrimary() throws Exception { - doTest("j2k/tests/testData/ast/constructors/allCallsPrimary.java"); - } - - @TestMetadata("allCallsPrimary2.java") - public void testAllCallsPrimary2() throws Exception { - doTest("j2k/tests/testData/ast/constructors/allCallsPrimary2.java"); - } - - public void testAllFilesPresentInConstructors() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/constructors"), Pattern.compile("^(.+)\\.java$"), true); - } - - @TestMetadata("customerBuilder.java") - public void testCustomerBuilder() throws Exception { - doTest("j2k/tests/testData/ast/constructors/customerBuilder.java"); - } - - @TestMetadata("fieldsInitializedFromParams1.java") - public void testFieldsInitializedFromParams1() throws Exception { - doTest("j2k/tests/testData/ast/constructors/fieldsInitializedFromParams1.java"); - } - - @TestMetadata("fieldsInitializedFromParams2.java") - public void testFieldsInitializedFromParams2() throws Exception { - doTest("j2k/tests/testData/ast/constructors/fieldsInitializedFromParams2.java"); - } - - @TestMetadata("fieldsInitializedFromParams3.java") - public void testFieldsInitializedFromParams3() throws Exception { - doTest("j2k/tests/testData/ast/constructors/fieldsInitializedFromParams3.java"); - } - - @TestMetadata("fieldsInitializedFromParams4.java") - public void testFieldsInitializedFromParams4() throws Exception { - doTest("j2k/tests/testData/ast/constructors/fieldsInitializedFromParams4.java"); - } - - @TestMetadata("fieldsInitializedFromParams5.java") - public void testFieldsInitializedFromParams5() throws Exception { - doTest("j2k/tests/testData/ast/constructors/fieldsInitializedFromParams5.java"); - } - - @TestMetadata("fieldsInitializedFromParams6.java") - public void testFieldsInitializedFromParams6() throws Exception { - doTest("j2k/tests/testData/ast/constructors/fieldsInitializedFromParams6.java"); - } - - @TestMetadata("fieldsInitializedFromParams7.java") - public void testFieldsInitializedFromParams7() throws Exception { - doTest("j2k/tests/testData/ast/constructors/fieldsInitializedFromParams7.java"); - } - - @TestMetadata("genericIdentifier.java") - public void testGenericIdentifier() throws Exception { - doTest("j2k/tests/testData/ast/constructors/genericIdentifier.java"); - } - - @TestMetadata("identifier.java") - public void testIdentifier() throws Exception { - doTest("j2k/tests/testData/ast/constructors/identifier.java"); - } - - @TestMetadata("privateConstructors.java") - public void testPrivateConstructors() throws Exception { - doTest("j2k/tests/testData/ast/constructors/privateConstructors.java"); - } - - @TestMetadata("withManyDefaultParams.java") - public void testWithManyDefaultParams() throws Exception { - doTest("j2k/tests/testData/ast/constructors/withManyDefaultParams.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/continueStatement") - public static class ContinueStatement extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("continueWithLabel.java") - public void testContinueWithLabel() throws Exception { - doTest("j2k/tests/testData/ast/continueStatement/continueWithLabel.java"); - } - - @TestMetadata("continueWithoutLabel.java") - public void testContinueWithoutLabel() throws Exception { - doTest("j2k/tests/testData/ast/continueStatement/continueWithoutLabel.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/declarationStatement") - public static class DeclarationStatement extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("multiplyFinalIntDeclaration.java") - public void testMultiplyFinalIntDeclaration() throws Exception { - doTest("j2k/tests/testData/ast/declarationStatement/multiplyFinalIntDeclaration.java"); - } - - @TestMetadata("multiplyIntDeclaration.java") - public void testMultiplyIntDeclaration() throws Exception { - doTest("j2k/tests/testData/ast/declarationStatement/multiplyIntDeclaration.java"); - } - - @TestMetadata("singleFinalIntDeclaration.java") - public void testSingleFinalIntDeclaration() throws Exception { - doTest("j2k/tests/testData/ast/declarationStatement/singleFinalIntDeclaration.java"); - } - - @TestMetadata("singleFinalStringDeclaration.java") - public void testSingleFinalStringDeclaration() throws Exception { - doTest("j2k/tests/testData/ast/declarationStatement/singleFinalStringDeclaration.java"); - } - - @TestMetadata("singleIntDeclaration.java") - public void testSingleIntDeclaration() throws Exception { - doTest("j2k/tests/testData/ast/declarationStatement/singleIntDeclaration.java"); - } - - @TestMetadata("singleStringDeclaration.java") - public void testSingleStringDeclaration() throws Exception { - doTest("j2k/tests/testData/ast/declarationStatement/singleStringDeclaration.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/doWhileStatement") - public static class DoWhileStatement extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("whileWithBlock.java") - public void testWhileWithBlock() throws Exception { - doTest("j2k/tests/testData/ast/doWhileStatement/whileWithBlock.java"); - } - - @TestMetadata("whileWithEmptyBlock.java") - public void testWhileWithEmptyBlock() throws Exception { - doTest("j2k/tests/testData/ast/doWhileStatement/whileWithEmptyBlock.java"); - } - - @TestMetadata("whileWithExpression.java") - public void testWhileWithExpression() throws Exception { - doTest("j2k/tests/testData/ast/doWhileStatement/whileWithExpression.java"); - } - - @TestMetadata("whileWithReturn.java") - public void testWhileWithReturn() throws Exception { - doTest("j2k/tests/testData/ast/doWhileStatement/whileWithReturn.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/enum") - public static class Enum extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("colorEnum.java") - public void testColorEnum() throws Exception { - doTest("j2k/tests/testData/ast/enum/colorEnum.java"); - } - - @TestMetadata("emptyEnum.java") - public void testEmptyEnum() throws Exception { - doTest("j2k/tests/testData/ast/enum/emptyEnum.java"); - } - - @TestMetadata("enumConstantIsNotNull.java") - public void testEnumConstantIsNotNull() throws Exception { - doTest("j2k/tests/testData/ast/enum/enumConstantIsNotNull.java"); - } - - @TestMetadata("enumImplementsOneInterface.java") - public void testEnumImplementsOneInterface() throws Exception { - doTest("j2k/tests/testData/ast/enum/enumImplementsOneInterface.java"); - } - - @TestMetadata("enumImplementsSeveralInterfaces.java") - public void testEnumImplementsSeveralInterfaces() throws Exception { - doTest("j2k/tests/testData/ast/enum/enumImplementsSeveralInterfaces.java"); - } - - @TestMetadata("enumWithNameField.java") - public void testEnumWithNameField() throws Exception { - doTest("j2k/tests/testData/ast/enum/enumWithNameField.java"); - } - - @TestMetadata("fieldsWithPrimaryPrivateConstructor.java") - public void testFieldsWithPrimaryPrivateConstructor() throws Exception { - doTest("j2k/tests/testData/ast/enum/fieldsWithPrimaryPrivateConstructor.java"); - } - - @TestMetadata("internalEnum.java") - public void testInternalEnum() throws Exception { - doTest("j2k/tests/testData/ast/enum/internalEnum.java"); - } - - @TestMetadata("overrideToString.java") - public void testOverrideToString() throws Exception { - doTest("j2k/tests/testData/ast/enum/overrideToString.java"); - } - - @TestMetadata("primaryPrivateConstructor.java") - public void testPrimaryPrivateConstructor() throws Exception { - doTest("j2k/tests/testData/ast/enum/primaryPrivateConstructor.java"); - } - - @TestMetadata("privateEnum.java") - public void testPrivateEnum() throws Exception { - doTest("j2k/tests/testData/ast/enum/privateEnum.java"); - } - - @TestMetadata("protectedEnum.java") - public void testProtectedEnum() throws Exception { - doTest("j2k/tests/testData/ast/enum/protectedEnum.java"); - } - - @TestMetadata("publicEnum.java") - public void testPublicEnum() throws Exception { - doTest("j2k/tests/testData/ast/enum/publicEnum.java"); - } - - @TestMetadata("runnableImplementation.java") - public void testRunnableImplementation() throws Exception { - doTest("j2k/tests/testData/ast/enum/runnableImplementation.java"); - } - - @TestMetadata("typeSafeEnum.java") - public void testTypeSafeEnum() throws Exception { - doTest("j2k/tests/testData/ast/enum/typeSafeEnum.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/field") - public static class Field extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("classChildExtendsBase.java") - public void testClassChildExtendsBase() throws Exception { - doTest("j2k/tests/testData/ast/field/classChildExtendsBase.java"); - } - - @TestMetadata("internalField.java") - public void testInternalField() throws Exception { - doTest("j2k/tests/testData/ast/field/internalField.java"); - } - - @TestMetadata("privateField.java") - public void testPrivateField() throws Exception { - doTest("j2k/tests/testData/ast/field/privateField.java"); - } - - @TestMetadata("protectedField.java") - public void testProtectedField() throws Exception { - doTest("j2k/tests/testData/ast/field/protectedField.java"); - } - - @TestMetadata("publicField.java") - public void testPublicField() throws Exception { - doTest("j2k/tests/testData/ast/field/publicField.java"); - } - - @TestMetadata("valWithInit.java") - public void testValWithInit() throws Exception { - doTest("j2k/tests/testData/ast/field/valWithInit.java"); - } - - @TestMetadata("varWithInit.java") - public void testVarWithInit() throws Exception { - doTest("j2k/tests/testData/ast/field/varWithInit.java"); - } - - @TestMetadata("varWithoutInit.java") - public void testVarWithoutInit() throws Exception { - doTest("j2k/tests/testData/ast/field/varWithoutInit.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/for") - public static class For extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("commonCaseForTest.java") - public void testCommonCaseForTest() throws Exception { - doTest("j2k/tests/testData/ast/for/commonCaseForTest.java"); - } - - @TestMetadata("forRangeWithLE.java") - public void testForRangeWithLE() throws Exception { - doTest("j2k/tests/testData/ast/for/forRangeWithLE.java"); - } - - @TestMetadata("forRangeWithLT.java") - public void testForRangeWithLT() throws Exception { - doTest("j2k/tests/testData/ast/for/forRangeWithLT.java"); - } - - @TestMetadata("forWithBlock.java") - public void testForWithBlock() throws Exception { - doTest("j2k/tests/testData/ast/for/forWithBlock.java"); - } - - @TestMetadata("forWithBlockAndDoubleUpdate.java") - public void testForWithBlockAndDoubleUpdate() throws Exception { - doTest("j2k/tests/testData/ast/for/forWithBlockAndDoubleUpdate.java"); - } - - @TestMetadata("forWithEmptyBlock.java") - public void testForWithEmptyBlock() throws Exception { - doTest("j2k/tests/testData/ast/for/forWithEmptyBlock.java"); - } - - @TestMetadata("forWithExpression.java") - public void testForWithExpression() throws Exception { - doTest("j2k/tests/testData/ast/for/forWithExpression.java"); - } - - @TestMetadata("forWithNullCondition.java") - public void testForWithNullCondition() throws Exception { - doTest("j2k/tests/testData/ast/for/forWithNullCondition.java"); - } - - @TestMetadata("forWithNullInit.java") - public void testForWithNullInit() throws Exception { - doTest("j2k/tests/testData/ast/for/forWithNullInit.java"); - } - - @TestMetadata("forWithNullUpdate.java") - public void testForWithNullUpdate() throws Exception { - doTest("j2k/tests/testData/ast/for/forWithNullUpdate.java"); - } - - @TestMetadata("forWithReturn.java") - public void testForWithReturn() throws Exception { - doTest("j2k/tests/testData/ast/for/forWithReturn.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/foreachStatement") - public static class ForeachStatement extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("enhancedForWithBlock.java") - public void testEnhancedForWithBlock() throws Exception { - doTest("j2k/tests/testData/ast/foreachStatement/enhancedForWithBlock.java"); - } - - @TestMetadata("enhancedForWithEmptyBlock.java") - public void testEnhancedForWithEmptyBlock() throws Exception { - doTest("j2k/tests/testData/ast/foreachStatement/enhancedForWithEmptyBlock.java"); - } - - @TestMetadata("enhancedForWithExpression.java") - public void testEnhancedForWithExpression() throws Exception { - doTest("j2k/tests/testData/ast/foreachStatement/enhancedForWithExpression.java"); - } - - @TestMetadata("enhancedForWithReturn.java") - public void testEnhancedForWithReturn() throws Exception { - doTest("j2k/tests/testData/ast/foreachStatement/enhancedForWithReturn.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/formatting") - public static class Formatting extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("nonStaticMembers.java") - public void testNonStaticMembers() throws Exception { - doTest("j2k/tests/testData/ast/formatting/nonStaticMembers.java"); - } - - @TestMetadata("nonStaticMembersWithComments.java") - public void testNonStaticMembersWithComments() throws Exception { - doTest("j2k/tests/testData/ast/formatting/nonStaticMembersWithComments.java"); - } - - @TestMetadata("staticAndNonStaticMembersWithComments.java") - public void testStaticAndNonStaticMembersWithComments() throws Exception { - doTest("j2k/tests/testData/ast/formatting/staticAndNonStaticMembersWithComments.java"); - } - - @TestMetadata("staticMembersWithComments.java") - public void testStaticMembersWithComments() throws Exception { - doTest("j2k/tests/testData/ast/formatting/staticMembersWithComments.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/function") - public static class Function extends AbstractJavaToKotlinConverterPluginTest { - @TestMetadata("abstractMethod.java") - public void testAbstractMethod() throws Exception { - doTest("j2k/tests/testData/ast/function/abstractMethod.java"); - } - - public void testAllFilesPresentInFunction() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/function"), Pattern.compile("^(.+)\\.java$"), true); - } - - @TestMetadata("classGenericParam.java") - public void testClassGenericParam() throws Exception { - doTest("j2k/tests/testData/ast/function/classGenericParam.java"); - } - - @TestMetadata("emptyVoidMethod.java") - public void testEmptyVoidMethod() throws Exception { - doTest("j2k/tests/testData/ast/function/emptyVoidMethod.java"); - } - - @TestMetadata("extendsBaseWhichExtendsObject.java") - public void testExtendsBaseWhichExtendsObject() throws Exception { - doTest("j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.java"); - } - - @TestMetadata("final.java") - public void testFinal() throws Exception { - doTest("j2k/tests/testData/ast/function/final.java"); - } - - @TestMetadata("functionInFinalClass.java") - public void testFunctionInFinalClass() throws Exception { - doTest("j2k/tests/testData/ast/function/functionInFinalClass.java"); - } - - @TestMetadata("internal.java") - public void testInternal() throws Exception { - doTest("j2k/tests/testData/ast/function/internal.java"); - } - - @TestMetadata("main.java") - public void testMain() throws Exception { - doTest("j2k/tests/testData/ast/function/main.java"); - } - - @TestMetadata("methodClassType.java") - public void testMethodClassType() throws Exception { - doTest("j2k/tests/testData/ast/function/methodClassType.java"); - } - - @TestMetadata("methodPrimitiveType.java") - public void testMethodPrimitiveType() throws Exception { - doTest("j2k/tests/testData/ast/function/methodPrimitiveType.java"); - } - - @TestMetadata("methodPrimitiveType2.java") - public void testMethodPrimitiveType2() throws Exception { - doTest("j2k/tests/testData/ast/function/methodPrimitiveType2.java"); - } - - @TestMetadata("methodWithReturnStatement.java") - public void testMethodWithReturnStatement() throws Exception { - doTest("j2k/tests/testData/ast/function/methodWithReturnStatement.java"); - } - - @TestMetadata("open.java") - public void testOpen() throws Exception { - doTest("j2k/tests/testData/ast/function/open.java"); - } - - @TestMetadata("override.java") - public void testOverride() throws Exception { - doTest("j2k/tests/testData/ast/function/override.java"); - } - - @TestMetadata("overrideAndOpen.java") - public void testOverrideAndOpen() throws Exception { - doTest("j2k/tests/testData/ast/function/overrideAndOpen.java"); - } - - @TestMetadata("overrideObject.java") - public void testOverrideObject() throws Exception { - doTest("j2k/tests/testData/ast/function/overrideObject.java"); - } - - @TestMetadata("ownGenericParam.java") - public void testOwnGenericParam() throws Exception { - doTest("j2k/tests/testData/ast/function/ownGenericParam.java"); - } - - @TestMetadata("ownSeveralGenericParams.java") - public void testOwnSeveralGenericParams() throws Exception { - doTest("j2k/tests/testData/ast/function/ownSeveralGenericParams.java"); - } - - @TestMetadata("private.java") - public void testPrivate() throws Exception { - doTest("j2k/tests/testData/ast/function/private.java"); - } - - @TestMetadata("protected.java") - public void testProtected() throws Exception { - doTest("j2k/tests/testData/ast/function/protected.java"); - } - - @TestMetadata("public.java") - public void testPublic() throws Exception { - doTest("j2k/tests/testData/ast/function/public.java"); - } - - @TestMetadata("varVararg.java") - public void testVarVararg() throws Exception { - doTest("j2k/tests/testData/ast/function/varVararg.java"); - } - - @TestMetadata("writableParameter.java") - public void testWritableParameter() throws Exception { - doTest("j2k/tests/testData/ast/function/writableParameter.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/identifier") - public static class Identifier extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("finalFieldReference.java") - public void testFinalFieldReference() throws Exception { - doTest("j2k/tests/testData/ast/identifier/finalFieldReference.java"); - } - - @TestMetadata("keywords.java") - public void testKeywords() throws Exception { - doTest("j2k/tests/testData/ast/identifier/keywords.java"); - } - - @TestMetadata("withDollar.java") - public void testWithDollar() throws Exception { - doTest("j2k/tests/testData/ast/identifier/withDollar.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/ifStatement") - public static class IfStatement extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("ifStatementWithEmptyBlocks.java") - public void testIfStatementWithEmptyBlocks() throws Exception { - doTest("j2k/tests/testData/ast/ifStatement/ifStatementWithEmptyBlocks.java"); - } - - @TestMetadata("ifStatementWithMultilineBlocks.java") - public void testIfStatementWithMultilineBlocks() throws Exception { - doTest("j2k/tests/testData/ast/ifStatement/ifStatementWithMultilineBlocks.java"); - } - - @TestMetadata("ifStatementWithOneLineBlocks.java") - public void testIfStatementWithOneLineBlocks() throws Exception { - doTest("j2k/tests/testData/ast/ifStatement/ifStatementWithOneLineBlocks.java"); - } - - @TestMetadata("ifStatementWithoutElse.java") - public void testIfStatementWithoutElse() throws Exception { - doTest("j2k/tests/testData/ast/ifStatement/ifStatementWithoutElse.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/importStatement") - public static class ImportStatement extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("importWithKeywords.java") - public void testImportWithKeywords() throws Exception { - doTest("j2k/tests/testData/ast/importStatement/importWithKeywords.java"); - } - - @TestMetadata("importWithStar.java") - public void testImportWithStar() throws Exception { - doTest("j2k/tests/testData/ast/importStatement/importWithStar.java"); - } - - @TestMetadata("oneImport.java") - public void testOneImport() throws Exception { - doTest("j2k/tests/testData/ast/importStatement/oneImport.java"); - } - - @TestMetadata("onlyImports.java") - public void testOnlyImports() throws Exception { - doTest("j2k/tests/testData/ast/importStatement/onlyImports.java"); - } - - @TestMetadata("simpleImport.java") - public void testSimpleImport() throws Exception { - doTest("j2k/tests/testData/ast/importStatement/simpleImport.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/inProjectionType") - public static class InProjectionType extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("methodParams.java") - public void testMethodParams() throws Exception { - doTest("j2k/tests/testData/ast/inProjectionType/methodParams.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/inheritance") - public static class Inheritance extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("classOneExtendsBaseGeneric.java") - public void testClassOneExtendsBaseGeneric() throws Exception { - doTest("j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.java"); - } - - @TestMetadata("classOneExtendsBaseWithOneParam.java") - public void testClassOneExtendsBaseWithOneParam() throws Exception { - doTest("j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.java"); - } - - @TestMetadata("classOneExtendsBaseWithZeroParams.java") - public void testClassOneExtendsBaseWithZeroParams() throws Exception { - doTest("j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.java"); - } - - @TestMetadata("classOneExtendsBaseWithZeroParamsNonEmptyConstructor.java") - public void testClassOneExtendsBaseWithZeroParamsNonEmptyConstructor() throws Exception { - doTest("j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/isOperator") - public static class IsOperator extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("complicatedExpression.java") - public void testComplicatedExpression() throws Exception { - doTest("j2k/tests/testData/ast/isOperator/complicatedExpression.java"); - } - - @TestMetadata("simpleReference.java") - public void testSimpleReference() throws Exception { - doTest("j2k/tests/testData/ast/isOperator/simpleReference.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/issues") - public static class Issues extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("arrayLength.java") - public void testArrayLength() throws Exception { - doTest("j2k/tests/testData/ast/issues/arrayLength.java"); - } - - @TestMetadata("comments.java") - public void testComments() throws Exception { - doTest("j2k/tests/testData/ast/issues/comments.java"); - } - - @TestMetadata("kt-1016.java") - public void testKt_1016() throws Exception { - doTest("j2k/tests/testData/ast/issues/kt-1016.java"); - } - - @TestMetadata("kt-1048.java") - public void testKt_1048() throws Exception { - doTest("j2k/tests/testData/ast/issues/kt-1048.java"); - } - - @TestMetadata("kt-1074.java") - public void testKt_1074() throws Exception { - doTest("j2k/tests/testData/ast/issues/kt-1074.java"); - } - - @TestMetadata("kt-543.java") - public void testKt_543() throws Exception { - doTest("j2k/tests/testData/ast/issues/kt-543.java"); - } - - @TestMetadata("kt-543-boxed.java") - public void testKt_543_boxed() throws Exception { - doTest("j2k/tests/testData/ast/issues/kt-543-boxed.java"); - } - - @TestMetadata("kt-543-mixed.java") - public void testKt_543_mixed() throws Exception { - doTest("j2k/tests/testData/ast/issues/kt-543-mixed.java"); - } - - @TestMetadata("kt-638.java") - public void testKt_638() throws Exception { - doTest("j2k/tests/testData/ast/issues/kt-638.java"); - } - - @TestMetadata("kt-696.java") - public void testKt_696() throws Exception { - doTest("j2k/tests/testData/ast/issues/kt-696.java"); - } - - @TestMetadata("kt-792.java") - public void testKt_792() throws Exception { - doTest("j2k/tests/testData/ast/issues/kt-792.java"); - } - - @TestMetadata("kt-792-mixed.java") - public void testKt_792_mixed() throws Exception { - doTest("j2k/tests/testData/ast/issues/kt-792-mixed.java"); - } - - @TestMetadata("kt-794.java") - public void testKt_794() throws Exception { - doTest("j2k/tests/testData/ast/issues/kt-794.java"); - } - - @TestMetadata("kt-794-mixed.java") - public void testKt_794_mixed() throws Exception { - doTest("j2k/tests/testData/ast/issues/kt-794-mixed.java"); - } - - @TestMetadata("kt-809.java") - public void testKt_809() throws Exception { - doTest("j2k/tests/testData/ast/issues/kt-809.java"); - } - - @TestMetadata("kt-809-string.java") - public void testKt_809_string() throws Exception { - doTest("j2k/tests/testData/ast/issues/kt-809-string.java"); - } - - @TestMetadata("kt-820.java") - public void testKt_820() throws Exception { - doTest("j2k/tests/testData/ast/issues/kt-820.java"); - } - - @TestMetadata("kt-820-field.java") - public void testKt_820_field() throws Exception { - doTest("j2k/tests/testData/ast/issues/kt-820-field.java"); - } - - @TestMetadata("kt-820-string.java") - public void testKt_820_string() throws Exception { - doTest("j2k/tests/testData/ast/issues/kt-820-string.java"); - } - - @TestMetadata("kt-824.java") - public void testKt_824() throws Exception { - doTest("j2k/tests/testData/ast/issues/kt-824.java"); - } - - @TestMetadata("kt-824-isDir.java") - public void testKt_824_isDir() throws Exception { - doTest("j2k/tests/testData/ast/issues/kt-824-isDir.java"); - } - - @TestMetadata("kt-828.java") - public void testKt_828() throws Exception { - doTest("j2k/tests/testData/ast/issues/kt-828.java"); - } - - @TestMetadata("kt-836.java") - public void testKt_836() throws Exception { - doTest("j2k/tests/testData/ast/issues/kt-836.java"); - } - - @TestMetadata("kt-837.java") - public void testKt_837() throws Exception { - doTest("j2k/tests/testData/ast/issues/kt-837.java"); - } - - @TestMetadata("kt-852.java") - public void testKt_852() throws Exception { - doTest("j2k/tests/testData/ast/issues/kt-852.java"); - } - - @TestMetadata("kt-871.java") - public void testKt_871() throws Exception { - doTest("j2k/tests/testData/ast/issues/kt-871.java"); - } - - @TestMetadata("kt-879.java") - public void testKt_879() throws Exception { - doTest("j2k/tests/testData/ast/issues/kt-879.java"); - } - - @TestMetadata("kt-893.java") - public void testKt_893() throws Exception { - doTest("j2k/tests/testData/ast/issues/kt-893.java"); - } - - @TestMetadata("kt-963.java") - public void testKt_963() throws Exception { - doTest("j2k/tests/testData/ast/issues/kt-963.java"); - } - - @TestMetadata("qualifyStatic.java") - public void testQualifyStatic() throws Exception { - doTest("j2k/tests/testData/ast/issues/qualifyStatic.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/kotlinExclusion") - public static class KotlinExclusion extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("kt-656.java") - public void testKt_656() throws Exception { - doTest("j2k/tests/testData/ast/kotlinExclusion/kt-656.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/labelStatement") - public static class LabelStatement extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("complicatedExampleFromJavaTutorial.java") - public void testComplicatedExampleFromJavaTutorial() throws Exception { - doTest("j2k/tests/testData/ast/labelStatement/complicatedExampleFromJavaTutorial.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/list") - public static class List extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("ForEach.java") - public void testForEach() throws Exception { - doTest("j2k/tests/testData/ast/list/ForEach.java"); - } - - @TestMetadata("Lists.java") - public void testLists() throws Exception { - doTest("j2k/tests/testData/ast/list/Lists.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/literalExpression") - public static class LiteralExpression extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("char.java") - public void testChar() throws Exception { - doTest("j2k/tests/testData/ast/literalExpression/char.java"); - } - - @TestMetadata("dollarInsideString.java") - public void testDollarInsideString() throws Exception { - doTest("j2k/tests/testData/ast/literalExpression/dollarInsideString.java"); - } - - @TestMetadata("endsWithDFL.java") - public void testEndsWithDFL() throws Exception { - doTest("j2k/tests/testData/ast/literalExpression/endsWithDFL.java"); - } - - @TestMetadata("hex.java") - public void testHex() throws Exception { - doTest("j2k/tests/testData/ast/literalExpression/hex.java"); - } - - @TestMetadata("octal.java") - public void testOctal() throws Exception { - doTest("j2k/tests/testData/ast/literalExpression/octal.java"); - } - - @TestMetadata("trueOrFalse.java") - public void testTrueOrFalse() throws Exception { - doTest("j2k/tests/testData/ast/literalExpression/trueOrFalse.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/localVariable") - public static class LocalVariable extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("object.java") - public void testObject() throws Exception { - doTest("j2k/tests/testData/ast/localVariable/object.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/methodCallExpression") - public static class MethodCallExpression extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("callWithKeywords.java") - public void testCallWithKeywords() throws Exception { - doTest("j2k/tests/testData/ast/methodCallExpression/callWithKeywords.java"); - } - - @TestMetadata("emptyCall.java") - public void testEmptyCall() throws Exception { - doTest("j2k/tests/testData/ast/methodCallExpression/emptyCall.java"); - } - - @TestMetadata("genericMethod.java") - public void testGenericMethod() throws Exception { - doTest("j2k/tests/testData/ast/methodCallExpression/genericMethod.java"); - } - - @TestMetadata("simpleCall.java") - public void testSimpleCall() throws Exception { - doTest("j2k/tests/testData/ast/methodCallExpression/simpleCall.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/misc") - public static class Misc extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("packageWithClass.java") - public void testPackageWithClass() throws Exception { - doTest("j2k/tests/testData/ast/misc/packageWithClass.java"); - } - - @TestMetadata("packageWithClasses.java") - public void testPackageWithClasses() throws Exception { - doTest("j2k/tests/testData/ast/misc/packageWithClasses.java"); - } - - @TestMetadata("packageWithImports.java") - public void testPackageWithImports() throws Exception { - doTest("j2k/tests/testData/ast/misc/packageWithImports.java"); - } - - @TestMetadata("packageWithMixedImports.java") - public void testPackageWithMixedImports() throws Exception { - doTest("j2k/tests/testData/ast/misc/packageWithMixedImports.java"); - } - - @TestMetadata("packageWithOpenClass.java") - public void testPackageWithOpenClass() throws Exception { - doTest("j2k/tests/testData/ast/misc/packageWithOpenClass.java"); - } - - @TestMetadata("packageWithStaticImports.java") - public void testPackageWithStaticImports() throws Exception { - doTest("j2k/tests/testData/ast/misc/packageWithStaticImports.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/newClassExpression") - public static class NewClassExpression extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("classWithParam.java") - public void testClassWithParam() throws Exception { - doTest("j2k/tests/testData/ast/newClassExpression/classWithParam.java"); - } - - @TestMetadata("classWithParams.java") - public void testClassWithParams() throws Exception { - doTest("j2k/tests/testData/ast/newClassExpression/classWithParams.java"); - } - - @TestMetadata("classWithoutBody.java") - public void testClassWithoutBody() throws Exception { - doTest("j2k/tests/testData/ast/newClassExpression/classWithoutBody.java"); - } - - @TestMetadata("fullQualifiedName.java") - public void testFullQualifiedName() throws Exception { - doTest("j2k/tests/testData/ast/newClassExpression/fullQualifiedName.java"); - } - - @TestMetadata("fullQualifiedName2.java") - public void testFullQualifiedName2() throws Exception { - doTest("j2k/tests/testData/ast/newClassExpression/fullQualifiedName2.java"); - } - - @TestMetadata("genericClassInvocation.java") - public void testGenericClassInvocation() throws Exception { - doTest("j2k/tests/testData/ast/newClassExpression/genericClassInvocation.java"); - } - - @TestMetadata("newClassByFullName.java") - public void testNewClassByFullName() throws Exception { - doTest("j2k/tests/testData/ast/newClassExpression/newClassByFullName.java"); - } - - @TestMetadata("newClassWithAnonymousScope.java") - public void testNewClassWithAnonymousScope() throws Exception { - doTest("j2k/tests/testData/ast/newClassExpression/newClassWithAnonymousScope.java"); - } - - @TestMetadata("newInnerClass.java") - public void testNewInnerClass() throws Exception { - doTest("j2k/tests/testData/ast/newClassExpression/newInnerClass.java"); - } - - @TestMetadata("newListAndNewMember.java") - public void testNewListAndNewMember() throws Exception { - doTest("j2k/tests/testData/ast/newClassExpression/newListAndNewMember.java"); - } - - @TestMetadata("newStaticInnerClass.java") - public void testNewStaticInnerClass() throws Exception { - doTest("j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/objectLiteral") - public static class ObjectLiteral extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("MyFrame.java") - public void testMyFrame() throws Exception { - doTest("j2k/tests/testData/ast/objectLiteral/MyFrame.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/outProjectionType") - public static class OutProjectionType extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("methodParams.java") - public void testMethodParams() throws Exception { - doTest("j2k/tests/testData/ast/outProjectionType/methodParams.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/packageStatement") - public static class PackageStatement extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("orgJetbrainsJetJ2kIn.java") - public void testOrgJetbrainsJetJ2kIn() throws Exception { - doTest("j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/parenthesizedExpression") - public static class ParenthesizedExpression extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("parenthesized.java") - public void testParenthesized() throws Exception { - doTest("j2k/tests/testData/ast/parenthesizedExpression/parenthesized.java"); - } - - @TestMetadata("parenthesized2.java") - public void testParenthesized2() throws Exception { - doTest("j2k/tests/testData/ast/parenthesizedExpression/parenthesized2.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/polyadicExpression") - public static class PolyadicExpression extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("divide.java") - public void testDivide() throws Exception { - doTest("j2k/tests/testData/ast/polyadicExpression/divide.java"); - } - - @TestMetadata("minus.java") - public void testMinus() throws Exception { - doTest("j2k/tests/testData/ast/polyadicExpression/minus.java"); - } - - @TestMetadata("multiply.java") - public void testMultiply() throws Exception { - doTest("j2k/tests/testData/ast/polyadicExpression/multiply.java"); - } - - @TestMetadata("plus.java") - public void testPlus() throws Exception { - doTest("j2k/tests/testData/ast/polyadicExpression/plus.java"); - } - - @TestMetadata("remainder.java") - public void testRemainder() throws Exception { - doTest("j2k/tests/testData/ast/polyadicExpression/remainder.java"); - } - - @TestMetadata("unassignedShiftRight.java") - public void testUnassignedShiftRight() throws Exception { - doTest("j2k/tests/testData/ast/polyadicExpression/unassignedShiftRight.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/postfixOperator") - public static class PostfixOperator extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("decrement.java") - public void testDecrement() throws Exception { - doTest("j2k/tests/testData/ast/postfixOperator/decrement.java"); - } - - @TestMetadata("increment.java") - public void testIncrement() throws Exception { - doTest("j2k/tests/testData/ast/postfixOperator/increment.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/prefixOperator") - public static class PrefixOperator extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("decrement.java") - public void testDecrement() throws Exception { - doTest("j2k/tests/testData/ast/prefixOperator/decrement.java"); - } - - @TestMetadata("excl.java") - public void testExcl() throws Exception { - doTest("j2k/tests/testData/ast/prefixOperator/excl.java"); - } - - @TestMetadata("increment.java") - public void testIncrement() throws Exception { - doTest("j2k/tests/testData/ast/prefixOperator/increment.java"); - } - - @TestMetadata("kt-667.java") - public void testKt_667() throws Exception { - doTest("j2k/tests/testData/ast/prefixOperator/kt-667.java"); - } - - @TestMetadata("nullableIf.java") - public void testNullableIf() throws Exception { - doTest("j2k/tests/testData/ast/prefixOperator/nullableIf.java"); - } - - @TestMetadata("tilde.java") - public void testTilde() throws Exception { - doTest("j2k/tests/testData/ast/prefixOperator/tilde.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/rawGenerics") - public static class RawGenerics extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("kt-540.java") - public void testKt_540() throws Exception { - doTest("j2k/tests/testData/ast/rawGenerics/kt-540.java"); - } - - @TestMetadata("kt-540-map.java") - public void testKt_540_map() throws Exception { - doTest("j2k/tests/testData/ast/rawGenerics/kt-540-map.java"); - } - - @TestMetadata("kt-540-rawGenericClass.java") - public void testKt_540_rawGenericClass() throws Exception { - doTest("j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.java"); - } - - @TestMetadata("rawGenericMethod.java") - public void testRawGenericMethod() throws Exception { - doTest("j2k/tests/testData/ast/rawGenerics/rawGenericMethod.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/returnStatement") - public static class ReturnStatement extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("returnChar.java") - public void testReturnChar() throws Exception { - doTest("j2k/tests/testData/ast/returnStatement/returnChar.java"); - } - - @TestMetadata("returnLiteral.java") - public void testReturnLiteral() throws Exception { - doTest("j2k/tests/testData/ast/returnStatement/returnLiteral.java"); - } - - @TestMetadata("returnNumber.java") - public void testReturnNumber() throws Exception { - doTest("j2k/tests/testData/ast/returnStatement/returnNumber.java"); - } - - @TestMetadata("returnString.java") - public void testReturnString() throws Exception { - doTest("j2k/tests/testData/ast/returnStatement/returnString.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/starProjectionType") - public static class StarProjectionType extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("methodParams.java") - public void testMethodParams() throws Exception { - doTest("j2k/tests/testData/ast/starProjectionType/methodParams.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/superExpression") - public static class SuperExpression extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("classAdotSuperFoo.java") - public void testClassAdotSuperFoo() throws Exception { - doTest("j2k/tests/testData/ast/superExpression/classAdotSuperFoo.java"); - } - - @TestMetadata("classAextendsB.java") - public void testClassAextendsB() throws Exception { - doTest("j2k/tests/testData/ast/superExpression/classAextendsB.java"); - } - - @TestMetadata("superStatement.java") - public void testSuperStatement() throws Exception { - doTest("j2k/tests/testData/ast/superExpression/superStatement.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/switch") - public static class Switch extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("comlicatedFallDown.java") - public void testComlicatedFallDown() throws Exception { - doTest("j2k/tests/testData/ast/switch/comlicatedFallDown.java"); - } - - @TestMetadata("emptySwitch.java") - public void testEmptySwitch() throws Exception { - doTest("j2k/tests/testData/ast/switch/emptySwitch.java"); - } - - @TestMetadata("fallDown.java") - public void testFallDown() throws Exception { - doTest("j2k/tests/testData/ast/switch/fallDown.java"); - } - - @TestMetadata("kt-539.java") - public void testKt_539() throws Exception { - doTest("j2k/tests/testData/ast/switch/kt-539.java"); - } - - @TestMetadata("nondefault.java") - public void testNondefault() throws Exception { - doTest("j2k/tests/testData/ast/switch/nondefault.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/synchronizedStatement") - public static class SynchronizedStatement extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("singleLineExample.java") - public void testSingleLineExample() throws Exception { - doTest("j2k/tests/testData/ast/synchronizedStatement/singleLineExample.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/thisExpression") - public static class ThisExpression extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("classAdotThisFoo.java") - public void testClassAdotThisFoo() throws Exception { - doTest("j2k/tests/testData/ast/thisExpression/classAdotThisFoo.java"); - } - - @TestMetadata("thisStatement.java") - public void testThisStatement() throws Exception { - doTest("j2k/tests/testData/ast/thisExpression/thisStatement.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/throwStatement") - public static class ThrowStatement extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("simpleThrowStatement.java") - public void testSimpleThrowStatement() throws Exception { - doTest("j2k/tests/testData/ast/throwStatement/simpleThrowStatement.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/trait") - public static class Trait extends AbstractJavaToKotlinConverterPluginTest { - @TestMetadata("abstactInterface.java") - public void testAbstactInterface() throws Exception { - doTest("j2k/tests/testData/ast/trait/abstactInterface.java"); - } - - public void testAllFilesPresentInTrait() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/trait"), Pattern.compile("^(.+)\\.java$"), true); - } - - @TestMetadata("emptyInterface.java") - public void testEmptyInterface() throws Exception { - doTest("j2k/tests/testData/ast/trait/emptyInterface.java"); - } - - @TestMetadata("extendsOneClassAndImplementsSeveralInterfaces.java") - public void testExtendsOneClassAndImplementsSeveralInterfaces() throws Exception { - doTest("j2k/tests/testData/ast/trait/extendsOneClassAndImplementsSeveralInterfaces.java"); - } - - @TestMetadata("extendsOneInterface.java") - public void testExtendsOneInterface() throws Exception { - doTest("j2k/tests/testData/ast/trait/extendsOneInterface.java"); - } - - @TestMetadata("interfaceWithFields.java") - public void testInterfaceWithFields() throws Exception { - doTest("j2k/tests/testData/ast/trait/interfaceWithFields.java"); - } - - @TestMetadata("interfaceWithMethodDeclaration.java") - public void testInterfaceWithMethodDeclaration() throws Exception { - doTest("j2k/tests/testData/ast/trait/interfaceWithMethodDeclaration.java"); - } - - @TestMetadata("interfaceWithStaticFields.java") - public void testInterfaceWithStaticFields() throws Exception { - doTest("j2k/tests/testData/ast/trait/interfaceWithStaticFields.java"); - } - - @TestMetadata("internalInterface.java") - public void testInternalInterface() throws Exception { - doTest("j2k/tests/testData/ast/trait/internalInterface.java"); - } - - @TestMetadata("privateInterface.java") - public void testPrivateInterface() throws Exception { - doTest("j2k/tests/testData/ast/trait/privateInterface.java"); - } - - @TestMetadata("protectedInterface.java") - public void testProtectedInterface() throws Exception { - doTest("j2k/tests/testData/ast/trait/protectedInterface.java"); - } - - @TestMetadata("publicInterface.java") - public void testPublicInterface() throws Exception { - doTest("j2k/tests/testData/ast/trait/publicInterface.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/tryStatement") - public static class TryStatement extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("commonCaseForTryStatement.java") - public void testCommonCaseForTryStatement() throws Exception { - doTest("j2k/tests/testData/ast/tryStatement/commonCaseForTryStatement.java"); - } - - @TestMetadata("emptyTryWithTwoCatchesWithEmptyFinally.java") - public void testEmptyTryWithTwoCatchesWithEmptyFinally() throws Exception { - doTest("j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.java"); - } - - @TestMetadata("emptyTryWithTwoCatchesWithFinally.java") - public void testEmptyTryWithTwoCatchesWithFinally() throws Exception { - doTest("j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithFinally.java"); - } - - @TestMetadata("emptyTryWithTwoCatchesWithoutFinally.java") - public void testEmptyTryWithTwoCatchesWithoutFinally() throws Exception { - doTest("j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithoutFinally.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/typeCastExpression") - public static class TypeCastExpression extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("extendsWildcardCast.java") - public void testExtendsWildcardCast() throws Exception { - doTest("j2k/tests/testData/ast/typeCastExpression/extendsWildcardCast.java"); - } - - @TestMetadata("fooCast.java") - public void testFooCast() throws Exception { - doTest("j2k/tests/testData/ast/typeCastExpression/fooCast.java"); - } - - @TestMetadata("intCast.java") - public void testIntCast() throws Exception { - doTest("j2k/tests/testData/ast/typeCastExpression/intCast.java"); - } - - @TestMetadata("primitiveType.java") - public void testPrimitiveType() throws Exception { - doTest("j2k/tests/testData/ast/typeCastExpression/primitiveType.java"); - } - - @TestMetadata("simpleGenericCast.java") - public void testSimpleGenericCast() throws Exception { - doTest("j2k/tests/testData/ast/typeCastExpression/simpleGenericCast.java"); - } - - @TestMetadata("stringCast.java") - public void testStringCast() throws Exception { - doTest("j2k/tests/testData/ast/typeCastExpression/stringCast.java"); - } - - @TestMetadata("superWildcardCast.java") - public void testSuperWildcardCast() throws Exception { - doTest("j2k/tests/testData/ast/typeCastExpression/superWildcardCast.java"); - } - - @TestMetadata("wildcardCast.java") - public void testWildcardCast() throws Exception { - doTest("j2k/tests/testData/ast/typeCastExpression/wildcardCast.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/typeParameters") - public static class TypeParameters extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("classDoubleParametrizationWithTwoBoundsWithExtending.java") - public void testClassDoubleParametrizationWithTwoBoundsWithExtending() throws Exception { - doTest("j2k/tests/testData/ast/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.java"); - } - - @TestMetadata("classParametrizationWithTwoBounds.java") - public void testClassParametrizationWithTwoBounds() throws Exception { - doTest("j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBounds.java"); - } - - @TestMetadata("classParametrizationWithTwoBoundsWithExtending.java") - public void testClassParametrizationWithTwoBoundsWithExtending() throws Exception { - doTest("j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBoundsWithExtending.java"); - } - - @TestMetadata("complexExampleWithClassExtending.java") - public void testComplexExampleWithClassExtending() throws Exception { - doTest("j2k/tests/testData/ast/typeParameters/complexExampleWithClassExtending.java"); - } - - @TestMetadata("complexExampleWithClassMultiplyExtending.java") - public void testComplexExampleWithClassMultiplyExtending() throws Exception { - doTest("j2k/tests/testData/ast/typeParameters/complexExampleWithClassMultiplyExtending.java"); - } - - @TestMetadata("genericClass.java") - public void testGenericClass() throws Exception { - doTest("j2k/tests/testData/ast/typeParameters/genericClass.java"); - } - - @TestMetadata("genericParam.java") - public void testGenericParam() throws Exception { - doTest("j2k/tests/testData/ast/typeParameters/genericParam.java"); - } - - @TestMetadata("manyGenericParams.java") - public void testManyGenericParams() throws Exception { - doTest("j2k/tests/testData/ast/typeParameters/manyGenericParams.java"); - } - - @TestMetadata("methodDoubleParametrizationWithTwoBounds.java") - public void testMethodDoubleParametrizationWithTwoBounds() throws Exception { - doTest("j2k/tests/testData/ast/typeParameters/methodDoubleParametrizationWithTwoBounds.java"); - } - - @TestMetadata("traitDoubleParametrizationWithTwoBoundsWithExtending.java") - public void testTraitDoubleParametrizationWithTwoBoundsWithExtending() throws Exception { - doTest("j2k/tests/testData/ast/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.java"); - } - - @TestMetadata("where.java") - public void testWhere() throws Exception { - doTest("j2k/tests/testData/ast/typeParameters/where.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/varArg") - public static class VarArg extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("ellipsisTypeSeveralParams.java") - public void testEllipsisTypeSeveralParams() throws Exception { - doTest("j2k/tests/testData/ast/varArg/ellipsisTypeSeveralParams.java"); - } - - @TestMetadata("ellipsisTypeSingleParams.java") - public void testEllipsisTypeSingleParams() throws Exception { - doTest("j2k/tests/testData/ast/varArg/ellipsisTypeSingleParams.java"); - } - - } - - @TestMetadata("j2k/tests/testData/ast/whileStatement") - public static class WhileStatement extends AbstractJavaToKotlinConverterPluginTest { - 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); - } - - @TestMetadata("whileWithBlock.java") - public void testWhileWithBlock() throws Exception { - doTest("j2k/tests/testData/ast/whileStatement/whileWithBlock.java"); - } - - @TestMetadata("whileWithEmptyBlock.java") - public void testWhileWithEmptyBlock() throws Exception { - doTest("j2k/tests/testData/ast/whileStatement/whileWithEmptyBlock.java"); - } - - @TestMetadata("whileWithExpression.java") - public void testWhileWithExpression() throws Exception { - doTest("j2k/tests/testData/ast/whileStatement/whileWithExpression.java"); - } - - @TestMetadata("whileWithReturn.java") - public void testWhileWithReturn() throws Exception { - doTest("j2k/tests/testData/ast/whileStatement/whileWithReturn.java"); - } - - } - - public static Test suite() { - TestSuite suite = new TestSuite("JavaToKotlinConverterPluginTestGenerated"); - suite.addTestSuite(JavaToKotlinConverterPluginTestGenerated.class); - suite.addTestSuite(Annotations.class); - suite.addTestSuite(AnonymousBlock.class); - suite.addTestSuite(ArrayAccessExpression.class); - suite.addTestSuite(ArrayInitializerExpression.class); - suite.addTestSuite(ArrayType.class); - suite.addTestSuite(AssertStatement.class); - suite.addTestSuite(AssignmentExpression.class); - suite.addTestSuite(BinaryExpression.class); - suite.addTestSuite(BoxedType.class); - suite.addTestSuite(BreakStatement.class); - suite.addTestSuite(CallChainExpression.class); - suite.addTestSuite(Class.class); - suite.addTestSuite(ClassExpression.class); - suite.addTestSuite(ConditionalExpression.class); - suite.addTestSuite(Constructors.class); - suite.addTestSuite(ContinueStatement.class); - suite.addTestSuite(DeclarationStatement.class); - suite.addTestSuite(DoWhileStatement.class); - suite.addTestSuite(Enum.class); - suite.addTestSuite(Field.class); - suite.addTestSuite(For.class); - suite.addTestSuite(ForeachStatement.class); - suite.addTestSuite(Formatting.class); - suite.addTestSuite(Function.class); - suite.addTestSuite(Identifier.class); - suite.addTestSuite(IfStatement.class); - suite.addTestSuite(ImportStatement.class); - suite.addTestSuite(InProjectionType.class); - suite.addTestSuite(Inheritance.class); - suite.addTestSuite(IsOperator.class); - suite.addTestSuite(Issues.class); - suite.addTestSuite(KotlinExclusion.class); - suite.addTestSuite(LabelStatement.class); - suite.addTestSuite(List.class); - suite.addTestSuite(LiteralExpression.class); - suite.addTestSuite(LocalVariable.class); - suite.addTestSuite(MethodCallExpression.class); - suite.addTestSuite(Misc.class); - suite.addTestSuite(NewClassExpression.class); - suite.addTestSuite(ObjectLiteral.class); - suite.addTestSuite(OutProjectionType.class); - suite.addTestSuite(PackageStatement.class); - suite.addTestSuite(ParenthesizedExpression.class); - suite.addTestSuite(PolyadicExpression.class); - suite.addTestSuite(PostfixOperator.class); - suite.addTestSuite(PrefixOperator.class); - suite.addTestSuite(RawGenerics.class); - suite.addTestSuite(ReturnStatement.class); - suite.addTestSuite(StarProjectionType.class); - suite.addTestSuite(SuperExpression.class); - suite.addTestSuite(Switch.class); - suite.addTestSuite(SynchronizedStatement.class); - suite.addTestSuite(ThisExpression.class); - suite.addTestSuite(ThrowStatement.class); - suite.addTestSuite(Trait.class); - suite.addTestSuite(TryStatement.class); - suite.addTestSuite(TypeCastExpression.class); - suite.addTestSuite(TypeParameters.class); - suite.addTestSuite(VarArg.class); - suite.addTestSuite(WhileStatement.class); - return suite; - } -} diff --git a/j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterBasicTestGenerated.java b/j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterTestGenerated.java similarity index 94% rename from j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterBasicTestGenerated.java rename to j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterTestGenerated.java index e2cc39f78f7..c15823a3576 100644 --- a/j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterBasicTestGenerated.java +++ b/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); diff --git a/j2k/tests/testData/ast/annotations/jetbrainsNotNull.ide.kt b/j2k/tests/testData/ast/annotations/jetbrainsNotNull.ide.kt deleted file mode 100644 index 1da906cb4ac..00000000000 --- a/j2k/tests/testData/ast/annotations/jetbrainsNotNull.ide.kt +++ /dev/null @@ -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 - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/annotations/jetbrainsNotNull.java b/j2k/tests/testData/ast/annotations/jetbrainsNotNull.java index 4de1a3c1e9e..ac921fdf2de 100644 --- a/j2k/tests/testData/ast/annotations/jetbrainsNotNull.java +++ b/j2k/tests/testData/ast/annotations/jetbrainsNotNull.java @@ -1,4 +1,6 @@ //file +// !forceNotNullTypes: false +// !specifyLocalVariableTypeByDefault: true package test; import org.jetbrains.annotations.NotNull; diff --git a/j2k/tests/testData/ast/annotations/jetbrainsNotNull.kt b/j2k/tests/testData/ast/annotations/jetbrainsNotNull.kt index 6740f27ca31..7598605805e 100644 --- a/j2k/tests/testData/ast/annotations/jetbrainsNotNull.kt +++ b/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)) diff --git a/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.ide.kt b/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.ide.kt deleted file mode 100644 index cdefa482919..00000000000 --- a/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.ide.kt +++ /dev/null @@ -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() - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.java b/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.java index d9f5e3196bf..588cea6e028 100644 --- a/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.java +++ b/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.java @@ -1,4 +1,6 @@ //file +// !forceNotNullTypes: false +// !specifyLocalVariableTypeByDefault: true package test; import org.jetbrains.annotations.NotNull; diff --git a/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.kt b/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.kt index 601a4c7f4d4..b3b71dabab0 100644 --- a/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.kt +++ b/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() diff --git a/j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.ide.kt b/j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.ide.kt deleted file mode 100644 index e1e6f1ed90f..00000000000 --- a/j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.ide.kt +++ /dev/null @@ -1,6 +0,0 @@ -class Test() { - var str: String = 0 - { - str = "Ola" - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.kt b/j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.kt index 664c5538140..e1e6f1ed90f 100644 --- a/j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.kt +++ b/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" } diff --git a/j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.ide.kt b/j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.ide.kt deleted file mode 100644 index 511ac6c621e..00000000000 --- a/j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.ide.kt +++ /dev/null @@ -1,9 +0,0 @@ -class Test() { - var str: String = 0 - - class object { - { - str = "Ola" - } - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.kt b/j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.kt index 5eae1d06822..511ac6c621e 100644 --- a/j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.kt +++ b/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 { { diff --git a/j2k/tests/testData/ast/arrayAccessExpression/expressionIndex.ide.kt b/j2k/tests/testData/ast/arrayAccessExpression/expressionIndex.ide.kt deleted file mode 100644 index 7a99230c2f6..00000000000 --- a/j2k/tests/testData/ast/arrayAccessExpression/expressionIndex.ide.kt +++ /dev/null @@ -1 +0,0 @@ -myArray[myLibrary.calculateIndex(100)] \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayAccessExpression/intIndex.ide.kt b/j2k/tests/testData/ast/arrayAccessExpression/intIndex.ide.kt deleted file mode 100644 index 8a7de5e4e73..00000000000 --- a/j2k/tests/testData/ast/arrayAccessExpression/intIndex.ide.kt +++ /dev/null @@ -1 +0,0 @@ -myArray[10] \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayAccessExpression/variableIndex.ide.kt b/j2k/tests/testData/ast/arrayAccessExpression/variableIndex.ide.kt deleted file mode 100644 index 2a40dae7f3b..00000000000 --- a/j2k/tests/testData/ast/arrayAccessExpression/variableIndex.ide.kt +++ /dev/null @@ -1 +0,0 @@ -myArray[i] \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/doubleArray.ide.kt b/j2k/tests/testData/ast/arrayInitializerExpression/doubleArray.ide.kt deleted file mode 100644 index 521c3aa570a..00000000000 --- a/j2k/tests/testData/ast/arrayInitializerExpression/doubleArray.ide.kt +++ /dev/null @@ -1 +0,0 @@ -val a = doubleArray(1.0, 2.0, 3.0) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/doubleArray.kt b/j2k/tests/testData/ast/arrayInitializerExpression/doubleArray.kt index cc1f3d31ab8..521c3aa570a 100644 --- a/j2k/tests/testData/ast/arrayInitializerExpression/doubleArray.kt +++ b/j2k/tests/testData/ast/arrayInitializerExpression/doubleArray.kt @@ -1 +1 @@ -var a: DoubleArray? = doubleArray(1.0, 2.0, 3.0) \ No newline at end of file +val a = doubleArray(1.0, 2.0, 3.0) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/doubleArrayWithVariables.ide.kt b/j2k/tests/testData/ast/arrayInitializerExpression/doubleArrayWithVariables.ide.kt deleted file mode 100644 index 5ecb77039a4..00000000000 --- a/j2k/tests/testData/ast/arrayInitializerExpression/doubleArrayWithVariables.ide.kt +++ /dev/null @@ -1,4 +0,0 @@ -val a = 0 -val b = 0 -val c = 0 -val ds = doubleArray((a).toDouble(), (b).toDouble(), (c).toDouble()) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/doubleArrayWithVariables.kt b/j2k/tests/testData/ast/arrayInitializerExpression/doubleArrayWithVariables.kt index 4827c8d6a7a..5ecb77039a4 100644 --- a/j2k/tests/testData/ast/arrayInitializerExpression/doubleArrayWithVariables.kt +++ b/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()) \ No newline at end of file +val a = 0 +val b = 0 +val c = 0 +val ds = doubleArray((a).toDouble(), (b).toDouble(), (c).toDouble()) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/floatArray.ide.kt b/j2k/tests/testData/ast/arrayInitializerExpression/floatArray.ide.kt deleted file mode 100644 index 75287a3f864..00000000000 --- a/j2k/tests/testData/ast/arrayInitializerExpression/floatArray.ide.kt +++ /dev/null @@ -1 +0,0 @@ -val a = floatArray(1.0, 2.0, 3.0) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/floatArray.kt b/j2k/tests/testData/ast/arrayInitializerExpression/floatArray.kt index cc5cf46981f..75287a3f864 100644 --- a/j2k/tests/testData/ast/arrayInitializerExpression/floatArray.kt +++ b/j2k/tests/testData/ast/arrayInitializerExpression/floatArray.kt @@ -1 +1 @@ -var a: FloatArray? = floatArray(1.0, 2.0, 3.0) \ No newline at end of file +val a = floatArray(1.0, 2.0, 3.0) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/intArrayWithLength.ide.kt b/j2k/tests/testData/ast/arrayInitializerExpression/intArrayWithLength.ide.kt deleted file mode 100644 index 50eeec88f46..00000000000 --- a/j2k/tests/testData/ast/arrayInitializerExpression/intArrayWithLength.ide.kt +++ /dev/null @@ -1 +0,0 @@ -val a = IntArray(10) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/intArrayWithLength.kt b/j2k/tests/testData/ast/arrayInitializerExpression/intArrayWithLength.kt index 9b17a7578d2..50eeec88f46 100644 --- a/j2k/tests/testData/ast/arrayInitializerExpression/intArrayWithLength.kt +++ b/j2k/tests/testData/ast/arrayInitializerExpression/intArrayWithLength.kt @@ -1 +1 @@ -var a: IntArray? = IntArray(10) \ No newline at end of file +val a = IntArray(10) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/javaLangDoubleArray.ide.kt b/j2k/tests/testData/ast/arrayInitializerExpression/javaLangDoubleArray.ide.kt deleted file mode 100644 index e45850509f1..00000000000 --- a/j2k/tests/testData/ast/arrayInitializerExpression/javaLangDoubleArray.ide.kt +++ /dev/null @@ -1 +0,0 @@ -val a = array(1.0, 2.0, 3.0) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/javaLangDoubleArray.kt b/j2k/tests/testData/ast/arrayInitializerExpression/javaLangDoubleArray.kt index a72f4f3fca6..e45850509f1 100644 --- a/j2k/tests/testData/ast/arrayInitializerExpression/javaLangDoubleArray.kt +++ b/j2k/tests/testData/ast/arrayInitializerExpression/javaLangDoubleArray.kt @@ -1 +1 @@ -var a: Array? = array(1.0, 2.0, 3.0) \ No newline at end of file +val a = array(1.0, 2.0, 3.0) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/javaLangFloatArray.ide.kt b/j2k/tests/testData/ast/arrayInitializerExpression/javaLangFloatArray.ide.kt deleted file mode 100644 index f7863159886..00000000000 --- a/j2k/tests/testData/ast/arrayInitializerExpression/javaLangFloatArray.ide.kt +++ /dev/null @@ -1 +0,0 @@ -val a = array(1.0, 2.0, 3.0) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/javaLangFloatArray.kt b/j2k/tests/testData/ast/arrayInitializerExpression/javaLangFloatArray.kt index a16630a32b0..f7863159886 100644 --- a/j2k/tests/testData/ast/arrayInitializerExpression/javaLangFloatArray.kt +++ b/j2k/tests/testData/ast/arrayInitializerExpression/javaLangFloatArray.kt @@ -1 +1 @@ -var a: Array? = array(1.0, 2.0, 3.0) \ No newline at end of file +val a = array(1.0, 2.0, 3.0) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/newByte.ide.kt b/j2k/tests/testData/ast/arrayInitializerExpression/newByte.ide.kt deleted file mode 100644 index 592a2c123db..00000000000 --- a/j2k/tests/testData/ast/arrayInitializerExpression/newByte.ide.kt +++ /dev/null @@ -1 +0,0 @@ -val a = byteArray(1, 2, 3) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/newByte.kt b/j2k/tests/testData/ast/arrayInitializerExpression/newByte.kt index 475d8e79643..592a2c123db 100644 --- a/j2k/tests/testData/ast/arrayInitializerExpression/newByte.kt +++ b/j2k/tests/testData/ast/arrayInitializerExpression/newByte.kt @@ -1 +1 @@ -var a: ByteArray? = byteArray(1, 2, 3) \ No newline at end of file +val a = byteArray(1, 2, 3) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/newInt.ide.kt b/j2k/tests/testData/ast/arrayInitializerExpression/newInt.ide.kt deleted file mode 100644 index 6cfae9942ea..00000000000 --- a/j2k/tests/testData/ast/arrayInitializerExpression/newInt.ide.kt +++ /dev/null @@ -1 +0,0 @@ -intArray(1, 2, 3) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/objectArrayWithLength.ide.kt b/j2k/tests/testData/ast/arrayInitializerExpression/objectArrayWithLength.ide.kt deleted file mode 100644 index 91ced175767..00000000000 --- a/j2k/tests/testData/ast/arrayInitializerExpression/objectArrayWithLength.ide.kt +++ /dev/null @@ -1 +0,0 @@ -val a = arrayOfNulls(10) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/objectArrayWithLength.kt b/j2k/tests/testData/ast/arrayInitializerExpression/objectArrayWithLength.kt index aa66c312f36..91ced175767 100644 --- a/j2k/tests/testData/ast/arrayInitializerExpression/objectArrayWithLength.kt +++ b/j2k/tests/testData/ast/arrayInitializerExpression/objectArrayWithLength.kt @@ -1 +1 @@ -var a: Array? = arrayOfNulls(10) \ No newline at end of file +val a = arrayOfNulls(10) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/oneDim.ide.kt b/j2k/tests/testData/ast/arrayInitializerExpression/oneDim.ide.kt deleted file mode 100644 index a9df4a3017b..00000000000 --- a/j2k/tests/testData/ast/arrayInitializerExpression/oneDim.ide.kt +++ /dev/null @@ -1 +0,0 @@ -val a = intArray(1, 2, 3) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/oneDim.kt b/j2k/tests/testData/ast/arrayInitializerExpression/oneDim.kt index 00bb8182165..a9df4a3017b 100644 --- a/j2k/tests/testData/ast/arrayInitializerExpression/oneDim.kt +++ b/j2k/tests/testData/ast/arrayInitializerExpression/oneDim.kt @@ -1 +1 @@ -var a: IntArray? = intArray(1, 2, 3) \ No newline at end of file +val a = intArray(1, 2, 3) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/oneDimWithVariables.ide.kt b/j2k/tests/testData/ast/arrayInitializerExpression/oneDimWithVariables.ide.kt deleted file mode 100644 index 1b0234abcac..00000000000 --- a/j2k/tests/testData/ast/arrayInitializerExpression/oneDimWithVariables.ide.kt +++ /dev/null @@ -1,4 +0,0 @@ -val a = 0 -val b = 0 -val c = 0 -val `is` = intArray(a, b, c) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/oneDimWithVariables.kt b/j2k/tests/testData/ast/arrayInitializerExpression/oneDimWithVariables.kt index 257787af11d..1b0234abcac 100644 --- a/j2k/tests/testData/ast/arrayInitializerExpression/oneDimWithVariables.kt +++ b/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) \ No newline at end of file +val a = 0 +val b = 0 +val c = 0 +val `is` = intArray(a, b, c) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/twoDim.ide.kt b/j2k/tests/testData/ast/arrayInitializerExpression/twoDim.ide.kt deleted file mode 100644 index 13f4c0fc540..00000000000 --- a/j2k/tests/testData/ast/arrayInitializerExpression/twoDim.ide.kt +++ /dev/null @@ -1 +0,0 @@ -val a = array(intArray(1, 2, 3), intArray(4, 5, 6), intArray(7, 8, 9)) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/twoDim.kt b/j2k/tests/testData/ast/arrayInitializerExpression/twoDim.kt index aacc8b02775..13f4c0fc540 100644 --- a/j2k/tests/testData/ast/arrayInitializerExpression/twoDim.kt +++ b/j2k/tests/testData/ast/arrayInitializerExpression/twoDim.kt @@ -1 +1 @@ -var a: Array? = array(intArray(1, 2, 3), intArray(4, 5, 6), intArray(7, 8, 9)) \ No newline at end of file +val a = array(intArray(1, 2, 3), intArray(4, 5, 6), intArray(7, 8, 9)) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayType/arrayInitializationStatement.ide.kt b/j2k/tests/testData/ast/arrayType/arrayInitializationStatement.ide.kt deleted file mode 100644 index 68ce4c06c72..00000000000 --- a/j2k/tests/testData/ast/arrayType/arrayInitializationStatement.ide.kt +++ /dev/null @@ -1 +0,0 @@ -val d2 = array() \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayType/arrayInitializationStatement.kt b/j2k/tests/testData/ast/arrayType/arrayInitializationStatement.kt index e3273f111c8..68ce4c06c72 100644 --- a/j2k/tests/testData/ast/arrayType/arrayInitializationStatement.kt +++ b/j2k/tests/testData/ast/arrayType/arrayInitializationStatement.kt @@ -1 +1 @@ -var d2: Array? = array() \ No newline at end of file +val d2 = array() \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension.ide.kt b/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension.ide.kt deleted file mode 100644 index 1462d0c46d1..00000000000 --- a/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension.ide.kt +++ /dev/null @@ -1 +0,0 @@ -val d2 = arrayOfNulls(5) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension.kt b/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension.kt index 81eb8c77ac7..1462d0c46d1 100644 --- a/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension.kt +++ b/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension.kt @@ -1 +1 @@ -var d2: Array? = arrayOfNulls(5) \ No newline at end of file +val d2 = arrayOfNulls(5) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension3d.ide.kt b/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension3d.ide.kt deleted file mode 100644 index f4cc76738ab..00000000000 --- a/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension3d.ide.kt +++ /dev/null @@ -1 +0,0 @@ -val d3 = Array>(5, { arrayOfNulls(5) }) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension3d.kt b/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension3d.kt index 9ba0d68c1b2..f4cc76738ab 100644 --- a/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension3d.kt +++ b/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension3d.kt @@ -1 +1 @@ -var d3: Array?>? = Array?>(5, { arrayOfNulls(5) }) \ No newline at end of file +val d3 = Array>(5, { arrayOfNulls(5) }) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimensionExplicit.ide.kt b/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimensionExplicit.ide.kt deleted file mode 100644 index 53aa946565f..00000000000 --- a/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimensionExplicit.ide.kt +++ /dev/null @@ -1 +0,0 @@ -val d2 = Array(5, { IntArray(5) }) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimensionExplicit.kt b/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimensionExplicit.kt index 43b51980ee1..53aa946565f 100644 --- a/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimensionExplicit.kt +++ b/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimensionExplicit.kt @@ -1 +1 @@ -var d2: Array? = Array(5, { IntArray(5) }) \ No newline at end of file +val d2 = Array(5, { IntArray(5) }) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayType/d2StringEmptyArray.ide.kt b/j2k/tests/testData/ast/arrayType/d2StringEmptyArray.ide.kt deleted file mode 100644 index 52d2dcfe14c..00000000000 --- a/j2k/tests/testData/ast/arrayType/d2StringEmptyArray.ide.kt +++ /dev/null @@ -1 +0,0 @@ -val ss = Array>(5, { arrayOfNulls(5) }) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayType/d2StringEmptyArray.kt b/j2k/tests/testData/ast/arrayType/d2StringEmptyArray.kt index a9a8e1ca8bf..52d2dcfe14c 100644 --- a/j2k/tests/testData/ast/arrayType/d2StringEmptyArray.kt +++ b/j2k/tests/testData/ast/arrayType/d2StringEmptyArray.kt @@ -1 +1 @@ -var ss: Array?>? = Array?>(5, { arrayOfNulls(5) }) \ No newline at end of file +val ss = Array>(5, { arrayOfNulls(5) }) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayType/d3StringEmptyArray.ide.kt b/j2k/tests/testData/ast/arrayType/d3StringEmptyArray.ide.kt deleted file mode 100644 index b0691fa416a..00000000000 --- a/j2k/tests/testData/ast/arrayType/d3StringEmptyArray.ide.kt +++ /dev/null @@ -1 +0,0 @@ -val sss = Array>>(5, { Array>(5, { arrayOfNulls(5) }) }) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayType/d3StringEmptyArray.kt b/j2k/tests/testData/ast/arrayType/d3StringEmptyArray.kt index 90640a9a4c1..b0691fa416a 100644 --- a/j2k/tests/testData/ast/arrayType/d3StringEmptyArray.kt +++ b/j2k/tests/testData/ast/arrayType/d3StringEmptyArray.kt @@ -1 +1 @@ -var sss: Array?>?>? = Array?>?>(5, { Array?>(5, { arrayOfNulls(5) }) }) \ No newline at end of file +val sss = Array>>(5, { Array>(5, { arrayOfNulls(5) }) }) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayType/longArray.ide.kt b/j2k/tests/testData/ast/arrayType/longArray.ide.kt deleted file mode 100644 index 6d27fcb3715..00000000000 --- a/j2k/tests/testData/ast/arrayType/longArray.ide.kt +++ /dev/null @@ -1 +0,0 @@ -val a = longArray(1, 2, 3) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayType/longArray.kt b/j2k/tests/testData/ast/arrayType/longArray.kt index f217eca7257..6d27fcb3715 100644 --- a/j2k/tests/testData/ast/arrayType/longArray.kt +++ b/j2k/tests/testData/ast/arrayType/longArray.kt @@ -1 +1 @@ -var a: LongArray? = longArray(1, 2, 3) \ No newline at end of file +val a = longArray(1, 2, 3) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayType/methodArrayArgs.ide.kt b/j2k/tests/testData/ast/arrayType/methodArrayArgs.ide.kt deleted file mode 100644 index 5be1e8e5db5..00000000000 --- a/j2k/tests/testData/ast/arrayType/methodArrayArgs.ide.kt +++ /dev/null @@ -1,2 +0,0 @@ -fun fromArrayToCollection(a: Array) { -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayType/methodArrayArgs.kt b/j2k/tests/testData/ast/arrayType/methodArrayArgs.kt index e0d0052c135..5be1e8e5db5 100644 --- a/j2k/tests/testData/ast/arrayType/methodArrayArgs.kt +++ b/j2k/tests/testData/ast/arrayType/methodArrayArgs.kt @@ -1,2 +1,2 @@ -fun fromArrayToCollection(a: Array?) { +fun fromArrayToCollection(a: Array) { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayType/newIntArray.ide.kt b/j2k/tests/testData/ast/arrayType/newIntArray.ide.kt deleted file mode 100644 index a9df4a3017b..00000000000 --- a/j2k/tests/testData/ast/arrayType/newIntArray.ide.kt +++ /dev/null @@ -1 +0,0 @@ -val a = intArray(1, 2, 3) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayType/newIntArray.kt b/j2k/tests/testData/ast/arrayType/newIntArray.kt index 00bb8182165..a9df4a3017b 100644 --- a/j2k/tests/testData/ast/arrayType/newIntArray.kt +++ b/j2k/tests/testData/ast/arrayType/newIntArray.kt @@ -1 +1 @@ -var a: IntArray? = intArray(1, 2, 3) \ No newline at end of file +val a = intArray(1, 2, 3) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayType/newStringArray.ide.kt b/j2k/tests/testData/ast/arrayType/newStringArray.ide.kt deleted file mode 100644 index c1803c10649..00000000000 --- a/j2k/tests/testData/ast/arrayType/newStringArray.ide.kt +++ /dev/null @@ -1 +0,0 @@ -val a = array("abc") \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayType/newStringArray.kt b/j2k/tests/testData/ast/arrayType/newStringArray.kt index 30c1b0a9560..c1803c10649 100644 --- a/j2k/tests/testData/ast/arrayType/newStringArray.kt +++ b/j2k/tests/testData/ast/arrayType/newStringArray.kt @@ -1 +1 @@ -var a: Array? = array("abc") \ No newline at end of file +val a = array("abc") \ No newline at end of file diff --git a/j2k/tests/testData/ast/assertStatement/onlyCondition.ide.kt b/j2k/tests/testData/ast/assertStatement/onlyCondition.ide.kt deleted file mode 100644 index 8d54af49a99..00000000000 --- a/j2k/tests/testData/ast/assertStatement/onlyCondition.ide.kt +++ /dev/null @@ -1 +0,0 @@ -assert(boolMethod()) \ No newline at end of file diff --git a/j2k/tests/testData/ast/assertStatement/onlyConditionWithBraces.ide.kt b/j2k/tests/testData/ast/assertStatement/onlyConditionWithBraces.ide.kt deleted file mode 100644 index 9c9d8fecb83..00000000000 --- a/j2k/tests/testData/ast/assertStatement/onlyConditionWithBraces.ide.kt +++ /dev/null @@ -1 +0,0 @@ -assert((boolMethod())) \ No newline at end of file diff --git a/j2k/tests/testData/ast/assertStatement/withStringDetail.ide.kt b/j2k/tests/testData/ast/assertStatement/withStringDetail.ide.kt deleted file mode 100644 index dbf44bd5eb8..00000000000 --- a/j2k/tests/testData/ast/assertStatement/withStringDetail.ide.kt +++ /dev/null @@ -1 +0,0 @@ -assert(true) { "string details" } \ No newline at end of file diff --git a/j2k/tests/testData/ast/assignmentExpression/and.ide.kt b/j2k/tests/testData/ast/assignmentExpression/and.ide.kt deleted file mode 100644 index dc3b47760da..00000000000 --- a/j2k/tests/testData/ast/assignmentExpression/and.ide.kt +++ /dev/null @@ -1 +0,0 @@ -x = x and 2 \ No newline at end of file diff --git a/j2k/tests/testData/ast/assignmentExpression/assignment.ide.kt b/j2k/tests/testData/ast/assignmentExpression/assignment.ide.kt deleted file mode 100644 index 1ddfb7dc8e4..00000000000 --- a/j2k/tests/testData/ast/assignmentExpression/assignment.ide.kt +++ /dev/null @@ -1 +0,0 @@ -x = 2 \ No newline at end of file diff --git a/j2k/tests/testData/ast/assignmentExpression/divideAssign.ide.kt b/j2k/tests/testData/ast/assignmentExpression/divideAssign.ide.kt deleted file mode 100644 index e63372a6277..00000000000 --- a/j2k/tests/testData/ast/assignmentExpression/divideAssign.ide.kt +++ /dev/null @@ -1 +0,0 @@ -x /= 2 \ No newline at end of file diff --git a/j2k/tests/testData/ast/assignmentExpression/minusAssign.ide.kt b/j2k/tests/testData/ast/assignmentExpression/minusAssign.ide.kt deleted file mode 100644 index 58f87ee4a6c..00000000000 --- a/j2k/tests/testData/ast/assignmentExpression/minusAssign.ide.kt +++ /dev/null @@ -1 +0,0 @@ -x -= 2 \ No newline at end of file diff --git a/j2k/tests/testData/ast/assignmentExpression/multiplyAssign.ide.kt b/j2k/tests/testData/ast/assignmentExpression/multiplyAssign.ide.kt deleted file mode 100644 index ddea70541b0..00000000000 --- a/j2k/tests/testData/ast/assignmentExpression/multiplyAssign.ide.kt +++ /dev/null @@ -1 +0,0 @@ -x *= 2 \ No newline at end of file diff --git a/j2k/tests/testData/ast/assignmentExpression/nullability-settings.java b/j2k/tests/testData/ast/assignmentExpression/nullability-settings.java new file mode 100644 index 00000000000..7e3e7cae347 --- /dev/null +++ b/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(); + } +} \ No newline at end of file diff --git a/j2k/tests/testData/ast/assignmentExpression/nullability-settings.kt b/j2k/tests/testData/ast/assignmentExpression/nullability-settings.kt new file mode 100644 index 00000000000..907706ff69f --- /dev/null +++ b/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()!! + } +} \ No newline at end of file diff --git a/j2k/tests/testData/ast/assignmentExpression/nullability.ide.kt b/j2k/tests/testData/ast/assignmentExpression/nullability.ide.kt deleted file mode 100644 index d67044c5044..00000000000 --- a/j2k/tests/testData/ast/assignmentExpression/nullability.ide.kt +++ /dev/null @@ -1,9 +0,0 @@ -import java.util.BitSet - -class Foo() { - fun foo(o: BitSet) { - val o2 = o - val foo = 0 - foo = o2.size() - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/assignmentExpression/nullability.kt b/j2k/tests/testData/ast/assignmentExpression/nullability.kt index 75e90a1771b..d67044c5044 100644 --- a/j2k/tests/testData/ast/assignmentExpression/nullability.kt +++ b/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() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/assignmentExpression/or.ide.kt b/j2k/tests/testData/ast/assignmentExpression/or.ide.kt deleted file mode 100644 index 776a84a8989..00000000000 --- a/j2k/tests/testData/ast/assignmentExpression/or.ide.kt +++ /dev/null @@ -1 +0,0 @@ -x = x or 2 \ No newline at end of file diff --git a/j2k/tests/testData/ast/assignmentExpression/plusAssign.ide.kt b/j2k/tests/testData/ast/assignmentExpression/plusAssign.ide.kt deleted file mode 100644 index 2448227cb69..00000000000 --- a/j2k/tests/testData/ast/assignmentExpression/plusAssign.ide.kt +++ /dev/null @@ -1 +0,0 @@ -x += 2 \ No newline at end of file diff --git a/j2k/tests/testData/ast/assignmentExpression/reminder.ide.kt b/j2k/tests/testData/ast/assignmentExpression/reminder.ide.kt deleted file mode 100644 index b6fe73d0db1..00000000000 --- a/j2k/tests/testData/ast/assignmentExpression/reminder.ide.kt +++ /dev/null @@ -1 +0,0 @@ -x %= 2 \ No newline at end of file diff --git a/j2k/tests/testData/ast/assignmentExpression/shiftLeft.ide.kt b/j2k/tests/testData/ast/assignmentExpression/shiftLeft.ide.kt deleted file mode 100644 index bc26f965e4d..00000000000 --- a/j2k/tests/testData/ast/assignmentExpression/shiftLeft.ide.kt +++ /dev/null @@ -1 +0,0 @@ -x = x shl 2 \ No newline at end of file diff --git a/j2k/tests/testData/ast/assignmentExpression/shiftRight.ide.kt b/j2k/tests/testData/ast/assignmentExpression/shiftRight.ide.kt deleted file mode 100644 index a731104d2f6..00000000000 --- a/j2k/tests/testData/ast/assignmentExpression/shiftRight.ide.kt +++ /dev/null @@ -1 +0,0 @@ -x = x shr 2 \ No newline at end of file diff --git a/j2k/tests/testData/ast/assignmentExpression/simpleAssignment.ide.kt b/j2k/tests/testData/ast/assignmentExpression/simpleAssignment.ide.kt deleted file mode 100644 index 88de072edc6..00000000000 --- a/j2k/tests/testData/ast/assignmentExpression/simpleAssignment.ide.kt +++ /dev/null @@ -1 +0,0 @@ -i = 1 \ No newline at end of file diff --git a/j2k/tests/testData/ast/assignmentExpression/unsignedRightShift.ide.kt b/j2k/tests/testData/ast/assignmentExpression/unsignedRightShift.ide.kt deleted file mode 100644 index 2450029bd56..00000000000 --- a/j2k/tests/testData/ast/assignmentExpression/unsignedRightShift.ide.kt +++ /dev/null @@ -1 +0,0 @@ -x = x ushr 2 \ No newline at end of file diff --git a/j2k/tests/testData/ast/assignmentExpression/xor.ide.kt b/j2k/tests/testData/ast/assignmentExpression/xor.ide.kt deleted file mode 100644 index 381ed467f3d..00000000000 --- a/j2k/tests/testData/ast/assignmentExpression/xor.ide.kt +++ /dev/null @@ -1 +0,0 @@ -x = x xor 2 \ No newline at end of file diff --git a/j2k/tests/testData/ast/binaryExpression/and.ide.kt b/j2k/tests/testData/ast/binaryExpression/and.ide.kt deleted file mode 100644 index cbf463b36ea..00000000000 --- a/j2k/tests/testData/ast/binaryExpression/and.ide.kt +++ /dev/null @@ -1 +0,0 @@ -x and 2 \ No newline at end of file diff --git a/j2k/tests/testData/ast/binaryExpression/conditionalAnd.ide.kt b/j2k/tests/testData/ast/binaryExpression/conditionalAnd.ide.kt deleted file mode 100644 index 5aa60340840..00000000000 --- a/j2k/tests/testData/ast/binaryExpression/conditionalAnd.ide.kt +++ /dev/null @@ -1 +0,0 @@ -true && false \ No newline at end of file diff --git a/j2k/tests/testData/ast/binaryExpression/conditionalOr.ide.kt b/j2k/tests/testData/ast/binaryExpression/conditionalOr.ide.kt deleted file mode 100644 index 64634c472bc..00000000000 --- a/j2k/tests/testData/ast/binaryExpression/conditionalOr.ide.kt +++ /dev/null @@ -1 +0,0 @@ -true || false \ No newline at end of file diff --git a/j2k/tests/testData/ast/binaryExpression/divide.ide.kt b/j2k/tests/testData/ast/binaryExpression/divide.ide.kt deleted file mode 100644 index 0e0b5d58618..00000000000 --- a/j2k/tests/testData/ast/binaryExpression/divide.ide.kt +++ /dev/null @@ -1 +0,0 @@ -1 / 2 \ No newline at end of file diff --git a/j2k/tests/testData/ast/binaryExpression/greaterThan.ide.kt b/j2k/tests/testData/ast/binaryExpression/greaterThan.ide.kt deleted file mode 100644 index 2774817e788..00000000000 --- a/j2k/tests/testData/ast/binaryExpression/greaterThan.ide.kt +++ /dev/null @@ -1 +0,0 @@ -1 > 2 \ No newline at end of file diff --git a/j2k/tests/testData/ast/binaryExpression/greaterThanEqual.ide.kt b/j2k/tests/testData/ast/binaryExpression/greaterThanEqual.ide.kt deleted file mode 100644 index 6993045c7a2..00000000000 --- a/j2k/tests/testData/ast/binaryExpression/greaterThanEqual.ide.kt +++ /dev/null @@ -1 +0,0 @@ -1 >= 2 \ No newline at end of file diff --git a/j2k/tests/testData/ast/binaryExpression/lessThan.ide.kt b/j2k/tests/testData/ast/binaryExpression/lessThan.ide.kt deleted file mode 100644 index 535e996ad9b..00000000000 --- a/j2k/tests/testData/ast/binaryExpression/lessThan.ide.kt +++ /dev/null @@ -1 +0,0 @@ -1 < 2 \ No newline at end of file diff --git a/j2k/tests/testData/ast/binaryExpression/lessThanEqual.ide.kt b/j2k/tests/testData/ast/binaryExpression/lessThanEqual.ide.kt deleted file mode 100644 index 5e9475f92bf..00000000000 --- a/j2k/tests/testData/ast/binaryExpression/lessThanEqual.ide.kt +++ /dev/null @@ -1 +0,0 @@ -1 <= 2 \ No newline at end of file diff --git a/j2k/tests/testData/ast/binaryExpression/minus.ide.kt b/j2k/tests/testData/ast/binaryExpression/minus.ide.kt deleted file mode 100644 index 7ec0a893aef..00000000000 --- a/j2k/tests/testData/ast/binaryExpression/minus.ide.kt +++ /dev/null @@ -1 +0,0 @@ -1 - 2 \ No newline at end of file diff --git a/j2k/tests/testData/ast/binaryExpression/multiply.ide.kt b/j2k/tests/testData/ast/binaryExpression/multiply.ide.kt deleted file mode 100644 index a48dfec9fa5..00000000000 --- a/j2k/tests/testData/ast/binaryExpression/multiply.ide.kt +++ /dev/null @@ -1 +0,0 @@ -1 * 2 \ No newline at end of file diff --git a/j2k/tests/testData/ast/binaryExpression/or.ide.kt b/j2k/tests/testData/ast/binaryExpression/or.ide.kt deleted file mode 100644 index ccad705935d..00000000000 --- a/j2k/tests/testData/ast/binaryExpression/or.ide.kt +++ /dev/null @@ -1 +0,0 @@ -x or 2 \ No newline at end of file diff --git a/j2k/tests/testData/ast/binaryExpression/plus.ide.kt b/j2k/tests/testData/ast/binaryExpression/plus.ide.kt deleted file mode 100644 index 193df0b550b..00000000000 --- a/j2k/tests/testData/ast/binaryExpression/plus.ide.kt +++ /dev/null @@ -1 +0,0 @@ -1 + 2 \ No newline at end of file diff --git a/j2k/tests/testData/ast/binaryExpression/remainder.ide.kt b/j2k/tests/testData/ast/binaryExpression/remainder.ide.kt deleted file mode 100644 index 049211394d2..00000000000 --- a/j2k/tests/testData/ast/binaryExpression/remainder.ide.kt +++ /dev/null @@ -1 +0,0 @@ -1 % 2 \ No newline at end of file diff --git a/j2k/tests/testData/ast/binaryExpression/shiftLeft.ide.kt b/j2k/tests/testData/ast/binaryExpression/shiftLeft.ide.kt deleted file mode 100644 index face9a53255..00000000000 --- a/j2k/tests/testData/ast/binaryExpression/shiftLeft.ide.kt +++ /dev/null @@ -1 +0,0 @@ -x shl 2 \ No newline at end of file diff --git a/j2k/tests/testData/ast/binaryExpression/shiftRight.ide.kt b/j2k/tests/testData/ast/binaryExpression/shiftRight.ide.kt deleted file mode 100644 index 771795abe88..00000000000 --- a/j2k/tests/testData/ast/binaryExpression/shiftRight.ide.kt +++ /dev/null @@ -1 +0,0 @@ -x shr 2 \ No newline at end of file diff --git a/j2k/tests/testData/ast/binaryExpression/unsignedRightShift.ide.kt b/j2k/tests/testData/ast/binaryExpression/unsignedRightShift.ide.kt deleted file mode 100644 index 8b8c1f89e58..00000000000 --- a/j2k/tests/testData/ast/binaryExpression/unsignedRightShift.ide.kt +++ /dev/null @@ -1 +0,0 @@ -x.ushr(2) \ No newline at end of file diff --git a/j2k/tests/testData/ast/binaryExpression/xor.ide.kt b/j2k/tests/testData/ast/binaryExpression/xor.ide.kt deleted file mode 100644 index b8ad1650a31..00000000000 --- a/j2k/tests/testData/ast/binaryExpression/xor.ide.kt +++ /dev/null @@ -1 +0,0 @@ -x xor 2 \ No newline at end of file diff --git a/j2k/tests/testData/ast/boxedType/Boxing.ide.kt b/j2k/tests/testData/ast/boxedType/Boxing.ide.kt deleted file mode 100644 index 3cbc28cefd1..00000000000 --- a/j2k/tests/testData/ast/boxedType/Boxing.ide.kt +++ /dev/null @@ -1,13 +0,0 @@ -import java.util.ArrayList - -class Boxing() { - fun test() { - val i = 0 - val n = 0.0.toFloat() - i = 1 - val j = i!! - val k = i!! + 2 - i = null - j = i!! - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/boxedType/Boxing.kt b/j2k/tests/testData/ast/boxedType/Boxing.kt index 927857f1a29..3cbc28cefd1 100644 --- a/j2k/tests/testData/ast/boxedType/Boxing.kt +++ b/j2k/tests/testData/ast/boxedType/Boxing.kt @@ -1,12 +1,12 @@ import java.util.ArrayList -open class Boxing() { - open fun test() { - var i: Int? = 0 - var n: Number? = 0.0.toFloat() +class Boxing() { + fun test() { + val i = 0 + val n = 0.0.toFloat() i = 1 - var j: Int = i!! - var k: Int? = i!! + 2 + val j = i!! + val k = i!! + 2 i = null j = i!! } diff --git a/j2k/tests/testData/ast/boxedType/boolean.ide.kt b/j2k/tests/testData/ast/boxedType/boolean.ide.kt deleted file mode 100644 index 428839e7260..00000000000 --- a/j2k/tests/testData/ast/boxedType/boolean.ide.kt +++ /dev/null @@ -1 +0,0 @@ -val i = 10 \ No newline at end of file diff --git a/j2k/tests/testData/ast/boxedType/boolean.kt b/j2k/tests/testData/ast/boxedType/boolean.kt index fdfd04e3aa2..428839e7260 100644 --- a/j2k/tests/testData/ast/boxedType/boolean.kt +++ b/j2k/tests/testData/ast/boxedType/boolean.kt @@ -1 +1 @@ -var i: Boolean? = 10 \ No newline at end of file +val i = 10 \ No newline at end of file diff --git a/j2k/tests/testData/ast/boxedType/byte.ide.kt b/j2k/tests/testData/ast/boxedType/byte.ide.kt deleted file mode 100644 index 428839e7260..00000000000 --- a/j2k/tests/testData/ast/boxedType/byte.ide.kt +++ /dev/null @@ -1 +0,0 @@ -val i = 10 \ No newline at end of file diff --git a/j2k/tests/testData/ast/boxedType/byte.kt b/j2k/tests/testData/ast/boxedType/byte.kt index 2902bb98552..428839e7260 100644 --- a/j2k/tests/testData/ast/boxedType/byte.kt +++ b/j2k/tests/testData/ast/boxedType/byte.kt @@ -1 +1 @@ -var i: Byte? = 10 \ No newline at end of file +val i = 10 \ No newline at end of file diff --git a/j2k/tests/testData/ast/boxedType/character.ide.kt b/j2k/tests/testData/ast/boxedType/character.ide.kt deleted file mode 100644 index 428839e7260..00000000000 --- a/j2k/tests/testData/ast/boxedType/character.ide.kt +++ /dev/null @@ -1 +0,0 @@ -val i = 10 \ No newline at end of file diff --git a/j2k/tests/testData/ast/boxedType/character.kt b/j2k/tests/testData/ast/boxedType/character.kt index 7d383e3d476..428839e7260 100644 --- a/j2k/tests/testData/ast/boxedType/character.kt +++ b/j2k/tests/testData/ast/boxedType/character.kt @@ -1 +1 @@ -var i: Char? = 10 \ No newline at end of file +val i = 10 \ No newline at end of file diff --git a/j2k/tests/testData/ast/boxedType/double.ide.kt b/j2k/tests/testData/ast/boxedType/double.ide.kt deleted file mode 100644 index 428839e7260..00000000000 --- a/j2k/tests/testData/ast/boxedType/double.ide.kt +++ /dev/null @@ -1 +0,0 @@ -val i = 10 \ No newline at end of file diff --git a/j2k/tests/testData/ast/boxedType/double.kt b/j2k/tests/testData/ast/boxedType/double.kt index 24601e602bd..428839e7260 100644 --- a/j2k/tests/testData/ast/boxedType/double.kt +++ b/j2k/tests/testData/ast/boxedType/double.kt @@ -1 +1 @@ -var i: Double? = 10 \ No newline at end of file +val i = 10 \ No newline at end of file diff --git a/j2k/tests/testData/ast/boxedType/float.ide.kt b/j2k/tests/testData/ast/boxedType/float.ide.kt deleted file mode 100644 index 428839e7260..00000000000 --- a/j2k/tests/testData/ast/boxedType/float.ide.kt +++ /dev/null @@ -1 +0,0 @@ -val i = 10 \ No newline at end of file diff --git a/j2k/tests/testData/ast/boxedType/float.kt b/j2k/tests/testData/ast/boxedType/float.kt index f51e98f1060..428839e7260 100644 --- a/j2k/tests/testData/ast/boxedType/float.kt +++ b/j2k/tests/testData/ast/boxedType/float.kt @@ -1 +1 @@ -var i: Float? = 10 \ No newline at end of file +val i = 10 \ No newline at end of file diff --git a/j2k/tests/testData/ast/boxedType/integer.ide.kt b/j2k/tests/testData/ast/boxedType/integer.ide.kt deleted file mode 100644 index 428839e7260..00000000000 --- a/j2k/tests/testData/ast/boxedType/integer.ide.kt +++ /dev/null @@ -1 +0,0 @@ -val i = 10 \ No newline at end of file diff --git a/j2k/tests/testData/ast/boxedType/integer.kt b/j2k/tests/testData/ast/boxedType/integer.kt index 2c2d2172639..428839e7260 100644 --- a/j2k/tests/testData/ast/boxedType/integer.kt +++ b/j2k/tests/testData/ast/boxedType/integer.kt @@ -1 +1 @@ -var i: Int? = 10 \ No newline at end of file +val i = 10 \ No newline at end of file diff --git a/j2k/tests/testData/ast/boxedType/kt-671.ide.kt b/j2k/tests/testData/ast/boxedType/kt-671.ide.kt deleted file mode 100644 index 3cd4711b3ae..00000000000 --- a/j2k/tests/testData/ast/boxedType/kt-671.ide.kt +++ /dev/null @@ -1,9 +0,0 @@ -package demo - -class Test() { - fun test() { - val i = Integer.valueOf(100) - val s = 3 - val ss = java.lang.Short.valueOf(s) - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/boxedType/kt-671.kt b/j2k/tests/testData/ast/boxedType/kt-671.kt index 3760a500f3c..3cd4711b3ae 100644 --- a/j2k/tests/testData/ast/boxedType/kt-671.kt +++ b/j2k/tests/testData/ast/boxedType/kt-671.kt @@ -1,9 +1,9 @@ package demo -open class Test() { - open fun test() { - var i: Int? = Integer.valueOf(100) - var s: Short = 3 - var ss: Short? = java.lang.Short.valueOf(s) +class Test() { + fun test() { + val i = Integer.valueOf(100) + val s = 3 + val ss = java.lang.Short.valueOf(s) } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/boxedType/long.ide.kt b/j2k/tests/testData/ast/boxedType/long.ide.kt deleted file mode 100644 index 428839e7260..00000000000 --- a/j2k/tests/testData/ast/boxedType/long.ide.kt +++ /dev/null @@ -1 +0,0 @@ -val i = 10 \ No newline at end of file diff --git a/j2k/tests/testData/ast/boxedType/long.kt b/j2k/tests/testData/ast/boxedType/long.kt index 933099062f0..428839e7260 100644 --- a/j2k/tests/testData/ast/boxedType/long.kt +++ b/j2k/tests/testData/ast/boxedType/long.kt @@ -1 +1 @@ -var i: Long? = 10 \ No newline at end of file +val i = 10 \ No newline at end of file diff --git a/j2k/tests/testData/ast/boxedType/object.ide.kt b/j2k/tests/testData/ast/boxedType/object.ide.kt deleted file mode 100644 index 428839e7260..00000000000 --- a/j2k/tests/testData/ast/boxedType/object.ide.kt +++ /dev/null @@ -1 +0,0 @@ -val i = 10 \ No newline at end of file diff --git a/j2k/tests/testData/ast/boxedType/object.kt b/j2k/tests/testData/ast/boxedType/object.kt index c4048aa0a48..428839e7260 100644 --- a/j2k/tests/testData/ast/boxedType/object.kt +++ b/j2k/tests/testData/ast/boxedType/object.kt @@ -1 +1 @@ -var i: Any? = 10 \ No newline at end of file +val i = 10 \ No newline at end of file diff --git a/j2k/tests/testData/ast/boxedType/short.ide.kt b/j2k/tests/testData/ast/boxedType/short.ide.kt deleted file mode 100644 index 428839e7260..00000000000 --- a/j2k/tests/testData/ast/boxedType/short.ide.kt +++ /dev/null @@ -1 +0,0 @@ -val i = 10 \ No newline at end of file diff --git a/j2k/tests/testData/ast/boxedType/short.kt b/j2k/tests/testData/ast/boxedType/short.kt index aa759e7e746..428839e7260 100644 --- a/j2k/tests/testData/ast/boxedType/short.kt +++ b/j2k/tests/testData/ast/boxedType/short.kt @@ -1 +1 @@ -var i: Short? = 10 \ No newline at end of file +val i = 10 \ No newline at end of file diff --git a/j2k/tests/testData/ast/breakStatement/breakWithLabel.ide.kt b/j2k/tests/testData/ast/breakStatement/breakWithLabel.ide.kt deleted file mode 100644 index 02d8620a138..00000000000 --- a/j2k/tests/testData/ast/breakStatement/breakWithLabel.ide.kt +++ /dev/null @@ -1 +0,0 @@ -break@label \ No newline at end of file diff --git a/j2k/tests/testData/ast/breakStatement/breakWithoutLabel.ide.kt b/j2k/tests/testData/ast/breakStatement/breakWithoutLabel.ide.kt deleted file mode 100644 index 5da70343a46..00000000000 --- a/j2k/tests/testData/ast/breakStatement/breakWithoutLabel.ide.kt +++ /dev/null @@ -1 +0,0 @@ -break \ No newline at end of file diff --git a/j2k/tests/testData/ast/callChainExpression/libraryFieldCall.ide.kt b/j2k/tests/testData/ast/callChainExpression/libraryFieldCall.ide.kt deleted file mode 100644 index 3f517922d0c..00000000000 --- a/j2k/tests/testData/ast/callChainExpression/libraryFieldCall.ide.kt +++ /dev/null @@ -1,11 +0,0 @@ -class Library() { - class object { - val ourOut: java.io.PrintStream = 0 - } -} - -class User() { - fun main() { - Library.ourOut.print() - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/callChainExpression/libraryFieldCall.kt b/j2k/tests/testData/ast/callChainExpression/libraryFieldCall.kt index 1090546e2af..3f517922d0c 100644 --- a/j2k/tests/testData/ast/callChainExpression/libraryFieldCall.kt +++ b/j2k/tests/testData/ast/callChainExpression/libraryFieldCall.kt @@ -1,11 +1,11 @@ -open class Library() { +class Library() { class object { - val ourOut: java.io.PrintStream? = null + val ourOut: java.io.PrintStream = 0 } } -open class User() { - open fun main() { - Library.ourOut?.print() +class User() { + fun main() { + Library.ourOut.print() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.ide.kt b/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.ide.kt deleted file mode 100644 index e4407881c7d..00000000000 --- a/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.ide.kt +++ /dev/null @@ -1,17 +0,0 @@ -class Library() { - class object { - fun call() { - } - - fun getString(): String { - return "" - } - } -} - -class User() { - fun main() { - Library.call() - Library.getString().isEmpty() - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.kt b/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.kt index 806a1b12b77..e4407881c7d 100644 --- a/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.kt +++ b/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.kt @@ -1,17 +1,17 @@ -open class Library() { +class Library() { class object { - open fun call() { + fun call() { } - open fun getString(): String? { + fun getString(): String { return "" } } } -open class User() { - open fun main() { +class User() { + fun main() { Library.call() - Library.getString()?.isEmpty() + Library.getString().isEmpty() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance-settings.java b/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance-settings.java new file mode 100644 index 00000000000..a7f32754bd0 --- /dev/null +++ b/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance-settings.java @@ -0,0 +1,19 @@ +//file +// !forceNotNullTypes: false +// !specifyLocalVariableTypeByDefault: true +class Library { + void call() {} + + String getString() { return ""; } +} + +class User { + void main() { + Library lib = new Library(); + lib.call(); + lib.getString().isEmpty(); + + new Library().call(); + new Library().getString().isEmpty(); + } +} \ No newline at end of file diff --git a/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance-settings.kt b/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance-settings.kt new file mode 100644 index 00000000000..fd94784d473 --- /dev/null +++ b/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance-settings.kt @@ -0,0 +1,21 @@ +// !forceNotNullTypes: false +// !specifyLocalVariableTypeByDefault: true +class Library() { + fun call() { + } + + fun getString(): String? { + return "" + } +} + +class User() { + fun main() { + val lib: Library? = Library() + lib?.call() + lib?.getString()?.isEmpty() + + Library().call() + Library().getString()?.isEmpty() + } +} \ No newline at end of file diff --git a/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.ide.kt b/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.ide.kt deleted file mode 100644 index 8d52a4e5c27..00000000000 --- a/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.ide.kt +++ /dev/null @@ -1,19 +0,0 @@ -class Library() { - fun call() { - } - - fun getString(): String { - return "" - } -} - -class User() { - fun main() { - val lib = Library() - lib.call() - lib.getString().isEmpty() - - Library().call() - Library().getString().isEmpty() - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.kt b/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.kt index 07c65e393bb..8d52a4e5c27 100644 --- a/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.kt +++ b/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.kt @@ -1,19 +1,19 @@ -open class Library() { - open fun call() { +class Library() { + fun call() { } - open fun getString(): String? { + fun getString(): String { return "" } } -open class User() { - open fun main() { - var lib: Library? = Library() - lib?.call() - lib?.getString()?.isEmpty() +class User() { + fun main() { + val lib = Library() + lib.call() + lib.getString().isEmpty() Library().call() - Library().getString()?.isEmpty() + Library().getString().isEmpty() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.ide.kt b/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.ide.kt deleted file mode 100644 index 59ec0eff040..00000000000 --- a/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.ide.kt +++ /dev/null @@ -1,9 +0,0 @@ -class Library() { - public val myString: String = 0 -} - -class User() { - fun main() { - Library.myString.isEmpty() - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.kt b/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.kt index 11116328203..59ec0eff040 100644 --- a/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.kt +++ b/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.kt @@ -1,9 +1,9 @@ -open class Library() { - public val myString: String? = null +class Library() { + public val myString: String = 0 } -open class User() { - open fun main() { - Library.myString?.isEmpty() +class User() { + fun main() { + Library.myString.isEmpty() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/callChainExpression/sout.ide.kt b/j2k/tests/testData/ast/callChainExpression/sout.ide.kt deleted file mode 100644 index 0dfec573287..00000000000 --- a/j2k/tests/testData/ast/callChainExpression/sout.ide.kt +++ /dev/null @@ -1 +0,0 @@ -System.out.println("Hello, world") \ No newline at end of file diff --git a/j2k/tests/testData/ast/callChainExpression/sout.kt b/j2k/tests/testData/ast/callChainExpression/sout.kt index 183416fbb5f..0dfec573287 100644 --- a/j2k/tests/testData/ast/callChainExpression/sout.kt +++ b/j2k/tests/testData/ast/callChainExpression/sout.kt @@ -1 +1 @@ -System.out?.println("Hello, world") \ No newline at end of file +System.out.println("Hello, world") \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/ClassShadowing.ide.kt b/j2k/tests/testData/ast/class/ClassShadowing.ide.kt deleted file mode 100644 index 947af1776a0..00000000000 --- a/j2k/tests/testData/ast/class/ClassShadowing.ide.kt +++ /dev/null @@ -1,19 +0,0 @@ -package test - -public class Short() { - class object { - public fun valueOf(value: String): Short { - return Short() - } - } -} - -class Test() { - class object { - public fun test() { - test.Short.valueOf("1") - test.Short.valueOf("1") - java.lang.Short.valueOf("1") - } - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/ClassShadowing.kt b/j2k/tests/testData/ast/class/ClassShadowing.kt index 9b6e159efef..947af1776a0 100644 --- a/j2k/tests/testData/ast/class/ClassShadowing.kt +++ b/j2k/tests/testData/ast/class/ClassShadowing.kt @@ -1,16 +1,16 @@ package test -public open class Short() { +public class Short() { class object { - public open fun valueOf(value: String?): Short? { + public fun valueOf(value: String): Short { return Short() } } } -open class Test() { +class Test() { class object { - public open fun test() { + public fun test() { test.Short.valueOf("1") test.Short.valueOf("1") java.lang.Short.valueOf("1") diff --git a/j2k/tests/testData/ast/class/abstractClass.ide.kt b/j2k/tests/testData/ast/class/abstractClass.ide.kt deleted file mode 100644 index 865a601b10a..00000000000 --- a/j2k/tests/testData/ast/class/abstractClass.ide.kt +++ /dev/null @@ -1,7 +0,0 @@ -abstract class A() { - abstract fun callme() - - fun callmetoo() { - print("This is a concrete method.") - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/abstractClass.kt b/j2k/tests/testData/ast/class/abstractClass.kt index f3772f0baf9..865a601b10a 100644 --- a/j2k/tests/testData/ast/class/abstractClass.kt +++ b/j2k/tests/testData/ast/class/abstractClass.kt @@ -1,7 +1,7 @@ abstract class A() { abstract fun callme() - open fun callmetoo() { + fun callmetoo() { print("This is a concrete method.") } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/abstractClassShape.ide.kt b/j2k/tests/testData/ast/class/abstractClassShape.ide.kt deleted file mode 100644 index 52864944fa2..00000000000 --- a/j2k/tests/testData/ast/class/abstractClassShape.ide.kt +++ /dev/null @@ -1,10 +0,0 @@ -abstract class Shape() { - public var color: String = 0 - public fun setColor(c: String) { - color = c - } - public fun getColor(): String { - return color - } - public abstract fun area(): Double -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/abstractClassShape.kt b/j2k/tests/testData/ast/class/abstractClassShape.kt index 43eba7811e8..52864944fa2 100644 --- a/j2k/tests/testData/ast/class/abstractClassShape.kt +++ b/j2k/tests/testData/ast/class/abstractClassShape.kt @@ -1,9 +1,9 @@ abstract class Shape() { - public var color: String? = null - public open fun setColor(c: String?) { + public var color: String = 0 + public fun setColor(c: String) { color = c } - public open fun getColor(): String? { + public fun getColor(): String { return color } public abstract fun area(): Double diff --git a/j2k/tests/testData/ast/class/class.ide.kt b/j2k/tests/testData/ast/class/class.ide.kt deleted file mode 100644 index 9eb0d07da4b..00000000000 --- a/j2k/tests/testData/ast/class/class.ide.kt +++ /dev/null @@ -1 +0,0 @@ -class Test() \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/class.kt b/j2k/tests/testData/ast/class/class.kt index 388efa65aa9..9eb0d07da4b 100644 --- a/j2k/tests/testData/ast/class/class.kt +++ b/j2k/tests/testData/ast/class/class.kt @@ -1 +1 @@ -open class Test() \ No newline at end of file +class Test() \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/classWithEmptyMethods.ide.kt b/j2k/tests/testData/ast/class/classWithEmptyMethods.ide.kt deleted file mode 100644 index 34384c82660..00000000000 --- a/j2k/tests/testData/ast/class/classWithEmptyMethods.ide.kt +++ /dev/null @@ -1,8 +0,0 @@ -class T() { - fun main() { - } - fun i(): Int { - } - fun s(): String { - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/classWithEmptyMethods.kt b/j2k/tests/testData/ast/class/classWithEmptyMethods.kt index b698dd2aa00..34384c82660 100644 --- a/j2k/tests/testData/ast/class/classWithEmptyMethods.kt +++ b/j2k/tests/testData/ast/class/classWithEmptyMethods.kt @@ -3,6 +3,6 @@ class T() { } fun i(): Int { } - fun s(): String? { + fun s(): String { } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/classWithFields.ide.kt b/j2k/tests/testData/ast/class/classWithFields.ide.kt deleted file mode 100644 index 134d4d62abf..00000000000 --- a/j2k/tests/testData/ast/class/classWithFields.ide.kt +++ /dev/null @@ -1,4 +0,0 @@ -class T() { - var a: String = "abc" - var b: Int = 10 -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/classWithFields.kt b/j2k/tests/testData/ast/class/classWithFields.kt index da5fda100f5..134d4d62abf 100644 --- a/j2k/tests/testData/ast/class/classWithFields.kt +++ b/j2k/tests/testData/ast/class/classWithFields.kt @@ -1,4 +1,4 @@ class T() { - var a: String? = "abc" + var a: String = "abc" var b: Int = 10 } \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/classWithMultiplyFields.ide.kt b/j2k/tests/testData/ast/class/classWithMultiplyFields.ide.kt deleted file mode 100644 index 19cbb56f9f5..00000000000 --- a/j2k/tests/testData/ast/class/classWithMultiplyFields.ide.kt +++ /dev/null @@ -1,5 +0,0 @@ -class T() { - var a: String = 0 - var b: String = 0 - var c: String = "abc" -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/classWithMultiplyFields.kt b/j2k/tests/testData/ast/class/classWithMultiplyFields.kt index 62182c76382..19cbb56f9f5 100644 --- a/j2k/tests/testData/ast/class/classWithMultiplyFields.kt +++ b/j2k/tests/testData/ast/class/classWithMultiplyFields.kt @@ -1,5 +1,5 @@ class T() { - var a: String? = null - var b: String? = null - var c: String? = "abc" + var a: String = 0 + var b: String = 0 + var c: String = "abc" } \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/emptyClass.ide.kt b/j2k/tests/testData/ast/class/emptyClass.ide.kt deleted file mode 100644 index 889a7ca7324..00000000000 --- a/j2k/tests/testData/ast/class/emptyClass.ide.kt +++ /dev/null @@ -1 +0,0 @@ -class A() \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/extendsOneClassAndImplementsOneInterface.ide.kt b/j2k/tests/testData/ast/class/extendsOneClassAndImplementsOneInterface.ide.kt deleted file mode 100644 index 2fb3570566d..00000000000 --- a/j2k/tests/testData/ast/class/extendsOneClassAndImplementsOneInterface.ide.kt +++ /dev/null @@ -1 +0,0 @@ -class A() : Base(), I \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/extendsOneClassAndImplementsSeveralInterfaces.ide.kt b/j2k/tests/testData/ast/class/extendsOneClassAndImplementsSeveralInterfaces.ide.kt deleted file mode 100644 index d253a077cee..00000000000 --- a/j2k/tests/testData/ast/class/extendsOneClassAndImplementsSeveralInterfaces.ide.kt +++ /dev/null @@ -1 +0,0 @@ -class A() : Base(), I0, I1, I2 \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/finalClass.ide.kt b/j2k/tests/testData/ast/class/finalClass.ide.kt deleted file mode 100644 index 9eb0d07da4b..00000000000 --- a/j2k/tests/testData/ast/class/finalClass.ide.kt +++ /dev/null @@ -1 +0,0 @@ -class Test() \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/genericClass.ide.kt b/j2k/tests/testData/ast/class/genericClass.ide.kt deleted file mode 100644 index eb27b9ce86e..00000000000 --- a/j2k/tests/testData/ast/class/genericClass.ide.kt +++ /dev/null @@ -1 +0,0 @@ -class Entry() \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/innerEmptyClass.ide.kt b/j2k/tests/testData/ast/class/innerEmptyClass.ide.kt deleted file mode 100644 index 316afd78138..00000000000 --- a/j2k/tests/testData/ast/class/innerEmptyClass.ide.kt +++ /dev/null @@ -1,3 +0,0 @@ -class A() { - class B() -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/innerStaticClass.ide.kt b/j2k/tests/testData/ast/class/innerStaticClass.ide.kt deleted file mode 100644 index 21c9a0e2e11..00000000000 --- a/j2k/tests/testData/ast/class/innerStaticClass.ide.kt +++ /dev/null @@ -1,5 +0,0 @@ -class S() { - class object { - class Inner() - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/innerStaticClass.kt b/j2k/tests/testData/ast/class/innerStaticClass.kt index 414d4ba04eb..21c9a0e2e11 100644 --- a/j2k/tests/testData/ast/class/innerStaticClass.kt +++ b/j2k/tests/testData/ast/class/innerStaticClass.kt @@ -1,5 +1,5 @@ class S() { class object { - open class Inner() + class Inner() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/internalClass.ide.kt b/j2k/tests/testData/ast/class/internalClass.ide.kt deleted file mode 100644 index 9eb0d07da4b..00000000000 --- a/j2k/tests/testData/ast/class/internalClass.ide.kt +++ /dev/null @@ -1 +0,0 @@ -class Test() \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/internalClass.kt b/j2k/tests/testData/ast/class/internalClass.kt index 388efa65aa9..9eb0d07da4b 100644 --- a/j2k/tests/testData/ast/class/internalClass.kt +++ b/j2k/tests/testData/ast/class/internalClass.kt @@ -1 +1 @@ -open class Test() \ No newline at end of file +class Test() \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/kt-639.ide.kt b/j2k/tests/testData/ast/class/kt-639.ide.kt deleted file mode 100644 index ddaee0f171b..00000000000 --- a/j2k/tests/testData/ast/class/kt-639.ide.kt +++ /dev/null @@ -1,26 +0,0 @@ -package demo - -import java.util.HashMap - -class Test private() { - class object { - fun init(): Test { - val __ = Test() - return __ - } - fun init(s: String): Test { - val __ = Test() - return __ - } - } -} - -class User() { - fun main() { - val m = HashMap(1) - val m2 = HashMap(10) - - val t1 = Test.init() - val t2 = Test.init("") - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/kt-639.kt b/j2k/tests/testData/ast/class/kt-639.kt index f4c2acbd06c..ddaee0f171b 100644 --- a/j2k/tests/testData/ast/class/kt-639.kt +++ b/j2k/tests/testData/ast/class/kt-639.kt @@ -2,25 +2,25 @@ package demo import java.util.HashMap -open class Test private() { +class Test private() { class object { - open fun init(): Test { + fun init(): Test { val __ = Test() return __ } - open fun init(s: String?): Test { + fun init(s: String): Test { val __ = Test() return __ } } } -open class User() { - open fun main() { - var m: HashMap? = HashMap(1) - var m2: HashMap? = HashMap(10) +class User() { + fun main() { + val m = HashMap(1) + val m2 = HashMap(10) - var t1: Test? = Test.init() - var t2: Test? = Test.init("") + val t1 = Test.init() + val t2 = Test.init("") } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/oneStaticFieldOneNonStatic.ide.kt b/j2k/tests/testData/ast/class/oneStaticFieldOneNonStatic.ide.kt deleted file mode 100644 index fa2ebfe0b04..00000000000 --- a/j2k/tests/testData/ast/class/oneStaticFieldOneNonStatic.ide.kt +++ /dev/null @@ -1,9 +0,0 @@ -class S() { - fun sB(): Boolean { - return true - } - - class object { - var myI: Int = 10 - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/oneStaticMethod.ide.kt b/j2k/tests/testData/ast/class/oneStaticMethod.ide.kt deleted file mode 100644 index afff20a288b..00000000000 --- a/j2k/tests/testData/ast/class/oneStaticMethod.ide.kt +++ /dev/null @@ -1,7 +0,0 @@ -class S() { - class object { - fun staticF(): Boolean { - return true - } - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/oneStaticMethodOneNonStatic.ide.kt b/j2k/tests/testData/ast/class/oneStaticMethodOneNonStatic.ide.kt deleted file mode 100644 index 8106a282485..00000000000 --- a/j2k/tests/testData/ast/class/oneStaticMethodOneNonStatic.ide.kt +++ /dev/null @@ -1,11 +0,0 @@ -class S() { - fun sB(): Boolean { - return true - } - - class object { - fun sI(): Int { - return 1 - } - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/pivateClass.ide.kt b/j2k/tests/testData/ast/class/pivateClass.ide.kt deleted file mode 100644 index ed5c74e2ac8..00000000000 --- a/j2k/tests/testData/ast/class/pivateClass.ide.kt +++ /dev/null @@ -1 +0,0 @@ -private class Test() \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/pivateClass.kt b/j2k/tests/testData/ast/class/pivateClass.kt index cc401415daf..ed5c74e2ac8 100644 --- a/j2k/tests/testData/ast/class/pivateClass.kt +++ b/j2k/tests/testData/ast/class/pivateClass.kt @@ -1 +1 @@ -private open class Test() \ No newline at end of file +private class Test() \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/privateInit.ide.kt b/j2k/tests/testData/ast/class/privateInit.ide.kt deleted file mode 100644 index 519db1ffe95..00000000000 --- a/j2k/tests/testData/ast/class/privateInit.ide.kt +++ /dev/null @@ -1,4 +0,0 @@ -public class MyClass() { - private fun init(arg1: Int, arg2: Int, arg3: Int) { - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/privateInit.kt b/j2k/tests/testData/ast/class/privateInit.kt index 406a1527d6b..519db1ffe95 100644 --- a/j2k/tests/testData/ast/class/privateInit.kt +++ b/j2k/tests/testData/ast/class/privateInit.kt @@ -1,4 +1,4 @@ -public open class MyClass() { +public class MyClass() { private fun init(arg1: Int, arg2: Int, arg3: Int) { } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/protectedClass.ide.kt b/j2k/tests/testData/ast/class/protectedClass.ide.kt deleted file mode 100644 index fc6c1ec5ff3..00000000000 --- a/j2k/tests/testData/ast/class/protectedClass.ide.kt +++ /dev/null @@ -1 +0,0 @@ -protected class Test() \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/protectedClass.kt b/j2k/tests/testData/ast/class/protectedClass.kt index c65c6796260..fc6c1ec5ff3 100644 --- a/j2k/tests/testData/ast/class/protectedClass.kt +++ b/j2k/tests/testData/ast/class/protectedClass.kt @@ -1 +1 @@ -protected open class Test() \ No newline at end of file +protected class Test() \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/publicClass.ide.kt b/j2k/tests/testData/ast/class/publicClass.ide.kt deleted file mode 100644 index 97dcb46fa1b..00000000000 --- a/j2k/tests/testData/ast/class/publicClass.ide.kt +++ /dev/null @@ -1 +0,0 @@ -public class Test() \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/publicClass.kt b/j2k/tests/testData/ast/class/publicClass.kt index 7f22c020830..97dcb46fa1b 100644 --- a/j2k/tests/testData/ast/class/publicClass.kt +++ b/j2k/tests/testData/ast/class/publicClass.kt @@ -1 +1 @@ -public open class Test() \ No newline at end of file +public class Test() \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/simpleInheritance.ide.kt b/j2k/tests/testData/ast/class/simpleInheritance.ide.kt deleted file mode 100644 index b22be127052..00000000000 --- a/j2k/tests/testData/ast/class/simpleInheritance.ide.kt +++ /dev/null @@ -1 +0,0 @@ -class A() : Base() \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/twoStaticMethod.ide.kt b/j2k/tests/testData/ast/class/twoStaticMethod.ide.kt deleted file mode 100644 index a9606a266fa..00000000000 --- a/j2k/tests/testData/ast/class/twoStaticMethod.ide.kt +++ /dev/null @@ -1,10 +0,0 @@ -class S() { - class object { - fun sB(): Boolean { - return true - } - fun sI(): Int { - return 1 - } - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/classExpression/complexExample.ide.kt b/j2k/tests/testData/ast/classExpression/complexExample.ide.kt deleted file mode 100644 index 61365f4d601..00000000000 --- a/j2k/tests/testData/ast/classExpression/complexExample.ide.kt +++ /dev/null @@ -1 +0,0 @@ -val constrArgTypes = array>(javaClass>(), javaClass()) \ No newline at end of file diff --git a/j2k/tests/testData/ast/classExpression/complexExample.kt b/j2k/tests/testData/ast/classExpression/complexExample.kt index 9a3af483bfb..61365f4d601 100644 --- a/j2k/tests/testData/ast/classExpression/complexExample.kt +++ b/j2k/tests/testData/ast/classExpression/complexExample.kt @@ -1 +1 @@ -var constrArgTypes: Array?>? = array?>(javaClass>(), javaClass()) \ No newline at end of file +val constrArgTypes = array>(javaClass>(), javaClass()) \ No newline at end of file diff --git a/j2k/tests/testData/ast/classExpression/objectClass.ide.kt b/j2k/tests/testData/ast/classExpression/objectClass.ide.kt deleted file mode 100644 index a23b22175d5..00000000000 --- a/j2k/tests/testData/ast/classExpression/objectClass.ide.kt +++ /dev/null @@ -1 +0,0 @@ -javaClass() \ No newline at end of file diff --git a/j2k/tests/testData/ast/classExpression/stringClass.ide.kt b/j2k/tests/testData/ast/classExpression/stringClass.ide.kt deleted file mode 100644 index 49f7ad88685..00000000000 --- a/j2k/tests/testData/ast/classExpression/stringClass.ide.kt +++ /dev/null @@ -1 +0,0 @@ -javaClass() \ No newline at end of file diff --git a/j2k/tests/testData/ast/conditionalExpression/simpleConditionalExpression.ide.kt b/j2k/tests/testData/ast/conditionalExpression/simpleConditionalExpression.ide.kt deleted file mode 100644 index a97f9ef4807..00000000000 --- a/j2k/tests/testData/ast/conditionalExpression/simpleConditionalExpression.ide.kt +++ /dev/null @@ -1,4 +0,0 @@ -(if (a.isEmpty()) - 0 -else - 1) \ No newline at end of file diff --git a/j2k/tests/testData/ast/constructors/allCallsPrimary.ide.kt b/j2k/tests/testData/ast/constructors/allCallsPrimary.ide.kt deleted file mode 100644 index 59223e27a74..00000000000 --- a/j2k/tests/testData/ast/constructors/allCallsPrimary.ide.kt +++ /dev/null @@ -1,24 +0,0 @@ -class C(arg1: Int, arg2: Int, arg3: Int) { - class object { - - fun init(arg1: Int, arg2: Int): C { - val __ = C(arg1, arg2, 0) - return __ - } - - fun init(arg1: Int): C { - val __ = C(arg1, 0, 0) - return __ - } - } -} - -public class User() { - class object { - public fun main() { - val c1 = C(100, 100, 100) - val c2 = C.init(100, 100) - val c3 = C.init(100) - } - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/constructors/allCallsPrimary.kt b/j2k/tests/testData/ast/constructors/allCallsPrimary.kt index 5deb3efcd4e..59223e27a74 100644 --- a/j2k/tests/testData/ast/constructors/allCallsPrimary.kt +++ b/j2k/tests/testData/ast/constructors/allCallsPrimary.kt @@ -1,24 +1,24 @@ -open class C(arg1: Int, arg2: Int, arg3: Int) { +class C(arg1: Int, arg2: Int, arg3: Int) { class object { - open fun init(arg1: Int, arg2: Int): C { + fun init(arg1: Int, arg2: Int): C { val __ = C(arg1, arg2, 0) return __ } - open fun init(arg1: Int): C { + fun init(arg1: Int): C { val __ = C(arg1, 0, 0) return __ } } } -public open class User() { +public class User() { class object { - public open fun main() { - var c1: C? = C(100, 100, 100) - var c2: C? = C.init(100, 100) - var c3: C? = C.init(100) + public fun main() { + val c1 = C(100, 100, 100) + val c2 = C.init(100, 100) + val c3 = C.init(100) } } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/constructors/allCallsPrimary2.ide.kt b/j2k/tests/testData/ast/constructors/allCallsPrimary2.ide.kt deleted file mode 100644 index c1249fd7180..00000000000 --- a/j2k/tests/testData/ast/constructors/allCallsPrimary2.ide.kt +++ /dev/null @@ -1,36 +0,0 @@ -class C(val myArg1: Int) { - var myArg2: Int = 0 - var myArg3: Int = 0 - - { - myArg2 = 0 - myArg3 = 0 - } - - class object { - - fun init(arg1: Int, arg2: Int, arg3: Int): C { - val __ = C(arg1) - __.myArg2 = arg2 - __.myArg3 = arg3 - return __ - } - - fun init(arg1: Int, arg2: Int): C { - val __ = C(arg1) - __.myArg2 = arg2 - __.myArg3 = 0 - return __ - } - } -} - -public class User() { - class object { - public fun main() { - val c1 = C.init(100, 100, 100) - val c2 = C.init(100, 100) - val c3 = C(100) - } - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/constructors/allCallsPrimary2.kt b/j2k/tests/testData/ast/constructors/allCallsPrimary2.kt index 79cd9ab106d..c1249fd7180 100644 --- a/j2k/tests/testData/ast/constructors/allCallsPrimary2.kt +++ b/j2k/tests/testData/ast/constructors/allCallsPrimary2.kt @@ -1,4 +1,4 @@ -open class C(val myArg1: Int) { +class C(val myArg1: Int) { var myArg2: Int = 0 var myArg3: Int = 0 @@ -9,14 +9,14 @@ open class C(val myArg1: Int) { class object { - open fun init(arg1: Int, arg2: Int, arg3: Int): C { + fun init(arg1: Int, arg2: Int, arg3: Int): C { val __ = C(arg1) __.myArg2 = arg2 __.myArg3 = arg3 return __ } - open fun init(arg1: Int, arg2: Int): C { + fun init(arg1: Int, arg2: Int): C { val __ = C(arg1) __.myArg2 = arg2 __.myArg3 = 0 @@ -25,12 +25,12 @@ open class C(val myArg1: Int) { } } -public open class User() { +public class User() { class object { - public open fun main() { - var c1: C? = C.init(100, 100, 100) - var c2: C? = C.init(100, 100) - var c3: C? = C(100) + public fun main() { + val c1 = C.init(100, 100, 100) + val c2 = C.init(100, 100) + val c3 = C(100) } } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/constructors/customerBuilder.ide.kt b/j2k/tests/testData/ast/constructors/customerBuilder.ide.kt deleted file mode 100644 index c417fa78bc5..00000000000 --- a/j2k/tests/testData/ast/constructors/customerBuilder.ide.kt +++ /dev/null @@ -1,51 +0,0 @@ -package org.test.customer - -class Customer(public val _firstName: String, public val _lastName: String) { - - public fun getFirstName(): String { - return _firstName - } - - public fun getLastName(): String { - return _lastName - } - - private fun doSmthBefore() { - } - private fun doSmthAfter() { - } - - { - doSmthBefore() - doSmthAfter() - } -} - -class CustomerBuilder() { - public var _firstName: String = "Homer" - public var _lastName: String = "Simpson" - - public fun WithFirstName(firstName: String): CustomerBuilder { - _firstName = firstName - return this - } - - public fun WithLastName(lastName: String): CustomerBuilder { - _lastName = lastName - return this - } - - public fun Build(): Customer { - return Customer(_firstName, _lastName) - } -} - -public class User() { - class object { - public fun main() { - val customer = CustomerBuilder().WithFirstName("Homer").WithLastName("Simpson").Build() - System.out.println(customer.getFirstName()) - System.out.println(customer.getLastName()) - } - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/constructors/customerBuilder.kt b/j2k/tests/testData/ast/constructors/customerBuilder.kt index b109bdf1b99..c417fa78bc5 100644 --- a/j2k/tests/testData/ast/constructors/customerBuilder.kt +++ b/j2k/tests/testData/ast/constructors/customerBuilder.kt @@ -1,12 +1,12 @@ package org.test.customer -open class Customer(public val _firstName: String?, public val _lastName: String?) { +class Customer(public val _firstName: String, public val _lastName: String) { - public open fun getFirstName(): String? { + public fun getFirstName(): String { return _firstName } - public open fun getLastName(): String? { + public fun getLastName(): String { return _lastName } @@ -21,31 +21,31 @@ open class Customer(public val _firstName: String?, public val _lastName: String } } -open class CustomerBuilder() { - public var _firstName: String? = "Homer" - public var _lastName: String? = "Simpson" +class CustomerBuilder() { + public var _firstName: String = "Homer" + public var _lastName: String = "Simpson" - public open fun WithFirstName(firstName: String?): CustomerBuilder? { + public fun WithFirstName(firstName: String): CustomerBuilder { _firstName = firstName return this } - public open fun WithLastName(lastName: String?): CustomerBuilder? { + public fun WithLastName(lastName: String): CustomerBuilder { _lastName = lastName return this } - public open fun Build(): Customer? { + public fun Build(): Customer { return Customer(_firstName, _lastName) } } -public open class User() { +public class User() { class object { - public open fun main() { - var customer: Customer? = CustomerBuilder().WithFirstName("Homer")?.WithLastName("Simpson")?.Build() - System.out?.println(customer?.getFirstName()) - System.out?.println(customer?.getLastName()) + public fun main() { + val customer = CustomerBuilder().WithFirstName("Homer").WithLastName("Simpson").Build() + System.out.println(customer.getFirstName()) + System.out.println(customer.getLastName()) } } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams1.ide.kt b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams1.ide.kt deleted file mode 100644 index f95f76bfb79..00000000000 --- a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams1.ide.kt +++ /dev/null @@ -1 +0,0 @@ -class C(private val p1: Int, private val myP2: Int, public var p3: Int) \ No newline at end of file diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams1.kt b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams1.kt index bcb2044129a..f95f76bfb79 100644 --- a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams1.kt +++ b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams1.kt @@ -1 +1 @@ -open class C(private val p1: Int, private val myP2: Int, public var p3: Int) \ No newline at end of file +class C(private val p1: Int, private val myP2: Int, public var p3: Int) \ No newline at end of file diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams2.ide.kt b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams2.ide.kt deleted file mode 100644 index 0ed9ef3a505..00000000000 --- a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams2.ide.kt +++ /dev/null @@ -1,5 +0,0 @@ -class C(private val field: Int) { - { - System.out.println(field) - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams2.kt b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams2.kt index 3d3580b445e..0ed9ef3a505 100644 --- a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams2.kt +++ b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams2.kt @@ -1,5 +1,5 @@ -open class C(private val field: Int) { +class C(private val field: Int) { { - System.out?.println(field) + System.out.println(field) } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams3.ide.kt b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams3.ide.kt deleted file mode 100644 index 3a28753de9b..00000000000 --- a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams3.ide.kt +++ /dev/null @@ -1,9 +0,0 @@ -class C(p: Int) { - private val p: Int - - { - this.p = p - System.out.println(p++) - System.out.println(p) - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams3.kt b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams3.kt index 70c8cc7f2df..3a28753de9b 100644 --- a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams3.kt +++ b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams3.kt @@ -1,9 +1,9 @@ -open class C(p: Int) { +class C(p: Int) { private val p: Int { this.p = p - System.out?.println(p++) - System.out?.println(p) + System.out.println(p++) + System.out.println(p) } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams4.ide.kt b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams4.ide.kt deleted file mode 100644 index fc1e3d24954..00000000000 --- a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams4.ide.kt +++ /dev/null @@ -1,7 +0,0 @@ -class C(p: Int, c: C) { - public var p: Int = 0 - - { - c.p = p - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams4.kt b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams4.kt index 4bfddc6e65a..fc1e3d24954 100644 --- a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams4.kt +++ b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams4.kt @@ -1,7 +1,7 @@ -open class C(p: Int, c: C?) { +class C(p: Int, c: C) { public var p: Int = 0 { - c?.p = p + c.p = p } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams5.ide.kt b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams5.ide.kt deleted file mode 100644 index d95fe990af6..00000000000 --- a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams5.ide.kt +++ /dev/null @@ -1,10 +0,0 @@ -class C(p: Int) { - public var p: Int = 0 - - { - this.p = 0 - if (p > 0) { - this.p = p - } - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams5.kt b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams5.kt index bb6b3d9ac26..d95fe990af6 100644 --- a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams5.kt +++ b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams5.kt @@ -1,4 +1,4 @@ -open class C(p: Int) { +class C(p: Int) { public var p: Int = 0 { diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams6.ide.kt b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams6.ide.kt deleted file mode 100644 index a508dab0751..00000000000 --- a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams6.ide.kt +++ /dev/null @@ -1,7 +0,0 @@ -class C(x: String) { - public var x: Any = 0 - - { - this.x = x - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams6.kt b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams6.kt index f400b912f5d..a508dab0751 100644 --- a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams6.kt +++ b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams6.kt @@ -1,5 +1,5 @@ -open class C(x: String?) { - public var x: Any? = null +class C(x: String) { + public var x: Any = 0 { this.x = x diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams7.ide.kt b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams7.ide.kt deleted file mode 100644 index 325673da894..00000000000 --- a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams7.ide.kt +++ /dev/null @@ -1,9 +0,0 @@ -class C(x: Any, b: Boolean) { - public var x: Any = 0 - - { - if (b) { - this.x = x - } - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams7.kt b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams7.kt index cc8e94fc168..325673da894 100644 --- a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams7.kt +++ b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams7.kt @@ -1,5 +1,5 @@ -open class C(x: Any?, b: Boolean) { - public var x: Any? = null +class C(x: Any, b: Boolean) { + public var x: Any = 0 { if (b) { diff --git a/j2k/tests/testData/ast/constructors/genericIdentifier.ide.kt b/j2k/tests/testData/ast/constructors/genericIdentifier.ide.kt deleted file mode 100644 index 0bbd7ccfb40..00000000000 --- a/j2k/tests/testData/ast/constructors/genericIdentifier.ide.kt +++ /dev/null @@ -1,37 +0,0 @@ -public class Identifier private(private val myName: T, private var myHasDollar: Boolean) { - private var myNullable: Boolean = true - - public fun getName(): T { - return myName - } - - class object { - - public fun init(name: T): Identifier { - val __ = Identifier(name, false) - return __ - } - - public fun init(name: T, isNullable: Boolean): Identifier { - val __ = Identifier(name, false) - __.myNullable = isNullable - return __ - } - - public fun init(name: T, hasDollar: Boolean, isNullable: Boolean): Identifier { - val __ = Identifier(name, hasDollar) - __.myNullable = isNullable - return __ - } - } -} - -public class User() { - class object { - public fun main() { - val i1 = Identifier.init("name", false, true) - val i2 = Identifier.init("name", false) - val i3 = Identifier.init("name") - } - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/constructors/genericIdentifier.kt b/j2k/tests/testData/ast/constructors/genericIdentifier.kt index c344f30c54c..0bbd7ccfb40 100644 --- a/j2k/tests/testData/ast/constructors/genericIdentifier.kt +++ b/j2k/tests/testData/ast/constructors/genericIdentifier.kt @@ -1,24 +1,24 @@ -public open class Identifier private(private val myName: T?, private var myHasDollar: Boolean) { +public class Identifier private(private val myName: T, private var myHasDollar: Boolean) { private var myNullable: Boolean = true - public open fun getName(): T? { + public fun getName(): T { return myName } class object { - public open fun init(name: T?): Identifier { + public fun init(name: T): Identifier { val __ = Identifier(name, false) return __ } - public open fun init(name: T?, isNullable: Boolean): Identifier { + public fun init(name: T, isNullable: Boolean): Identifier { val __ = Identifier(name, false) __.myNullable = isNullable return __ } - public open fun init(name: T?, hasDollar: Boolean, isNullable: Boolean): Identifier { + public fun init(name: T, hasDollar: Boolean, isNullable: Boolean): Identifier { val __ = Identifier(name, hasDollar) __.myNullable = isNullable return __ @@ -26,12 +26,12 @@ public open class Identifier private(private val myName: T?, private var myHa } } -public open class User() { +public class User() { class object { - public open fun main() { - var i1: Identifier<*>? = Identifier.init("name", false, true) - var i2: Identifier<*>? = Identifier.init("name", false) - var i3: Identifier<*>? = Identifier.init("name") + public fun main() { + val i1 = Identifier.init("name", false, true) + val i2 = Identifier.init("name", false) + val i3 = Identifier.init("name") } } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/constructors/identifier.ide.kt b/j2k/tests/testData/ast/constructors/identifier.ide.kt deleted file mode 100644 index 5e6c067fe8f..00000000000 --- a/j2k/tests/testData/ast/constructors/identifier.ide.kt +++ /dev/null @@ -1,37 +0,0 @@ -public class Identifier private(private val myName: String, private var myHasDollar: Boolean) { - private var myNullable: Boolean = true - - public fun getName(): String { - return myName - } - - class object { - - public fun init(name: String): Identifier { - val __ = Identifier(name, false) - return __ - } - - public fun init(name: String, isNullable: Boolean): Identifier { - val __ = Identifier(name, false) - __.myNullable = isNullable - return __ - } - - public fun init(name: String, hasDollar: Boolean, isNullable: Boolean): Identifier { - val __ = Identifier(name, hasDollar) - __.myNullable = isNullable - return __ - } - } -} - -public class User() { - class object { - public fun main() { - val i1 = Identifier.init("name", false, true) - val i2 = Identifier.init("name", false) - val i3 = Identifier.init("name") - } - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/constructors/identifier.kt b/j2k/tests/testData/ast/constructors/identifier.kt index f675f5923c8..5e6c067fe8f 100644 --- a/j2k/tests/testData/ast/constructors/identifier.kt +++ b/j2k/tests/testData/ast/constructors/identifier.kt @@ -1,24 +1,24 @@ -public open class Identifier private(private val myName: String?, private var myHasDollar: Boolean) { +public class Identifier private(private val myName: String, private var myHasDollar: Boolean) { private var myNullable: Boolean = true - public open fun getName(): String? { + public fun getName(): String { return myName } class object { - public open fun init(name: String?): Identifier { + public fun init(name: String): Identifier { val __ = Identifier(name, false) return __ } - public open fun init(name: String?, isNullable: Boolean): Identifier { + public fun init(name: String, isNullable: Boolean): Identifier { val __ = Identifier(name, false) __.myNullable = isNullable return __ } - public open fun init(name: String?, hasDollar: Boolean, isNullable: Boolean): Identifier { + public fun init(name: String, hasDollar: Boolean, isNullable: Boolean): Identifier { val __ = Identifier(name, hasDollar) __.myNullable = isNullable return __ @@ -26,12 +26,12 @@ public open class Identifier private(private val myName: String?, private var my } } -public open class User() { +public class User() { class object { - public open fun main() { - var i1: Identifier? = Identifier.init("name", false, true) - var i2: Identifier? = Identifier.init("name", false) - var i3: Identifier? = Identifier.init("name") + public fun main() { + val i1 = Identifier.init("name", false, true) + val i2 = Identifier.init("name", false) + val i3 = Identifier.init("name") } } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/constructors/privateConstructors.ide.kt b/j2k/tests/testData/ast/constructors/privateConstructors.ide.kt deleted file mode 100644 index 884b005389f..00000000000 --- a/j2k/tests/testData/ast/constructors/privateConstructors.ide.kt +++ /dev/null @@ -1,14 +0,0 @@ -class C private(arg1: Int, arg2: Int, arg3: Int) { - class object { - - private fun init(arg1: Int, arg2: Int): C { - val __ = C(arg1, arg2, 0) - return __ - } - - public fun init(arg1: Int): C { - val __ = C(arg1, 0, 0) - return __ - } - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/constructors/privateConstructors.kt b/j2k/tests/testData/ast/constructors/privateConstructors.kt index 8ec02d2adb9..884b005389f 100644 --- a/j2k/tests/testData/ast/constructors/privateConstructors.kt +++ b/j2k/tests/testData/ast/constructors/privateConstructors.kt @@ -1,4 +1,4 @@ -open class C private(arg1: Int, arg2: Int, arg3: Int) { +class C private(arg1: Int, arg2: Int, arg3: Int) { class object { private fun init(arg1: Int, arg2: Int): C { @@ -6,7 +6,7 @@ open class C private(arg1: Int, arg2: Int, arg3: Int) { return __ } - public open fun init(arg1: Int): C { + public fun init(arg1: Int): C { val __ = C(arg1, 0, 0) return __ } diff --git a/j2k/tests/testData/ast/constructors/withManyDefaultParams.ide.kt b/j2k/tests/testData/ast/constructors/withManyDefaultParams.ide.kt deleted file mode 100644 index 9a651b687c1..00000000000 --- a/j2k/tests/testData/ast/constructors/withManyDefaultParams.ide.kt +++ /dev/null @@ -1,27 +0,0 @@ -public class Test private(private val myName: String, private var a: Boolean, private var b: Double, private var c: Float, private var d: Long, private var e: Int, private var f: Short, private var g: Char) { - class object { - - public fun init(): Test { - val __ = Test(0, false, 0.toDouble(), 0.toFloat(), 0, 0, 0, ' ') - return __ - } - - public fun init(name: String): Test { - val __ = Test(foo(name), false, 0.toDouble(), 0.toFloat(), 0, 0, 0, ' ') - return __ - } - - - fun foo(n: String): String { - return "" - } - } -} - -public class User() { - class object { - public fun main() { - val t = Test.init("name") - } - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/constructors/withManyDefaultParams.kt b/j2k/tests/testData/ast/constructors/withManyDefaultParams.kt index 7ffc9bc3e15..9a651b687c1 100644 --- a/j2k/tests/testData/ast/constructors/withManyDefaultParams.kt +++ b/j2k/tests/testData/ast/constructors/withManyDefaultParams.kt @@ -1,27 +1,27 @@ -public open class Test private(private val myName: String?, private var a: Boolean, private var b: Double, private var c: Float, private var d: Long, private var e: Int, private var f: Short, private var g: Char) { +public class Test private(private val myName: String, private var a: Boolean, private var b: Double, private var c: Float, private var d: Long, private var e: Int, private var f: Short, private var g: Char) { class object { - public open fun init(): Test { - val __ = Test(null, false, 0.toDouble(), 0.toFloat(), 0, 0, 0, ' ') + public fun init(): Test { + val __ = Test(0, false, 0.toDouble(), 0.toFloat(), 0, 0, 0, ' ') return __ } - public open fun init(name: String?): Test { + public fun init(name: String): Test { val __ = Test(foo(name), false, 0.toDouble(), 0.toFloat(), 0, 0, 0, ' ') return __ } - open fun foo(n: String?): String? { + fun foo(n: String): String { return "" } } } -public open class User() { +public class User() { class object { - public open fun main() { - var t: Test? = Test.init("name") + public fun main() { + val t = Test.init("name") } } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/continueStatement/continueWithLabel.ide.kt b/j2k/tests/testData/ast/continueStatement/continueWithLabel.ide.kt deleted file mode 100644 index 9dc6020680e..00000000000 --- a/j2k/tests/testData/ast/continueStatement/continueWithLabel.ide.kt +++ /dev/null @@ -1 +0,0 @@ -continue@label \ No newline at end of file diff --git a/j2k/tests/testData/ast/continueStatement/continueWithoutLabel.ide.kt b/j2k/tests/testData/ast/continueStatement/continueWithoutLabel.ide.kt deleted file mode 100644 index b2960313c53..00000000000 --- a/j2k/tests/testData/ast/continueStatement/continueWithoutLabel.ide.kt +++ /dev/null @@ -1 +0,0 @@ -continue \ No newline at end of file diff --git a/j2k/tests/testData/ast/declarationStatement/multiplyFinalIntDeclaration.ide.kt b/j2k/tests/testData/ast/declarationStatement/multiplyFinalIntDeclaration.ide.kt deleted file mode 100644 index a9685f5edb0..00000000000 --- a/j2k/tests/testData/ast/declarationStatement/multiplyFinalIntDeclaration.ide.kt +++ /dev/null @@ -1,3 +0,0 @@ -val k: Int -val l: Int -val m: Int \ No newline at end of file diff --git a/j2k/tests/testData/ast/declarationStatement/multiplyIntDeclaration.ide.kt b/j2k/tests/testData/ast/declarationStatement/multiplyIntDeclaration.ide.kt deleted file mode 100644 index a9685f5edb0..00000000000 --- a/j2k/tests/testData/ast/declarationStatement/multiplyIntDeclaration.ide.kt +++ /dev/null @@ -1,3 +0,0 @@ -val k: Int -val l: Int -val m: Int \ No newline at end of file diff --git a/j2k/tests/testData/ast/declarationStatement/multiplyIntDeclaration.kt b/j2k/tests/testData/ast/declarationStatement/multiplyIntDeclaration.kt index fd6fdcff5c0..a9685f5edb0 100644 --- a/j2k/tests/testData/ast/declarationStatement/multiplyIntDeclaration.kt +++ b/j2k/tests/testData/ast/declarationStatement/multiplyIntDeclaration.kt @@ -1,3 +1,3 @@ -var k: Int -var l: Int -var m: Int \ No newline at end of file +val k: Int +val l: Int +val m: Int \ No newline at end of file diff --git a/j2k/tests/testData/ast/declarationStatement/singleFinalIntDeclaration.ide.kt b/j2k/tests/testData/ast/declarationStatement/singleFinalIntDeclaration.ide.kt deleted file mode 100644 index e6ec3869b80..00000000000 --- a/j2k/tests/testData/ast/declarationStatement/singleFinalIntDeclaration.ide.kt +++ /dev/null @@ -1 +0,0 @@ -val s: Int \ No newline at end of file diff --git a/j2k/tests/testData/ast/declarationStatement/singleFinalStringDeclaration.ide.kt b/j2k/tests/testData/ast/declarationStatement/singleFinalStringDeclaration.ide.kt deleted file mode 100644 index b217e2028f6..00000000000 --- a/j2k/tests/testData/ast/declarationStatement/singleFinalStringDeclaration.ide.kt +++ /dev/null @@ -1 +0,0 @@ -val s: String \ No newline at end of file diff --git a/j2k/tests/testData/ast/declarationStatement/singleFinalStringDeclaration.kt b/j2k/tests/testData/ast/declarationStatement/singleFinalStringDeclaration.kt index e0ab795514f..b217e2028f6 100644 --- a/j2k/tests/testData/ast/declarationStatement/singleFinalStringDeclaration.kt +++ b/j2k/tests/testData/ast/declarationStatement/singleFinalStringDeclaration.kt @@ -1 +1 @@ -val s: String? \ No newline at end of file +val s: String \ No newline at end of file diff --git a/j2k/tests/testData/ast/declarationStatement/singleIntDeclaration.ide.kt b/j2k/tests/testData/ast/declarationStatement/singleIntDeclaration.ide.kt deleted file mode 100644 index e6ec3869b80..00000000000 --- a/j2k/tests/testData/ast/declarationStatement/singleIntDeclaration.ide.kt +++ /dev/null @@ -1 +0,0 @@ -val s: Int \ No newline at end of file diff --git a/j2k/tests/testData/ast/declarationStatement/singleIntDeclaration.kt b/j2k/tests/testData/ast/declarationStatement/singleIntDeclaration.kt index 19d6d1e7e08..e6ec3869b80 100644 --- a/j2k/tests/testData/ast/declarationStatement/singleIntDeclaration.kt +++ b/j2k/tests/testData/ast/declarationStatement/singleIntDeclaration.kt @@ -1 +1 @@ -var s: Int \ No newline at end of file +val s: Int \ No newline at end of file diff --git a/j2k/tests/testData/ast/declarationStatement/singleStringDeclaration.ide.kt b/j2k/tests/testData/ast/declarationStatement/singleStringDeclaration.ide.kt deleted file mode 100644 index b217e2028f6..00000000000 --- a/j2k/tests/testData/ast/declarationStatement/singleStringDeclaration.ide.kt +++ /dev/null @@ -1 +0,0 @@ -val s: String \ No newline at end of file diff --git a/j2k/tests/testData/ast/declarationStatement/singleStringDeclaration.kt b/j2k/tests/testData/ast/declarationStatement/singleStringDeclaration.kt index d8bb3457603..b217e2028f6 100644 --- a/j2k/tests/testData/ast/declarationStatement/singleStringDeclaration.kt +++ b/j2k/tests/testData/ast/declarationStatement/singleStringDeclaration.kt @@ -1 +1 @@ -var s: String? \ No newline at end of file +val s: String \ No newline at end of file diff --git a/j2k/tests/testData/ast/doWhileStatement/whileWithBlock.ide.kt b/j2k/tests/testData/ast/doWhileStatement/whileWithBlock.ide.kt deleted file mode 100644 index 2730c62c402..00000000000 --- a/j2k/tests/testData/ast/doWhileStatement/whileWithBlock.ide.kt +++ /dev/null @@ -1,4 +0,0 @@ -do { - val i = 1 - i = i + 1 -} while (a > b) \ No newline at end of file diff --git a/j2k/tests/testData/ast/doWhileStatement/whileWithBlock.kt b/j2k/tests/testData/ast/doWhileStatement/whileWithBlock.kt index 8ff4423bf33..2730c62c402 100644 --- a/j2k/tests/testData/ast/doWhileStatement/whileWithBlock.kt +++ b/j2k/tests/testData/ast/doWhileStatement/whileWithBlock.kt @@ -1,4 +1,4 @@ do { - var i: Int = 1 + val i = 1 i = i + 1 } while (a > b) \ No newline at end of file diff --git a/j2k/tests/testData/ast/doWhileStatement/whileWithEmptyBlock.ide.kt b/j2k/tests/testData/ast/doWhileStatement/whileWithEmptyBlock.ide.kt deleted file mode 100644 index e70bed37653..00000000000 --- a/j2k/tests/testData/ast/doWhileStatement/whileWithEmptyBlock.ide.kt +++ /dev/null @@ -1,2 +0,0 @@ -do { -} while (true) \ No newline at end of file diff --git a/j2k/tests/testData/ast/doWhileStatement/whileWithExpression.ide.kt b/j2k/tests/testData/ast/doWhileStatement/whileWithExpression.ide.kt deleted file mode 100644 index cae40e3d98f..00000000000 --- a/j2k/tests/testData/ast/doWhileStatement/whileWithExpression.ide.kt +++ /dev/null @@ -1,3 +0,0 @@ -do - i = i + 1 -while (true) \ No newline at end of file diff --git a/j2k/tests/testData/ast/doWhileStatement/whileWithReturn.ide.kt b/j2k/tests/testData/ast/doWhileStatement/whileWithReturn.ide.kt deleted file mode 100644 index 3f495449470..00000000000 --- a/j2k/tests/testData/ast/doWhileStatement/whileWithReturn.ide.kt +++ /dev/null @@ -1,3 +0,0 @@ -do - return 1 -while (true) \ No newline at end of file diff --git a/j2k/tests/testData/ast/enum/colorEnum.ide.kt b/j2k/tests/testData/ast/enum/colorEnum.ide.kt deleted file mode 100644 index a96ba5955a8..00000000000 --- a/j2k/tests/testData/ast/enum/colorEnum.ide.kt +++ /dev/null @@ -1,10 +0,0 @@ -package demo - -enum class MyEnum private(private val color: Int) { - RED : MyEnum(10) - BLUE : MyEnum(20) - - public fun getColor(): Int { - return color - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/enum/emptyEnum.ide.kt b/j2k/tests/testData/ast/enum/emptyEnum.ide.kt deleted file mode 100644 index cf0c22de5bd..00000000000 --- a/j2k/tests/testData/ast/enum/emptyEnum.ide.kt +++ /dev/null @@ -1 +0,0 @@ -enum class A {} \ No newline at end of file diff --git a/j2k/tests/testData/ast/enum/enumConstantIsNotNull.ide.kt b/j2k/tests/testData/ast/enum/enumConstantIsNotNull.ide.kt deleted file mode 100644 index b55fb50de2b..00000000000 --- a/j2k/tests/testData/ast/enum/enumConstantIsNotNull.ide.kt +++ /dev/null @@ -1,7 +0,0 @@ -enum class E { - FOO - - fun foo() { - FOO.toString() - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/enum/enumImplementsOneInterface.ide.kt b/j2k/tests/testData/ast/enum/enumImplementsOneInterface.ide.kt deleted file mode 100644 index 09b2e590bef..00000000000 --- a/j2k/tests/testData/ast/enum/enumImplementsOneInterface.ide.kt +++ /dev/null @@ -1 +0,0 @@ -enum class A : I {} \ No newline at end of file diff --git a/j2k/tests/testData/ast/enum/enumImplementsSeveralInterfaces.ide.kt b/j2k/tests/testData/ast/enum/enumImplementsSeveralInterfaces.ide.kt deleted file mode 100644 index 183b15c4fff..00000000000 --- a/j2k/tests/testData/ast/enum/enumImplementsSeveralInterfaces.ide.kt +++ /dev/null @@ -1 +0,0 @@ -enum class A : I0, I1, I2 {} \ No newline at end of file diff --git a/j2k/tests/testData/ast/enum/enumWithNameField.ide.kt b/j2k/tests/testData/ast/enum/enumWithNameField.ide.kt deleted file mode 100644 index 4dbfe1f26ac..00000000000 --- a/j2k/tests/testData/ast/enum/enumWithNameField.ide.kt +++ /dev/null @@ -1,4 +0,0 @@ -enum class E { - I - private var name: String = 0 -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/enum/enumWithNameField.kt b/j2k/tests/testData/ast/enum/enumWithNameField.kt index e89bf52cdd1..4dbfe1f26ac 100644 --- a/j2k/tests/testData/ast/enum/enumWithNameField.kt +++ b/j2k/tests/testData/ast/enum/enumWithNameField.kt @@ -1,4 +1,4 @@ enum class E { I - private var name: String? = null + private var name: String = 0 } \ No newline at end of file diff --git a/j2k/tests/testData/ast/enum/fieldsWithPrimaryPrivateConstructor.ide.kt b/j2k/tests/testData/ast/enum/fieldsWithPrimaryPrivateConstructor.ide.kt deleted file mode 100644 index 53ff728122c..00000000000 --- a/j2k/tests/testData/ast/enum/fieldsWithPrimaryPrivateConstructor.ide.kt +++ /dev/null @@ -1,11 +0,0 @@ -enum class Color private(private var code: Int) { - WHITE : Color(21) - BLACK : Color(22) - RED : Color(23) - YELLOW : Color(24) - BLUE : Color(25) - - public fun getCode(): Int { - return code - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/enum/internalEnum.ide.kt b/j2k/tests/testData/ast/enum/internalEnum.ide.kt deleted file mode 100644 index 04f0bcf787a..00000000000 --- a/j2k/tests/testData/ast/enum/internalEnum.ide.kt +++ /dev/null @@ -1 +0,0 @@ -enum class Test {} \ No newline at end of file diff --git a/j2k/tests/testData/ast/enum/overrideToString.ide.kt b/j2k/tests/testData/ast/enum/overrideToString.ide.kt deleted file mode 100644 index 90eae56b973..00000000000 --- a/j2k/tests/testData/ast/enum/overrideToString.ide.kt +++ /dev/null @@ -1,10 +0,0 @@ -enum class Color { - WHITE - BLACK - RED - YELLOW - BLUE - override fun toString(): String { - return "COLOR" - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/enum/overrideToString.kt b/j2k/tests/testData/ast/enum/overrideToString.kt index 7891b3b4ea0..90eae56b973 100644 --- a/j2k/tests/testData/ast/enum/overrideToString.kt +++ b/j2k/tests/testData/ast/enum/overrideToString.kt @@ -4,7 +4,7 @@ enum class Color { RED YELLOW BLUE - override fun toString(): String? { + override fun toString(): String { return "COLOR" } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/enum/primaryPrivateConstructor.ide.kt b/j2k/tests/testData/ast/enum/primaryPrivateConstructor.ide.kt deleted file mode 100644 index 583a45b4a47..00000000000 --- a/j2k/tests/testData/ast/enum/primaryPrivateConstructor.ide.kt +++ /dev/null @@ -1,8 +0,0 @@ -package demo - -enum class Color private(private var code: Int) { - - public fun getCode(): Int { - return code - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/enum/privateEnum.ide.kt b/j2k/tests/testData/ast/enum/privateEnum.ide.kt deleted file mode 100644 index 3dc188a912b..00000000000 --- a/j2k/tests/testData/ast/enum/privateEnum.ide.kt +++ /dev/null @@ -1 +0,0 @@ -private enum class Test {} \ No newline at end of file diff --git a/j2k/tests/testData/ast/enum/protectedEnum.ide.kt b/j2k/tests/testData/ast/enum/protectedEnum.ide.kt deleted file mode 100644 index 0cfa23e3ab5..00000000000 --- a/j2k/tests/testData/ast/enum/protectedEnum.ide.kt +++ /dev/null @@ -1 +0,0 @@ -protected enum class Test {} \ No newline at end of file diff --git a/j2k/tests/testData/ast/enum/publicEnum.ide.kt b/j2k/tests/testData/ast/enum/publicEnum.ide.kt deleted file mode 100644 index 0059e39d75d..00000000000 --- a/j2k/tests/testData/ast/enum/publicEnum.ide.kt +++ /dev/null @@ -1 +0,0 @@ -public enum class Test {} \ No newline at end of file diff --git a/j2k/tests/testData/ast/enum/runnableImplementation.ide.kt b/j2k/tests/testData/ast/enum/runnableImplementation.ide.kt deleted file mode 100644 index bb01ce3f3be..00000000000 --- a/j2k/tests/testData/ast/enum/runnableImplementation.ide.kt +++ /dev/null @@ -1,11 +0,0 @@ -enum class Color : Runnable { - WHITE - BLACK - RED - YELLOW - BLUE - - override fun run() { - System.out.println("name()=" + name() + ", toString()=" + toString()) - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/enum/runnableImplementation.kt b/j2k/tests/testData/ast/enum/runnableImplementation.kt index 563be8ad292..bb01ce3f3be 100644 --- a/j2k/tests/testData/ast/enum/runnableImplementation.kt +++ b/j2k/tests/testData/ast/enum/runnableImplementation.kt @@ -6,6 +6,6 @@ enum class Color : Runnable { BLUE override fun run() { - System.out?.println("name()=" + name() + ", toString()=" + toString()) + System.out.println("name()=" + name() + ", toString()=" + toString()) } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/enum/typeSafeEnum.ide.kt b/j2k/tests/testData/ast/enum/typeSafeEnum.ide.kt deleted file mode 100644 index 5e49520179f..00000000000 --- a/j2k/tests/testData/ast/enum/typeSafeEnum.ide.kt +++ /dev/null @@ -1,6 +0,0 @@ -enum class Coin { - PENNY - NICKEL - DIME - QUARTER -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/field/classChildExtendsBase.ide.kt b/j2k/tests/testData/ast/field/classChildExtendsBase.ide.kt deleted file mode 100644 index 13bc6b8db49..00000000000 --- a/j2k/tests/testData/ast/field/classChildExtendsBase.ide.kt +++ /dev/null @@ -1,7 +0,0 @@ -class Base() { - private var myFirst: String = 0 -} - -class Child() : Base() { - private var mySecond: String = 0 -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/field/classChildExtendsBase.kt b/j2k/tests/testData/ast/field/classChildExtendsBase.kt index 86fab901b1b..13bc6b8db49 100644 --- a/j2k/tests/testData/ast/field/classChildExtendsBase.kt +++ b/j2k/tests/testData/ast/field/classChildExtendsBase.kt @@ -1,7 +1,7 @@ -open class Base() { - private var myFirst: String? = null +class Base() { + private var myFirst: String = 0 } -open class Child() : Base() { - private var mySecond: String? = null +class Child() : Base() { + private var mySecond: String = 0 } \ No newline at end of file diff --git a/j2k/tests/testData/ast/field/internalField.ide.kt b/j2k/tests/testData/ast/field/internalField.ide.kt deleted file mode 100644 index 8d789ab1717..00000000000 --- a/j2k/tests/testData/ast/field/internalField.ide.kt +++ /dev/null @@ -1,3 +0,0 @@ -class C() { - var f: Foo = 0 -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/field/internalField.kt b/j2k/tests/testData/ast/field/internalField.kt index ae7755d1f9f..8d789ab1717 100644 --- a/j2k/tests/testData/ast/field/internalField.kt +++ b/j2k/tests/testData/ast/field/internalField.kt @@ -1,3 +1,3 @@ -open class C() { - var f: Foo? = null +class C() { + var f: Foo = 0 } \ No newline at end of file diff --git a/j2k/tests/testData/ast/field/privateField.ide.kt b/j2k/tests/testData/ast/field/privateField.ide.kt deleted file mode 100644 index f321996b3fe..00000000000 --- a/j2k/tests/testData/ast/field/privateField.ide.kt +++ /dev/null @@ -1,3 +0,0 @@ -class C() { - private var f: Foo = 0 -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/field/privateField.kt b/j2k/tests/testData/ast/field/privateField.kt index e6b40a96bad..f321996b3fe 100644 --- a/j2k/tests/testData/ast/field/privateField.kt +++ b/j2k/tests/testData/ast/field/privateField.kt @@ -1,3 +1,3 @@ -open class C() { - private var f: Foo? = null +class C() { + private var f: Foo = 0 } \ No newline at end of file diff --git a/j2k/tests/testData/ast/field/protectedField.ide.kt b/j2k/tests/testData/ast/field/protectedField.ide.kt deleted file mode 100644 index 91f3813466c..00000000000 --- a/j2k/tests/testData/ast/field/protectedField.ide.kt +++ /dev/null @@ -1,3 +0,0 @@ -class C() { - protected var f: Foo = 0 -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/field/protectedField.kt b/j2k/tests/testData/ast/field/protectedField.kt index df09fcaff99..91f3813466c 100644 --- a/j2k/tests/testData/ast/field/protectedField.kt +++ b/j2k/tests/testData/ast/field/protectedField.kt @@ -1,3 +1,3 @@ -open class C() { - protected var f: Foo? = null +class C() { + protected var f: Foo = 0 } \ No newline at end of file diff --git a/j2k/tests/testData/ast/field/publicField.ide.kt b/j2k/tests/testData/ast/field/publicField.ide.kt deleted file mode 100644 index 2952347719f..00000000000 --- a/j2k/tests/testData/ast/field/publicField.ide.kt +++ /dev/null @@ -1,3 +0,0 @@ -class C() { - public var f: Foo = 0 -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/field/publicField.kt b/j2k/tests/testData/ast/field/publicField.kt index cf25bc81490..2952347719f 100644 --- a/j2k/tests/testData/ast/field/publicField.kt +++ b/j2k/tests/testData/ast/field/publicField.kt @@ -1,3 +1,3 @@ -open class C() { - public var f: Foo? = null +class C() { + public var f: Foo = 0 } \ No newline at end of file diff --git a/j2k/tests/testData/ast/field/valWithInit.ide.kt b/j2k/tests/testData/ast/field/valWithInit.ide.kt deleted file mode 100644 index 2d120001aa4..00000000000 --- a/j2k/tests/testData/ast/field/valWithInit.ide.kt +++ /dev/null @@ -1,3 +0,0 @@ -class C() { - val f: Foo = Foo(1, 2) -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/field/valWithInit.kt b/j2k/tests/testData/ast/field/valWithInit.kt index 180515d343d..2d120001aa4 100644 --- a/j2k/tests/testData/ast/field/valWithInit.kt +++ b/j2k/tests/testData/ast/field/valWithInit.kt @@ -1,3 +1,3 @@ -open class C() { +class C() { val f: Foo = Foo(1, 2) } \ No newline at end of file diff --git a/j2k/tests/testData/ast/field/varWithInit.ide.kt b/j2k/tests/testData/ast/field/varWithInit.ide.kt deleted file mode 100644 index 9238f03f782..00000000000 --- a/j2k/tests/testData/ast/field/varWithInit.ide.kt +++ /dev/null @@ -1,3 +0,0 @@ -class C() { - var f: Foo = Foo(1, 2) -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/field/varWithInit.kt b/j2k/tests/testData/ast/field/varWithInit.kt index 1e58d5fe3e0..9238f03f782 100644 --- a/j2k/tests/testData/ast/field/varWithInit.kt +++ b/j2k/tests/testData/ast/field/varWithInit.kt @@ -1,3 +1,3 @@ -open class C() { - var f: Foo? = Foo(1, 2) +class C() { + var f: Foo = Foo(1, 2) } \ No newline at end of file diff --git a/j2k/tests/testData/ast/field/varWithoutInit.ide.kt b/j2k/tests/testData/ast/field/varWithoutInit.ide.kt deleted file mode 100644 index 8d789ab1717..00000000000 --- a/j2k/tests/testData/ast/field/varWithoutInit.ide.kt +++ /dev/null @@ -1,3 +0,0 @@ -class C() { - var f: Foo = 0 -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/field/varWithoutInit.kt b/j2k/tests/testData/ast/field/varWithoutInit.kt index ae7755d1f9f..8d789ab1717 100644 --- a/j2k/tests/testData/ast/field/varWithoutInit.kt +++ b/j2k/tests/testData/ast/field/varWithoutInit.kt @@ -1,3 +1,3 @@ -open class C() { - var f: Foo? = null +class C() { + var f: Foo = 0 } \ No newline at end of file diff --git a/j2k/tests/testData/ast/for/commonCaseForTest.ide.kt b/j2k/tests/testData/ast/for/commonCaseForTest.ide.kt deleted file mode 100644 index 93765cdb4f9..00000000000 --- a/j2k/tests/testData/ast/for/commonCaseForTest.ide.kt +++ /dev/null @@ -1,9 +0,0 @@ -{ - init() - while (condition()) { - body() - { - update() - } - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/for/forRangeWithLE.ide.kt b/j2k/tests/testData/ast/for/forRangeWithLE.ide.kt deleted file mode 100644 index 311f19b237c..00000000000 --- a/j2k/tests/testData/ast/for/forRangeWithLE.ide.kt +++ /dev/null @@ -1,4 +0,0 @@ -val array = IntArray(10) -for (i in 0..10) { - array[i] = i -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/for/forRangeWithLE.kt b/j2k/tests/testData/ast/for/forRangeWithLE.kt index 24c565e1eb6..311f19b237c 100644 --- a/j2k/tests/testData/ast/for/forRangeWithLE.kt +++ b/j2k/tests/testData/ast/for/forRangeWithLE.kt @@ -1,4 +1,4 @@ -var array: IntArray? = IntArray(10) +val array = IntArray(10) for (i in 0..10) { array[i] = i } \ No newline at end of file diff --git a/j2k/tests/testData/ast/for/forRangeWithLT.ide.kt b/j2k/tests/testData/ast/for/forRangeWithLT.ide.kt deleted file mode 100644 index 69ad99b50a8..00000000000 --- a/j2k/tests/testData/ast/for/forRangeWithLT.ide.kt +++ /dev/null @@ -1,4 +0,0 @@ -val array = IntArray(10) -for (i in 0..10 - 1) { - array[i] = i -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/for/forRangeWithLT.kt b/j2k/tests/testData/ast/for/forRangeWithLT.kt index 6215132aa81..69ad99b50a8 100644 --- a/j2k/tests/testData/ast/for/forRangeWithLT.kt +++ b/j2k/tests/testData/ast/for/forRangeWithLT.kt @@ -1,4 +1,4 @@ -var array: IntArray? = IntArray(10) +val array = IntArray(10) for (i in 0..10 - 1) { array[i] = i } \ No newline at end of file diff --git a/j2k/tests/testData/ast/for/forWithBlock.ide.kt b/j2k/tests/testData/ast/for/forWithBlock.ide.kt deleted file mode 100644 index 69ad99b50a8..00000000000 --- a/j2k/tests/testData/ast/for/forWithBlock.ide.kt +++ /dev/null @@ -1,4 +0,0 @@ -val array = IntArray(10) -for (i in 0..10 - 1) { - array[i] = i -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/for/forWithBlock.kt b/j2k/tests/testData/ast/for/forWithBlock.kt index 6215132aa81..69ad99b50a8 100644 --- a/j2k/tests/testData/ast/for/forWithBlock.kt +++ b/j2k/tests/testData/ast/for/forWithBlock.kt @@ -1,4 +1,4 @@ -var array: IntArray? = IntArray(10) +val array = IntArray(10) for (i in 0..10 - 1) { array[i] = i } \ No newline at end of file diff --git a/j2k/tests/testData/ast/for/forWithBlockAndDoubleUpdate.ide.kt b/j2k/tests/testData/ast/for/forWithBlockAndDoubleUpdate.ide.kt deleted file mode 100644 index 45e8901650b..00000000000 --- a/j2k/tests/testData/ast/for/forWithBlockAndDoubleUpdate.ide.kt +++ /dev/null @@ -1,13 +0,0 @@ -{ - val i = 0 - while (i < 0) { - { - val i = 1 - i++ - } - { - j++ - i++ - } - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/for/forWithBlockAndDoubleUpdate.kt b/j2k/tests/testData/ast/for/forWithBlockAndDoubleUpdate.kt index 7f40a6b8885..45e8901650b 100644 --- a/j2k/tests/testData/ast/for/forWithBlockAndDoubleUpdate.kt +++ b/j2k/tests/testData/ast/for/forWithBlockAndDoubleUpdate.kt @@ -1,8 +1,8 @@ { - var i: Int = 0 + val i = 0 while (i < 0) { { - var i: Int = 1 + val i = 1 i++ } { diff --git a/j2k/tests/testData/ast/for/forWithEmptyBlock.ide.kt b/j2k/tests/testData/ast/for/forWithEmptyBlock.ide.kt deleted file mode 100644 index fab9b579c8d..00000000000 --- a/j2k/tests/testData/ast/for/forWithEmptyBlock.ide.kt +++ /dev/null @@ -1,10 +0,0 @@ -{ - val i = 0 - while (i < 0) { - {} - { - j++ - i++ - } - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/for/forWithEmptyBlock.kt b/j2k/tests/testData/ast/for/forWithEmptyBlock.kt index 1535058e9bf..fab9b579c8d 100644 --- a/j2k/tests/testData/ast/for/forWithEmptyBlock.kt +++ b/j2k/tests/testData/ast/for/forWithEmptyBlock.kt @@ -1,5 +1,5 @@ { - var i: Int = 0 + val i = 0 while (i < 0) { {} { diff --git a/j2k/tests/testData/ast/for/forWithExpression.ide.kt b/j2k/tests/testData/ast/for/forWithExpression.ide.kt deleted file mode 100644 index be1826e8d8a..00000000000 --- a/j2k/tests/testData/ast/for/forWithExpression.ide.kt +++ /dev/null @@ -1 +0,0 @@ -for (i in 0..0 - 1) t++ \ No newline at end of file diff --git a/j2k/tests/testData/ast/for/forWithNullCondition.ide.kt b/j2k/tests/testData/ast/for/forWithNullCondition.ide.kt deleted file mode 100644 index 068c816cfcf..00000000000 --- a/j2k/tests/testData/ast/for/forWithNullCondition.ide.kt +++ /dev/null @@ -1,9 +0,0 @@ -{ - init() - while (true) { - body() - { - update() - } - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/for/forWithNullInit.ide.kt b/j2k/tests/testData/ast/for/forWithNullInit.ide.kt deleted file mode 100644 index 9848b9962ac..00000000000 --- a/j2k/tests/testData/ast/for/forWithNullInit.ide.kt +++ /dev/null @@ -1,8 +0,0 @@ -{ - while (condition()) { - body() - { - update() - } - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/for/forWithNullUpdate.ide.kt b/j2k/tests/testData/ast/for/forWithNullUpdate.ide.kt deleted file mode 100644 index 7ca346555e1..00000000000 --- a/j2k/tests/testData/ast/for/forWithNullUpdate.ide.kt +++ /dev/null @@ -1,6 +0,0 @@ -{ - init() - while (condition()) { - body() - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/for/forWithReturn.ide.kt b/j2k/tests/testData/ast/for/forWithReturn.ide.kt deleted file mode 100644 index cd07bc24e34..00000000000 --- a/j2k/tests/testData/ast/for/forWithReturn.ide.kt +++ /dev/null @@ -1,10 +0,0 @@ -{ - val i = 0 - while (i < 0) { - return i - { - j++ - i++ - } - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/for/forWithReturn.kt b/j2k/tests/testData/ast/for/forWithReturn.kt index bc0bf300ef7..cd07bc24e34 100644 --- a/j2k/tests/testData/ast/for/forWithReturn.kt +++ b/j2k/tests/testData/ast/for/forWithReturn.kt @@ -1,5 +1,5 @@ { - var i: Int = 0 + val i = 0 while (i < 0) { return i { diff --git a/j2k/tests/testData/ast/foreachStatement/enhancedForWithBlock.ide.kt b/j2k/tests/testData/ast/foreachStatement/enhancedForWithBlock.ide.kt deleted file mode 100644 index aad8f1fe027..00000000000 --- a/j2k/tests/testData/ast/foreachStatement/enhancedForWithBlock.ide.kt +++ /dev/null @@ -1,4 +0,0 @@ -for (n in list) { - val i = 1 - i++ -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/foreachStatement/enhancedForWithBlock.kt b/j2k/tests/testData/ast/foreachStatement/enhancedForWithBlock.kt index defda6b0aa6..aad8f1fe027 100644 --- a/j2k/tests/testData/ast/foreachStatement/enhancedForWithBlock.kt +++ b/j2k/tests/testData/ast/foreachStatement/enhancedForWithBlock.kt @@ -1,4 +1,4 @@ for (n in list) { - var i: Int = 1 + val i = 1 i++ } \ No newline at end of file diff --git a/j2k/tests/testData/ast/foreachStatement/enhancedForWithEmptyBlock.ide.kt b/j2k/tests/testData/ast/foreachStatement/enhancedForWithEmptyBlock.ide.kt deleted file mode 100644 index 69ca8ed72fd..00000000000 --- a/j2k/tests/testData/ast/foreachStatement/enhancedForWithEmptyBlock.ide.kt +++ /dev/null @@ -1,2 +0,0 @@ -for (n in list) { -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/foreachStatement/enhancedForWithExpression.ide.kt b/j2k/tests/testData/ast/foreachStatement/enhancedForWithExpression.ide.kt deleted file mode 100644 index 6e73d85bff7..00000000000 --- a/j2k/tests/testData/ast/foreachStatement/enhancedForWithExpression.ide.kt +++ /dev/null @@ -1,2 +0,0 @@ -for (n in list) - i++ \ No newline at end of file diff --git a/j2k/tests/testData/ast/foreachStatement/enhancedForWithReturn.ide.kt b/j2k/tests/testData/ast/foreachStatement/enhancedForWithReturn.ide.kt deleted file mode 100644 index 94e85bb493e..00000000000 --- a/j2k/tests/testData/ast/foreachStatement/enhancedForWithReturn.ide.kt +++ /dev/null @@ -1,2 +0,0 @@ -for (n in list) - return n \ No newline at end of file diff --git a/j2k/tests/testData/ast/formatting/nonStaticMembers.ide.kt b/j2k/tests/testData/ast/formatting/nonStaticMembers.ide.kt deleted file mode 100644 index 32ea2da202f..00000000000 --- a/j2k/tests/testData/ast/formatting/nonStaticMembers.ide.kt +++ /dev/null @@ -1,13 +0,0 @@ -class F() { - - fun f1() { - } - - - fun f2() { - } - var i: Int = 0 - - fun f3() { - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/formatting/nonStaticMembers.kt b/j2k/tests/testData/ast/formatting/nonStaticMembers.kt index 15b6123fa90..32ea2da202f 100644 --- a/j2k/tests/testData/ast/formatting/nonStaticMembers.kt +++ b/j2k/tests/testData/ast/formatting/nonStaticMembers.kt @@ -1,13 +1,13 @@ -open class F() { +class F() { - open fun f1() { + fun f1() { } - open fun f2() { + fun f2() { } - var i: Int? = 0 + var i: Int = 0 - open fun f3() { + fun f3() { } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/formatting/nonStaticMembersWithComments.ide.kt b/j2k/tests/testData/ast/formatting/nonStaticMembersWithComments.ide.kt deleted file mode 100644 index 163c5d65b5a..00000000000 --- a/j2k/tests/testData/ast/formatting/nonStaticMembersWithComments.ide.kt +++ /dev/null @@ -1,26 +0,0 @@ -class F() { - - //c1 - - /*c2*/ - - fun f1() { - } - - - //c3 - - - - - //c4 - - fun f2() { - } - var i: Int = 0 - - fun f3() { - } - - //c5 -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/formatting/nonStaticMembersWithComments.kt b/j2k/tests/testData/ast/formatting/nonStaticMembersWithComments.kt index f15c735e69f..163c5d65b5a 100644 --- a/j2k/tests/testData/ast/formatting/nonStaticMembersWithComments.kt +++ b/j2k/tests/testData/ast/formatting/nonStaticMembersWithComments.kt @@ -1,10 +1,10 @@ -open class F() { +class F() { //c1 /*c2*/ - open fun f1() { + fun f1() { } @@ -15,11 +15,11 @@ open class F() { //c4 - open fun f2() { + fun f2() { } - var i: Int? = 0 + var i: Int = 0 - open fun f3() { + fun f3() { } //c5 diff --git a/j2k/tests/testData/ast/formatting/staticAndNonStaticMembersWithComments.ide.kt b/j2k/tests/testData/ast/formatting/staticAndNonStaticMembersWithComments.ide.kt deleted file mode 100644 index 7840a9982f7..00000000000 --- a/j2k/tests/testData/ast/formatting/staticAndNonStaticMembersWithComments.ide.kt +++ /dev/null @@ -1,38 +0,0 @@ -class F() { - - - //c3 - - - - - //c4 - - fun f2() { - } - - fun f3() { - } - - fun f4() { - } - - class object { - - //c1 - - /*c2*/ - - fun f1() { - } - var i: Int = 0 - - //c5 - - fun f5() { - } - - //c6 - - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/formatting/staticAndNonStaticMembersWithComments.kt b/j2k/tests/testData/ast/formatting/staticAndNonStaticMembersWithComments.kt index ff2e41296e2..7840a9982f7 100644 --- a/j2k/tests/testData/ast/formatting/staticAndNonStaticMembersWithComments.kt +++ b/j2k/tests/testData/ast/formatting/staticAndNonStaticMembersWithComments.kt @@ -1,4 +1,4 @@ -open class F() { +class F() { //c3 @@ -8,13 +8,13 @@ open class F() { //c4 - open fun f2() { + fun f2() { } - open fun f3() { + fun f3() { } - open fun f4() { + fun f4() { } class object { @@ -23,13 +23,13 @@ open class F() { /*c2*/ - open fun f1() { + fun f1() { } - var i: Int? = 0 + var i: Int = 0 //c5 - open fun f5() { + fun f5() { } //c6 diff --git a/j2k/tests/testData/ast/formatting/staticMembersWithComments.ide.kt b/j2k/tests/testData/ast/formatting/staticMembersWithComments.ide.kt deleted file mode 100644 index c3197e5af63..00000000000 --- a/j2k/tests/testData/ast/formatting/staticMembersWithComments.ide.kt +++ /dev/null @@ -1,28 +0,0 @@ -class F() { - class object { - - //c1 - - /*c2*/ - - fun f1() { - } - - - //c3 - - - - - //c4 - - fun f2() { - } - var i: Int = 0 - - fun f3() { - } - - //c5 - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/formatting/staticMembersWithComments.kt b/j2k/tests/testData/ast/formatting/staticMembersWithComments.kt index b1004da0197..c3197e5af63 100644 --- a/j2k/tests/testData/ast/formatting/staticMembersWithComments.kt +++ b/j2k/tests/testData/ast/formatting/staticMembersWithComments.kt @@ -1,11 +1,11 @@ -open class F() { +class F() { class object { //c1 /*c2*/ - open fun f1() { + fun f1() { } @@ -16,11 +16,11 @@ open class F() { //c4 - open fun f2() { + fun f2() { } - var i: Int? = 0 + var i: Int = 0 - open fun f3() { + fun f3() { } //c5 diff --git a/j2k/tests/testData/ast/function/abstractMethod.ide.kt b/j2k/tests/testData/ast/function/abstractMethod.ide.kt deleted file mode 100644 index 7fcdd037e33..00000000000 --- a/j2k/tests/testData/ast/function/abstractMethod.ide.kt +++ /dev/null @@ -1 +0,0 @@ -abstract fun getNoofGears(): Int \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/classGenericParam.ide.kt b/j2k/tests/testData/ast/function/classGenericParam.ide.kt deleted file mode 100644 index 9286b7acb4b..00000000000 --- a/j2k/tests/testData/ast/function/classGenericParam.ide.kt +++ /dev/null @@ -1,2 +0,0 @@ -fun getT(): T { -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/classGenericParam.kt b/j2k/tests/testData/ast/function/classGenericParam.kt index 677843b64ee..9286b7acb4b 100644 --- a/j2k/tests/testData/ast/function/classGenericParam.kt +++ b/j2k/tests/testData/ast/function/classGenericParam.kt @@ -1,2 +1,2 @@ -fun getT(): T? { +fun getT(): T { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/emptyVoidMethod.ide.kt b/j2k/tests/testData/ast/function/emptyVoidMethod.ide.kt deleted file mode 100644 index e97bc7ec751..00000000000 --- a/j2k/tests/testData/ast/function/emptyVoidMethod.ide.kt +++ /dev/null @@ -1,2 +0,0 @@ -fun main() { -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.ide.kt b/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.ide.kt deleted file mode 100644 index 5fdb3b33eea..00000000000 --- a/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.ide.kt +++ /dev/null @@ -1,45 +0,0 @@ -package test - -class Test() : Base() { - override fun hashCode(): Int { - return super.hashCode() - } - - override fun equals(o: Any): Boolean { - return super.equals(o) - } - - override fun clone(): Any { - return super.clone() - } - - override fun toString(): String { - return super.toString() - } - - override fun finalize() { - super.finalize() - } -} - -class Base() { - public fun hashCode(): Int { - return System.identityHashCode(this) - } - - public fun equals(o: Any): Boolean { - return this.identityEquals(o) - } - - protected fun clone(): Any { - return super.clone() - } - - public fun toString(): String { - return getJavaClass.getName() + '@' + Integer.toHexString(hashCode()) - } - - protected fun finalize() { - super.finalize() - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.kt b/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.kt index 200dbdc0d74..5fdb3b33eea 100644 --- a/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.kt +++ b/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.kt @@ -1,19 +1,19 @@ package test -open class Test() : Base() { +class Test() : Base() { override fun hashCode(): Int { return super.hashCode() } - override fun equals(o: Any?): Boolean { + override fun equals(o: Any): Boolean { return super.equals(o) } - override fun clone(): Any? { + override fun clone(): Any { return super.clone() } - override fun toString(): String? { + override fun toString(): String { return super.toString() } @@ -22,24 +22,24 @@ open class Test() : Base() { } } -open class Base() { - public open fun hashCode(): Int { +class Base() { + public fun hashCode(): Int { return System.identityHashCode(this) } - public open fun equals(o: Any?): Boolean { + public fun equals(o: Any): Boolean { return this.identityEquals(o) } - protected open fun clone(): Any? { + protected fun clone(): Any { return super.clone() } - public open fun toString(): String? { + public fun toString(): String { return getJavaClass.getName() + '@' + Integer.toHexString(hashCode()) } - protected open fun finalize() { + protected fun finalize() { super.finalize() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/final.ide.kt b/j2k/tests/testData/ast/function/final.ide.kt deleted file mode 100644 index 836f70823d6..00000000000 --- a/j2k/tests/testData/ast/function/final.ide.kt +++ /dev/null @@ -1,3 +0,0 @@ -fun getString(): String { - return "" -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/final.kt b/j2k/tests/testData/ast/function/final.kt index bf1a5d26a15..836f70823d6 100644 --- a/j2k/tests/testData/ast/function/final.kt +++ b/j2k/tests/testData/ast/function/final.kt @@ -1,3 +1,3 @@ -fun getString(): String? { +fun getString(): String { return "" } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/functionInFinalClass.ide.kt b/j2k/tests/testData/ast/function/functionInFinalClass.ide.kt deleted file mode 100644 index a6f400168ce..00000000000 --- a/j2k/tests/testData/ast/function/functionInFinalClass.ide.kt +++ /dev/null @@ -1,6 +0,0 @@ -package demo - -class Final() { - fun test() { - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/internal.ide.kt b/j2k/tests/testData/ast/function/internal.ide.kt deleted file mode 100644 index a7a0a149d8b..00000000000 --- a/j2k/tests/testData/ast/function/internal.ide.kt +++ /dev/null @@ -1,2 +0,0 @@ -fun test() { -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/main.ide.kt b/j2k/tests/testData/ast/function/main.ide.kt deleted file mode 100644 index bbc3b65a453..00000000000 --- a/j2k/tests/testData/ast/function/main.ide.kt +++ /dev/null @@ -1,4 +0,0 @@ -class object { - public fun main(args: Array) { - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/main.kt b/j2k/tests/testData/ast/function/main.kt index 4d5d6e99387..bbc3b65a453 100644 --- a/j2k/tests/testData/ast/function/main.kt +++ b/j2k/tests/testData/ast/function/main.kt @@ -1,4 +1,4 @@ class object { - public fun main(args: Array?) { + public fun main(args: Array) { } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/methodClassType.ide.kt b/j2k/tests/testData/ast/function/methodClassType.ide.kt deleted file mode 100644 index 0124d08ad5b..00000000000 --- a/j2k/tests/testData/ast/function/methodClassType.ide.kt +++ /dev/null @@ -1,2 +0,0 @@ -fun main(): String { -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/methodClassType.kt b/j2k/tests/testData/ast/function/methodClassType.kt index 2d291e0b1c1..0124d08ad5b 100644 --- a/j2k/tests/testData/ast/function/methodClassType.kt +++ b/j2k/tests/testData/ast/function/methodClassType.kt @@ -1,2 +1,2 @@ -fun main(): String? { +fun main(): String { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/methodPrimitiveType.ide.kt b/j2k/tests/testData/ast/function/methodPrimitiveType.ide.kt deleted file mode 100644 index bf6eb1424e4..00000000000 --- a/j2k/tests/testData/ast/function/methodPrimitiveType.ide.kt +++ /dev/null @@ -1,2 +0,0 @@ -fun main(): Int { -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/methodPrimitiveType2.ide.kt b/j2k/tests/testData/ast/function/methodPrimitiveType2.ide.kt deleted file mode 100644 index 388e4288f4c..00000000000 --- a/j2k/tests/testData/ast/function/methodPrimitiveType2.ide.kt +++ /dev/null @@ -1,2 +0,0 @@ -fun main(): Boolean { -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/methodWithReturnStatement.ide.kt b/j2k/tests/testData/ast/function/methodWithReturnStatement.ide.kt deleted file mode 100644 index f2cd6c4849c..00000000000 --- a/j2k/tests/testData/ast/function/methodWithReturnStatement.ide.kt +++ /dev/null @@ -1,3 +0,0 @@ -fun isTrue(): Boolean { - return true -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/open.ide.kt b/j2k/tests/testData/ast/function/open.ide.kt deleted file mode 100644 index 836f70823d6..00000000000 --- a/j2k/tests/testData/ast/function/open.ide.kt +++ /dev/null @@ -1,3 +0,0 @@ -fun getString(): String { - return "" -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/open.kt b/j2k/tests/testData/ast/function/open.kt index bf1a5d26a15..836f70823d6 100644 --- a/j2k/tests/testData/ast/function/open.kt +++ b/j2k/tests/testData/ast/function/open.kt @@ -1,3 +1,3 @@ -fun getString(): String? { +fun getString(): String { return "" } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/override.ide.kt b/j2k/tests/testData/ast/function/override.ide.kt deleted file mode 100644 index cf7ed6fcaa3..00000000000 --- a/j2k/tests/testData/ast/function/override.ide.kt +++ /dev/null @@ -1,8 +0,0 @@ -class A() { - fun a() { - } -} -class B() : A() { - override fun a() { - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/override.kt b/j2k/tests/testData/ast/function/override.kt index 54040f40578..cf7ed6fcaa3 100644 --- a/j2k/tests/testData/ast/function/override.kt +++ b/j2k/tests/testData/ast/function/override.kt @@ -1,5 +1,5 @@ -open class A() { - open fun a() { +class A() { + fun a() { } } class B() : A() { diff --git a/j2k/tests/testData/ast/function/overrideAndOpen.ide.kt b/j2k/tests/testData/ast/function/overrideAndOpen.ide.kt deleted file mode 100644 index 6827fe9f063..00000000000 --- a/j2k/tests/testData/ast/function/overrideAndOpen.ide.kt +++ /dev/null @@ -1,14 +0,0 @@ -class A() { - fun foo() { - } -} - -class B() : A() { - override fun foo() { - } -} - -class C() : B() { - override fun foo() { - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/overrideAndOpen.kt b/j2k/tests/testData/ast/function/overrideAndOpen.kt index 2d48968249a..6827fe9f063 100644 --- a/j2k/tests/testData/ast/function/overrideAndOpen.kt +++ b/j2k/tests/testData/ast/function/overrideAndOpen.kt @@ -1,14 +1,14 @@ -open class A() { - open fun foo() { +class A() { + fun foo() { } } -open class B() : A() { +class B() : A() { override fun foo() { } } -open class C() : B() { +class C() : B() { override fun foo() { } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/overrideObject.ide.kt b/j2k/tests/testData/ast/function/overrideObject.ide.kt deleted file mode 100644 index 65bf9dcdc49..00000000000 --- a/j2k/tests/testData/ast/function/overrideObject.ide.kt +++ /dev/null @@ -1,23 +0,0 @@ -package test - -class Test() { - public fun hashCode(): Int { - return System.identityHashCode(this) - } - - public fun equals(o: Any): Boolean { - return this.identityEquals(o) - } - - protected fun clone(): Any { - return super.clone() - } - - public fun toString(): String { - return getJavaClass.getName() + '@' + Integer.toHexString(hashCode()) - } - - protected fun finalize() { - super.finalize() - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/overrideObject.kt b/j2k/tests/testData/ast/function/overrideObject.kt index 553a15151de..65bf9dcdc49 100644 --- a/j2k/tests/testData/ast/function/overrideObject.kt +++ b/j2k/tests/testData/ast/function/overrideObject.kt @@ -1,23 +1,23 @@ package test -open class Test() { - public open fun hashCode(): Int { +class Test() { + public fun hashCode(): Int { return System.identityHashCode(this) } - public open fun equals(o: Any?): Boolean { + public fun equals(o: Any): Boolean { return this.identityEquals(o) } - protected open fun clone(): Any? { + protected fun clone(): Any { return super.clone() } - public open fun toString(): String? { + public fun toString(): String { return getJavaClass.getName() + '@' + Integer.toHexString(hashCode()) } - protected open fun finalize() { + protected fun finalize() { super.finalize() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/ownGenericParam.ide.kt b/j2k/tests/testData/ast/function/ownGenericParam.ide.kt deleted file mode 100644 index e0a4fa6e530..00000000000 --- a/j2k/tests/testData/ast/function/ownGenericParam.ide.kt +++ /dev/null @@ -1,2 +0,0 @@ -fun putU(u: U) { -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/ownGenericParam.kt b/j2k/tests/testData/ast/function/ownGenericParam.kt index 9f01d056d30..e0a4fa6e530 100644 --- a/j2k/tests/testData/ast/function/ownGenericParam.kt +++ b/j2k/tests/testData/ast/function/ownGenericParam.kt @@ -1,2 +1,2 @@ -fun putU(u: U?) { +fun putU(u: U) { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/ownSeveralGenericParams.ide.kt b/j2k/tests/testData/ast/function/ownSeveralGenericParams.ide.kt deleted file mode 100644 index 6f04d1b814f..00000000000 --- a/j2k/tests/testData/ast/function/ownSeveralGenericParams.ide.kt +++ /dev/null @@ -1,2 +0,0 @@ -fun putUVW(u: U, v: V, w: W) { -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/ownSeveralGenericParams.kt b/j2k/tests/testData/ast/function/ownSeveralGenericParams.kt index bf17cf44329..6f04d1b814f 100644 --- a/j2k/tests/testData/ast/function/ownSeveralGenericParams.kt +++ b/j2k/tests/testData/ast/function/ownSeveralGenericParams.kt @@ -1,2 +1,2 @@ -fun putUVW(u: U?, v: V?, w: W?) { +fun putUVW(u: U, v: V, w: W) { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/private.ide.kt b/j2k/tests/testData/ast/function/private.ide.kt deleted file mode 100644 index dd4bde284eb..00000000000 --- a/j2k/tests/testData/ast/function/private.ide.kt +++ /dev/null @@ -1,2 +0,0 @@ -private fun test() { -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/protected.ide.kt b/j2k/tests/testData/ast/function/protected.ide.kt deleted file mode 100644 index 992d26c14fe..00000000000 --- a/j2k/tests/testData/ast/function/protected.ide.kt +++ /dev/null @@ -1,2 +0,0 @@ -protected fun test() { -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/public.ide.kt b/j2k/tests/testData/ast/function/public.ide.kt deleted file mode 100644 index 327abedcdb0..00000000000 --- a/j2k/tests/testData/ast/function/public.ide.kt +++ /dev/null @@ -1,2 +0,0 @@ -public fun test() { -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/varVararg.ide.kt b/j2k/tests/testData/ast/function/varVararg.ide.kt deleted file mode 100644 index ed47bc9b46a..00000000000 --- a/j2k/tests/testData/ast/function/varVararg.ide.kt +++ /dev/null @@ -1,7 +0,0 @@ -package demo - -class Test() { - fun test(vararg args: Any) { - args = array(1, 2, 3) - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/varVararg.kt b/j2k/tests/testData/ast/function/varVararg.kt index 7358fce42e3..ed47bc9b46a 100644 --- a/j2k/tests/testData/ast/function/varVararg.kt +++ b/j2k/tests/testData/ast/function/varVararg.kt @@ -1,7 +1,7 @@ package demo -open class Test() { - open fun test(vararg args: Any?) { - args = array(1, 2, 3) +class Test() { + fun test(vararg args: Any) { + args = array(1, 2, 3) } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/writableParameter.ide.kt b/j2k/tests/testData/ast/function/writableParameter.ide.kt deleted file mode 100644 index d4bd2c26442..00000000000 --- a/j2k/tests/testData/ast/function/writableParameter.ide.kt +++ /dev/null @@ -1,8 +0,0 @@ -package demo - -class Test() { - fun test(i: Int): Int { - i = 10 - return i + 20 - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/writableParameter.kt b/j2k/tests/testData/ast/function/writableParameter.kt index dd84d1d238c..d4bd2c26442 100644 --- a/j2k/tests/testData/ast/function/writableParameter.kt +++ b/j2k/tests/testData/ast/function/writableParameter.kt @@ -1,7 +1,7 @@ package demo -open class Test() { - open fun test(i: Int): Int { +class Test() { + fun test(i: Int): Int { i = 10 return i + 20 } diff --git a/j2k/tests/testData/ast/identifier/finalFieldReference.ide.kt b/j2k/tests/testData/ast/identifier/finalFieldReference.ide.kt deleted file mode 100644 index 678e5b332e2..00000000000 --- a/j2k/tests/testData/ast/identifier/finalFieldReference.ide.kt +++ /dev/null @@ -1,10 +0,0 @@ -class `$$$$$`() - -class `$`() - -class `$$`(val `$$$`: `$$$$$`) : `$`() { - - public fun `$$$$$$`(): `$$$$$` { - return `$$$` - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/identifier/finalFieldReference.kt b/j2k/tests/testData/ast/identifier/finalFieldReference.kt index 67cc624a5c8..678e5b332e2 100644 --- a/j2k/tests/testData/ast/identifier/finalFieldReference.kt +++ b/j2k/tests/testData/ast/identifier/finalFieldReference.kt @@ -1,10 +1,10 @@ -open class `$$$$$`() +class `$$$$$`() -open class `$`() +class `$`() -open class `$$`(val `$$$`: `$$$$$`?) : `$`() { +class `$$`(val `$$$`: `$$$$$`) : `$`() { - public open fun `$$$$$$`(): `$$$$$`? { + public fun `$$$$$$`(): `$$$$$` { return `$$$` } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/identifier/keywords.ide.kt b/j2k/tests/testData/ast/identifier/keywords.ide.kt deleted file mode 100644 index c0f0386ed2b..00000000000 --- a/j2k/tests/testData/ast/identifier/keywords.ide.kt +++ /dev/null @@ -1,11 +0,0 @@ -val `as`: Int -val `type`: Int -val `val`: Int -val `var`: Int -val `fun`: Int -val `is`: Int -val `in`: Int -val `object`: Int -val `when`: Int -val `trait`: Int -val `This`: Int \ No newline at end of file diff --git a/j2k/tests/testData/ast/identifier/keywords.kt b/j2k/tests/testData/ast/identifier/keywords.kt index b33a48d6b8c..c0f0386ed2b 100644 --- a/j2k/tests/testData/ast/identifier/keywords.kt +++ b/j2k/tests/testData/ast/identifier/keywords.kt @@ -1,11 +1,11 @@ -var `as`: Int -var `type`: Int -var `val`: Int -var `var`: Int -var `fun`: Int -var `is`: Int -var `in`: Int -var `object`: Int -var `when`: Int -var `trait`: Int -var `This`: Int \ No newline at end of file +val `as`: Int +val `type`: Int +val `val`: Int +val `var`: Int +val `fun`: Int +val `is`: Int +val `in`: Int +val `object`: Int +val `when`: Int +val `trait`: Int +val `This`: Int \ No newline at end of file diff --git a/j2k/tests/testData/ast/identifier/withDollar.ide.kt b/j2k/tests/testData/ast/identifier/withDollar.ide.kt deleted file mode 100644 index 47ac2104db8..00000000000 --- a/j2k/tests/testData/ast/identifier/withDollar.ide.kt +++ /dev/null @@ -1 +0,0 @@ -`$$$$$` \ No newline at end of file diff --git a/j2k/tests/testData/ast/ifStatement/ifStatementWithEmptyBlocks.ide.kt b/j2k/tests/testData/ast/ifStatement/ifStatementWithEmptyBlocks.ide.kt deleted file mode 100644 index e41b4fa942b..00000000000 --- a/j2k/tests/testData/ast/ifStatement/ifStatementWithEmptyBlocks.ide.kt +++ /dev/null @@ -1,3 +0,0 @@ -if (1 > 0) { -} else { -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/ifStatement/ifStatementWithMultilineBlocks.ide.kt b/j2k/tests/testData/ast/ifStatement/ifStatementWithMultilineBlocks.ide.kt deleted file mode 100644 index 803d3a232c7..00000000000 --- a/j2k/tests/testData/ast/ifStatement/ifStatementWithMultilineBlocks.ide.kt +++ /dev/null @@ -1,6 +0,0 @@ -if (1 > 0) { - val n = 1 - return n -} else { - return 0 -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/ifStatement/ifStatementWithMultilineBlocks.kt b/j2k/tests/testData/ast/ifStatement/ifStatementWithMultilineBlocks.kt index 3d83bfd7509..803d3a232c7 100644 --- a/j2k/tests/testData/ast/ifStatement/ifStatementWithMultilineBlocks.kt +++ b/j2k/tests/testData/ast/ifStatement/ifStatementWithMultilineBlocks.kt @@ -1,5 +1,5 @@ if (1 > 0) { - var n: Int = 1 + val n = 1 return n } else { return 0 diff --git a/j2k/tests/testData/ast/ifStatement/ifStatementWithOneLineBlocks.ide.kt b/j2k/tests/testData/ast/ifStatement/ifStatementWithOneLineBlocks.ide.kt deleted file mode 100644 index 693e8dab8dc..00000000000 --- a/j2k/tests/testData/ast/ifStatement/ifStatementWithOneLineBlocks.ide.kt +++ /dev/null @@ -1,4 +0,0 @@ -if (true) - return 1 -else - return 0 \ No newline at end of file diff --git a/j2k/tests/testData/ast/ifStatement/ifStatementWithoutElse.ide.kt b/j2k/tests/testData/ast/ifStatement/ifStatementWithoutElse.ide.kt deleted file mode 100644 index be2db5323dd..00000000000 --- a/j2k/tests/testData/ast/ifStatement/ifStatementWithoutElse.ide.kt +++ /dev/null @@ -1,4 +0,0 @@ -if (1 > 0) { - val n = 1 - return n -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/ifStatement/ifStatementWithoutElse.kt b/j2k/tests/testData/ast/ifStatement/ifStatementWithoutElse.kt index dcc7018a813..be2db5323dd 100644 --- a/j2k/tests/testData/ast/ifStatement/ifStatementWithoutElse.kt +++ b/j2k/tests/testData/ast/ifStatement/ifStatementWithoutElse.kt @@ -1,4 +1,4 @@ if (1 > 0) { - var n: Int = 1 + val n = 1 return n } \ No newline at end of file diff --git a/j2k/tests/testData/ast/importStatement/importWithKeywords.ide.kt b/j2k/tests/testData/ast/importStatement/importWithKeywords.ide.kt deleted file mode 100644 index c9959e925fd..00000000000 --- a/j2k/tests/testData/ast/importStatement/importWithKeywords.ide.kt +++ /dev/null @@ -1,5 +0,0 @@ -package test - -import `as`.`type`.`val`.`var`.`fun`.`is`.`in`.`object`.`when`.`trait`.`This` - -class Test() \ No newline at end of file diff --git a/j2k/tests/testData/ast/importStatement/importWithKeywords.kt b/j2k/tests/testData/ast/importStatement/importWithKeywords.kt index 17cba8bd680..c9959e925fd 100644 --- a/j2k/tests/testData/ast/importStatement/importWithKeywords.kt +++ b/j2k/tests/testData/ast/importStatement/importWithKeywords.kt @@ -2,4 +2,4 @@ package test import `as`.`type`.`val`.`var`.`fun`.`is`.`in`.`object`.`when`.`trait`.`This` -open class Test() \ No newline at end of file +class Test() \ No newline at end of file diff --git a/j2k/tests/testData/ast/importStatement/importWithStar.ide.kt b/j2k/tests/testData/ast/importStatement/importWithStar.ide.kt deleted file mode 100644 index 21965cae265..00000000000 --- a/j2k/tests/testData/ast/importStatement/importWithStar.ide.kt +++ /dev/null @@ -1,5 +0,0 @@ -package org.jetbrains.jet.j2k - -import org.jetbrains.annotations.* - -public class Converter() \ No newline at end of file diff --git a/j2k/tests/testData/ast/importStatement/importWithStar.kt b/j2k/tests/testData/ast/importStatement/importWithStar.kt index d8a8c44eff6..21965cae265 100644 --- a/j2k/tests/testData/ast/importStatement/importWithStar.kt +++ b/j2k/tests/testData/ast/importStatement/importWithStar.kt @@ -2,4 +2,4 @@ package org.jetbrains.jet.j2k import org.jetbrains.annotations.* -public open class Converter() \ No newline at end of file +public class Converter() \ No newline at end of file diff --git a/j2k/tests/testData/ast/importStatement/oneImport.ide.kt b/j2k/tests/testData/ast/importStatement/oneImport.ide.kt deleted file mode 100644 index 94e87657f16..00000000000 --- a/j2k/tests/testData/ast/importStatement/oneImport.ide.kt +++ /dev/null @@ -1 +0,0 @@ -import java.util.Arrays \ No newline at end of file diff --git a/j2k/tests/testData/ast/importStatement/onlyImports.ide.kt b/j2k/tests/testData/ast/importStatement/onlyImports.ide.kt deleted file mode 100644 index 584cb68ce05..00000000000 --- a/j2k/tests/testData/ast/importStatement/onlyImports.ide.kt +++ /dev/null @@ -1,2 +0,0 @@ -import java.util.Arrays -import java.util.concurrent.ArrayBlockingQueue \ No newline at end of file diff --git a/j2k/tests/testData/ast/importStatement/simpleImport.ide.kt b/j2k/tests/testData/ast/importStatement/simpleImport.ide.kt deleted file mode 100644 index 884fd619677..00000000000 --- a/j2k/tests/testData/ast/importStatement/simpleImport.ide.kt +++ /dev/null @@ -1,3 +0,0 @@ -package org.jetbrains.jet.j2k - -public class Converter() \ No newline at end of file diff --git a/j2k/tests/testData/ast/importStatement/simpleImport.kt b/j2k/tests/testData/ast/importStatement/simpleImport.kt index fce74776e95..884fd619677 100644 --- a/j2k/tests/testData/ast/importStatement/simpleImport.kt +++ b/j2k/tests/testData/ast/importStatement/simpleImport.kt @@ -1,3 +1,3 @@ package org.jetbrains.jet.j2k -public open class Converter() \ No newline at end of file +public class Converter() \ No newline at end of file diff --git a/j2k/tests/testData/ast/inProjectionType/methodParams.ide.kt b/j2k/tests/testData/ast/inProjectionType/methodParams.ide.kt deleted file mode 100644 index ab6ba2211d8..00000000000 --- a/j2k/tests/testData/ast/inProjectionType/methodParams.ide.kt +++ /dev/null @@ -1,2 +0,0 @@ -fun popAll(dst: Collection) { -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/inProjectionType/methodParams.kt b/j2k/tests/testData/ast/inProjectionType/methodParams.kt index 44136a2ff0c..ab6ba2211d8 100644 --- a/j2k/tests/testData/ast/inProjectionType/methodParams.kt +++ b/j2k/tests/testData/ast/inProjectionType/methodParams.kt @@ -1,2 +1,2 @@ -fun popAll(dst: Collection?) { +fun popAll(dst: Collection) { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.ide.kt b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.ide.kt deleted file mode 100644 index 3013c8a3582..00000000000 --- a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.ide.kt +++ /dev/null @@ -1,3 +0,0 @@ -class Base(name: T) - -class One(name: T, private var mySecond: K) : Base(name) \ No newline at end of file diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.kt b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.kt index d044b70864a..3013c8a3582 100644 --- a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.kt +++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.kt @@ -1,3 +1,3 @@ -open class Base(name: T?) +class Base(name: T) -open class One(name: T?, private var mySecond: K?) : Base(name) \ No newline at end of file +class One(name: T, private var mySecond: K) : Base(name) \ No newline at end of file diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.ide.kt b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.ide.kt deleted file mode 100644 index ebef8b114af..00000000000 --- a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.ide.kt +++ /dev/null @@ -1,3 +0,0 @@ -class Base(name: String) - -class One(name: String, second: String) : Base(name) \ No newline at end of file diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.kt b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.kt index 1428e1c3248..ebef8b114af 100644 --- a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.kt +++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.kt @@ -1,3 +1,3 @@ -open class Base(name: String?) +class Base(name: String) -open class One(name: String?, second: String?) : Base(name) \ No newline at end of file +class One(name: String, second: String) : Base(name) \ No newline at end of file diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.ide.kt b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.ide.kt deleted file mode 100644 index b0bed1c0f9f..00000000000 --- a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.ide.kt +++ /dev/null @@ -1,3 +0,0 @@ -class Base() - -class One() : Base() \ No newline at end of file diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.kt b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.kt index ebc4ca2c396..b0bed1c0f9f 100644 --- a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.kt +++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.kt @@ -1,3 +1,3 @@ -open class Base() +class Base() -open class One() : Base() \ No newline at end of file +class One() : Base() \ No newline at end of file diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.ide.kt b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.ide.kt deleted file mode 100644 index 800d1f056c8..00000000000 --- a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.ide.kt +++ /dev/null @@ -1,3 +0,0 @@ -class Base(name: String) - -class One(name: String, private var mySecond: String) : Base(name) \ No newline at end of file diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt index a835d91f8f9..800d1f056c8 100644 --- a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt +++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt @@ -1,3 +1,3 @@ -open class Base(name: String?) +class Base(name: String) -open class One(name: String?, private var mySecond: String?) : Base(name) \ No newline at end of file +class One(name: String, private var mySecond: String) : Base(name) \ No newline at end of file diff --git a/j2k/tests/testData/ast/isOperator/complicatedExpression.ide.kt b/j2k/tests/testData/ast/isOperator/complicatedExpression.ide.kt deleted file mode 100644 index 1cf2e9ebc79..00000000000 --- a/j2k/tests/testData/ast/isOperator/complicatedExpression.ide.kt +++ /dev/null @@ -1 +0,0 @@ -c.getType().getName() is String \ No newline at end of file diff --git a/j2k/tests/testData/ast/isOperator/simpleReference.ide.kt b/j2k/tests/testData/ast/isOperator/simpleReference.ide.kt deleted file mode 100644 index 7ccaa0c9744..00000000000 --- a/j2k/tests/testData/ast/isOperator/simpleReference.ide.kt +++ /dev/null @@ -1 +0,0 @@ -a is String \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/arrayLength.ide.kt b/j2k/tests/testData/ast/issues/arrayLength.ide.kt deleted file mode 100644 index a68f7e6e4db..00000000000 --- a/j2k/tests/testData/ast/issues/arrayLength.ide.kt +++ /dev/null @@ -1,7 +0,0 @@ -class Test() { - class object { - public fun foo(args: Array): Int { - return args.size - } - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/arrayLength.kt b/j2k/tests/testData/ast/issues/arrayLength.kt index 9164aa943a0..a68f7e6e4db 100644 --- a/j2k/tests/testData/ast/issues/arrayLength.kt +++ b/j2k/tests/testData/ast/issues/arrayLength.kt @@ -1,7 +1,7 @@ -open class Test() { +class Test() { class object { - public open fun foo(args: Array?): Int { - return args?.size!! + public fun foo(args: Array): Int { + return args.size } } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/comments.ide.kt b/j2k/tests/testData/ast/issues/comments.ide.kt deleted file mode 100644 index fc29fd34d76..00000000000 --- a/j2k/tests/testData/ast/issues/comments.ide.kt +++ /dev/null @@ -1,66 +0,0 @@ -// This is an end-of-line comment - -/* -This is a block comment -*/ - - -/*doc comment of class*/ -//one line comment of class -//another one -/*another doc*/ -class C() { - // This is a class comment - - /** - * This is a field doc comment. - */ - private var i: Int = 0 - - /** - * This is a function doc comment. - */ - public fun foo() { - /* This is a function comment */ - } - - //simple one line comment for function - fun f1() { - } - - //simple one line comment for field - var j: Int = 0 - - //double c style - //comment before function - fun f2() { - } - - //double c style - //comment before field - var k: Int = 0 - - //combination - /** of - */ - // - /** - * different - */ - //comments - fun f3() { - } - - //combination - /** of - */ - // - /** - * different - */ - //comments - var l: Int = 0 - - /*two*/ /*comments*//*line*/ - var z: Int = 0 -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/comments.kt b/j2k/tests/testData/ast/issues/comments.kt index 6e97ab0dbe1..fc29fd34d76 100644 --- a/j2k/tests/testData/ast/issues/comments.kt +++ b/j2k/tests/testData/ast/issues/comments.kt @@ -9,7 +9,7 @@ This is a block comment //one line comment of class //another one /*another doc*/ -open class C() { +class C() { // This is a class comment /** @@ -20,12 +20,12 @@ open class C() { /** * This is a function doc comment. */ - public open fun foo() { + public fun foo() { /* This is a function comment */ } //simple one line comment for function - open fun f1() { + fun f1() { } //simple one line comment for field @@ -33,7 +33,7 @@ open class C() { //double c style //comment before function - open fun f2() { + fun f2() { } //double c style @@ -48,7 +48,7 @@ open class C() { * different */ //comments - open fun f3() { + fun f3() { } //combination diff --git a/j2k/tests/testData/ast/issues/kt-1016.ide.kt b/j2k/tests/testData/ast/issues/kt-1016.ide.kt deleted file mode 100644 index 1c05eab009f..00000000000 --- a/j2k/tests/testData/ast/issues/kt-1016.ide.kt +++ /dev/null @@ -1,3 +0,0 @@ -package demo - -class C(private val i: Int) \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-1016.kt b/j2k/tests/testData/ast/issues/kt-1016.kt index b02a7642617..1c05eab009f 100644 --- a/j2k/tests/testData/ast/issues/kt-1016.kt +++ b/j2k/tests/testData/ast/issues/kt-1016.kt @@ -1,3 +1,3 @@ package demo -open class C(private val i: Int) \ No newline at end of file +class C(private val i: Int) \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-1048.ide.kt b/j2k/tests/testData/ast/issues/kt-1048.ide.kt deleted file mode 100644 index 27bd795083c..00000000000 --- a/j2k/tests/testData/ast/issues/kt-1048.ide.kt +++ /dev/null @@ -1,15 +0,0 @@ -import java.util.HashMap - -class G(t: T) - -public class Java() { - fun test() { - val m = HashMap() - m.put(1, 1) - } - fun test2() { - val m = HashMap() - val g = G("") - val g2 = G("") - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-1048.kt b/j2k/tests/testData/ast/issues/kt-1048.kt index 271f903cf7d..27bd795083c 100644 --- a/j2k/tests/testData/ast/issues/kt-1048.kt +++ b/j2k/tests/testData/ast/issues/kt-1048.kt @@ -1,15 +1,15 @@ import java.util.HashMap -open class G(t: T?) +class G(t: T) -public open class Java() { - open fun test() { - var m: HashMap? = HashMap() - m?.put(1, 1) +public class Java() { + fun test() { + val m = HashMap() + m.put(1, 1) } - open fun test2() { - var m: HashMap<*, *>? = HashMap() - var g: G? = G("") - var g2: G? = G("") + fun test2() { + val m = HashMap() + val g = G("") + val g2 = G("") } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-1074.ide.kt b/j2k/tests/testData/ast/issues/kt-1074.ide.kt deleted file mode 100644 index 56321222166..00000000000 --- a/j2k/tests/testData/ast/issues/kt-1074.ide.kt +++ /dev/null @@ -1,14 +0,0 @@ -package demo - -class Test() { - class object { - fun subListRangeCheck(fromIndex: Int, toIndex: Int, size: Int) { - if (fromIndex < 0) - throw IndexOutOfBoundsException("fromIndex = " + fromIndex) - if (toIndex > size) - throw IndexOutOfBoundsException("toIndex = " + toIndex) - if (fromIndex > toIndex) - throw IllegalArgumentException("fromIndex(" + fromIndex + ") > toIndex(" + toIndex + ")") - } - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-1074.kt b/j2k/tests/testData/ast/issues/kt-1074.kt index ae17f4cd853..56321222166 100644 --- a/j2k/tests/testData/ast/issues/kt-1074.kt +++ b/j2k/tests/testData/ast/issues/kt-1074.kt @@ -1,8 +1,8 @@ package demo -open class Test() { +class Test() { class object { - open fun subListRangeCheck(fromIndex: Int, toIndex: Int, size: Int) { + fun subListRangeCheck(fromIndex: Int, toIndex: Int, size: Int) { if (fromIndex < 0) throw IndexOutOfBoundsException("fromIndex = " + fromIndex) if (toIndex > size) diff --git a/j2k/tests/testData/ast/issues/kt-543-boxed.ide.kt b/j2k/tests/testData/ast/issues/kt-543-boxed.ide.kt deleted file mode 100644 index a66932aa467..00000000000 --- a/j2k/tests/testData/ast/issues/kt-543-boxed.ide.kt +++ /dev/null @@ -1,14 +0,0 @@ -package demo - -class Test() { - fun putInt(i: Int) { - } - - fun test() { - val b = 10 - putInt(b.toInt()) - - val b2 = 10 - putInt(b2.toInt()) - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-543-boxed.kt b/j2k/tests/testData/ast/issues/kt-543-boxed.kt index fe129ae366f..a66932aa467 100644 --- a/j2k/tests/testData/ast/issues/kt-543-boxed.kt +++ b/j2k/tests/testData/ast/issues/kt-543-boxed.kt @@ -1,14 +1,14 @@ package demo -open class Test() { - open fun putInt(i: Int?) { +class Test() { + fun putInt(i: Int) { } - open fun test() { - var b: Byte = 10 + fun test() { + val b = 10 putInt(b.toInt()) - var b2: Byte? = 10 - putInt(b2?.toInt()) + val b2 = 10 + putInt(b2.toInt()) } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-543-mixed.ide.kt b/j2k/tests/testData/ast/issues/kt-543-mixed.ide.kt deleted file mode 100644 index 553cbc1888c..00000000000 --- a/j2k/tests/testData/ast/issues/kt-543-mixed.ide.kt +++ /dev/null @@ -1,11 +0,0 @@ -package demo - -class Test() { - fun putInt(i: Int) { - } - - fun test() { - val i = 10 - putInt(i) - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-543-mixed.kt b/j2k/tests/testData/ast/issues/kt-543-mixed.kt index 7b05d582845..553cbc1888c 100644 --- a/j2k/tests/testData/ast/issues/kt-543-mixed.kt +++ b/j2k/tests/testData/ast/issues/kt-543-mixed.kt @@ -1,11 +1,11 @@ package demo -open class Test() { - open fun putInt(i: Int?) { +class Test() { + fun putInt(i: Int) { } - open fun test() { - var i: Int = 10 + fun test() { + val i = 10 putInt(i) } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-543.ide.kt b/j2k/tests/testData/ast/issues/kt-543.ide.kt deleted file mode 100644 index 804c0e4e7ec..00000000000 --- a/j2k/tests/testData/ast/issues/kt-543.ide.kt +++ /dev/null @@ -1,11 +0,0 @@ -package demo - -class Test() { - fun putInt(i: Int) { - } - - fun test() { - val b = 10 - putInt(b.toInt()) - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-543.kt b/j2k/tests/testData/ast/issues/kt-543.kt index 595ca46d31f..804c0e4e7ec 100644 --- a/j2k/tests/testData/ast/issues/kt-543.kt +++ b/j2k/tests/testData/ast/issues/kt-543.kt @@ -1,11 +1,11 @@ package demo -open class Test() { - open fun putInt(i: Int) { +class Test() { + fun putInt(i: Int) { } - open fun test() { - var b: Byte = 10 + fun test() { + val b = 10 putInt(b.toInt()) } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-638.ide.kt b/j2k/tests/testData/ast/issues/kt-638.ide.kt deleted file mode 100644 index 5e8777317de..00000000000 --- a/j2k/tests/testData/ast/issues/kt-638.ide.kt +++ /dev/null @@ -1,38 +0,0 @@ -public class Identifier private(private val myName: T, private var myHasDollar: Boolean) { - private var myNullable: Boolean = true - - public fun getName(): T { - return myName - } - - class object { - - public fun init(name: T): Identifier { - val __ = Identifier(name, false) - return __ - } - - public fun init(name: T, isNullable: Boolean): Identifier { - val __ = Identifier(name, false) - __.myNullable = isNullable - return __ - } - - public fun init(name: T, hasDollar: Boolean, isNullable: Boolean): Identifier { - val __ = Identifier(name, hasDollar) - __.myNullable = isNullable - return __ - } - } -} - -public class User() { - class object { - public fun main(args: Array) { - val i1 = Identifier.init("name", false, true) - val i2 = Identifier.init("name", false) - val i3 = Identifier.init("name") - } - } -} -fun main(args: Array) = User.main(args as Array?) \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-638.kt b/j2k/tests/testData/ast/issues/kt-638.kt index deb2ebc93d4..5e8777317de 100644 --- a/j2k/tests/testData/ast/issues/kt-638.kt +++ b/j2k/tests/testData/ast/issues/kt-638.kt @@ -1,24 +1,24 @@ -public open class Identifier private(private val myName: T?, private var myHasDollar: Boolean) { +public class Identifier private(private val myName: T, private var myHasDollar: Boolean) { private var myNullable: Boolean = true - public open fun getName(): T? { + public fun getName(): T { return myName } class object { - public open fun init(name: T?): Identifier { + public fun init(name: T): Identifier { val __ = Identifier(name, false) return __ } - public open fun init(name: T?, isNullable: Boolean): Identifier { + public fun init(name: T, isNullable: Boolean): Identifier { val __ = Identifier(name, false) __.myNullable = isNullable return __ } - public open fun init(name: T?, hasDollar: Boolean, isNullable: Boolean): Identifier { + public fun init(name: T, hasDollar: Boolean, isNullable: Boolean): Identifier { val __ = Identifier(name, hasDollar) __.myNullable = isNullable return __ @@ -26,12 +26,12 @@ public open class Identifier private(private val myName: T?, private var myHa } } -public open class User() { +public class User() { class object { - public open fun main(args: Array?) { - var i1: Identifier<*>? = Identifier.init("name", false, true) - var i2: Identifier<*>? = Identifier.init("name", false) - var i3: Identifier<*>? = Identifier.init("name") + public fun main(args: Array) { + val i1 = Identifier.init("name", false, true) + val i2 = Identifier.init("name", false) + val i3 = Identifier.init("name") } } } diff --git a/j2k/tests/testData/ast/issues/kt-696.ide.kt b/j2k/tests/testData/ast/issues/kt-696.ide.kt deleted file mode 100644 index e1b0319f277..00000000000 --- a/j2k/tests/testData/ast/issues/kt-696.ide.kt +++ /dev/null @@ -1,29 +0,0 @@ -package test - -class Base() { - public fun hashCode(): Int { - return System.identityHashCode(this) - } - - public fun equals(o: Any): Boolean { - return this.identityEquals(o) - } - - public fun toString(): String { - return getJavaClass.getName() + '@' + Integer.toHexString(hashCode()) - } -} - -class Child() : Base() { - override fun hashCode(): Int { - return super.hashCode() - } - - override fun equals(o: Any): Boolean { - return super.equals(o) - } - - override fun toString(): String { - return super.toString() - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-696.kt b/j2k/tests/testData/ast/issues/kt-696.kt index 4fcf09c4ca1..e1b0319f277 100644 --- a/j2k/tests/testData/ast/issues/kt-696.kt +++ b/j2k/tests/testData/ast/issues/kt-696.kt @@ -1,29 +1,29 @@ package test -open class Base() { - public open fun hashCode(): Int { +class Base() { + public fun hashCode(): Int { return System.identityHashCode(this) } - public open fun equals(o: Any?): Boolean { + public fun equals(o: Any): Boolean { return this.identityEquals(o) } - public open fun toString(): String? { + public fun toString(): String { return getJavaClass.getName() + '@' + Integer.toHexString(hashCode()) } } -open class Child() : Base() { +class Child() : Base() { override fun hashCode(): Int { return super.hashCode() } - override fun equals(o: Any?): Boolean { + override fun equals(o: Any): Boolean { return super.equals(o) } - override fun toString(): String? { + override fun toString(): String { return super.toString() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-792-mixed.ide.kt b/j2k/tests/testData/ast/issues/kt-792-mixed.ide.kt deleted file mode 100644 index e8eb0dc6c4b..00000000000 --- a/j2k/tests/testData/ast/issues/kt-792-mixed.ide.kt +++ /dev/null @@ -1,9 +0,0 @@ -package demo - -class Test(i: Int) { - - fun test() { - val i = 10 - Test(i) - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-792-mixed.kt b/j2k/tests/testData/ast/issues/kt-792-mixed.kt index 7c4142e4c56..e8eb0dc6c4b 100644 --- a/j2k/tests/testData/ast/issues/kt-792-mixed.kt +++ b/j2k/tests/testData/ast/issues/kt-792-mixed.kt @@ -1,9 +1,9 @@ package demo -open class Test(i: Int?) { +class Test(i: Int) { - open fun test() { - var i: Int = 10 + fun test() { + val i = 10 Test(i) } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-792.ide.kt b/j2k/tests/testData/ast/issues/kt-792.ide.kt deleted file mode 100644 index ec6ecf6b300..00000000000 --- a/j2k/tests/testData/ast/issues/kt-792.ide.kt +++ /dev/null @@ -1,9 +0,0 @@ -package demo - -class Test(i: Int) { - - fun test() { - val b = 10 - Test(b.toInt()) - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-792.kt b/j2k/tests/testData/ast/issues/kt-792.kt index efe164c999a..ec6ecf6b300 100644 --- a/j2k/tests/testData/ast/issues/kt-792.kt +++ b/j2k/tests/testData/ast/issues/kt-792.kt @@ -1,9 +1,9 @@ package demo -open class Test(i: Int) { +class Test(i: Int) { - open fun test() { - var b: Byte = 10 + fun test() { + val b = 10 Test(b.toInt()) } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-794-mixed.ide.kt b/j2k/tests/testData/ast/issues/kt-794-mixed.ide.kt deleted file mode 100644 index 50b165d27f0..00000000000 --- a/j2k/tests/testData/ast/issues/kt-794-mixed.ide.kt +++ /dev/null @@ -1,11 +0,0 @@ -package demo - -class Test() { - fun getInteger(i: Int): Int { - return i - } - - fun test() { - val i = getInteger(10)!! - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-794-mixed.kt b/j2k/tests/testData/ast/issues/kt-794-mixed.kt index e955c799520..50b165d27f0 100644 --- a/j2k/tests/testData/ast/issues/kt-794-mixed.kt +++ b/j2k/tests/testData/ast/issues/kt-794-mixed.kt @@ -1,11 +1,11 @@ package demo -open class Test() { - open fun getInteger(i: Int?): Int? { +class Test() { + fun getInteger(i: Int): Int { return i } - open fun test() { - var i: Int = getInteger(10)!! + fun test() { + val i = getInteger(10)!! } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-794.ide.kt b/j2k/tests/testData/ast/issues/kt-794.ide.kt deleted file mode 100644 index fc8a0f8fb4e..00000000000 --- a/j2k/tests/testData/ast/issues/kt-794.ide.kt +++ /dev/null @@ -1,6 +0,0 @@ -class Test() { - fun getInt(): Int { - val b = 10 - return b.toInt() - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-794.kt b/j2k/tests/testData/ast/issues/kt-794.kt index 9c85a938677..fc8a0f8fb4e 100644 --- a/j2k/tests/testData/ast/issues/kt-794.kt +++ b/j2k/tests/testData/ast/issues/kt-794.kt @@ -1,6 +1,6 @@ -open class Test() { - open fun getInt(): Int { - var b: Byte = 10 +class Test() { + fun getInt(): Int { + val b = 10 return b.toInt() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-809-string.ide.kt b/j2k/tests/testData/ast/issues/kt-809-string.ide.kt deleted file mode 100644 index 5a4bed58e1f..00000000000 --- a/j2k/tests/testData/ast/issues/kt-809-string.ide.kt +++ /dev/null @@ -1,22 +0,0 @@ -package demo - -class Container() { - var myString: String = "1" -} - -class One() { - class object { - var myContainer: Container = Container() - } -} - -class StringContainer(s: String) - -class Test() { - fun putString(s: String) { - } - fun test() { - putString(One.myContainer.myString) - StringContainer(One.myContainer.myString) - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-809-string.kt b/j2k/tests/testData/ast/issues/kt-809-string.kt index 7de1285696e..5a4bed58e1f 100644 --- a/j2k/tests/testData/ast/issues/kt-809-string.kt +++ b/j2k/tests/testData/ast/issues/kt-809-string.kt @@ -1,22 +1,22 @@ package demo -open class Container() { - var myString: String? = "1" +class Container() { + var myString: String = "1" } -open class One() { +class One() { class object { - var myContainer: Container? = Container() + var myContainer: Container = Container() } } -open class StringContainer(s: String?) +class StringContainer(s: String) -open class Test() { - open fun putString(s: String?) { +class Test() { + fun putString(s: String) { } - open fun test() { - putString(One.myContainer?.myString) - StringContainer(One.myContainer?.myString) + fun test() { + putString(One.myContainer.myString) + StringContainer(One.myContainer.myString) } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-809.ide.kt b/j2k/tests/testData/ast/issues/kt-809.ide.kt deleted file mode 100644 index 07d1c14aad1..00000000000 --- a/j2k/tests/testData/ast/issues/kt-809.ide.kt +++ /dev/null @@ -1,22 +0,0 @@ -package demo - -class Container() { - var myInt: Int = 1 -} - -class One() { - class object { - var myContainer: Container = Container() - } -} - -class IntContainer(i: Int) - -class Test() { - fun putInt(i: Int) { - } - fun test() { - putInt(One.myContainer.myInt) - IntContainer(One.myContainer.myInt) - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-809.kt b/j2k/tests/testData/ast/issues/kt-809.kt index 6efe9ded725..07d1c14aad1 100644 --- a/j2k/tests/testData/ast/issues/kt-809.kt +++ b/j2k/tests/testData/ast/issues/kt-809.kt @@ -1,22 +1,22 @@ package demo -open class Container() { +class Container() { var myInt: Int = 1 } -open class One() { +class One() { class object { - var myContainer: Container? = Container() + var myContainer: Container = Container() } } -open class IntContainer(i: Int) +class IntContainer(i: Int) -open class Test() { - open fun putInt(i: Int) { +class Test() { + fun putInt(i: Int) { } - open fun test() { - putInt(One.myContainer?.myInt!!) - IntContainer(One.myContainer?.myInt!!) + fun test() { + putInt(One.myContainer.myInt) + IntContainer(One.myContainer.myInt) } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-820-field.ide.kt b/j2k/tests/testData/ast/issues/kt-820-field.ide.kt deleted file mode 100644 index 83bc0ee2951..00000000000 --- a/j2k/tests/testData/ast/issues/kt-820-field.ide.kt +++ /dev/null @@ -1,15 +0,0 @@ -package demo - -class Container() { - var myInt: Int = 1 -} - -class One() { - class object { - var myContainer: Container = Container() - } -} - -class Test() { - var b: Byte = One.myContainer.myInt.toByte() -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-820-field.kt b/j2k/tests/testData/ast/issues/kt-820-field.kt index 1c333aac4c1..83bc0ee2951 100644 --- a/j2k/tests/testData/ast/issues/kt-820-field.kt +++ b/j2k/tests/testData/ast/issues/kt-820-field.kt @@ -1,15 +1,15 @@ package demo -open class Container() { +class Container() { var myInt: Int = 1 } -open class One() { +class One() { class object { - var myContainer: Container? = Container() + var myContainer: Container = Container() } } -open class Test() { - var b: Byte = One.myContainer?.myInt!!.toByte() +class Test() { + var b: Byte = One.myContainer.myInt.toByte() } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-820-string.ide.kt b/j2k/tests/testData/ast/issues/kt-820-string.ide.kt deleted file mode 100644 index f9ab23ad088..00000000000 --- a/j2k/tests/testData/ast/issues/kt-820-string.ide.kt +++ /dev/null @@ -1,8 +0,0 @@ -class Test() { - class object { - public fun toFileSystemSafeName(name: String): String { - val size = name.length() - return name - } - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-820-string.kt b/j2k/tests/testData/ast/issues/kt-820-string.kt index cdf5f625bea..f9ab23ad088 100644 --- a/j2k/tests/testData/ast/issues/kt-820-string.kt +++ b/j2k/tests/testData/ast/issues/kt-820-string.kt @@ -1,7 +1,7 @@ -open class Test() { +class Test() { class object { - public open fun toFileSystemSafeName(name: String?): String? { - var size: Int = name?.length()!! + public fun toFileSystemSafeName(name: String): String { + val size = name.length() return name } } diff --git a/j2k/tests/testData/ast/issues/kt-820.ide.kt b/j2k/tests/testData/ast/issues/kt-820.ide.kt deleted file mode 100644 index e654ea3b795..00000000000 --- a/j2k/tests/testData/ast/issues/kt-820.ide.kt +++ /dev/null @@ -1,17 +0,0 @@ -package demo - -class Container() { - var myInt: Int = 1 -} - -class One() { - class object { - var myContainer: Container = Container() - } -} - -class Test() { - fun test() { - val b = One.myContainer.myInt.toByte() - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-820.kt b/j2k/tests/testData/ast/issues/kt-820.kt index 22b4c0166f6..e654ea3b795 100644 --- a/j2k/tests/testData/ast/issues/kt-820.kt +++ b/j2k/tests/testData/ast/issues/kt-820.kt @@ -1,17 +1,17 @@ package demo -open class Container() { +class Container() { var myInt: Int = 1 } -open class One() { +class One() { class object { - var myContainer: Container? = Container() + var myContainer: Container = Container() } } -open class Test() { - open fun test() { - var b: Byte = One.myContainer?.myInt!!.toByte() +class Test() { + fun test() { + val b = One.myContainer.myInt.toByte() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-824-isDir.ide.kt b/j2k/tests/testData/ast/issues/kt-824-isDir.ide.kt deleted file mode 100644 index 5acf781d134..00000000000 --- a/j2k/tests/testData/ast/issues/kt-824-isDir.ide.kt +++ /dev/null @@ -1,21 +0,0 @@ -package test - -import java.io.File - -/** - * User: ignatov - */ -public class Test() { - class object { - public fun isDir(parent: File): Boolean { - if (parent == null || !parent.exists()) { - return false - } - val result = true - if (parent.isDirectory()) { - return true - } else - return false - } - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-824-isDir.kt b/j2k/tests/testData/ast/issues/kt-824-isDir.kt index f4fbc7809ce..5acf781d134 100644 --- a/j2k/tests/testData/ast/issues/kt-824-isDir.kt +++ b/j2k/tests/testData/ast/issues/kt-824-isDir.kt @@ -5,14 +5,14 @@ import java.io.File /** * User: ignatov */ -public open class Test() { +public class Test() { class object { - public open fun isDir(parent: File?): Boolean { - if (parent == null || !parent?.exists()!!) { + public fun isDir(parent: File): Boolean { + if (parent == null || !parent.exists()) { return false } - var result: Boolean = true - if (parent?.isDirectory()!!) { + val result = true + if (parent.isDirectory()) { return true } else return false diff --git a/j2k/tests/testData/ast/issues/kt-824.ide.kt b/j2k/tests/testData/ast/issues/kt-824.ide.kt deleted file mode 100644 index 0c65acfe367..00000000000 --- a/j2k/tests/testData/ast/issues/kt-824.ide.kt +++ /dev/null @@ -1,30 +0,0 @@ -package demo - -class Container() { - var myBoolean: Boolean = true -} - -class One() { - class object { - var myContainer: Container = Container() - } -} - -class Test() { - fun test() { - if (One.myContainer.myBoolean) - System.out.println("Ok") - - val s = (if (One.myContainer.myBoolean) - "YES" - else - "NO") - - while (One.myContainer.myBoolean) - System.out.println("Ok") - - do { - System.out.println("Ok") - } while (One.myContainer.myBoolean) - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-824.kt b/j2k/tests/testData/ast/issues/kt-824.kt index a2330e6e817..0c65acfe367 100644 --- a/j2k/tests/testData/ast/issues/kt-824.kt +++ b/j2k/tests/testData/ast/issues/kt-824.kt @@ -1,30 +1,30 @@ package demo -open class Container() { +class Container() { var myBoolean: Boolean = true } -open class One() { +class One() { class object { - var myContainer: Container? = Container() + var myContainer: Container = Container() } } -open class Test() { - open fun test() { - if (One.myContainer?.myBoolean!!) - System.out?.println("Ok") +class Test() { + fun test() { + if (One.myContainer.myBoolean) + System.out.println("Ok") - var s: String? = (if (One.myContainer?.myBoolean!!) + val s = (if (One.myContainer.myBoolean) "YES" else "NO") - while (One.myContainer?.myBoolean!!) - System.out?.println("Ok") + while (One.myContainer.myBoolean) + System.out.println("Ok") do { - System.out?.println("Ok") - } while (One.myContainer?.myBoolean!!) + System.out.println("Ok") + } while (One.myContainer.myBoolean) } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-828.ide.kt b/j2k/tests/testData/ast/issues/kt-828.ide.kt deleted file mode 100644 index ec7b2a557e4..00000000000 --- a/j2k/tests/testData/ast/issues/kt-828.ide.kt +++ /dev/null @@ -1,15 +0,0 @@ -class Test() { - fun test() { - val res = true - res = res and false - res = res or false - res = res xor false - System.out.println(true and false) - System.out.println(true or false) - System.out.println(true xor false) - System.out.println(!true) - - System.out.println(true && false) - System.out.println(true || false) - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-828.kt b/j2k/tests/testData/ast/issues/kt-828.kt index 9384913ec33..ec7b2a557e4 100644 --- a/j2k/tests/testData/ast/issues/kt-828.kt +++ b/j2k/tests/testData/ast/issues/kt-828.kt @@ -1,15 +1,15 @@ -open class Test() { - open fun test() { - var res: Boolean = true +class Test() { + fun test() { + val res = true res = res and false res = res or false res = res xor false - System.out?.println(true and false) - System.out?.println(true or false) - System.out?.println(true xor false) - System.out?.println(!true) + System.out.println(true and false) + System.out.println(true or false) + System.out.println(true xor false) + System.out.println(!true) - System.out?.println(true && false) - System.out?.println(true || false) + System.out.println(true && false) + System.out.println(true || false) } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-836.ide.kt b/j2k/tests/testData/ast/issues/kt-836.ide.kt deleted file mode 100644 index f570a57bb23..00000000000 --- a/j2k/tests/testData/ast/issues/kt-836.ide.kt +++ /dev/null @@ -1,27 +0,0 @@ -package com.voltvoodoo.saplo4j.model - -import java.io.Serializable - -public class Language(protected var code: String) : Serializable { - - override fun toString(): String { - return this.code - } -} - - -class Base() { - fun test() { - } - fun toString(): String { - return "BASE" - } -} - -class Child() : Base() { - override fun test() { - } - override fun toString(): String { - return "Child" - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-836.kt b/j2k/tests/testData/ast/issues/kt-836.kt index 056904f1c1c..f570a57bb23 100644 --- a/j2k/tests/testData/ast/issues/kt-836.kt +++ b/j2k/tests/testData/ast/issues/kt-836.kt @@ -2,26 +2,26 @@ package com.voltvoodoo.saplo4j.model import java.io.Serializable -public open class Language(protected var code: String?) : Serializable { +public class Language(protected var code: String) : Serializable { - override fun toString(): String? { + override fun toString(): String { return this.code } } -open class Base() { - open fun test() { +class Base() { + fun test() { } - open fun toString(): String? { + fun toString(): String { return "BASE" } } -open class Child() : Base() { +class Child() : Base() { override fun test() { } - override fun toString(): String? { + override fun toString(): String { return "Child" } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-837.ide.kt b/j2k/tests/testData/ast/issues/kt-837.ide.kt deleted file mode 100644 index ca2b9991a51..00000000000 --- a/j2k/tests/testData/ast/issues/kt-837.ide.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.voltvoodoo.saplo4j.model - -import java.io.Serializable - -public class Language(protected var code: String) : Serializable { - - public fun equals(other: Language): Boolean { - return other.toString().equals(this.toString()) - } - - class object { - public var ENGLISH: Language = Language("en") - public var SWEDISH: Language = Language("sv") - - private val serialVersionUID: Long = -2442762969929206780 - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-837.kt b/j2k/tests/testData/ast/issues/kt-837.kt index f42da3f5162..ca2b9991a51 100644 --- a/j2k/tests/testData/ast/issues/kt-837.kt +++ b/j2k/tests/testData/ast/issues/kt-837.kt @@ -2,15 +2,15 @@ package com.voltvoodoo.saplo4j.model import java.io.Serializable -public open class Language(protected var code: String?) : Serializable { +public class Language(protected var code: String) : Serializable { - public open fun equals(other: Language?): Boolean { - return other?.toString()?.equals(this.toString())!! + public fun equals(other: Language): Boolean { + return other.toString().equals(this.toString()) } class object { - public var ENGLISH: Language? = Language("en") - public var SWEDISH: Language? = Language("sv") + public var ENGLISH: Language = Language("en") + public var SWEDISH: Language = Language("sv") private val serialVersionUID: Long = -2442762969929206780 } diff --git a/j2k/tests/testData/ast/issues/kt-852.ide.kt b/j2k/tests/testData/ast/issues/kt-852.ide.kt deleted file mode 100644 index 70f0d4a9fc1..00000000000 --- a/j2k/tests/testData/ast/issues/kt-852.ide.kt +++ /dev/null @@ -1,16 +0,0 @@ -package demo - -class Test() { - fun test(): String { - val s1 = "" - val s2 = "" - val s3 = "" - if (s1.isEmpty() && s2.isEmpty()) - return "OK" - - if (s1.isEmpty() && s2.isEmpty() && s3.isEmpty()) - return "OOOK" - - return "" - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-852.kt b/j2k/tests/testData/ast/issues/kt-852.kt index 1c4367dc3d9..70f0d4a9fc1 100644 --- a/j2k/tests/testData/ast/issues/kt-852.kt +++ b/j2k/tests/testData/ast/issues/kt-852.kt @@ -1,14 +1,14 @@ package demo -open class Test() { - open fun test(): String? { - var s1: String? = "" - var s2: String? = "" - var s3: String? = "" - if (s1?.isEmpty()!! && s2?.isEmpty()!!) +class Test() { + fun test(): String { + val s1 = "" + val s2 = "" + val s3 = "" + if (s1.isEmpty() && s2.isEmpty()) return "OK" - if (s1?.isEmpty()!! && s2?.isEmpty()!! && s3?.isEmpty()!!) + if (s1.isEmpty() && s2.isEmpty() && s3.isEmpty()) return "OOOK" return "" diff --git a/j2k/tests/testData/ast/issues/kt-871.ide.kt b/j2k/tests/testData/ast/issues/kt-871.ide.kt deleted file mode 100644 index 1f09d168f4b..00000000000 --- a/j2k/tests/testData/ast/issues/kt-871.ide.kt +++ /dev/null @@ -1,10 +0,0 @@ -package demo - -class Program() { - class object { - public fun main(args: Array) { - System.out.println("Halo!") - } - } -} -fun main(args: Array) = Program.main(args as Array?) \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-871.kt b/j2k/tests/testData/ast/issues/kt-871.kt index 15b776bacc4..1f09d168f4b 100644 --- a/j2k/tests/testData/ast/issues/kt-871.kt +++ b/j2k/tests/testData/ast/issues/kt-871.kt @@ -1,9 +1,9 @@ package demo -open class Program() { +class Program() { class object { - public open fun main(args: Array?) { - System.out?.println("Halo!") + public fun main(args: Array) { + System.out.println("Halo!") } } } diff --git a/j2k/tests/testData/ast/issues/kt-879.ide.kt b/j2k/tests/testData/ast/issues/kt-879.ide.kt deleted file mode 100644 index 1afd07def0b..00000000000 --- a/j2k/tests/testData/ast/issues/kt-879.ide.kt +++ /dev/null @@ -1,23 +0,0 @@ -class Test() { - class object { - public fun getInt(i: Int): Int { - when (i) { - 0 -> { - return 0 - } - 1 -> { - return 1 - } - 2 -> { - return 2 - } - 3 -> { - return 3 - } - else -> { - return -1 - } - } - } - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-879.kt b/j2k/tests/testData/ast/issues/kt-879.kt index 4844637577c..1afd07def0b 100644 --- a/j2k/tests/testData/ast/issues/kt-879.kt +++ b/j2k/tests/testData/ast/issues/kt-879.kt @@ -1,6 +1,6 @@ -open class Test() { +class Test() { class object { - public open fun getInt(i: Int): Int { + public fun getInt(i: Int): Int { when (i) { 0 -> { return 0 diff --git a/j2k/tests/testData/ast/issues/kt-893.ide.kt b/j2k/tests/testData/ast/issues/kt-893.ide.kt deleted file mode 100644 index 17a4e93b8da..00000000000 --- a/j2k/tests/testData/ast/issues/kt-893.ide.kt +++ /dev/null @@ -1,9 +0,0 @@ -package demo - -class Test() { - fun test() { - for (i in 0..10 - 1) { - System.out.println(i) - } - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-893.kt b/j2k/tests/testData/ast/issues/kt-893.kt index f10e5b5aeb6..17a4e93b8da 100644 --- a/j2k/tests/testData/ast/issues/kt-893.kt +++ b/j2k/tests/testData/ast/issues/kt-893.kt @@ -1,9 +1,9 @@ package demo -open class Test() { - open fun test() { +class Test() { + fun test() { for (i in 0..10 - 1) { - System.out?.println(i) + System.out.println(i) } } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-963.ide.kt b/j2k/tests/testData/ast/issues/kt-963.ide.kt deleted file mode 100644 index b3a33d854cd..00000000000 --- a/j2k/tests/testData/ast/issues/kt-963.ide.kt +++ /dev/null @@ -1,9 +0,0 @@ -package demo - -class C(a: Int) { - var abc: Int = 0 - - { - abc = a * 2 - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-963.kt b/j2k/tests/testData/ast/issues/kt-963.kt index 2faaee613b0..b3a33d854cd 100644 --- a/j2k/tests/testData/ast/issues/kt-963.kt +++ b/j2k/tests/testData/ast/issues/kt-963.kt @@ -1,6 +1,6 @@ package demo -open class C(a: Int) { +class C(a: Int) { var abc: Int = 0 { diff --git a/j2k/tests/testData/ast/issues/qualifyStatic.ide.kt b/j2k/tests/testData/ast/issues/qualifyStatic.ide.kt deleted file mode 100644 index 78187e0669e..00000000000 --- a/j2k/tests/testData/ast/issues/qualifyStatic.ide.kt +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.Calendar - -abstract class MyCalendar() : Calendar() { - public fun foo() { - val i = Calendar.ALL_STYLES - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/qualifyStatic.kt b/j2k/tests/testData/ast/issues/qualifyStatic.kt index 4c50d0fe284..78187e0669e 100644 --- a/j2k/tests/testData/ast/issues/qualifyStatic.kt +++ b/j2k/tests/testData/ast/issues/qualifyStatic.kt @@ -1,7 +1,7 @@ import java.util.Calendar abstract class MyCalendar() : Calendar() { - public open fun foo() { - var i: Int = Calendar.ALL_STYLES + public fun foo() { + val i = Calendar.ALL_STYLES } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/kotlinExclusion/kt-656.ide.kt b/j2k/tests/testData/ast/kotlinExclusion/kt-656.ide.kt deleted file mode 100644 index c01283f0bc7..00000000000 --- a/j2k/tests/testData/ast/kotlinExclusion/kt-656.ide.kt +++ /dev/null @@ -1,23 +0,0 @@ -package demo - -class Test() : java.lang.Iterable { - override fun iterator(): java.util.Iterator { - return null - } - - public fun push(i: java.util.Iterator): java.util.Iterator { - val j = i - return j - } -} - -class FullTest() : java.lang.Iterable { - override fun iterator(): java.util.Iterator { - return null - } - - public fun push(i: java.util.Iterator): java.util.Iterator { - val j = i - return j - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/kotlinExclusion/kt-656.kt b/j2k/tests/testData/ast/kotlinExclusion/kt-656.kt index 02897cab103..c01283f0bc7 100644 --- a/j2k/tests/testData/ast/kotlinExclusion/kt-656.kt +++ b/j2k/tests/testData/ast/kotlinExclusion/kt-656.kt @@ -1,23 +1,23 @@ package demo -open class Test() : java.lang.Iterable { - override fun iterator(): java.util.Iterator? { +class Test() : java.lang.Iterable { + override fun iterator(): java.util.Iterator { return null } - public open fun push(i: java.util.Iterator?): java.util.Iterator? { - var j: java.util.Iterator? = i + public fun push(i: java.util.Iterator): java.util.Iterator { + val j = i return j } } -open class FullTest() : java.lang.Iterable { - override fun iterator(): java.util.Iterator? { +class FullTest() : java.lang.Iterable { + override fun iterator(): java.util.Iterator { return null } - public open fun push(i: java.util.Iterator?): java.util.Iterator? { - var j: java.util.Iterator? = i + public fun push(i: java.util.Iterator): java.util.Iterator { + val j = i return j } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/labelStatement/complicatedExampleFromJavaTutorial.ide.kt b/j2k/tests/testData/ast/labelStatement/complicatedExampleFromJavaTutorial.ide.kt deleted file mode 100644 index 178c5ccd09e..00000000000 --- a/j2k/tests/testData/ast/labelStatement/complicatedExampleFromJavaTutorial.ide.kt +++ /dev/null @@ -1,16 +0,0 @@ -@test for (i in 0..max) { - val n = substring.length() - val j = i - val k = 0 - while (n-- != 0) { - if (searchMe.charAt(j++) != substring.charAt(k++)) { - continue@test - } - } - foundIt = true - break@test -} -System.out.println((if (foundIt) - "Found it" -else - "Didn't find it")) \ No newline at end of file diff --git a/j2k/tests/testData/ast/labelStatement/complicatedExampleFromJavaTutorial.kt b/j2k/tests/testData/ast/labelStatement/complicatedExampleFromJavaTutorial.kt index df97d29477a..178c5ccd09e 100644 --- a/j2k/tests/testData/ast/labelStatement/complicatedExampleFromJavaTutorial.kt +++ b/j2k/tests/testData/ast/labelStatement/complicatedExampleFromJavaTutorial.kt @@ -1,7 +1,7 @@ @test for (i in 0..max) { - var n: Int = substring.length() - var j: Int = i - var k: Int = 0 + val n = substring.length() + val j = i + val k = 0 while (n-- != 0) { if (searchMe.charAt(j++) != substring.charAt(k++)) { continue@test @@ -10,7 +10,7 @@ foundIt = true break@test } -System.out?.println((if (foundIt) +System.out.println((if (foundIt) "Found it" else "Didn't find it")) \ No newline at end of file diff --git a/j2k/tests/testData/ast/list/ForEach.ide.kt b/j2k/tests/testData/ast/list/ForEach.ide.kt deleted file mode 100644 index 514a4bedced..00000000000 --- a/j2k/tests/testData/ast/list/ForEach.ide.kt +++ /dev/null @@ -1,14 +0,0 @@ -import java.util.* - -public class ForEach() { - public fun test() { - val xs = ArrayList() - val ys = LinkedList() - for (x in xs) { - ys.add(x) - } - for (y in ys) { - xs.add(y) - } - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/list/ForEach.kt b/j2k/tests/testData/ast/list/ForEach.kt index e1c9fe33cee..514a4bedced 100644 --- a/j2k/tests/testData/ast/list/ForEach.kt +++ b/j2k/tests/testData/ast/list/ForEach.kt @@ -1,14 +1,14 @@ import java.util.* -public open class ForEach() { - public open fun test() { - var xs: ArrayList? = ArrayList() - var ys: MutableList? = LinkedList() - for (x in xs!!) { - ys?.add(x) +public class ForEach() { + public fun test() { + val xs = ArrayList() + val ys = LinkedList() + for (x in xs) { + ys.add(x) } - for (y in ys!!) { - xs?.add(y) + for (y in ys) { + xs.add(y) } } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/list/Lists.ide.kt b/j2k/tests/testData/ast/list/Lists.ide.kt deleted file mode 100644 index fa18ac3de26..00000000000 --- a/j2k/tests/testData/ast/list/Lists.ide.kt +++ /dev/null @@ -1,14 +0,0 @@ -import java.util.* - -public class Lists() { - public fun test() { - val xs = ArrayList() - val ys = LinkedList() - val zs = ArrayList() - xs.add(null) - ys.add(null) - xs.clear() - ys.clear() - zs.add(null) - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/list/Lists.kt b/j2k/tests/testData/ast/list/Lists.kt index 6c40e0a861e..fa18ac3de26 100644 --- a/j2k/tests/testData/ast/list/Lists.kt +++ b/j2k/tests/testData/ast/list/Lists.kt @@ -1,14 +1,14 @@ import java.util.* -public open class Lists() { - public open fun test() { - var xs: MutableList? = ArrayList() - var ys: MutableList? = LinkedList() - var zs: ArrayList? = ArrayList() - xs?.add(null) - ys?.add(null) - xs?.clear() - ys?.clear() - zs?.add(null) +public class Lists() { + public fun test() { + val xs = ArrayList() + val ys = LinkedList() + val zs = ArrayList() + xs.add(null) + ys.add(null) + xs.clear() + ys.clear() + zs.add(null) } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/literalExpression/char.ide.kt b/j2k/tests/testData/ast/literalExpression/char.ide.kt deleted file mode 100644 index fde7d4cd475..00000000000 --- a/j2k/tests/testData/ast/literalExpression/char.ide.kt +++ /dev/null @@ -1,6 +0,0 @@ -class Test() { - fun test() { - val c1 = 'c' - val c2 = 'C' - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/literalExpression/char.kt b/j2k/tests/testData/ast/literalExpression/char.kt index cbdd0433836..fde7d4cd475 100644 --- a/j2k/tests/testData/ast/literalExpression/char.kt +++ b/j2k/tests/testData/ast/literalExpression/char.kt @@ -1,6 +1,6 @@ -open class Test() { - open fun test() { - var c1: Char = 'c' - var c2: Char? = 'C' +class Test() { + fun test() { + val c1 = 'c' + val c2 = 'C' } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/literalExpression/dollarInsideString.ide.kt b/j2k/tests/testData/ast/literalExpression/dollarInsideString.ide.kt deleted file mode 100644 index 1b684315c88..00000000000 --- a/j2k/tests/testData/ast/literalExpression/dollarInsideString.ide.kt +++ /dev/null @@ -1,14 +0,0 @@ -package demo - -class Test() { - fun test() { - val name = "$$$$" - name = name.replaceAll("\\$[0-9]+", "\\$") - - val c = '$' - System.out.println(c) - - val C = '$' - System.out.println(C) - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/literalExpression/dollarInsideString.kt b/j2k/tests/testData/ast/literalExpression/dollarInsideString.kt index 23cf9e14c71..1b684315c88 100644 --- a/j2k/tests/testData/ast/literalExpression/dollarInsideString.kt +++ b/j2k/tests/testData/ast/literalExpression/dollarInsideString.kt @@ -1,14 +1,14 @@ package demo -open class Test() { - open fun test() { - var name: String? = "$$$$" - name = name?.replaceAll("\\$[0-9]+", "\\$") +class Test() { + fun test() { + val name = "$$$$" + name = name.replaceAll("\\$[0-9]+", "\\$") - var c: Char = '$' - System.out?.println(c) + val c = '$' + System.out.println(c) - var C: Char? = '$' - System.out?.println(C) + val C = '$' + System.out.println(C) } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/literalExpression/endsWithDFL.ide.kt b/j2k/tests/testData/ast/literalExpression/endsWithDFL.ide.kt deleted file mode 100644 index 969bf6ff0ea..00000000000 --- a/j2k/tests/testData/ast/literalExpression/endsWithDFL.ide.kt +++ /dev/null @@ -1,21 +0,0 @@ -class Test() { - fun test() { - val l1 = 10 - val d1 = 10.0 - val f1 = 10.0.toFloat() - - val l2 = 10 - val d2 = 10.0 - val f2 = 10.0.toFloat() - } - - fun testBoxed() { - val l1 = 10 - val d1 = 10.0 - val f1 = 10.0.toFloat() - - val l2 = 10 - val d2 = 10.0 - val f2 = 10.0.toFloat() - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/literalExpression/endsWithDFL.kt b/j2k/tests/testData/ast/literalExpression/endsWithDFL.kt index afa8dec2801..969bf6ff0ea 100644 --- a/j2k/tests/testData/ast/literalExpression/endsWithDFL.kt +++ b/j2k/tests/testData/ast/literalExpression/endsWithDFL.kt @@ -1,21 +1,21 @@ -open class Test() { - open fun test() { - var l1: Long = 10 - var d1: Double = 10.0 - var f1: Float = 10.0.toFloat() +class Test() { + fun test() { + val l1 = 10 + val d1 = 10.0 + val f1 = 10.0.toFloat() - var l2: Long = 10 - var d2: Double = 10.0 - var f2: Float = 10.0.toFloat() + val l2 = 10 + val d2 = 10.0 + val f2 = 10.0.toFloat() } - open fun testBoxed() { - var l1: Long? = 10 - var d1: Double? = 10.0 - var f1: Float? = 10.0.toFloat() + fun testBoxed() { + val l1 = 10 + val d1 = 10.0 + val f1 = 10.0.toFloat() - var l2: Long? = 10 - var d2: Double? = 10.0 - var f2: Float? = 10.0.toFloat() + val l2 = 10 + val d2 = 10.0 + val f2 = 10.0.toFloat() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/literalExpression/hex.ide.kt b/j2k/tests/testData/ast/literalExpression/hex.ide.kt deleted file mode 100644 index 764a4d98026..00000000000 --- a/j2k/tests/testData/ast/literalExpression/hex.ide.kt +++ /dev/null @@ -1,6 +0,0 @@ -class Test() { - fun test() { - val i1 = 33 - val i2 = 51 - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/literalExpression/hex.kt b/j2k/tests/testData/ast/literalExpression/hex.kt index 00dba06dfef..764a4d98026 100644 --- a/j2k/tests/testData/ast/literalExpression/hex.kt +++ b/j2k/tests/testData/ast/literalExpression/hex.kt @@ -1,6 +1,6 @@ -open class Test() { - open fun test() { - var i1: Int = 33 - var i2: Int? = 51 +class Test() { + fun test() { + val i1 = 33 + val i2 = 51 } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/literalExpression/octal.ide.kt b/j2k/tests/testData/ast/literalExpression/octal.ide.kt deleted file mode 100644 index dc68442d8ee..00000000000 --- a/j2k/tests/testData/ast/literalExpression/octal.ide.kt +++ /dev/null @@ -1,6 +0,0 @@ -class Test() { - fun test() { - val i1 = 37 - val i2 = 26 - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/literalExpression/octal.kt b/j2k/tests/testData/ast/literalExpression/octal.kt index 280414f0197..dc68442d8ee 100644 --- a/j2k/tests/testData/ast/literalExpression/octal.kt +++ b/j2k/tests/testData/ast/literalExpression/octal.kt @@ -1,6 +1,6 @@ -open class Test() { - open fun test() { - var i1: Int = 37 - var i2: Int? = 26 +class Test() { + fun test() { + val i1 = 37 + val i2 = 26 } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/literalExpression/trueOrFalse.ide.kt b/j2k/tests/testData/ast/literalExpression/trueOrFalse.ide.kt deleted file mode 100644 index 326b2c6d6fd..00000000000 --- a/j2k/tests/testData/ast/literalExpression/trueOrFalse.ide.kt +++ /dev/null @@ -1,9 +0,0 @@ -class Test() { - fun test() { - val t1 = true - val t2 = true - - val f1 = false - val f2 = false - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/literalExpression/trueOrFalse.kt b/j2k/tests/testData/ast/literalExpression/trueOrFalse.kt index 65777641eaf..326b2c6d6fd 100644 --- a/j2k/tests/testData/ast/literalExpression/trueOrFalse.kt +++ b/j2k/tests/testData/ast/literalExpression/trueOrFalse.kt @@ -1,9 +1,9 @@ -open class Test() { - open fun test() { - var t1: Boolean = true - var t2: Boolean? = true +class Test() { + fun test() { + val t1 = true + val t2 = true - var f1: Boolean = false - var f2: Boolean? = false + val f1 = false + val f2 = false } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/localVariable/object.ide.kt b/j2k/tests/testData/ast/localVariable/object.ide.kt deleted file mode 100644 index 203f56027c6..00000000000 --- a/j2k/tests/testData/ast/localVariable/object.ide.kt +++ /dev/null @@ -1 +0,0 @@ -val i: Int \ No newline at end of file diff --git a/j2k/tests/testData/ast/localVariable/object.kt b/j2k/tests/testData/ast/localVariable/object.kt index 406b70ca8e1..203f56027c6 100644 --- a/j2k/tests/testData/ast/localVariable/object.kt +++ b/j2k/tests/testData/ast/localVariable/object.kt @@ -1 +1 @@ -var i: Int \ No newline at end of file +val i: Int \ No newline at end of file diff --git a/j2k/tests/testData/ast/methodCallExpression/callWithKeywords.ide.kt b/j2k/tests/testData/ast/methodCallExpression/callWithKeywords.ide.kt deleted file mode 100644 index 489e2d97b10..00000000000 --- a/j2k/tests/testData/ast/methodCallExpression/callWithKeywords.ide.kt +++ /dev/null @@ -1 +0,0 @@ -`when`(open, `trait`) \ No newline at end of file diff --git a/j2k/tests/testData/ast/methodCallExpression/emptyCall.ide.kt b/j2k/tests/testData/ast/methodCallExpression/emptyCall.ide.kt deleted file mode 100644 index 60d495be000..00000000000 --- a/j2k/tests/testData/ast/methodCallExpression/emptyCall.ide.kt +++ /dev/null @@ -1 +0,0 @@ -methodCall() \ No newline at end of file diff --git a/j2k/tests/testData/ast/methodCallExpression/genericMethod.ide.kt b/j2k/tests/testData/ast/methodCallExpression/genericMethod.ide.kt deleted file mode 100644 index 78ff43f2a98..00000000000 --- a/j2k/tests/testData/ast/methodCallExpression/genericMethod.ide.kt +++ /dev/null @@ -1,13 +0,0 @@ -package demo - -class Map() { - fun put(k: K, v: V) { - } -} - -class U() { - fun test() { - val m = Map() - m.put("10", 10) - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/methodCallExpression/genericMethod.kt b/j2k/tests/testData/ast/methodCallExpression/genericMethod.kt index 55d7266c79e..78ff43f2a98 100644 --- a/j2k/tests/testData/ast/methodCallExpression/genericMethod.kt +++ b/j2k/tests/testData/ast/methodCallExpression/genericMethod.kt @@ -1,13 +1,13 @@ package demo -open class Map() { - open fun put(k: K?, v: V?) { +class Map() { + fun put(k: K, v: V) { } } -open class U() { - open fun test() { - var m: Map? = Map() - m?.put("10", 10) +class U() { + fun test() { + val m = Map() + m.put("10", 10) } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/methodCallExpression/simpleCall.ide.kt b/j2k/tests/testData/ast/methodCallExpression/simpleCall.ide.kt deleted file mode 100644 index 43ea8339772..00000000000 --- a/j2k/tests/testData/ast/methodCallExpression/simpleCall.ide.kt +++ /dev/null @@ -1 +0,0 @@ -method(param1, param2) \ No newline at end of file diff --git a/j2k/tests/testData/ast/misc/packageWithClass.ide.kt b/j2k/tests/testData/ast/misc/packageWithClass.ide.kt deleted file mode 100644 index 7681b2952fa..00000000000 --- a/j2k/tests/testData/ast/misc/packageWithClass.ide.kt +++ /dev/null @@ -1,3 +0,0 @@ -package test - -class C() \ No newline at end of file diff --git a/j2k/tests/testData/ast/misc/packageWithClasses.ide.kt b/j2k/tests/testData/ast/misc/packageWithClasses.ide.kt deleted file mode 100644 index 9e2da6b537c..00000000000 --- a/j2k/tests/testData/ast/misc/packageWithClasses.ide.kt +++ /dev/null @@ -1,2 +0,0 @@ -class A() -class B() \ No newline at end of file diff --git a/j2k/tests/testData/ast/misc/packageWithImports.ide.kt b/j2k/tests/testData/ast/misc/packageWithImports.ide.kt deleted file mode 100644 index 1ab1fb21e99..00000000000 --- a/j2k/tests/testData/ast/misc/packageWithImports.ide.kt +++ /dev/null @@ -1,4 +0,0 @@ -package test - -import ast -import ast2 \ No newline at end of file diff --git a/j2k/tests/testData/ast/misc/packageWithMixedImports.ide.kt b/j2k/tests/testData/ast/misc/packageWithMixedImports.ide.kt deleted file mode 100644 index 1ab1fb21e99..00000000000 --- a/j2k/tests/testData/ast/misc/packageWithMixedImports.ide.kt +++ /dev/null @@ -1,4 +0,0 @@ -package test - -import ast -import ast2 \ No newline at end of file diff --git a/j2k/tests/testData/ast/misc/packageWithOpenClass.ide.kt b/j2k/tests/testData/ast/misc/packageWithOpenClass.ide.kt deleted file mode 100644 index 7681b2952fa..00000000000 --- a/j2k/tests/testData/ast/misc/packageWithOpenClass.ide.kt +++ /dev/null @@ -1,3 +0,0 @@ -package test - -class C() \ No newline at end of file diff --git a/j2k/tests/testData/ast/misc/packageWithOpenClass.kt b/j2k/tests/testData/ast/misc/packageWithOpenClass.kt index e7a8833ef47..7681b2952fa 100644 --- a/j2k/tests/testData/ast/misc/packageWithOpenClass.kt +++ b/j2k/tests/testData/ast/misc/packageWithOpenClass.kt @@ -1,3 +1,3 @@ package test -open class C() \ No newline at end of file +class C() \ No newline at end of file diff --git a/j2k/tests/testData/ast/misc/packageWithStaticImports.ide.kt b/j2k/tests/testData/ast/misc/packageWithStaticImports.ide.kt deleted file mode 100644 index 1ab1fb21e99..00000000000 --- a/j2k/tests/testData/ast/misc/packageWithStaticImports.ide.kt +++ /dev/null @@ -1,4 +0,0 @@ -package test - -import ast -import ast2 \ No newline at end of file diff --git a/j2k/tests/testData/ast/newClassExpression/classWithParam.ide.kt b/j2k/tests/testData/ast/newClassExpression/classWithParam.ide.kt deleted file mode 100644 index 9d29e159e31..00000000000 --- a/j2k/tests/testData/ast/newClassExpression/classWithParam.ide.kt +++ /dev/null @@ -1 +0,0 @@ -Foo(param) \ No newline at end of file diff --git a/j2k/tests/testData/ast/newClassExpression/classWithParams.ide.kt b/j2k/tests/testData/ast/newClassExpression/classWithParams.ide.kt deleted file mode 100644 index e10fb436db2..00000000000 --- a/j2k/tests/testData/ast/newClassExpression/classWithParams.ide.kt +++ /dev/null @@ -1 +0,0 @@ -Foo(param1, param2) \ No newline at end of file diff --git a/j2k/tests/testData/ast/newClassExpression/classWithoutBody.ide.kt b/j2k/tests/testData/ast/newClassExpression/classWithoutBody.ide.kt deleted file mode 100644 index 17f280dc444..00000000000 --- a/j2k/tests/testData/ast/newClassExpression/classWithoutBody.ide.kt +++ /dev/null @@ -1 +0,0 @@ -Foo() \ No newline at end of file diff --git a/j2k/tests/testData/ast/newClassExpression/fullQualifiedName.ide.kt b/j2k/tests/testData/ast/newClassExpression/fullQualifiedName.ide.kt deleted file mode 100644 index 61d3e8d4c60..00000000000 --- a/j2k/tests/testData/ast/newClassExpression/fullQualifiedName.ide.kt +++ /dev/null @@ -1,7 +0,0 @@ -package test - -class User() { - fun main() { - val list = java.util.LinkedList() - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/newClassExpression/fullQualifiedName.kt b/j2k/tests/testData/ast/newClassExpression/fullQualifiedName.kt index ff74844d2f6..61d3e8d4c60 100644 --- a/j2k/tests/testData/ast/newClassExpression/fullQualifiedName.kt +++ b/j2k/tests/testData/ast/newClassExpression/fullQualifiedName.kt @@ -1,7 +1,7 @@ package test -open class User() { - open fun main() { - var list: MutableList<*>? = java.util.LinkedList() +class User() { + fun main() { + val list = java.util.LinkedList() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/newClassExpression/fullQualifiedName2.ide.kt b/j2k/tests/testData/ast/newClassExpression/fullQualifiedName2.ide.kt deleted file mode 100644 index 61d3e8d4c60..00000000000 --- a/j2k/tests/testData/ast/newClassExpression/fullQualifiedName2.ide.kt +++ /dev/null @@ -1,7 +0,0 @@ -package test - -class User() { - fun main() { - val list = java.util.LinkedList() - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/newClassExpression/fullQualifiedName2.kt b/j2k/tests/testData/ast/newClassExpression/fullQualifiedName2.kt index ff74844d2f6..61d3e8d4c60 100644 --- a/j2k/tests/testData/ast/newClassExpression/fullQualifiedName2.kt +++ b/j2k/tests/testData/ast/newClassExpression/fullQualifiedName2.kt @@ -1,7 +1,7 @@ package test -open class User() { - open fun main() { - var list: MutableList<*>? = java.util.LinkedList() +class User() { + fun main() { + val list = java.util.LinkedList() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/newClassExpression/genericClassInvocation.ide.kt b/j2k/tests/testData/ast/newClassExpression/genericClassInvocation.ide.kt deleted file mode 100644 index cab47c50a09..00000000000 --- a/j2k/tests/testData/ast/newClassExpression/genericClassInvocation.ide.kt +++ /dev/null @@ -1,7 +0,0 @@ -import java.util.LinkedList - -class User() { - fun main() { - val list = LinkedList() - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/newClassExpression/genericClassInvocation.kt b/j2k/tests/testData/ast/newClassExpression/genericClassInvocation.kt index 4447b1dd47f..cab47c50a09 100644 --- a/j2k/tests/testData/ast/newClassExpression/genericClassInvocation.kt +++ b/j2k/tests/testData/ast/newClassExpression/genericClassInvocation.kt @@ -1,7 +1,7 @@ import java.util.LinkedList -open class User() { - open fun main() { - var list: MutableList? = LinkedList() +class User() { + fun main() { + val list = LinkedList() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/newClassExpression/newClassByFullName.ide.kt b/j2k/tests/testData/ast/newClassExpression/newClassByFullName.ide.kt deleted file mode 100644 index 1546fb45464..00000000000 --- a/j2k/tests/testData/ast/newClassExpression/newClassByFullName.ide.kt +++ /dev/null @@ -1,9 +0,0 @@ -package org.test - -class Library() - -class User() { - fun main() { - val lib = Library() - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/newClassExpression/newClassByFullName.kt b/j2k/tests/testData/ast/newClassExpression/newClassByFullName.kt index dd736087a09..1546fb45464 100644 --- a/j2k/tests/testData/ast/newClassExpression/newClassByFullName.kt +++ b/j2k/tests/testData/ast/newClassExpression/newClassByFullName.kt @@ -1,9 +1,9 @@ package org.test -open class Library() +class Library() -open class User() { - open fun main() { - var lib: Library? = Library() +class User() { + fun main() { + val lib = Library() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/newClassExpression/newClassWithAnonymousScope.ide.kt b/j2k/tests/testData/ast/newClassExpression/newClassWithAnonymousScope.ide.kt deleted file mode 100644 index 7c22181b2aa..00000000000 --- a/j2k/tests/testData/ast/newClassExpression/newClassWithAnonymousScope.ide.kt +++ /dev/null @@ -1,5 +0,0 @@ -object : Runnable() { - override fun run() { - System.out.println("Run") - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/newClassExpression/newClassWithAnonymousScope.kt b/j2k/tests/testData/ast/newClassExpression/newClassWithAnonymousScope.kt index 08c854bbbd4..7c22181b2aa 100644 --- a/j2k/tests/testData/ast/newClassExpression/newClassWithAnonymousScope.kt +++ b/j2k/tests/testData/ast/newClassExpression/newClassWithAnonymousScope.kt @@ -1,5 +1,5 @@ object : Runnable() { override fun run() { - System.out?.println("Run") + System.out.println("Run") } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/newClassExpression/newInnerClass.ide.kt b/j2k/tests/testData/ast/newClassExpression/newInnerClass.ide.kt deleted file mode 100644 index 48064b3ce9f..00000000000 --- a/j2k/tests/testData/ast/newClassExpression/newInnerClass.ide.kt +++ /dev/null @@ -1,12 +0,0 @@ -package org.test - -class OuterClass() { - class InnerClass() -} - -class User() { - fun main() { - val outerObject = OuterClass() - val innerObject = outerObject.InnerClass() - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/newClassExpression/newInnerClass.kt b/j2k/tests/testData/ast/newClassExpression/newInnerClass.kt index 7c6d425e002..48064b3ce9f 100644 --- a/j2k/tests/testData/ast/newClassExpression/newInnerClass.kt +++ b/j2k/tests/testData/ast/newClassExpression/newInnerClass.kt @@ -1,12 +1,12 @@ package org.test -open class OuterClass() { - open class InnerClass() +class OuterClass() { + class InnerClass() } -open class User() { - open fun main() { - var outerObject: OuterClass? = OuterClass() - var innerObject: OuterClass.InnerClass? = outerObject?.InnerClass() +class User() { + fun main() { + val outerObject = OuterClass() + val innerObject = outerObject.InnerClass() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.ide.kt b/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.ide.kt deleted file mode 100644 index 031a5e051cd..00000000000 --- a/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.ide.kt +++ /dev/null @@ -1,12 +0,0 @@ -package org.test - -import java.util.LinkedList - -class Member() - -class User() { - fun main() { - val members = LinkedList() - members.add(Member()) - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.kt b/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.kt index 781ee9311f7..031a5e051cd 100644 --- a/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.kt +++ b/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.kt @@ -2,11 +2,11 @@ package org.test import java.util.LinkedList -open class Member() +class Member() -open class User() { - open fun main() { - var members: MutableList? = LinkedList() - members?.add(Member()) +class User() { + fun main() { + val members = LinkedList() + members.add(Member()) } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.ide.kt b/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.ide.kt deleted file mode 100644 index 5dea1cbe8f3..00000000000 --- a/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.ide.kt +++ /dev/null @@ -1,13 +0,0 @@ -package demo - -class Foo() { - class object { - class Bar() - } -} - -class User() { - fun main() { - val boo = Foo.Bar() - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.kt b/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.kt index 34f9bfcaf2a..5dea1cbe8f3 100644 --- a/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.kt +++ b/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.kt @@ -1,13 +1,13 @@ package demo -open class Foo() { +class Foo() { class object { - open class Bar() + class Bar() } } -open class User() { - open fun main() { - var boo: Foo.Bar? = Foo.Bar() +class User() { + fun main() { + val boo = Foo.Bar() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/objectLiteral/MyFrame.ide.kt b/j2k/tests/testData/ast/objectLiteral/MyFrame.ide.kt deleted file mode 100644 index c461d53dc4c..00000000000 --- a/j2k/tests/testData/ast/objectLiteral/MyFrame.ide.kt +++ /dev/null @@ -1,20 +0,0 @@ -package demo - -class WindowAdapter() { - public fun windowClosing() { - } -} - -public class Client() : Frame() { - { - val a = object : WindowAdapter() { - override fun windowClosing() { - } - } - addWindowListener(a) - addWindowListener(object : WindowAdapter() { - override fun windowClosing() { - } - }) - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/objectLiteral/MyFrame.kt b/j2k/tests/testData/ast/objectLiteral/MyFrame.kt index 9cb5ce6ee83..c461d53dc4c 100644 --- a/j2k/tests/testData/ast/objectLiteral/MyFrame.kt +++ b/j2k/tests/testData/ast/objectLiteral/MyFrame.kt @@ -1,13 +1,13 @@ package demo -open class WindowAdapter() { - public open fun windowClosing() { +class WindowAdapter() { + public fun windowClosing() { } } public class Client() : Frame() { { - var a: WindowAdapter? = object : WindowAdapter() { + val a = object : WindowAdapter() { override fun windowClosing() { } } diff --git a/j2k/tests/testData/ast/outProjectionType/methodParams.ide.kt b/j2k/tests/testData/ast/outProjectionType/methodParams.ide.kt deleted file mode 100644 index f04b37cf5ce..00000000000 --- a/j2k/tests/testData/ast/outProjectionType/methodParams.ide.kt +++ /dev/null @@ -1,2 +0,0 @@ -fun pushAll(src: Collection) { -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/outProjectionType/methodParams.kt b/j2k/tests/testData/ast/outProjectionType/methodParams.kt index 16946be5ee1..f04b37cf5ce 100644 --- a/j2k/tests/testData/ast/outProjectionType/methodParams.kt +++ b/j2k/tests/testData/ast/outProjectionType/methodParams.kt @@ -1,2 +1,2 @@ -fun pushAll(src: Collection?) { +fun pushAll(src: Collection) { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.ide.kt b/j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.ide.kt deleted file mode 100644 index 31190c76a54..00000000000 --- a/j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.ide.kt +++ /dev/null @@ -1,5 +0,0 @@ -package org.jetbrains.jet.j2k.`in` - -import org.jetbrains.annotations.Nullable - -public class Converter() \ No newline at end of file diff --git a/j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.kt b/j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.kt index 01b546d1268..31190c76a54 100644 --- a/j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.kt +++ b/j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.kt @@ -2,4 +2,4 @@ package org.jetbrains.jet.j2k.`in` import org.jetbrains.annotations.Nullable -public open class Converter() \ No newline at end of file +public class Converter() \ No newline at end of file diff --git a/j2k/tests/testData/ast/parenthesizedExpression/parenthesized.ide.kt b/j2k/tests/testData/ast/parenthesizedExpression/parenthesized.ide.kt deleted file mode 100644 index 0a911375668..00000000000 --- a/j2k/tests/testData/ast/parenthesizedExpression/parenthesized.ide.kt +++ /dev/null @@ -1 +0,0 @@ -(1 + 2) \ No newline at end of file diff --git a/j2k/tests/testData/ast/parenthesizedExpression/parenthesized2.ide.kt b/j2k/tests/testData/ast/parenthesizedExpression/parenthesized2.ide.kt deleted file mode 100644 index 01d3d19b7d8..00000000000 --- a/j2k/tests/testData/ast/parenthesizedExpression/parenthesized2.ide.kt +++ /dev/null @@ -1 +0,0 @@ -(str.toString() + "abc") \ No newline at end of file diff --git a/j2k/tests/testData/ast/polyadicExpression/divide.ide.kt b/j2k/tests/testData/ast/polyadicExpression/divide.ide.kt deleted file mode 100644 index 6005ff02b5d..00000000000 --- a/j2k/tests/testData/ast/polyadicExpression/divide.ide.kt +++ /dev/null @@ -1 +0,0 @@ -1 / 2 / 3 \ No newline at end of file diff --git a/j2k/tests/testData/ast/polyadicExpression/minus.ide.kt b/j2k/tests/testData/ast/polyadicExpression/minus.ide.kt deleted file mode 100644 index 35002f64d1e..00000000000 --- a/j2k/tests/testData/ast/polyadicExpression/minus.ide.kt +++ /dev/null @@ -1 +0,0 @@ -1 - 2 - 3 \ No newline at end of file diff --git a/j2k/tests/testData/ast/polyadicExpression/multiply.ide.kt b/j2k/tests/testData/ast/polyadicExpression/multiply.ide.kt deleted file mode 100644 index 89ddea79483..00000000000 --- a/j2k/tests/testData/ast/polyadicExpression/multiply.ide.kt +++ /dev/null @@ -1 +0,0 @@ -1 * 2 * 3 \ No newline at end of file diff --git a/j2k/tests/testData/ast/polyadicExpression/plus.ide.kt b/j2k/tests/testData/ast/polyadicExpression/plus.ide.kt deleted file mode 100644 index 8a2a3c5ef6f..00000000000 --- a/j2k/tests/testData/ast/polyadicExpression/plus.ide.kt +++ /dev/null @@ -1 +0,0 @@ -1 + 2 + 3 \ No newline at end of file diff --git a/j2k/tests/testData/ast/polyadicExpression/remainder.ide.kt b/j2k/tests/testData/ast/polyadicExpression/remainder.ide.kt deleted file mode 100644 index 2e120c0cd68..00000000000 --- a/j2k/tests/testData/ast/polyadicExpression/remainder.ide.kt +++ /dev/null @@ -1 +0,0 @@ -1 % 2 % 3 \ No newline at end of file diff --git a/j2k/tests/testData/ast/polyadicExpression/unassignedShiftRight.ide.kt b/j2k/tests/testData/ast/polyadicExpression/unassignedShiftRight.ide.kt deleted file mode 100644 index 83d192a6a77..00000000000 --- a/j2k/tests/testData/ast/polyadicExpression/unassignedShiftRight.ide.kt +++ /dev/null @@ -1 +0,0 @@ -1 ushr 2 ushr 3 \ No newline at end of file diff --git a/j2k/tests/testData/ast/postfixOperator/decrement.ide.kt b/j2k/tests/testData/ast/postfixOperator/decrement.ide.kt deleted file mode 100644 index b45bc7f1686..00000000000 --- a/j2k/tests/testData/ast/postfixOperator/decrement.ide.kt +++ /dev/null @@ -1 +0,0 @@ -i-- \ No newline at end of file diff --git a/j2k/tests/testData/ast/postfixOperator/increment.ide.kt b/j2k/tests/testData/ast/postfixOperator/increment.ide.kt deleted file mode 100644 index f47eebed94d..00000000000 --- a/j2k/tests/testData/ast/postfixOperator/increment.ide.kt +++ /dev/null @@ -1 +0,0 @@ -i++ \ No newline at end of file diff --git a/j2k/tests/testData/ast/prefixOperator/decrement.ide.kt b/j2k/tests/testData/ast/prefixOperator/decrement.ide.kt deleted file mode 100644 index 33b7049c8ba..00000000000 --- a/j2k/tests/testData/ast/prefixOperator/decrement.ide.kt +++ /dev/null @@ -1 +0,0 @@ ---i \ No newline at end of file diff --git a/j2k/tests/testData/ast/prefixOperator/excl.ide.kt b/j2k/tests/testData/ast/prefixOperator/excl.ide.kt deleted file mode 100644 index 15f6f9d5a87..00000000000 --- a/j2k/tests/testData/ast/prefixOperator/excl.ide.kt +++ /dev/null @@ -1,2 +0,0 @@ -val i = true -val j = !i \ No newline at end of file diff --git a/j2k/tests/testData/ast/prefixOperator/excl.kt b/j2k/tests/testData/ast/prefixOperator/excl.kt index e0b51ec2084..15f6f9d5a87 100644 --- a/j2k/tests/testData/ast/prefixOperator/excl.kt +++ b/j2k/tests/testData/ast/prefixOperator/excl.kt @@ -1,2 +1,2 @@ -var i: Boolean = true -var j: Boolean = !i \ No newline at end of file +val i = true +val j = !i \ No newline at end of file diff --git a/j2k/tests/testData/ast/prefixOperator/increment.ide.kt b/j2k/tests/testData/ast/prefixOperator/increment.ide.kt deleted file mode 100644 index de36816d982..00000000000 --- a/j2k/tests/testData/ast/prefixOperator/increment.ide.kt +++ /dev/null @@ -1 +0,0 @@ -++i \ No newline at end of file diff --git a/j2k/tests/testData/ast/prefixOperator/kt-667.ide.kt b/j2k/tests/testData/ast/prefixOperator/kt-667.ide.kt deleted file mode 100644 index a709cf29015..00000000000 --- a/j2k/tests/testData/ast/prefixOperator/kt-667.ide.kt +++ /dev/null @@ -1,2 +0,0 @@ -val i = (10).inv() -val j = ((i * 100)).inv() \ No newline at end of file diff --git a/j2k/tests/testData/ast/prefixOperator/kt-667.kt b/j2k/tests/testData/ast/prefixOperator/kt-667.kt index 577120ab6fe..a709cf29015 100644 --- a/j2k/tests/testData/ast/prefixOperator/kt-667.kt +++ b/j2k/tests/testData/ast/prefixOperator/kt-667.kt @@ -1,2 +1,2 @@ -var i: Int = (10).inv() -var j: Int = ((i * 100)).inv() \ No newline at end of file +val i = (10).inv() +val j = ((i * 100)).inv() \ No newline at end of file diff --git a/j2k/tests/testData/ast/prefixOperator/nullableIf.ide.kt b/j2k/tests/testData/ast/prefixOperator/nullableIf.ide.kt deleted file mode 100644 index 0f8d7276176..00000000000 --- a/j2k/tests/testData/ast/prefixOperator/nullableIf.ide.kt +++ /dev/null @@ -1,3 +0,0 @@ -val s = null -if (!s.isEmpty()) { -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/prefixOperator/nullableIf.kt b/j2k/tests/testData/ast/prefixOperator/nullableIf.kt index d0f6e254a42..0f8d7276176 100644 --- a/j2k/tests/testData/ast/prefixOperator/nullableIf.kt +++ b/j2k/tests/testData/ast/prefixOperator/nullableIf.kt @@ -1,3 +1,3 @@ -var s: String? = null -if (!s?.isEmpty()!!) { +val s = null +if (!s.isEmpty()) { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/prefixOperator/tilde.ide.kt b/j2k/tests/testData/ast/prefixOperator/tilde.ide.kt deleted file mode 100644 index b98a77a029e..00000000000 --- a/j2k/tests/testData/ast/prefixOperator/tilde.ide.kt +++ /dev/null @@ -1,2 +0,0 @@ -val i = 10 -val j = (10).inv() \ No newline at end of file diff --git a/j2k/tests/testData/ast/prefixOperator/tilde.kt b/j2k/tests/testData/ast/prefixOperator/tilde.kt index b5a1b376cd4..b98a77a029e 100644 --- a/j2k/tests/testData/ast/prefixOperator/tilde.kt +++ b/j2k/tests/testData/ast/prefixOperator/tilde.kt @@ -1,2 +1,2 @@ -var i: Int = 10 -var j: Int = (10).inv() \ No newline at end of file +val i = 10 +val j = (10).inv() \ No newline at end of file diff --git a/j2k/tests/testData/ast/rawGenerics/kt-540-map.ide.kt b/j2k/tests/testData/ast/rawGenerics/kt-540-map.ide.kt deleted file mode 100644 index 218ae4d0df5..00000000000 --- a/j2k/tests/testData/ast/rawGenerics/kt-540-map.ide.kt +++ /dev/null @@ -1,11 +0,0 @@ -package demo - -import java.util.HashMap - -class Test() { - fun main() { - val commonMap = HashMap() - val rawMap = HashMap() - val superRawMap = HashMap() - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/rawGenerics/kt-540-map.kt b/j2k/tests/testData/ast/rawGenerics/kt-540-map.kt index c0ba05f34d0..218ae4d0df5 100644 --- a/j2k/tests/testData/ast/rawGenerics/kt-540-map.kt +++ b/j2k/tests/testData/ast/rawGenerics/kt-540-map.kt @@ -2,10 +2,10 @@ package demo import java.util.HashMap -open class Test() { - open fun main() { - var commonMap: HashMap? = HashMap() - var rawMap: HashMap? = HashMap() - var superRawMap: HashMap? = HashMap() +class Test() { + fun main() { + val commonMap = HashMap() + val rawMap = HashMap() + val superRawMap = HashMap() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.ide.kt b/j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.ide.kt deleted file mode 100644 index 73b9e947035..00000000000 --- a/j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.ide.kt +++ /dev/null @@ -1,15 +0,0 @@ -package demo - -class Collection(e: E) { - { - System.out.println(e) - } -} - -class Test() { - fun main() { - val raw1 = Collection(1) - val raw2 = Collection(1) - val raw3 = Collection("1") - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.kt b/j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.kt index bce28ddeae4..73b9e947035 100644 --- a/j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.kt +++ b/j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.kt @@ -1,15 +1,15 @@ package demo -open class Collection(e: E?) { +class Collection(e: E) { { - System.out?.println(e) + System.out.println(e) } } -open class Test() { - open fun main() { - var raw1: Collection<*>? = Collection(1) - var raw2: Collection<*>? = Collection(1) - var raw3: Collection<*>? = Collection("1") +class Test() { + fun main() { + val raw1 = Collection(1) + val raw2 = Collection(1) + val raw3 = Collection("1") } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/rawGenerics/kt-540.ide.kt b/j2k/tests/testData/ast/rawGenerics/kt-540.ide.kt deleted file mode 100644 index 716b971d661..00000000000 --- a/j2k/tests/testData/ast/rawGenerics/kt-540.ide.kt +++ /dev/null @@ -1,11 +0,0 @@ -package demo - -import java.util.LinkedList - -class Test() { - fun main() { - val common = LinkedList() - val raw = LinkedList() - val superRaw = LinkedList() - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/rawGenerics/kt-540.kt b/j2k/tests/testData/ast/rawGenerics/kt-540.kt index c12ac80a3c9..716b971d661 100644 --- a/j2k/tests/testData/ast/rawGenerics/kt-540.kt +++ b/j2k/tests/testData/ast/rawGenerics/kt-540.kt @@ -2,10 +2,10 @@ package demo import java.util.LinkedList -open class Test() { - open fun main() { - var common: MutableList? = LinkedList() - var raw: MutableList<*>? = LinkedList() - var superRaw: MutableList<*>? = LinkedList() +class Test() { + fun main() { + val common = LinkedList() + val raw = LinkedList() + val superRaw = LinkedList() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/rawGenerics/rawGenericMethod.ide.kt b/j2k/tests/testData/ast/rawGenerics/rawGenericMethod.ide.kt deleted file mode 100644 index d866f64fa78..00000000000 --- a/j2k/tests/testData/ast/rawGenerics/rawGenericMethod.ide.kt +++ /dev/null @@ -1,15 +0,0 @@ -package demo - -class TestT() { - fun getT() { - } -} - -class U() { - fun main() { - val t = TestT() - t.getT() - t.getT() - t.getT() - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/rawGenerics/rawGenericMethod.kt b/j2k/tests/testData/ast/rawGenerics/rawGenericMethod.kt index f8afcf4122b..d866f64fa78 100644 --- a/j2k/tests/testData/ast/rawGenerics/rawGenericMethod.kt +++ b/j2k/tests/testData/ast/rawGenerics/rawGenericMethod.kt @@ -1,15 +1,15 @@ package demo -open class TestT() { - open fun getT() { +class TestT() { + fun getT() { } } -open class U() { - open fun main() { - var t: TestT? = TestT() - t?.getT() - t?.getT() - t?.getT() +class U() { + fun main() { + val t = TestT() + t.getT() + t.getT() + t.getT() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/returnStatement/returnChar.ide.kt b/j2k/tests/testData/ast/returnStatement/returnChar.ide.kt deleted file mode 100644 index b6284fba897..00000000000 --- a/j2k/tests/testData/ast/returnStatement/returnChar.ide.kt +++ /dev/null @@ -1 +0,0 @@ -return 'c' \ No newline at end of file diff --git a/j2k/tests/testData/ast/returnStatement/returnLiteral.ide.kt b/j2k/tests/testData/ast/returnStatement/returnLiteral.ide.kt deleted file mode 100644 index 2a925639120..00000000000 --- a/j2k/tests/testData/ast/returnStatement/returnLiteral.ide.kt +++ /dev/null @@ -1 +0,0 @@ -return true \ No newline at end of file diff --git a/j2k/tests/testData/ast/returnStatement/returnNumber.ide.kt b/j2k/tests/testData/ast/returnStatement/returnNumber.ide.kt deleted file mode 100644 index 5efef616fdb..00000000000 --- a/j2k/tests/testData/ast/returnStatement/returnNumber.ide.kt +++ /dev/null @@ -1 +0,0 @@ -return 1 \ No newline at end of file diff --git a/j2k/tests/testData/ast/returnStatement/returnString.ide.kt b/j2k/tests/testData/ast/returnStatement/returnString.ide.kt deleted file mode 100644 index f831e0baf83..00000000000 --- a/j2k/tests/testData/ast/returnStatement/returnString.ide.kt +++ /dev/null @@ -1 +0,0 @@ -return "str" \ No newline at end of file diff --git a/j2k/tests/testData/ast/settings/openByDefault.java.todo b/j2k/tests/testData/ast/settings/openByDefault.java.todo new file mode 100644 index 00000000000..00c68630efb --- /dev/null +++ b/j2k/tests/testData/ast/settings/openByDefault.java.todo @@ -0,0 +1,29 @@ +//file +// !openByDefault: true + +class A { + void foo1() { } + private void foo2(){} + final void foo3(){} +} + +final class B { + void foo(){} +} + +abstract class C { + abstract void foo(); +} + +interface I{ + void foo(); +} + +class D implements I { + @Override + public void foo() { } +} + +enum E { + int foo() { return 0; } +} diff --git a/j2k/tests/testData/ast/settings/specifyLocalVariableTypeByDefault.java b/j2k/tests/testData/ast/settings/specifyLocalVariableTypeByDefault.java new file mode 100644 index 00000000000..de5ea41f4de --- /dev/null +++ b/j2k/tests/testData/ast/settings/specifyLocalVariableTypeByDefault.java @@ -0,0 +1,6 @@ +//method +// !specifyLocalVariableTypeByDefault: true +public void foo() { + int i = 1; + String s = ""; +} \ No newline at end of file diff --git a/j2k/tests/testData/ast/settings/specifyLocalVariableTypeByDefault.kt b/j2k/tests/testData/ast/settings/specifyLocalVariableTypeByDefault.kt new file mode 100644 index 00000000000..b0abb1e8ee3 --- /dev/null +++ b/j2k/tests/testData/ast/settings/specifyLocalVariableTypeByDefault.kt @@ -0,0 +1,5 @@ +// !specifyLocalVariableTypeByDefault: true +public fun foo() { + val i: Int = 1 + val s: String = "" +} \ No newline at end of file diff --git a/j2k/tests/testData/ast/starProjectionType/methodParams.ide.kt b/j2k/tests/testData/ast/starProjectionType/methodParams.ide.kt deleted file mode 100644 index 74bf6891c03..00000000000 --- a/j2k/tests/testData/ast/starProjectionType/methodParams.ide.kt +++ /dev/null @@ -1,2 +0,0 @@ -fun wtf(w: Collection<*>) { -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/starProjectionType/methodParams.kt b/j2k/tests/testData/ast/starProjectionType/methodParams.kt index b34d120446d..74bf6891c03 100644 --- a/j2k/tests/testData/ast/starProjectionType/methodParams.kt +++ b/j2k/tests/testData/ast/starProjectionType/methodParams.kt @@ -1,2 +1,2 @@ -fun wtf(w: Collection<*>?) { +fun wtf(w: Collection<*>) { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.ide.kt b/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.ide.kt deleted file mode 100644 index 3ed8769e54b..00000000000 --- a/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.ide.kt +++ /dev/null @@ -1,11 +0,0 @@ -class Base() { - fun foo() -} - -class A() : Base() { - class C() { - fun test() { - super@A.foo() - } - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.kt b/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.kt index c2c90468330..3ed8769e54b 100644 --- a/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.kt +++ b/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.kt @@ -1,10 +1,10 @@ -open class Base() { - open fun foo() +class Base() { + fun foo() } -open class A() : Base() { - open class C() { - open fun test() { +class A() : Base() { + class C() { + fun test() { super@A.foo() } } diff --git a/j2k/tests/testData/ast/superExpression/classAextendsB.ide.kt b/j2k/tests/testData/ast/superExpression/classAextendsB.ide.kt deleted file mode 100644 index 4ceeedfcf65..00000000000 --- a/j2k/tests/testData/ast/superExpression/classAextendsB.ide.kt +++ /dev/null @@ -1,12 +0,0 @@ -class B(i: Int) { - fun call(): Int { - return 1 - } -} - -class A() : B(10) { - - override fun call(): Int { - return super.call() - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/superExpression/classAextendsB.kt b/j2k/tests/testData/ast/superExpression/classAextendsB.kt index 1c51f741e79..4ceeedfcf65 100644 --- a/j2k/tests/testData/ast/superExpression/classAextendsB.kt +++ b/j2k/tests/testData/ast/superExpression/classAextendsB.kt @@ -1,10 +1,10 @@ -open class B(i: Int) { - open fun call(): Int { +class B(i: Int) { + fun call(): Int { return 1 } } -open class A() : B(10) { +class A() : B(10) { override fun call(): Int { return super.call() diff --git a/j2k/tests/testData/ast/superExpression/superStatement.ide.kt b/j2k/tests/testData/ast/superExpression/superStatement.ide.kt deleted file mode 100644 index a0ea37bcc63..00000000000 --- a/j2k/tests/testData/ast/superExpression/superStatement.ide.kt +++ /dev/null @@ -1 +0,0 @@ -super.call() \ No newline at end of file diff --git a/j2k/tests/testData/ast/switch/comlicatedFallDown.ide.kt b/j2k/tests/testData/ast/switch/comlicatedFallDown.ide.kt deleted file mode 100644 index 64f45d06a8c..00000000000 --- a/j2k/tests/testData/ast/switch/comlicatedFallDown.ide.kt +++ /dev/null @@ -1,91 +0,0 @@ -package demo - -public class SwitchDemo() { - class object { - public fun print(o: Any) { - System.out.println(o) - } - - public fun test(i: Int) { - val monthString = "" - when (i) { - 1 -> { - print(1) - print(2) - print(3) - print(4) - print(5) - } - 2 -> { - print(2) - print(3) - print(4) - print(5) - } - 3 -> { - print(3) - print(4) - print(5) - } - 4 -> { - print(4) - print(5) - } - 5 -> { - print(5) - } - 6 -> { - print(6) - print(7) - print(8) - print(9) - print(10) - print(11) - monthString = "December" - } - 7 -> { - print(7) - print(8) - print(9) - print(10) - print(11) - monthString = "December" - } - 8 -> { - print(8) - print(9) - print(10) - print(11) - monthString = "December" - } - 9 -> { - print(9) - print(10) - print(11) - monthString = "December" - } - 10 -> { - print(10) - print(11) - monthString = "December" - } - 11 -> { - print(11) - monthString = "December" - } - 12 -> { - monthString = "December" - } - else -> { - monthString = "Invalid month" - } - } - System.out.println(monthString) - } - - public fun main(args: Array) { - for (i in 1..12) test(i) - } - } -} -fun main(args: Array) = SwitchDemo.main(args as Array?) \ No newline at end of file diff --git a/j2k/tests/testData/ast/switch/comlicatedFallDown.kt b/j2k/tests/testData/ast/switch/comlicatedFallDown.kt index 8f3ca8b5959..64f45d06a8c 100644 --- a/j2k/tests/testData/ast/switch/comlicatedFallDown.kt +++ b/j2k/tests/testData/ast/switch/comlicatedFallDown.kt @@ -1,13 +1,13 @@ package demo -public open class SwitchDemo() { +public class SwitchDemo() { class object { - public open fun print(o: Any?) { - System.out?.println(o) + public fun print(o: Any) { + System.out.println(o) } - public open fun test(i: Int) { - var monthString: String? = "" + public fun test(i: Int) { + val monthString = "" when (i) { 1 -> { print(1) @@ -80,10 +80,10 @@ public open class SwitchDemo() { monthString = "Invalid month" } } - System.out?.println(monthString) + System.out.println(monthString) } - public open fun main(args: Array?) { + public fun main(args: Array) { for (i in 1..12) test(i) } } diff --git a/j2k/tests/testData/ast/switch/emptySwitch.ide.kt b/j2k/tests/testData/ast/switch/emptySwitch.ide.kt deleted file mode 100644 index eb104015720..00000000000 --- a/j2k/tests/testData/ast/switch/emptySwitch.ide.kt +++ /dev/null @@ -1,15 +0,0 @@ -public class NonDefault() { - class object { - public fun main(args: Array) { - - val value = 3 - val valueString = "" - when (value) { - else -> { - } - } - System.out.println(valueString) - } - } -} -fun main(args: Array) = NonDefault.main(args as Array?) \ No newline at end of file diff --git a/j2k/tests/testData/ast/switch/emptySwitch.kt b/j2k/tests/testData/ast/switch/emptySwitch.kt index 85d906b4223..eb104015720 100644 --- a/j2k/tests/testData/ast/switch/emptySwitch.kt +++ b/j2k/tests/testData/ast/switch/emptySwitch.kt @@ -1,14 +1,14 @@ -public open class NonDefault() { +public class NonDefault() { class object { - public open fun main(args: Array?) { + public fun main(args: Array) { - var value: Int = 3 - var valueString: String? = "" + val value = 3 + val valueString = "" when (value) { else -> { } } - System.out?.println(valueString) + System.out.println(valueString) } } } diff --git a/j2k/tests/testData/ast/switch/fallDown.ide.kt b/j2k/tests/testData/ast/switch/fallDown.ide.kt deleted file mode 100644 index 9a55b06ec8d..00000000000 --- a/j2k/tests/testData/ast/switch/fallDown.ide.kt +++ /dev/null @@ -1,20 +0,0 @@ -package switch_demo - -public class SwitchDemo() { - class object { - public fun main(args: Array) { - val month = 8 - val monthString: String - when (month) { - 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 -> { - monthString = "December" - } - else -> { - monthString = "Invalid month" - } - } - System.out.println(monthString) - } - } -} -fun main(args: Array) = SwitchDemo.main(args as Array?) \ No newline at end of file diff --git a/j2k/tests/testData/ast/switch/fallDown.kt b/j2k/tests/testData/ast/switch/fallDown.kt index d34cc351c8e..9a55b06ec8d 100644 --- a/j2k/tests/testData/ast/switch/fallDown.kt +++ b/j2k/tests/testData/ast/switch/fallDown.kt @@ -1,10 +1,10 @@ package switch_demo -public open class SwitchDemo() { +public class SwitchDemo() { class object { - public open fun main(args: Array?) { - var month: Int = 8 - var monthString: String? + public fun main(args: Array) { + val month = 8 + val monthString: String when (month) { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 -> { monthString = "December" @@ -13,7 +13,7 @@ public open class SwitchDemo() { monthString = "Invalid month" } } - System.out?.println(monthString) + System.out.println(monthString) } } } diff --git a/j2k/tests/testData/ast/switch/kt-539.ide.kt b/j2k/tests/testData/ast/switch/kt-539.ide.kt deleted file mode 100644 index b0104470441..00000000000 --- a/j2k/tests/testData/ast/switch/kt-539.ide.kt +++ /dev/null @@ -1,54 +0,0 @@ -package switch_demo - -public class SwitchDemo() { - class object { - public fun main(args: Array) { - - val month = 8 - val monthString: String - when (month) { - 1 -> { - monthString = "January" - } - 2 -> { - monthString = "February" - } - 3 -> { - monthString = "March" - } - 4 -> { - monthString = "April" - } - 5 -> { - monthString = "May" - } - 6 -> { - monthString = "June" - } - 7 -> { - monthString = "July" - } - 8 -> { - monthString = "August" - } - 9 -> { - monthString = "September" - } - 10 -> { - monthString = "October" - } - 11 -> { - monthString = "November" - } - 12 -> { - monthString = "December" - } - else -> { - monthString = "Invalid month" - } - } - System.out.println(monthString) - } - } -} -fun main(args: Array) = SwitchDemo.main(args as Array?) \ No newline at end of file diff --git a/j2k/tests/testData/ast/switch/kt-539.kt b/j2k/tests/testData/ast/switch/kt-539.kt index 45cc1b256d1..b0104470441 100644 --- a/j2k/tests/testData/ast/switch/kt-539.kt +++ b/j2k/tests/testData/ast/switch/kt-539.kt @@ -1,11 +1,11 @@ package switch_demo -public open class SwitchDemo() { +public class SwitchDemo() { class object { - public open fun main(args: Array?) { + public fun main(args: Array) { - var month: Int = 8 - var monthString: String? + val month = 8 + val monthString: String when (month) { 1 -> { monthString = "January" @@ -47,7 +47,7 @@ public open class SwitchDemo() { monthString = "Invalid month" } } - System.out?.println(monthString) + System.out.println(monthString) } } } diff --git a/j2k/tests/testData/ast/switch/nondefault.ide.kt b/j2k/tests/testData/ast/switch/nondefault.ide.kt deleted file mode 100644 index 2b6b3e9d185..00000000000 --- a/j2k/tests/testData/ast/switch/nondefault.ide.kt +++ /dev/null @@ -1,24 +0,0 @@ -public class NonDefault() { - class object { - public fun main(args: Array) { - - val value = 3 - val valueString = "" - when (value) { - 1 -> { - valueString = "ONE" - } - 2 -> { - valueString = "TWO" - } - 3 -> { - valueString = "THREE" - } - else -> { - } - } - System.out.println(valueString) - } - } -} -fun main(args: Array) = NonDefault.main(args as Array?) \ No newline at end of file diff --git a/j2k/tests/testData/ast/switch/nondefault.kt b/j2k/tests/testData/ast/switch/nondefault.kt index b426f030703..2b6b3e9d185 100644 --- a/j2k/tests/testData/ast/switch/nondefault.kt +++ b/j2k/tests/testData/ast/switch/nondefault.kt @@ -1,9 +1,9 @@ -public open class NonDefault() { +public class NonDefault() { class object { - public open fun main(args: Array?) { + public fun main(args: Array) { - var value: Int = 3 - var valueString: String? = "" + val value = 3 + val valueString = "" when (value) { 1 -> { valueString = "ONE" @@ -17,7 +17,7 @@ public open class NonDefault() { else -> { } } - System.out?.println(valueString) + System.out.println(valueString) } } } diff --git a/j2k/tests/testData/ast/synchronizedStatement/singleLineExample.ide.kt b/j2k/tests/testData/ast/synchronizedStatement/singleLineExample.ide.kt deleted file mode 100644 index f81a9077fb5..00000000000 --- a/j2k/tests/testData/ast/synchronizedStatement/singleLineExample.ide.kt +++ /dev/null @@ -1,3 +0,0 @@ -synchronized (s) { - doSomething(s) -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.ide.kt b/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.ide.kt deleted file mode 100644 index 9cd50bbe58d..00000000000 --- a/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.ide.kt +++ /dev/null @@ -1,12 +0,0 @@ -class Base() { - fun foo() { - } -} - -class A() : Base() { - class C() { - fun test() { - this@A.foo() - } - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.kt b/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.kt index c4209b42701..9cd50bbe58d 100644 --- a/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.kt +++ b/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.kt @@ -1,11 +1,11 @@ -open class Base() { - open fun foo() { +class Base() { + fun foo() { } } -open class A() : Base() { - open class C() { - open fun test() { +class A() : Base() { + class C() { + fun test() { this@A.foo() } } diff --git a/j2k/tests/testData/ast/thisExpression/thisStatement.ide.kt b/j2k/tests/testData/ast/thisExpression/thisStatement.ide.kt deleted file mode 100644 index a0ea37bcc63..00000000000 --- a/j2k/tests/testData/ast/thisExpression/thisStatement.ide.kt +++ /dev/null @@ -1 +0,0 @@ -super.call() \ No newline at end of file diff --git a/j2k/tests/testData/ast/throwStatement/simpleThrowStatement.ide.kt b/j2k/tests/testData/ast/throwStatement/simpleThrowStatement.ide.kt deleted file mode 100644 index 0894cfeda14..00000000000 --- a/j2k/tests/testData/ast/throwStatement/simpleThrowStatement.ide.kt +++ /dev/null @@ -1 +0,0 @@ -throw exception \ No newline at end of file diff --git a/j2k/tests/testData/ast/trait/abstactInterface.ide.kt b/j2k/tests/testData/ast/trait/abstactInterface.ide.kt deleted file mode 100644 index 988db5e9373..00000000000 --- a/j2k/tests/testData/ast/trait/abstactInterface.ide.kt +++ /dev/null @@ -1 +0,0 @@ -abstract trait I \ No newline at end of file diff --git a/j2k/tests/testData/ast/trait/emptyInterface.ide.kt b/j2k/tests/testData/ast/trait/emptyInterface.ide.kt deleted file mode 100644 index 16c5ea4846e..00000000000 --- a/j2k/tests/testData/ast/trait/emptyInterface.ide.kt +++ /dev/null @@ -1 +0,0 @@ -trait A \ No newline at end of file diff --git a/j2k/tests/testData/ast/trait/extendsOneClassAndImplementsSeveralInterfaces.ide.kt b/j2k/tests/testData/ast/trait/extendsOneClassAndImplementsSeveralInterfaces.ide.kt deleted file mode 100644 index ce36fca2a9d..00000000000 --- a/j2k/tests/testData/ast/trait/extendsOneClassAndImplementsSeveralInterfaces.ide.kt +++ /dev/null @@ -1 +0,0 @@ -trait A : I0, I1, I2 \ No newline at end of file diff --git a/j2k/tests/testData/ast/trait/extendsOneInterface.ide.kt b/j2k/tests/testData/ast/trait/extendsOneInterface.ide.kt deleted file mode 100644 index 5ece953808c..00000000000 --- a/j2k/tests/testData/ast/trait/extendsOneInterface.ide.kt +++ /dev/null @@ -1 +0,0 @@ -trait A : I \ No newline at end of file diff --git a/j2k/tests/testData/ast/trait/interfaceWithFields.ide.kt b/j2k/tests/testData/ast/trait/interfaceWithFields.ide.kt deleted file mode 100644 index 1cd7c1bb0ac..00000000000 --- a/j2k/tests/testData/ast/trait/interfaceWithFields.ide.kt +++ /dev/null @@ -1,7 +0,0 @@ -trait INode { - class object { - val IN: String = "in" - val AT: String = "@" - val COMMA_WITH_SPACE: String = COMMA + SPACE - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/trait/interfaceWithFields.kt b/j2k/tests/testData/ast/trait/interfaceWithFields.kt index 8ca3777deac..1cd7c1bb0ac 100644 --- a/j2k/tests/testData/ast/trait/interfaceWithFields.kt +++ b/j2k/tests/testData/ast/trait/interfaceWithFields.kt @@ -2,6 +2,6 @@ trait INode { class object { val IN: String = "in" val AT: String = "@" - val COMMA_WITH_SPACE: String? = COMMA + SPACE + val COMMA_WITH_SPACE: String = COMMA + SPACE } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/trait/interfaceWithMethodDeclaration.ide.kt b/j2k/tests/testData/ast/trait/interfaceWithMethodDeclaration.ide.kt deleted file mode 100644 index 7379723f17b..00000000000 --- a/j2k/tests/testData/ast/trait/interfaceWithMethodDeclaration.ide.kt +++ /dev/null @@ -1,4 +0,0 @@ -trait INode { - fun getTag(): Tag - fun toKotlin(): String -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/trait/interfaceWithMethodDeclaration.kt b/j2k/tests/testData/ast/trait/interfaceWithMethodDeclaration.kt index 51faca96c9f..7379723f17b 100644 --- a/j2k/tests/testData/ast/trait/interfaceWithMethodDeclaration.kt +++ b/j2k/tests/testData/ast/trait/interfaceWithMethodDeclaration.kt @@ -1,4 +1,4 @@ trait INode { - open fun getTag(): Tag? - open fun toKotlin(): String? + fun getTag(): Tag + fun toKotlin(): String } \ No newline at end of file diff --git a/j2k/tests/testData/ast/trait/interfaceWithStaticFields.ide.kt b/j2k/tests/testData/ast/trait/interfaceWithStaticFields.ide.kt deleted file mode 100644 index 813f496d125..00000000000 --- a/j2k/tests/testData/ast/trait/interfaceWithStaticFields.ide.kt +++ /dev/null @@ -1,7 +0,0 @@ -public trait INode { - class object { - public val IN: String = "in" - public val AT: String = "@" - public val COMMA_WITH_SPACE: String = COMMA + SPACE - } -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/trait/interfaceWithStaticFields.kt b/j2k/tests/testData/ast/trait/interfaceWithStaticFields.kt index 59e0d7cbed5..813f496d125 100644 --- a/j2k/tests/testData/ast/trait/interfaceWithStaticFields.kt +++ b/j2k/tests/testData/ast/trait/interfaceWithStaticFields.kt @@ -2,6 +2,6 @@ public trait INode { class object { public val IN: String = "in" public val AT: String = "@" - public val COMMA_WITH_SPACE: String? = COMMA + SPACE + public val COMMA_WITH_SPACE: String = COMMA + SPACE } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/trait/internalInterface.ide.kt b/j2k/tests/testData/ast/trait/internalInterface.ide.kt deleted file mode 100644 index 03eed70d1fb..00000000000 --- a/j2k/tests/testData/ast/trait/internalInterface.ide.kt +++ /dev/null @@ -1 +0,0 @@ -trait Test \ No newline at end of file diff --git a/j2k/tests/testData/ast/trait/privateInterface.ide.kt b/j2k/tests/testData/ast/trait/privateInterface.ide.kt deleted file mode 100644 index 01664e81afe..00000000000 --- a/j2k/tests/testData/ast/trait/privateInterface.ide.kt +++ /dev/null @@ -1 +0,0 @@ -private trait Test \ No newline at end of file diff --git a/j2k/tests/testData/ast/trait/protectedInterface.ide.kt b/j2k/tests/testData/ast/trait/protectedInterface.ide.kt deleted file mode 100644 index 40e6bbe6a82..00000000000 --- a/j2k/tests/testData/ast/trait/protectedInterface.ide.kt +++ /dev/null @@ -1 +0,0 @@ -protected trait Test \ No newline at end of file diff --git a/j2k/tests/testData/ast/trait/publicInterface.ide.kt b/j2k/tests/testData/ast/trait/publicInterface.ide.kt deleted file mode 100644 index 17b72fe1674..00000000000 --- a/j2k/tests/testData/ast/trait/publicInterface.ide.kt +++ /dev/null @@ -1 +0,0 @@ -public trait Test \ No newline at end of file diff --git a/j2k/tests/testData/ast/tryStatement/commonCaseForTryStatement.ide.kt b/j2k/tests/testData/ast/tryStatement/commonCaseForTryStatement.ide.kt deleted file mode 100644 index 985d275ab2b..00000000000 --- a/j2k/tests/testData/ast/tryStatement/commonCaseForTryStatement.ide.kt +++ /dev/null @@ -1,9 +0,0 @@ -try { - callMethod(params) -} catch (e: Exception) { - println(1) -} catch (e: IOException) { - println(0) -} finally { - println(3) -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.ide.kt b/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.ide.kt deleted file mode 100644 index 76169f577e2..00000000000 --- a/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.ide.kt +++ /dev/null @@ -1,7 +0,0 @@ -try { -} catch (e: Exception) { - println(1) -} catch (e: IOException) { - println(0) -} finally { -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithFinally.ide.kt b/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithFinally.ide.kt deleted file mode 100644 index 328e7ede774..00000000000 --- a/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithFinally.ide.kt +++ /dev/null @@ -1,8 +0,0 @@ -try { -} catch (e: Exception) { - println(1) -} catch (e: IOException) { - println(0) -} finally { - println(3) -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithoutFinally.ide.kt b/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithoutFinally.ide.kt deleted file mode 100644 index cf32e20abc2..00000000000 --- a/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithoutFinally.ide.kt +++ /dev/null @@ -1,6 +0,0 @@ -try { -} catch (e: Exception) { - println(1) -} catch (e: IOException) { - println(0) -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/typeCastExpression/extendsWildcardCast.ide.kt b/j2k/tests/testData/ast/typeCastExpression/extendsWildcardCast.ide.kt deleted file mode 100644 index 41e0ce28f7d..00000000000 --- a/j2k/tests/testData/ast/typeCastExpression/extendsWildcardCast.ide.kt +++ /dev/null @@ -1 +0,0 @@ -(list as List) \ No newline at end of file diff --git a/j2k/tests/testData/ast/typeCastExpression/extendsWildcardCast.kt b/j2k/tests/testData/ast/typeCastExpression/extendsWildcardCast.kt index 05db17e423f..41e0ce28f7d 100644 --- a/j2k/tests/testData/ast/typeCastExpression/extendsWildcardCast.kt +++ b/j2k/tests/testData/ast/typeCastExpression/extendsWildcardCast.kt @@ -1 +1 @@ -(list as List?) \ No newline at end of file +(list as List) \ No newline at end of file diff --git a/j2k/tests/testData/ast/typeCastExpression/fooCast.ide.kt b/j2k/tests/testData/ast/typeCastExpression/fooCast.ide.kt deleted file mode 100644 index ae853a5e094..00000000000 --- a/j2k/tests/testData/ast/typeCastExpression/fooCast.ide.kt +++ /dev/null @@ -1 +0,0 @@ -(t as Foo) \ No newline at end of file diff --git a/j2k/tests/testData/ast/typeCastExpression/fooCast.kt b/j2k/tests/testData/ast/typeCastExpression/fooCast.kt index 109689e1240..ae853a5e094 100644 --- a/j2k/tests/testData/ast/typeCastExpression/fooCast.kt +++ b/j2k/tests/testData/ast/typeCastExpression/fooCast.kt @@ -1 +1 @@ -(t as Foo?) \ No newline at end of file +(t as Foo) \ No newline at end of file diff --git a/j2k/tests/testData/ast/typeCastExpression/intCast.ide.kt b/j2k/tests/testData/ast/typeCastExpression/intCast.ide.kt deleted file mode 100644 index 28dc4fc3816..00000000000 --- a/j2k/tests/testData/ast/typeCastExpression/intCast.ide.kt +++ /dev/null @@ -1 +0,0 @@ -(t as Int) \ No newline at end of file diff --git a/j2k/tests/testData/ast/typeCastExpression/primitiveType.ide.kt b/j2k/tests/testData/ast/typeCastExpression/primitiveType.ide.kt deleted file mode 100644 index e312f02e742..00000000000 --- a/j2k/tests/testData/ast/typeCastExpression/primitiveType.ide.kt +++ /dev/null @@ -1 +0,0 @@ -100.00.toInt() \ No newline at end of file diff --git a/j2k/tests/testData/ast/typeCastExpression/simpleGenericCast.ide.kt b/j2k/tests/testData/ast/typeCastExpression/simpleGenericCast.ide.kt deleted file mode 100644 index c5c0169c4c1..00000000000 --- a/j2k/tests/testData/ast/typeCastExpression/simpleGenericCast.ide.kt +++ /dev/null @@ -1 +0,0 @@ -(list as List) \ No newline at end of file diff --git a/j2k/tests/testData/ast/typeCastExpression/simpleGenericCast.kt b/j2k/tests/testData/ast/typeCastExpression/simpleGenericCast.kt index c48c5d7637d..c5c0169c4c1 100644 --- a/j2k/tests/testData/ast/typeCastExpression/simpleGenericCast.kt +++ b/j2k/tests/testData/ast/typeCastExpression/simpleGenericCast.kt @@ -1 +1 @@ -(list as List?) \ No newline at end of file +(list as List) \ No newline at end of file diff --git a/j2k/tests/testData/ast/typeCastExpression/stringCast.ide.kt b/j2k/tests/testData/ast/typeCastExpression/stringCast.ide.kt deleted file mode 100644 index 88d53877299..00000000000 --- a/j2k/tests/testData/ast/typeCastExpression/stringCast.ide.kt +++ /dev/null @@ -1 +0,0 @@ -(t as String) \ No newline at end of file diff --git a/j2k/tests/testData/ast/typeCastExpression/stringCast.kt b/j2k/tests/testData/ast/typeCastExpression/stringCast.kt index a2020f03831..88d53877299 100644 --- a/j2k/tests/testData/ast/typeCastExpression/stringCast.kt +++ b/j2k/tests/testData/ast/typeCastExpression/stringCast.kt @@ -1 +1 @@ -(t as String?) \ No newline at end of file +(t as String) \ No newline at end of file diff --git a/j2k/tests/testData/ast/typeCastExpression/superWildcardCast.ide.kt b/j2k/tests/testData/ast/typeCastExpression/superWildcardCast.ide.kt deleted file mode 100644 index c440782dd48..00000000000 --- a/j2k/tests/testData/ast/typeCastExpression/superWildcardCast.ide.kt +++ /dev/null @@ -1 +0,0 @@ -(list as List) \ No newline at end of file diff --git a/j2k/tests/testData/ast/typeCastExpression/superWildcardCast.kt b/j2k/tests/testData/ast/typeCastExpression/superWildcardCast.kt index 1bc5cd16259..c440782dd48 100644 --- a/j2k/tests/testData/ast/typeCastExpression/superWildcardCast.kt +++ b/j2k/tests/testData/ast/typeCastExpression/superWildcardCast.kt @@ -1 +1 @@ -(list as List?) \ No newline at end of file +(list as List) \ No newline at end of file diff --git a/j2k/tests/testData/ast/typeCastExpression/wildcardCast.ide.kt b/j2k/tests/testData/ast/typeCastExpression/wildcardCast.ide.kt deleted file mode 100644 index 13fd5a7456a..00000000000 --- a/j2k/tests/testData/ast/typeCastExpression/wildcardCast.ide.kt +++ /dev/null @@ -1 +0,0 @@ -(list as List<*>) \ No newline at end of file diff --git a/j2k/tests/testData/ast/typeCastExpression/wildcardCast.kt b/j2k/tests/testData/ast/typeCastExpression/wildcardCast.kt index 47484fba27b..13fd5a7456a 100644 --- a/j2k/tests/testData/ast/typeCastExpression/wildcardCast.kt +++ b/j2k/tests/testData/ast/typeCastExpression/wildcardCast.kt @@ -1 +1 @@ -(list as List<*>?) \ No newline at end of file +(list as List<*>) \ No newline at end of file diff --git a/j2k/tests/testData/ast/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.ide.kt b/j2k/tests/testData/ast/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.ide.kt deleted file mode 100644 index abc1138c735..00000000000 --- a/j2k/tests/testData/ast/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.ide.kt +++ /dev/null @@ -1 +0,0 @@ -class CC() : A() where T : Comparable, K : Collection \ No newline at end of file diff --git a/j2k/tests/testData/ast/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.kt b/j2k/tests/testData/ast/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.kt index 3f639d4b160..abc1138c735 100644 --- a/j2k/tests/testData/ast/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.kt +++ b/j2k/tests/testData/ast/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.kt @@ -1 +1 @@ -class CC() : A() where T : Comparable?, K : Collection? \ No newline at end of file +class CC() : A() where T : Comparable, K : Collection \ No newline at end of file diff --git a/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBounds.ide.kt b/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBounds.ide.kt deleted file mode 100644 index 3e52cd0539d..00000000000 --- a/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBounds.ide.kt +++ /dev/null @@ -1 +0,0 @@ -class C() where T : Comparable \ No newline at end of file diff --git a/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBounds.kt b/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBounds.kt index b178801cdf0..3e52cd0539d 100644 --- a/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBounds.kt +++ b/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBounds.kt @@ -1 +1 @@ -class C() where T : Comparable? \ No newline at end of file +class C() where T : Comparable \ No newline at end of file diff --git a/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBoundsWithExtending.ide.kt b/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBoundsWithExtending.ide.kt deleted file mode 100644 index 43cd7f4fc3a..00000000000 --- a/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBoundsWithExtending.ide.kt +++ /dev/null @@ -1 +0,0 @@ -class C() : A() where T : Comparable \ No newline at end of file diff --git a/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBoundsWithExtending.kt b/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBoundsWithExtending.kt index ed5af9296d3..43cd7f4fc3a 100644 --- a/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBoundsWithExtending.kt +++ b/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBoundsWithExtending.kt @@ -1 +1 @@ -class C() : A() where T : Comparable? \ No newline at end of file +class C() : A() where T : Comparable \ No newline at end of file diff --git a/j2k/tests/testData/ast/typeParameters/complexExampleWithClassExtending.ide.kt b/j2k/tests/testData/ast/typeParameters/complexExampleWithClassExtending.ide.kt deleted file mode 100644 index b85297cbc4f..00000000000 --- a/j2k/tests/testData/ast/typeParameters/complexExampleWithClassExtending.ide.kt +++ /dev/null @@ -1 +0,0 @@ -trait CommandHandler \ No newline at end of file diff --git a/j2k/tests/testData/ast/typeParameters/complexExampleWithClassExtending.kt b/j2k/tests/testData/ast/typeParameters/complexExampleWithClassExtending.kt index fc45262d371..b85297cbc4f 100644 --- a/j2k/tests/testData/ast/typeParameters/complexExampleWithClassExtending.kt +++ b/j2k/tests/testData/ast/typeParameters/complexExampleWithClassExtending.kt @@ -1 +1 @@ -trait CommandHandler \ No newline at end of file +trait CommandHandler \ No newline at end of file diff --git a/j2k/tests/testData/ast/typeParameters/complexExampleWithClassMultiplyExtending.ide.kt b/j2k/tests/testData/ast/typeParameters/complexExampleWithClassMultiplyExtending.ide.kt deleted file mode 100644 index 7fefeae3e8f..00000000000 --- a/j2k/tests/testData/ast/typeParameters/complexExampleWithClassMultiplyExtending.ide.kt +++ /dev/null @@ -1 +0,0 @@ -trait CommandHandler \ No newline at end of file diff --git a/j2k/tests/testData/ast/typeParameters/complexExampleWithClassMultiplyExtending.kt b/j2k/tests/testData/ast/typeParameters/complexExampleWithClassMultiplyExtending.kt index 45b21508477..7fefeae3e8f 100644 --- a/j2k/tests/testData/ast/typeParameters/complexExampleWithClassMultiplyExtending.kt +++ b/j2k/tests/testData/ast/typeParameters/complexExampleWithClassMultiplyExtending.kt @@ -1 +1 @@ -trait CommandHandler \ No newline at end of file +trait CommandHandler \ No newline at end of file diff --git a/j2k/tests/testData/ast/typeParameters/genericClass.ide.kt b/j2k/tests/testData/ast/typeParameters/genericClass.ide.kt deleted file mode 100644 index e43deaba778..00000000000 --- a/j2k/tests/testData/ast/typeParameters/genericClass.ide.kt +++ /dev/null @@ -1 +0,0 @@ -class Comparable() \ No newline at end of file diff --git a/j2k/tests/testData/ast/typeParameters/genericParam-settings.java b/j2k/tests/testData/ast/typeParameters/genericParam-settings.java new file mode 100644 index 00000000000..fff20ca543a --- /dev/null +++ b/j2k/tests/testData/ast/typeParameters/genericParam-settings.java @@ -0,0 +1,4 @@ +//statement +// !forceNotNullTypes: false +// !specifyLocalVariableTypeByDefault: true +List l; \ No newline at end of file diff --git a/j2k/tests/testData/ast/typeParameters/genericParam-settings.kt b/j2k/tests/testData/ast/typeParameters/genericParam-settings.kt new file mode 100644 index 00000000000..963f34c1264 --- /dev/null +++ b/j2k/tests/testData/ast/typeParameters/genericParam-settings.kt @@ -0,0 +1,3 @@ +// !forceNotNullTypes: false +// !specifyLocalVariableTypeByDefault: true +val l: List? \ No newline at end of file diff --git a/j2k/tests/testData/ast/typeParameters/genericParam.ide.kt b/j2k/tests/testData/ast/typeParameters/genericParam.ide.kt deleted file mode 100644 index e7f54df3449..00000000000 --- a/j2k/tests/testData/ast/typeParameters/genericParam.ide.kt +++ /dev/null @@ -1 +0,0 @@ -val l: List \ No newline at end of file diff --git a/j2k/tests/testData/ast/typeParameters/genericParam.kt b/j2k/tests/testData/ast/typeParameters/genericParam.kt index 45fd6c20cf2..e7f54df3449 100644 --- a/j2k/tests/testData/ast/typeParameters/genericParam.kt +++ b/j2k/tests/testData/ast/typeParameters/genericParam.kt @@ -1 +1 @@ -var l: List? \ No newline at end of file +val l: List \ No newline at end of file diff --git a/j2k/tests/testData/ast/typeParameters/manyGenericParams.ide.kt b/j2k/tests/testData/ast/typeParameters/manyGenericParams.ide.kt deleted file mode 100644 index c8219f80a79..00000000000 --- a/j2k/tests/testData/ast/typeParameters/manyGenericParams.ide.kt +++ /dev/null @@ -1 +0,0 @@ -val l: List \ No newline at end of file diff --git a/j2k/tests/testData/ast/typeParameters/manyGenericParams.kt b/j2k/tests/testData/ast/typeParameters/manyGenericParams.kt index dec3e5c17b9..c8219f80a79 100644 --- a/j2k/tests/testData/ast/typeParameters/manyGenericParams.kt +++ b/j2k/tests/testData/ast/typeParameters/manyGenericParams.kt @@ -1 +1 @@ -var l: List? \ No newline at end of file +val l: List \ No newline at end of file diff --git a/j2k/tests/testData/ast/typeParameters/methodDoubleParametrizationWithTwoBounds.ide.kt b/j2k/tests/testData/ast/typeParameters/methodDoubleParametrizationWithTwoBounds.ide.kt deleted file mode 100644 index ea8e4426ebb..00000000000 --- a/j2k/tests/testData/ast/typeParameters/methodDoubleParametrizationWithTwoBounds.ide.kt +++ /dev/null @@ -1,2 +0,0 @@ -fun max(coll: Collection): T where T : Comparable, K : Collection { -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/typeParameters/methodDoubleParametrizationWithTwoBounds.kt b/j2k/tests/testData/ast/typeParameters/methodDoubleParametrizationWithTwoBounds.kt index 94037a798d9..ea8e4426ebb 100644 --- a/j2k/tests/testData/ast/typeParameters/methodDoubleParametrizationWithTwoBounds.kt +++ b/j2k/tests/testData/ast/typeParameters/methodDoubleParametrizationWithTwoBounds.kt @@ -1,2 +1,2 @@ -fun max(coll: Collection?): T? where T : Comparable?, K : Collection? { +fun max(coll: Collection): T where T : Comparable, K : Collection { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.ide.kt b/j2k/tests/testData/ast/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.ide.kt deleted file mode 100644 index c7a4593dd43..00000000000 --- a/j2k/tests/testData/ast/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.ide.kt +++ /dev/null @@ -1 +0,0 @@ -trait I : II where T : Comparable, K : Collection \ No newline at end of file diff --git a/j2k/tests/testData/ast/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.kt b/j2k/tests/testData/ast/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.kt index dab444cb5ed..c7a4593dd43 100644 --- a/j2k/tests/testData/ast/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.kt +++ b/j2k/tests/testData/ast/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.kt @@ -1 +1 @@ -trait I : II where T : Comparable?, K : Collection? \ No newline at end of file +trait I : II where T : Comparable, K : Collection \ No newline at end of file diff --git a/j2k/tests/testData/ast/typeParameters/where.ide.kt b/j2k/tests/testData/ast/typeParameters/where.ide.kt deleted file mode 100644 index 347e80c1306..00000000000 --- a/j2k/tests/testData/ast/typeParameters/where.ide.kt +++ /dev/null @@ -1,2 +0,0 @@ -fun max(coll: Collection): T where T : Comparable { -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/typeParameters/where.kt b/j2k/tests/testData/ast/typeParameters/where.kt index 8538b7536d4..347e80c1306 100644 --- a/j2k/tests/testData/ast/typeParameters/where.kt +++ b/j2k/tests/testData/ast/typeParameters/where.kt @@ -1,2 +1,2 @@ -fun max(coll: Collection?): T? where T : Comparable? { +fun max(coll: Collection): T where T : Comparable { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/varArg/ellipsisTypeSeveralParams.ide.kt b/j2k/tests/testData/ast/varArg/ellipsisTypeSeveralParams.ide.kt deleted file mode 100644 index 28aec67d146..00000000000 --- a/j2k/tests/testData/ast/varArg/ellipsisTypeSeveralParams.ide.kt +++ /dev/null @@ -1 +0,0 @@ -fun format(pattern: String, vararg arguments: Any): String \ No newline at end of file diff --git a/j2k/tests/testData/ast/varArg/ellipsisTypeSeveralParams.kt b/j2k/tests/testData/ast/varArg/ellipsisTypeSeveralParams.kt index f81a8d2b812..28aec67d146 100644 --- a/j2k/tests/testData/ast/varArg/ellipsisTypeSeveralParams.kt +++ b/j2k/tests/testData/ast/varArg/ellipsisTypeSeveralParams.kt @@ -1 +1 @@ -fun format(pattern: String?, vararg arguments: Any?): String? \ No newline at end of file +fun format(pattern: String, vararg arguments: Any): String \ No newline at end of file diff --git a/j2k/tests/testData/ast/varArg/ellipsisTypeSingleParams.ide.kt b/j2k/tests/testData/ast/varArg/ellipsisTypeSingleParams.ide.kt deleted file mode 100644 index e1403964927..00000000000 --- a/j2k/tests/testData/ast/varArg/ellipsisTypeSingleParams.ide.kt +++ /dev/null @@ -1,2 +0,0 @@ -fun pushAll(vararg objs: Any) { -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/varArg/ellipsisTypeSingleParams.kt b/j2k/tests/testData/ast/varArg/ellipsisTypeSingleParams.kt index 34689e6d465..e1403964927 100644 --- a/j2k/tests/testData/ast/varArg/ellipsisTypeSingleParams.kt +++ b/j2k/tests/testData/ast/varArg/ellipsisTypeSingleParams.kt @@ -1,2 +1,2 @@ -fun pushAll(vararg objs: Any?) { +fun pushAll(vararg objs: Any) { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/whileStatement/whileWithBlock.ide.kt b/j2k/tests/testData/ast/whileStatement/whileWithBlock.ide.kt deleted file mode 100644 index 01995926e71..00000000000 --- a/j2k/tests/testData/ast/whileStatement/whileWithBlock.ide.kt +++ /dev/null @@ -1,4 +0,0 @@ -while (a > b) { - val i = 1 - i = i + 1 -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/whileStatement/whileWithBlock.kt b/j2k/tests/testData/ast/whileStatement/whileWithBlock.kt index f88a69acbce..01995926e71 100644 --- a/j2k/tests/testData/ast/whileStatement/whileWithBlock.kt +++ b/j2k/tests/testData/ast/whileStatement/whileWithBlock.kt @@ -1,4 +1,4 @@ while (a > b) { - var i: Int = 1 + val i = 1 i = i + 1 } \ No newline at end of file diff --git a/j2k/tests/testData/ast/whileStatement/whileWithEmptyBlock.ide.kt b/j2k/tests/testData/ast/whileStatement/whileWithEmptyBlock.ide.kt deleted file mode 100644 index 2f3daa10853..00000000000 --- a/j2k/tests/testData/ast/whileStatement/whileWithEmptyBlock.ide.kt +++ /dev/null @@ -1,2 +0,0 @@ -while (true) { -} \ No newline at end of file diff --git a/j2k/tests/testData/ast/whileStatement/whileWithExpression.ide.kt b/j2k/tests/testData/ast/whileStatement/whileWithExpression.ide.kt deleted file mode 100644 index 2d8af0c7945..00000000000 --- a/j2k/tests/testData/ast/whileStatement/whileWithExpression.ide.kt +++ /dev/null @@ -1,2 +0,0 @@ -while (true) - i = i + 1 \ No newline at end of file diff --git a/j2k/tests/testData/ast/whileStatement/whileWithReturn.ide.kt b/j2k/tests/testData/ast/whileStatement/whileWithReturn.ide.kt deleted file mode 100644 index 2fe2ef09188..00000000000 --- a/j2k/tests/testData/ast/whileStatement/whileWithReturn.ide.kt +++ /dev/null @@ -1,2 +0,0 @@ -while (true) - return 1 \ No newline at end of file