diff --git a/j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterBasicTestGenerated.java b/j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterBasicTestGenerated.java index a0cd88819d0..540bb1a9e12 100644 --- a/j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterBasicTestGenerated.java +++ b/j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterBasicTestGenerated.java @@ -31,7 +31,7 @@ import org.jetbrains.jet.j2k.test.AbstractJavaToKotlinConverterBasicTest; /** 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.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}) +@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 { public void testAllFilesPresentInAst() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast"), Pattern.compile("^(.+)\\.jav$"), true); @@ -1043,6 +1043,34 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli } + @TestMetadata("j2k/tests/testData/ast/formatting") + public static class Formatting extends AbstractJavaToKotlinConverterBasicTest { + public void testAllFilesPresentInFormatting() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/formatting"), Pattern.compile("^(.+)\\.jav$"), true); + } + + @TestMetadata("nonStaticMembers.jav") + public void testNonStaticMembers() throws Exception { + doTest("j2k/tests/testData/ast/formatting/nonStaticMembers.jav"); + } + + @TestMetadata("nonStaticMembersWithComments.jav") + public void testNonStaticMembersWithComments() throws Exception { + doTest("j2k/tests/testData/ast/formatting/nonStaticMembersWithComments.jav"); + } + + @TestMetadata("staticAndNonStaticMembersWithComments.jav") + public void testStaticAndNonStaticMembersWithComments() throws Exception { + doTest("j2k/tests/testData/ast/formatting/staticAndNonStaticMembersWithComments.jav"); + } + + @TestMetadata("staticMembersWithComments.jav") + public void testStaticMembersWithComments() throws Exception { + doTest("j2k/tests/testData/ast/formatting/staticMembersWithComments.jav"); + } + + } + @TestMetadata("j2k/tests/testData/ast/function") public static class Function extends AbstractJavaToKotlinConverterBasicTest { @TestMetadata("abstractMethod.jav") @@ -2290,6 +2318,7 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli 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); diff --git a/j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterPluginTestGenerated.java b/j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterPluginTestGenerated.java index 71177d709fc..16d0071426a 100644 --- a/j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterPluginTestGenerated.java +++ b/j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterPluginTestGenerated.java @@ -31,7 +31,7 @@ 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.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}) +@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("^(.+)\\.jav$"), true); @@ -1043,6 +1043,34 @@ public class JavaToKotlinConverterPluginTestGenerated extends AbstractJavaToKotl } + @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("^(.+)\\.jav$"), true); + } + + @TestMetadata("nonStaticMembers.jav") + public void testNonStaticMembers() throws Exception { + doTest("j2k/tests/testData/ast/formatting/nonStaticMembers.jav"); + } + + @TestMetadata("nonStaticMembersWithComments.jav") + public void testNonStaticMembersWithComments() throws Exception { + doTest("j2k/tests/testData/ast/formatting/nonStaticMembersWithComments.jav"); + } + + @TestMetadata("staticAndNonStaticMembersWithComments.jav") + public void testStaticAndNonStaticMembersWithComments() throws Exception { + doTest("j2k/tests/testData/ast/formatting/staticAndNonStaticMembersWithComments.jav"); + } + + @TestMetadata("staticMembersWithComments.jav") + public void testStaticMembersWithComments() throws Exception { + doTest("j2k/tests/testData/ast/formatting/staticMembersWithComments.jav"); + } + + } + @TestMetadata("j2k/tests/testData/ast/function") public static class Function extends AbstractJavaToKotlinConverterPluginTest { @TestMetadata("abstractMethod.jav") @@ -2290,6 +2318,7 @@ public class JavaToKotlinConverterPluginTestGenerated extends AbstractJavaToKotl 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); diff --git a/j2k/tests/testData/ast/formatting/nonStaticMembers.ide.kt b/j2k/tests/testData/ast/formatting/nonStaticMembers.ide.kt new file mode 100644 index 00000000000..32ea2da202f --- /dev/null +++ b/j2k/tests/testData/ast/formatting/nonStaticMembers.ide.kt @@ -0,0 +1,13 @@ +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.jav b/j2k/tests/testData/ast/formatting/nonStaticMembers.jav new file mode 100644 index 00000000000..5c56f5c61d0 --- /dev/null +++ b/j2k/tests/testData/ast/formatting/nonStaticMembers.jav @@ -0,0 +1,14 @@ +//file +class F { + + void f1() { + } + + + void f2() { + } + Integer i = 0; + + void 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 new file mode 100644 index 00000000000..15b6123fa90 --- /dev/null +++ b/j2k/tests/testData/ast/formatting/nonStaticMembers.kt @@ -0,0 +1,13 @@ +open class F() { + + open fun f1() { + } + + + open fun f2() { + } + var i: Int? = 0 + + open 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 new file mode 100644 index 00000000000..163c5d65b5a --- /dev/null +++ b/j2k/tests/testData/ast/formatting/nonStaticMembersWithComments.ide.kt @@ -0,0 +1,26 @@ +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.jav b/j2k/tests/testData/ast/formatting/nonStaticMembersWithComments.jav new file mode 100644 index 00000000000..021aba1c509 --- /dev/null +++ b/j2k/tests/testData/ast/formatting/nonStaticMembersWithComments.jav @@ -0,0 +1,27 @@ +//file +class F { + + //c1 + + /*c2*/ + + void f1() { + } + + + //c3 + + + + + //c4 + + void f2() { + } + Integer i = 0; + + void 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 new file mode 100644 index 00000000000..f15c735e69f --- /dev/null +++ b/j2k/tests/testData/ast/formatting/nonStaticMembersWithComments.kt @@ -0,0 +1,26 @@ +open class F() { + + //c1 + + /*c2*/ + + open fun f1() { + } + + + //c3 + + + + + //c4 + + open fun f2() { + } + var i: Int? = 0 + + open fun f3() { + } + + //c5 +} \ No newline at end of file diff --git a/j2k/tests/testData/ast/formatting/staticAndNonStaticMembersWithComments.ide.kt b/j2k/tests/testData/ast/formatting/staticAndNonStaticMembersWithComments.ide.kt new file mode 100644 index 00000000000..7840a9982f7 --- /dev/null +++ b/j2k/tests/testData/ast/formatting/staticAndNonStaticMembersWithComments.ide.kt @@ -0,0 +1,38 @@ +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.jav b/j2k/tests/testData/ast/formatting/staticAndNonStaticMembersWithComments.jav new file mode 100644 index 00000000000..546756bc0b7 --- /dev/null +++ b/j2k/tests/testData/ast/formatting/staticAndNonStaticMembersWithComments.jav @@ -0,0 +1,36 @@ +//file +class F { + + //c1 + + /*c2*/ + + static void f1() { + } + + + //c3 + + + + + //c4 + + void f2() { + } + static Integer i = 0; + + void f3() { + } + + void f4() { + } + + //c5 + + static void 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 new file mode 100644 index 00000000000..ff2e41296e2 --- /dev/null +++ b/j2k/tests/testData/ast/formatting/staticAndNonStaticMembersWithComments.kt @@ -0,0 +1,38 @@ +open class F() { + + + //c3 + + + + + //c4 + + open fun f2() { + } + + open fun f3() { + } + + open fun f4() { + } + + class object { + + //c1 + + /*c2*/ + + open fun f1() { + } + var i: Int? = 0 + + //c5 + + open fun f5() { + } + + //c6 + + } +} \ No newline at end of file diff --git a/j2k/tests/testData/ast/formatting/staticMembersWithComments.ide.kt b/j2k/tests/testData/ast/formatting/staticMembersWithComments.ide.kt new file mode 100644 index 00000000000..c3197e5af63 --- /dev/null +++ b/j2k/tests/testData/ast/formatting/staticMembersWithComments.ide.kt @@ -0,0 +1,28 @@ +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.jav b/j2k/tests/testData/ast/formatting/staticMembersWithComments.jav new file mode 100644 index 00000000000..cd1c3247063 --- /dev/null +++ b/j2k/tests/testData/ast/formatting/staticMembersWithComments.jav @@ -0,0 +1,27 @@ +//file +class F { + + //c1 + + /*c2*/ + + static void f1() { + } + + + //c3 + + + + + //c4 + + static void f2() { + } + static Integer i = 0; + + static void 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 new file mode 100644 index 00000000000..b1004da0197 --- /dev/null +++ b/j2k/tests/testData/ast/formatting/staticMembersWithComments.kt @@ -0,0 +1,28 @@ +open class F() { + class object { + + //c1 + + /*c2*/ + + open fun f1() { + } + + + //c3 + + + + + //c4 + + open fun f2() { + } + var i: Int? = 0 + + open fun f3() { + } + + //c5 + } +} \ No newline at end of file