Commit Graph

108 Commits

Author SHA1 Message Date
Pavel V. Talanov 7dc7db04b3 Formatter: support "while on new line" option 2014-01-20 19:54:43 +04:00
Pavel V. Talanov 5caabc20f6 Formatter: support "else on new line" option 2014-01-20 19:54:42 +04:00
Pavel V. Talanov e0b1170dc6 Formatter: left brace formatting for "for in ..." 2014-01-20 19:54:35 +04:00
Pavel V. Talanov 2aea631c1b Formatter: left brace formatting for "do while" 2014-01-20 19:54:34 +04:00
Pavel V. Talanov 2d6f8aef4e Formatter: introduce "Put left brace on new line option", support this option for "if/else" expressions 2014-01-20 19:54:25 +04:00
Natalia Ukhorskaya f2f1a1313d Add jdk jars to kotlin classpath
#KT-4214 Fixed
2013-12-26 13:50:10 +04:00
Evgeny Gerashchenko bd4073932b Generating inner suites when dir is not empty, but has not files related to current test. 2013-12-24 23:15:28 +04:00
Evgeny Gerashchenko 61d346e93d Reverted changes in test data to fix tests. 2013-12-23 18:28:10 +04:00
Evgeny Gerashchenko f7d33d2297 Removed comments auto-generated by IDEA. 2013-12-23 15:58:36 +04:00
Pavel V. Talanov a25ced9aa0 Refactor Converter:
Minor: remove redundant public modifiers and fix formatting issues
2013-12-22 16:50:00 +04:00
Pavel V. Talanov 0e484d9a14 Converter tests:
Use JetTestUtils.assertEqualsToFile for comparison, write test data and fail if test data is absent
2013-12-22 16:49:58 +04:00
Pavel V. Talanov 1570a3792b Converter tests:
Change test data files extension to "java"
2013-12-22 16:49:57 +04:00
Pavel Talanov d69c61c972 Converter:
Preserve white spaces for top members (classes, package statements, comments)
2013-12-22 16:49:54 +04:00
Pavel Talanov 098a80a2af Converter:
Member comments are preserved (not only doc comments)
2013-12-22 16:49:53 +04:00
Pavel Talanov f08861c14a Converter:
Wrong test data fixed
2013-12-22 16:49:52 +04:00
Pavel Talanov 35f9d7b834 Converter:
Preserve formatting in member lists
Introduce MemberList
Refactor handling of static/non static members in classes
2013-12-22 16:49:50 +04:00
Pavel V. Talanov 30c016fa2a Converter tests:
Add tests for preserving white spaces between class members
2013-12-22 16:49:49 +04:00
Pavel V. Talanov 7f88de1dba Converter tests:
White spaces in member lists are preserved
2013-12-22 16:49:47 +04:00
Pavel Talanov 4b1b3aa122 Refactor Converter:
Minor: Move StatementList class
2013-12-22 16:49:46 +04:00
Pavel Talanov 5dc790246a Refactor Converter:
Minor: change naming convention of EMPTY_* constants to Empty
2013-12-22 16:49:45 +04:00
Pavel Talanov 8577d3ca55 Converter:
Preserve white spaces inside code blocks
Introduce WhiteSpaceSeparatedElementList which keeps track of whitespaces
Introduce StatementList
Change old test data accordingly
2013-12-22 16:49:43 +04:00
Pavel Talanov fabfcb4271 Refactor converter:
Minor: Fix "deprecated" warnings
2013-12-22 16:49:42 +04:00
Pavel Talanov d7e1c1f0a2 Refactor converter:
Minor: Replace *to* naming convention by convert* convention
2013-12-22 16:49:40 +04:00
Pavel Talanov ffbbbc8529 Refactor converter:
Refactor handling of type parameter list
2013-12-22 16:49:39 +04:00
Pavel Talanov 9ed6fe8888 Refactor converter:
Refactor handling of doc comments
2013-12-22 16:46:56 +04:00
Pavel Talanov f8c8e59f94 Refactor converter:
Remove unneeded filtering
2013-12-22 16:46:54 +04:00
Pavel V. Talanov 04edb3d742 Converter:
Fix inadequate formatting
2013-12-22 16:46:53 +04:00
Pavel V. Talanov 741e031ff1 Converter:
Use formatter in converter tests
Reformat test data
2013-12-22 16:46:51 +04:00
Pavel V. Talanov ea6b751645 Converter:
Place function type parameters before function name
2013-12-22 16:46:49 +04:00
Pavel V. Talanov f912c0bc65 Converter: Fix converting a single import statement
Untested (tests for copy paste processor needed)
2013-12-22 16:46:48 +04:00
Pavel V. Talanov df74352ea3 Converter:
Fix converting import list
Add tests for imports problem
Add 'element' test type
2013-12-22 16:46:46 +04:00
Pavel Talanov ba87779a8e Refactor converter:
Move the logic dealing with imports to Imports.kt file, refactor the code
2013-12-22 16:46:44 +04:00
Pavel V. Talanov 0f9a93ffca Refactor converter:
Move some of the code out of Converter.kt to newly created MethodUtils.kt
Simplify and clarify that code
2013-12-22 16:46:43 +04:00
Pavel V. Talanov 5ea324a320 Refactor converter:
Remove unused flags
2013-12-22 16:46:41 +04:00
Pavel V. Talanov 2b9599e987 Refactor converter:
Move some of the code out of Converter.kt to newly created MainMethodUtils.kt and ConstructorUtils.kt
Get rid of class object of Converter class
2013-12-22 15:53:23 +04:00
Pavel V. Talanov 38f5361021 Converter:
Do not generate redundant visibility modifier for overrides
2013-12-22 15:53:22 +04:00
Pavel V. Talanov d98d8cfa7f Converter:
Functions are final by default in plugin mode
2013-12-22 15:53:21 +04:00
Pavel V. Talanov bf4e27b152 Converter:
Classes are final by default in plugin mode
2013-12-22 15:53:19 +04:00
Pavel V. Talanov 354daa91bb Converter:
Remove outdated compatibility import mode
2013-12-22 15:53:18 +04:00
Pavel V. Talanov f9586581a9 Converter:
Fix assert statement
2013-12-22 15:53:15 +04:00
Pavel V. Talanov 21bc2887d2 Converter:
Omit Unit return type
Refactor handling of Unit type: extract separate object UnitType
2013-12-22 15:53:14 +04:00
Pavel V. Talanov 82b19499e3 Converter tests:
Use generated tests approach in converter tests

Introduce two seperate generated test cases of each of configurations, all tests are generated in both test cases
Test data for plugin configuration has extension "ide.kt", for basic configuration "*.kt"
Test data file is used to determine type of the test (file/class/expression/...) instead of directory, all test data is moved accordingly
Add abstract base classes for generated tests
Rename test folder "file" to "misc" (for the lack of imagination)
2013-12-22 15:53:13 +04:00
Pavel Talanov cba8d3b6db Converter:
Replace hack used to configure Converter by ConverterSettings class
Minor: remove redundant open modifiers, add override annotations
2013-12-22 15:37:09 +04:00
Pavel Talanov 3edefcf598 Converter:
Refactor handling of primitive types
Inject converter in places of use
Make Element and Node traits
2013-12-22 15:37:08 +04:00
Pavel V. Talanov e19373cac7 Hack that adds more convenient defaults for J2K, minimal test for these defaults 2013-10-29 21:03:37 +04:00
Pavel V. Talanov a649eb52cf J2K: Do not specify type of for loop parameter 2013-10-29 21:03:36 +04:00
Pavel V. Talanov 28f3d692ab Apply reformat code and optimize imports to kotlin code in j2k
Minor: remove Unit return types
2013-10-29 21:03:35 +04:00
Pavel V. Talanov 2a5657e0e6 Convert JavaToKotlinTranslator, StandaloneJavaToKotlinConverterTest, TestCaseBuilder to Kotlin 2013-10-29 21:03:34 +04:00
Pavel V. Talanov 212c4f62d3 Delete commented out code 2013-10-29 21:03:33 +04:00
Pavel V. Talanov 5e254f6edb Copyright generated for new version of Java to Kotlin converter 2013-10-29 21:03:32 +04:00