Commit Graph

281 Commits

Author SHA1 Message Date
Pavel V. Talanov a1f4c06a49 Update test data that mentioned old JvmAbi constants 2015-02-16 15:38:34 +03:00
Evgeny Gerashchenko 4b6112d380 Fixed compilation. Some class files generated by kotlinc may have no annotation (that should be fixed later). 2015-02-16 15:34:35 +03:00
Evgeny Gerashchenko dd89311d22 Not reading class file three times incremental caches. 2015-02-13 21:51:51 +03:00
Evgeny Gerashchenko 9f159b1fea Extracted cli-parser to separate library. Removed full dependency jps-plugin -> idea-full. 2015-02-13 21:51:50 +03:00
Evgeny Gerashchenko 1484ce4a46 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.
2015-02-13 21:51:50 +03:00
Evgeny Gerashchenko bca8711182 Removed redundant dependencies. 2015-02-13 21:51:50 +03:00
Evgeny Gerashchenko 3e1b869070 Moved parts of ide-compiler-runner to direct modules. 2015-02-13 21:51:49 +03:00
Evgeny Gerashchenko d3d30106a4 Corrected updating Java mappings for package facade classes. We report all source files for it, not only currently compiled. 2015-02-11 19:19:55 +03:00
Evgeny Gerashchenko 1a486bf969 Reverted wrong test data for tests where files are added to package. Let them fail. 2015-02-11 19:19:55 +03:00
Evgeny Gerashchenko 02faa02a35 Checking Java mappings after rebuild (failing now for partially compiled package facades) 2015-02-11 19:19:55 +03:00
Evgeny Gerashchenko 478118c12a Extracted common function getRecompilationDecision. 2015-02-06 17:44:42 +03:00
Evgeny Gerashchenko 432408e1a8 Checking source to output mapping after rebuild. 2015-02-06 17:44:41 +03:00
Evgeny Gerashchenko c5593a5b80 Correctly processing disappeared protos, files with constants/inline function. 2015-02-06 17:44:41 +03:00
Evgeny Gerashchenko 5b89f88447 Minor. Simplified getObsoletePackageParts() and similar functions. 2015-02-06 17:44:40 +03:00
Evgeny Gerashchenko 89f3d21ba4 Clearing incremental cache for removed files without scanning output directory. 2015-02-06 17:44:40 +03:00
Evgeny Gerashchenko 602642715c Checking incremental cache dump after make. Comparing it with dump after rebuild. 2015-02-06 17:44:40 +03:00
Evgeny Gerashchenko f071802e19 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.
2015-02-06 17:44:39 +03:00
Evgeny Gerashchenko 512ea72e69 Minor. Green code and formatting. 2015-02-06 15:56:33 +03:00
Evgeny Gerashchenko 84ca0a5b4e Minor. Green code. 2015-02-06 15:56:33 +03:00
Evgeny Gerashchenko c1b6e3a63d Minor. Swapped test data. "other" and "same" packages were confused. 2015-01-30 14:01:33 +03:00
Evgeny Gerashchenko 1e3558afc6 Simple changing temp directory in JPS test for easier debugging. 2015-01-30 14:01:32 +03:00
Alexander Udalov 5903b8c4a7 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
2015-01-28 19:58:35 +03:00
Alexander Udalov 3ea59117ac Simplify code in module script/xml generation
Pass classpath and annotation roots explicitly instead of wrapped in a callback
2015-01-28 19:58:32 +03:00
Alexander Udalov fa2116040e 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
2015-01-28 19:58:31 +03:00
Alexander Udalov eb3588bd0a Minor, don't add external annotation roots multiple times 2015-01-28 19:58:31 +03:00
Evgeny Gerashchenko a6362dda22 Added workaround for linkage error in IDEA 14.0-14.0.2 2015-01-27 16:43:01 +03:00
Evgeny Gerashchenko c60797e306 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. 2015-01-19 15:36:57 +03:00
Evgeny Gerashchenko 72687758a5 Rebuilding dependent modules. 2015-01-19 15:36:56 +03:00
Evgeny Gerashchenko 00f2ba5124 Test with Java and Kotlin changed simultaneously. 2015-01-19 15:36:56 +03:00
Evgeny Gerashchenko 967f470b16 Added multi-module tests on incremental compilation.
Changing code wasn't required, Java's incremental caches were enough.
2015-01-19 15:36:55 +03:00
Evgeny Gerashchenko 2b438a286f Updated test data according to changes in IDEA. 2015-01-16 20:19:37 +03:00
Alexander Udalov 17227bb4fe Rename org.jetbrains.kotlin.plugin -> org.jetbrains.kotlin.idea 2015-01-13 01:14:31 +03:00
nik 6e9f94d1ea incremental compiler caches: code cleanup and simplification 2015-01-12 17:15:13 +03:00
Alexander Udalov 3b81d63334 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
2015-01-12 00:24:12 +03:00
Alexander Udalov 8affc31303 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'
2015-01-11 05:08:57 +03:00
Alexander Udalov 524fdc2527 Rename jet -> kotlin in descriptors, types, names
org.jetbrains.jet.lang.descriptors -> org.jetbrains.kotlin.descriptors
org.jetbrains.jet.lang.types -> org.jetbrains.kotlin.types
org.jetbrains.jet.lang.resolve.name -> org.jetbrains.kotlin.name
2015-01-10 15:52:20 +03:00
Alexander Udalov 05eaf81ba6 Rename jet -> kotlin and regroup files in serialization
org.jetbrains.jet.descriptors.serialization ->
org.jetbrains.kotlin.serialization

Deserialization goes to subpackage deserialization, built-ins-related stuff
goes to subpackage builtins
2015-01-09 16:37:22 +03:00
Alexander Udalov 00878cc31a Rename java -> jvm, jet -> kotlin in module serialization.java
org.jetbrains.jet.descriptors.serialization ->
org.jetbrains.kotlin.serialization.jvm
2015-01-09 14:27:13 +03:00
Alexander Udalov de6e8a7493 Rename package jet -> kotlin in backend
org.jetbrains.jet.codegen -> org.jetbrains.kotlin.codegen
2015-01-08 23:32:09 +03:00
Alexander Udalov f37e2f173d Rename package jet -> kotlin in util, util-runtime
org.jetbrains.jet.config -> org.jetbrains.kotlin.config
org.jetbrains.jet.utils -> org.jetbrains.kotlin.utils

Also move coreLib.kt to package 'org.jetbrains.kotlin.utils'
2015-01-08 23:32:08 +03:00
Alexander Udalov 8ca803775f Rename package jet -> kotlin in cli, cli-common
org.jetbrains.jet.cli -> org.jetbrains.kotlin.cli

Also fix some minor warnings
2015-01-08 23:32:07 +03:00
Alexander Udalov 98faeb8647 Rename package jet -> kotlin in ide-compiler-runner
org.jetbrains.jet.compiler.runner -> org.jetbrains.kotlin.compilerRunner
org.jetbrains.jet.compiler -> org.jetbrains.kotlin.config
2015-01-06 05:15:11 +03:00
Alexander Udalov 3f7d2e461e Rename package jet -> kotlin in jps-plugin
org.jetbrains.jet.jps -> org.jetbrains.kotlin.jps
2015-01-05 19:54:21 +03:00
Alexander Udalov 36feb4dfdc Move module script-related code to org.jetbrains.kotlin.modules 2015-01-05 19:43:16 +03:00
Alexander Udalov 2fdd63fa53 Rename package jet -> kotlin in kannotator-jps-plugin-test
org.jetbrains.jet.jps.build.kannotator ->
org.jetbrains.kotlin.jps.build.kannotator
2015-01-03 12:46:05 +03:00
Alexander Udalov f58b151d58 Rename package jet -> kotlin in bare-plugin
org.jetbrains.jet.plugin.bare -> org.jetbrains.kotlin.plugin.bare
2015-01-03 12:41:47 +03:00
Alexander Udalov 7f90dc3934 Regenerate tests 2015-01-03 00:20:28 +03:00
Alexander Udalov 0d671141d0 Don't store class loader in CompilerEnvironment
Modules jps-plugin and ide-compiler-runner are loaded by the same class loader
2014-12-29 18:19:21 +03:00
nik 2a60c6d759 fixed typo in file name 2014-12-23 14:41:00 +03:00
Evgeny Gerashchenko c6c3e5a4c6 Updated test data according to JPS. Behavior is still wrong, but it is work in progress on IDEA side. 2014-12-20 15:06:53 +03:00