Commit Graph

19897 Commits

Author SHA1 Message Date
Dmitry Jemerov f4a25f69b1 Merge pull request #552 from JetBrains/rr/yole/kdoc-generate
structured rendering of doc comments in quick documentation dialog
2015-01-21 23:32:10 +01:00
Valentin Kipyatkov 4f2ecffee1 Better tests 2015-01-21 20:10:19 +03:00
Valentin Kipyatkov d2016e2670 Fixing compilation 2015-01-21 20:10:19 +03:00
Valentin Kipyatkov 77a560775f KT-6628 Allow imports of classes from root package
#KT-6628 Fixed
2015-01-21 20:10:18 +03:00
Valentin Kipyatkov fa779bbdd2 Fixed KT-4085 Usability problem: Can't import protected nested class
#KT-4085 Fixed
2015-01-21 20:10:18 +03:00
Valentin Kipyatkov 974982463c Visible classes take priority when resolving imports with * 2015-01-21 20:10:18 +03:00
Valentin Kipyatkov b9d47ffe7a Changed priority for default imports + default imports include all built-ins explicitly for java module
#KT-4374 Fixed
2015-01-21 20:10:18 +03:00
Valentin Kipyatkov ae9ebbec7d Corrected test data 2015-01-21 20:10:18 +03:00
Valentin Kipyatkov e117e5aa16 It is more correct to resolve default imports this way 2015-01-21 20:10:17 +03:00
Valentin Kipyatkov 7ce3925d71 Removed USELESS_HIDDEN_IMPORT error for it cannot happen anymore 2015-01-21 20:10:17 +03:00
Valentin Kipyatkov 929d6b885d Current package members to have less priority than explicit imports 2015-01-21 20:10:17 +03:00
Valentin Kipyatkov 59f24020b2 Renames 2015-01-21 20:10:17 +03:00
Valentin Kipyatkov 3caef82184 Big refactoring of imports resolve - preparing to change current package members priority 2015-01-21 20:10:17 +03:00
Valentin Kipyatkov 45a7c3bcdc No need to inherit from LazyEntity 2015-01-21 20:10:17 +03:00
Valentin Kipyatkov 9317593565 Fixed test data to be compilable with new import rules 2015-01-21 20:10:17 +03:00
Valentin Kipyatkov a9d4fd5213 Moved tests for imports into proper group 2015-01-21 20:10:16 +03:00
Valentin Kipyatkov 2c60201832 Fixed test data (+ renamed test) 2015-01-21 20:10:16 +03:00
Valentin Kipyatkov 2e420fc312 Conflicting imports error for imports of classes and packages 2015-01-21 20:10:16 +03:00
Valentin Kipyatkov 0c74f1679b Variable renames 2015-01-21 20:10:16 +03:00
Valentin Kipyatkov b888ea601c Changed imports semantics: imports order does not affect resolve, explicit imports have higher priority for classes 2015-01-21 20:10:16 +03:00
Valentin Kipyatkov 8fc0063410 Refactoring of Importer - PlatformToKotlinClassMap is the same for all imports 2015-01-21 20:10:16 +03:00
Valentin Kipyatkov 58fb303f8c Code improvements after conversion 2015-01-21 20:10:15 +03:00
Valentin Kipyatkov de3a93264c Converted code to Kotlin - step 2 2015-01-21 20:10:15 +03:00
Valentin Kipyatkov 251d98a602 Converted code to Kotlin (step 1 to keep history) 2015-01-21 20:10:15 +03:00
Valentin Kipyatkov b625298cd4 Reordered methods 2015-01-21 20:10:15 +03:00
Valentin Kipyatkov 2b215681c9 Code refactoring - no need to filter out classes with Kotlin analogs from inside classes 2015-01-21 20:10:15 +03:00
Dmitry Jemerov 906c0fd7f7 Merge branch 'master' into rr/yole/kdoc-generate 2015-01-21 18:00:21 +01:00
Dmitry Jemerov 609914fb4a code review; add test for brackets around subject name in tag 2015-01-21 17:23:24 +01:00
Nikolay Krasko 77cb279154 Don't restrict number of builds 2015-01-21 18:36:08 +03:00
Dmitry Jemerov 659c54d7e6 structured rendering of doc comments in quick documentation dialog 2015-01-21 16:20:20 +01:00
Alexander Udalov 5194310d6e Use javac2 filter to disable NotNull instrumentation of Kotlin code
We skip all classes annotated with kotlin/jvm/internal/<anything> (currently
KotlinClass, KotlinPackage and KotlinSyntheticClass) because Kotlin compiler
emits its own nullability assertions
2015-01-21 16:17:50 +03:00
Svetlana Isakova 9dbcd8b55f Approximate captured types only when necessary 2015-01-21 15:37:33 +03:00
Dmitry Jemerov 6c814279fc Merge pull request #550 from JetBrains/kdoc-inherit
allow inheriting doc comments from base classes
2015-01-21 13:26:01 +01:00
Natalia Ukhorskaya 8b5279897f Gradle: fix kotlinOptions for kotlin-android plugin 2015-01-21 13:58:16 +03:00
Natalia Ukhorskaya bcbfb1bd77 Gradle: include groovy output to kotlin-gradle-plugin.jar
#KT-6635 Fixed
2015-01-21 13:58:16 +03:00
Natalia Ukhorskaya 72510beb69 Android tests: generate tests only for directories 'box' and 'boxWithStdlib' 2015-01-21 13:58:15 +03:00
Ilya Ryzhenkov 3a9e41f2d7 stdlib: Pair and Triple .toList() 2015-01-20 22:39:24 +03:00
Ilya Ryzhenkov 95d4accda7 stdlib: add flatten() 2015-01-20 22:39:24 +03:00
Ilya Ryzhenkov 1d4591d99c stdlib: add sumBy(function) 2015-01-20 22:39:23 +03:00
Ilya Ryzhenkov 4ee64d7283 Covering stdlib with tests. 2015-01-20 22:37:16 +03:00
Ilya Ryzhenkov c3eaf1b869 Fix return type of linkedHashSetOf to be more specific. 2015-01-20 22:37:16 +03:00
Ilya Ryzhenkov 9b04f57a25 Collection tests: format and fix usages of deprecated symbols. 2015-01-20 22:37:15 +03:00
Evgeny Gerashchenko 5a77a70710 Merge pull request #551 from JetBrains/delete-operation-mode-provider
delete unused OperationModeProvider class
2015-01-20 22:52:33 +04:00
Dmitry Jemerov 431cdd2245 delete unused OperationModeProvider class 2015-01-20 19:51:24 +01:00
Dmitry Jemerov 0c2b230e4a allow inheriting doc comments from base classes 2015-01-20 19:20:59 +01:00
Alexander Udalov ae6ffeb88a Skip inlined lambdas when determining EnclosingMethod
#KT-6368 Fixed
2015-01-20 21:02:57 +03:00
Alexander Udalov 20dc3438a2 Fix generation of InnerClasses/EnclosingMethod attributes
Generate InnerClasses for each outer class and each direct inner class in all
inheritors of MemberCodegen, i.e. for classes, objects, lambdas, local classes,
etc.

Also skip lambdas which will be inlined when calculating outer class for
EnclosingMethod

 #KT-5447 Fixed
 #KT-5478 Fixed
2015-01-20 21:02:56 +03:00
Dmitry Jemerov 432bdcd0fc Merge pull request #549 from JetBrains/rr/yole/kdoc-parser
Rr/yole/kdoc parser
2015-01-20 18:54:17 +01:00
Dmitry Jemerov 8217563aac KDocTokens.START can't be the first token of a tag 2015-01-20 18:08:02 +01:00
Dmitry Jemerov 31f5441f6b code review 2015-01-20 18:08:01 +01:00