Commit Graph

299 Commits

Author SHA1 Message Date
Mikhail Mutcianko 889a3d38ad add android layout file searching to kotlin jps plugin
Original commit: c6b8cbbb01
2015-02-26 15:25:28 +03:00
Nikolay Krasko 0a8fa0238d Add kotlin runtime to idea-jps-common module dependency
#KT-6826 Fixed

Original commit: c8c1ce521b
2015-02-26 12:37:32 +03:00
Nikolay Krasko 0b7c9870a6 Do not generate long lines and simplify merge in generated tests
Original commit: 8ea9d39e98
2015-02-24 13:15:09 +03:00
Dmitry Jemerov 7076fe6eb1 vendor and homepage
Original commit: ce4b2db8f6
2015-02-19 15:35:46 +03:00
Nikolay Krasko d5e88324fc Fixed test data according to fixed bug in IDEA JPS.
Original commit: f1774bd6fb
2015-02-19 14:36:23 +03:00
Evgeny Gerashchenko 88964f4276 Added tests with conversion between Java and Kotlin and moving class.
Original commit: 460a77275a
2015-02-18 18:51:59 +03:00
Evgeny Gerashchenko 7c78491e42 Fixed test data according to fixed bug in IDEA JPS.
Original commit: f09fd923f3
2015-02-18 18:51:50 +03:00
Evgeny Gerashchenko 52134ed01b Filtering out non-existent directories from generated classpath. The check is so simple, because there may be, e.g. non-existent production output directory for just created module.
#KT-6703 fixed

Original commit: 4ddaa5cdda
2015-02-18 13:37:35 +03:00
Evgeny Gerashchenko fcd46cdf64 Minor. Clarified property name.
Original commit: 7e9ea23ce0
2015-02-18 13:37:34 +03:00
Evgeny Gerashchenko 5bb5fe0c49 KT-6586 accessing Kotlin class static class object variable's value from Java does not properly update between compiles
#KT-6586 fixed

Original commit: d1a2fd9c66
2015-02-18 13:37:34 +03:00
Alexander Udalov 59855baf7d Revert "Fixed compilation. Some class files generated by kotlinc may have no annotation (that should be fixed later)."
This reverts commit aa412c72fc.

This workaround is not needed anymore after the fix in c24688c

Original commit: 0217121814
2015-02-17 15:32:46 +03:00
Alexander Udalov 1cbd28ae41 Fix KotlinJpsBuildTest, run J+K tests with runtime
Otherwise javac is not able to find class KotlinClass$Kind, which is used in
annotation argument and for some reason this leads to an exception (in javac)
which gets swallowed and unresolved reference is reported in Java code.

java:INFO:com.sun.tools.javac.code.Symbol$CompletionFailure: class file for
kotlin.jvm.internal.KotlinClass$Kind not found
java:INFO:Errors occurred while compiling module 'm1'

Original commit: 640adecde6
2015-02-16 21:46:23 +03:00
Alexander Udalov ce38b4c43f Serialize descriptors for local/anonymous classes on JVM
Reflection needs this information to work for local classes and anonymous
objects

Original commit: 6ce8d6bd2e
2015-02-16 21:46:21 +03:00
Alexander Udalov 52fb79b0be Minor, move replaceHashWithStar to JetTestUtils
Original commit: 45fec9257a
2015-02-16 20:19:48 +03:00
Pavel V. Talanov 19499caee0 Update test data that mentioned old JvmAbi constants
Original commit: a1f4c06a49
2015-02-16 15:38:34 +03:00
Evgeny Gerashchenko aa412c72fc Fixed compilation. Some class files generated by kotlinc may have no annotation (that should be fixed later).
Original commit: 4b6112d380
2015-02-16 15:34:35 +03:00
Evgeny Gerashchenko 45a865658f Not reading class file three times incremental caches.
Original commit: dd89311d22
2015-02-13 21:51:51 +03:00
Evgeny Gerashchenko b886ffd42c Extracted cli-parser to separate library. Removed full dependency jps-plugin -> idea-full.
Original commit: 9f159b1fea
2015-02-13 21:51:50 +03:00
Evgeny Gerashchenko 8dca16dfd5 Moved constant to idea module and removed redundant dependency.
Original commit: 1f10cbb0d5
2015-02-13 21:51:50 +03:00
Evgeny Gerashchenko 723b869a9f Renamed and moved module ide-compiler-runner to idea-jps-common.
Motivation: it has only a bunch of constants and a trivial class needed in idea and jps modules.

Original commit: 1484ce4a46
2015-02-13 21:51:50 +03:00
Evgeny Gerashchenko 6a0c095b1f Removed redundant dependencies.
Original commit: bca8711182
2015-02-13 21:51:50 +03:00
Evgeny Gerashchenko a58c801984 Moved parts of ide-compiler-runner to direct modules.
Original commit: 3e1b869070
2015-02-13 21:51:49 +03:00
Evgeny Gerashchenko b778ecd0ba Corrected updating Java mappings for package facade classes. We report all source files for it, not only currently compiled.
Original commit: d3d30106a4
2015-02-11 19:19:55 +03:00
Evgeny Gerashchenko c7a26e4522 Reverted wrong test data for tests where files are added to package. Let them fail.
Original commit: 1a486bf969
2015-02-11 19:19:55 +03:00
Evgeny Gerashchenko a0ea638bc8 Checking Java mappings after rebuild (failing now for partially compiled package facades)
Original commit: 02faa02a35
2015-02-11 19:19:55 +03:00
Evgeny Gerashchenko 06875cc4b6 Extracted common function getRecompilationDecision.
Original commit: 478118c12a
2015-02-06 17:44:42 +03:00
Evgeny Gerashchenko 60d7e39c98 Checking source to output mapping after rebuild.
Original commit: 432408e1a8
2015-02-06 17:44:41 +03:00
Evgeny Gerashchenko 8d02c74ddd Correctly processing disappeared protos, files with constants/inline function.
Original commit: c5593a5b80
2015-02-06 17:44:41 +03:00
Evgeny Gerashchenko 618e37a080 Minor. Simplified getObsoletePackageParts() and similar functions.
Original commit: 5b89f88447
2015-02-06 17:44:40 +03:00
Evgeny Gerashchenko 3d6d7ba14d Clearing incremental cache for removed files without scanning output directory.
Original commit: 89f3d21ba4
2015-02-06 17:44:40 +03:00
Evgeny Gerashchenko 75e5ee2fbf Checking incremental cache dump after make. Comparing it with dump after rebuild.
Original commit: 602642715c
2015-02-06 17:44:40 +03:00
Evgeny Gerashchenko 143ab5dad2 Simplified process of filtering out obsolete package parts and loading descriptors from incremental caches.
Now when file is deleted or dirty (compiled right now), its old package part is used. Current package of file doesn't matter.

Original commit: f071802e19
2015-02-06 17:44:39 +03:00
Evgeny Gerashchenko cfaaeb8118 Minor. Green code and formatting.
Original commit: 512ea72e69
2015-02-06 15:56:33 +03:00
Evgeny Gerashchenko 561af16974 Minor. Green code.
Original commit: 84ca0a5b4e
2015-02-06 15:56:33 +03:00
Evgeny Gerashchenko 09715786fe Minor. Swapped test data. "other" and "same" packages were confused.
Original commit: c1b6e3a63d
2015-01-30 14:01:33 +03:00
Evgeny Gerashchenko 7e49986847 Simple changing temp directory in JPS test for easier debugging.
Original commit: 1e3558afc6
2015-01-30 14:01:32 +03:00
Alexander Udalov ecae29aa3c Reorder and optimize dependencies between modules and libraries
- drop 'kotlin-runtime' and other dependencies which are exported by
  other modules ('util' and 'util.runtime' in case of 'kotlin-runtime')
- make all Kotlin modules from the compiler depend on 'util' for clarity
- put 'util' and 'util.runtime' to the bottom of the list everywhere: when
  kotlin-runtime gets reflection, classes from core/ should have higher
  priority than their previous versions from kotlin-runtime.jar

Original commit: 5903b8c4a7
2015-01-28 19:58:35 +03:00
Alexander Udalov 8436a8e119 Simplify code in module script/xml generation
Pass classpath and annotation roots explicitly instead of wrapped in a callback

Original commit: 3ea59117ac
2015-01-28 19:58:32 +03:00
Alexander Udalov e98c929be6 Modules.xml: add Java sources right after Kotlin sources
Java sources should appear before classpath dependencies because they should
have higher priority if the same symbol is located in the module source and in
the classpath. This is so because by default module source has the highest
priority in IDEA except the JDK. Ideally this will be handled later by full
support of modules in the compiler

Original commit: fa2116040e
2015-01-28 19:58:31 +03:00
Alexander Udalov 2be92c8bed Minor, don't add external annotation roots multiple times
Original commit: eb3588bd0a
2015-01-28 19:58:31 +03:00
Evgeny Gerashchenko 183a056c10 Added workaround for linkage error in IDEA 14.0-14.0.2
Original commit: a6362dda22
2015-01-27 16:43:01 +03:00
Evgeny Gerashchenko fadeb20c5c Rebuilding dependants fully only when constants/inline functions changed. This is not 100% precise, but it is faster. It is a compromise until we implement preciser incremental compilation.
Original commit: c60797e306
2015-01-19 15:36:57 +03:00
Evgeny Gerashchenko 41522a3b65 Rebuilding dependent modules.
Original commit: 72687758a5
2015-01-19 15:36:56 +03:00
Evgeny Gerashchenko 72fdd2c6ba Test with Java and Kotlin changed simultaneously.
Original commit: 00f2ba5124
2015-01-19 15:36:56 +03:00
Evgeny Gerashchenko 2f3028e45e Added multi-module tests on incremental compilation.
Changing code wasn't required, Java's incremental caches were enough.

Original commit: 967f470b16
2015-01-19 15:36:55 +03:00
Evgeny Gerashchenko c5bc52a1b0 Updated test data according to changes in IDEA.
Original commit: 2b438a286f
2015-01-16 20:19:37 +03:00
Alexander Udalov 641dced1fb Rename org.jetbrains.kotlin.plugin -> org.jetbrains.kotlin.idea
Original commit: 17227bb4fe
2015-01-13 01:14:31 +03:00
nik a790153333 incremental compiler caches: code cleanup and simplification
Original commit: 6e9f94d1ea
2015-01-12 17:15:13 +03:00
Alexander Udalov 8d4457f748 Rename jet -> kotlin in compiler-tests (except resolve)
Move test-related code to org.jetbrains.kotlin.test, also move some tests to
packages with better names

Original commit: 3b81d63334
2015-01-12 00:24:12 +03:00
Alexander Udalov 9a43996589 Rename jet -> kotlin in descriptor.loader.java, frontend.java
Split package 'lang/resolve/java' into two semantically different packages:
'resolve/jvm' and 'load/java'. Also rename 'lang/resolve/kotlin' to
'load/kotlin'

Original commit: 8affc31303
2015-01-11 05:08:57 +03:00