Commit Graph

20312 Commits

Author SHA1 Message Date
Nikolay Krasko fd616a3c8d Update to IDEA 140.2493.5 2015-02-18 18:53:21 +03:00
Evgeny Gerashchenko 460a77275a Added tests with conversion between Java and Kotlin and moving class. 2015-02-18 18:51:59 +03:00
Nikolay Krasko 07d58b55eb Synchronize KotlinJavaPsiFacade with JavaPsiFacadeImpl 2015-02-18 18:51:58 +03:00
Evgeny Gerashchenko f870388962 Fixed compilation error for IDEA 14.1+ (140 branch) 2015-02-18 18:51:58 +03:00
Alexander Udalov 042230fefc Using factory method instead of deprecated constructor. 2015-02-18 18:51:57 +03:00
Nikolay Krasko 45a3b47664 Fix compilation once again 2015-02-18 18:51:56 +03:00
Nikolay Krasko 440cc20ed9 Add expected action 2015-02-18 18:51:56 +03:00
Nikolay Krasko 20b7a55bf2 Add overrides in order to fix compilation errors 2015-02-18 18:51:55 +03:00
Nikolay Krasko a49a206de3 Get containing file from original method 2015-02-18 18:51:54 +03:00
Nikolay Krasko 3ec591a6d6 Manually register extension points 2015-02-18 18:51:54 +03:00
Nikolay Krasko 5d3d446ea4 Now PsiElementFinderImpl is registered via extension but it hadn't been added to JavaCoreProjectEnvironment 2015-02-18 18:51:53 +03:00
Alexey Kudravtsev 28b7d71ab7 Registering extension points manually in JetCoreEnvironment. They are not registered by IDEA's core environment code anymore. 2015-02-18 18:51:52 +03:00
Natalia Ukhorskaya 43249e928c Fix tests with annotations: enum constants are now resolved as constants in JavaConstantExpressionEvaluator 2015-02-18 18:51:52 +03:00
Natalia Ukhorskaya 601a33f772 Fix stepping test's testData 2015-02-18 18:51:51 +03:00
Evgeny Gerashchenko f9f75f1155 Fixed compilation error (IDEA API changed). 2015-02-18 18:51:50 +03:00
Evgeny Gerashchenko f09fd923f3 Fixed test data according to fixed bug in IDEA JPS. 2015-02-18 18:51:50 +03:00
Evgeny Gerashchenko 501cb08154 Fixed compilation (IDEA API changed). 2015-02-18 18:51:49 +03:00
Evgeny Gerashchenko 1c1ead0471 Minor. Fixed case of test data file. 2015-02-18 14:26:20 +03:00
Evgeny Gerashchenko a8179a497e KT-5146 "Remove explicit type arguments" should highlight type arguments as unused (not as warning)
#KT-5146 fixed
2015-02-18 13:37:36 +03:00
Evgeny Gerashchenko b1840ebd99 Suppressing unused parameter annotation when function is entry point. 2015-02-18 13:37:36 +03:00
Evgeny Gerashchenko 943131b7b0 Added button to configure annotations for methods which shouldn't be marked as unused. 2015-02-18 13:37:35 +03:00
Evgeny Gerashchenko 4ddaa5cdda 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
2015-02-18 13:37:35 +03:00
Evgeny Gerashchenko 7e9ea23ce0 Minor. Clarified property name. 2015-02-18 13:37:34 +03:00
Evgeny Gerashchenko d1a2fd9c66 KT-6586 accessing Kotlin class static class object variable's value from Java does not properly update between compiles
#KT-6586 fixed
2015-02-18 13:37:34 +03:00
Alexander Udalov 15a3496dbd Gradle plugin tests: change kotlin-stdlib dependency scope to compile
This way is advertised in the docs anyway. Otherwise J+K projects do not
compile, see 640adec for the explanation
2015-02-18 11:43:50 +03:00
Andrey Breslav 2dcae465f7 Work around the redirect problem on SourceForge 2015-02-17 19:28:11 +03:00
Andrey Breslav ab93b530f1 Don't use annotations after nullability was forced upon a platform type
#KT-6762 Fixed
 #KT-6763 Fixed
2015-02-17 18:44:46 +03:00
Alexander Udalov 0217121814 Revert "Fixed compilation. Some class files generated by kotlinc may have no annotation (that should be fixed later)."
This reverts commit 4b6112d380.

This workaround is not needed anymore after the fix in e705ff2
2015-02-17 15:32:46 +03:00
Alexander Udalov a960d2d785 Fix "No descriptor for enum entry" exception
EA-52557, EA-64887
2015-02-17 15:31:45 +03:00
Alexander Udalov 640adecde6 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'
2015-02-16 21:46:23 +03:00
Alexander Udalov e705ff2517 Write KotlinSyntheticClass annotation on when-by-enum mapping classes 2015-02-16 21:46:22 +03:00
Alexander Udalov 6ce8d6bd2e Serialize descriptors for local/anonymous classes on JVM
Reflection needs this information to work for local classes and anonymous
objects
2015-02-16 21:46:21 +03:00
Alexander Udalov 98b554d995 Fix path to runtime when building kotlin-ant.jar
${kotlin-home}/lib/kotlin-runtime.jar is the newly built runtime, which is not
compiled yet when invoking a clean "ant dist"
2015-02-16 20:19:54 +03:00
Alexander Udalov 0d05fca838 Support serialization/deserialization of local classes
Most of these changes are aimed to support and correctly transform ClassId for
local classes, no actual bytes are written or read at the moment (see next
commits). See the comment on ClassId for clarification.

A hack in DescriptorSerializer which erased anonymous types to Any (which had
been breaking the consistency between descriptors resolved from sources and
from serialized information) is now gone
2015-02-16 20:19:54 +03:00
Alexander Udalov add9bb34cb Refactor ReadKotlinClassHeaderAnnotationVisitor
Extract a hierarchy of four nested classes instead of anonymous
2015-02-16 20:19:53 +03:00
Alexander Udalov 5d8ae3ed6a Minor, refactor some constants in JvmAnnotationNames
Declare KotlinClass similarly to KotlinSyntheticClass, this will be used later
2015-02-16 20:19:52 +03:00
Alexander Udalov fdfe3fd73b Minor, serialize/deserialize local visibility
Also support non-subsequent enum values in Flags
2015-02-16 20:19:51 +03:00
Alexander Udalov cd9898fc43 Minor, rename and invert meaning of ClassId.isTopLevelClass
Also use a simpler constructor and simplify ClassDeserializer.ClassKey
2015-02-16 20:19:50 +03:00
Alexander Udalov e812c4e67f Introduce KotlinSyntheticClass.Kind.LOCAL_TRAIT_IMPL 2015-02-16 20:19:50 +03:00
Alexander Udalov ce26ce0458 Drop "extra visibility" from binary format
Descriptors of Kotlin symbols should always have a visibility known to Kotlin
2015-02-16 20:19:49 +03:00
Alexander Udalov 1609bbcd10 Minor, add FQ name to avoid clash
Maven build compiles runtime.jvm and reflection.jvm together and
IllegalAccessException is ambiguous between java.lang and kotlin.reflect
2015-02-16 20:19:48 +03:00
Alexander Udalov 45fec9257a Minor, move replaceHashWithStar to JetTestUtils 2015-02-16 20:19:48 +03:00
Alexander Udalov 37da154ea2 Minor, move builtins serializer test data 2015-02-16 20:19:47 +03:00
Alexander Udalov c3909ebbd7 Minor, update outdated comment 2015-02-16 20:19:46 +03:00
Alexander Udalov 245b16dccc Drop unneeded factory methods due to ABI version increase
Either ReflectionFactory or direct creation is now used instead
2015-02-16 20:19:14 +03:00
Alexander Udalov 17c930c84f Use abstract factory for reflection objects on JVM
Introduce an abstract factory class ReflectionFactory which is responsible for creating
reflection objects (KClass, KProperty, ...). The meaningful implementation is
located in "reflection.jvm" where KClassImpl/KPropertyImpl/... are accessible
and can be instantiated. The default implementation will be used in the lite
runtime with no reflection and will return nulls / throw exceptions there.

Put all functions, calls to which are generated by JVM back-end, in one place:
the class named Reflection which contains only static methods. Previously these
functions were scattered across different files in module "reflection.jvm".

The code using reflection may now be compiled against either runtime, but
reflection features will work if and only if reflection is accessible at
runtime
2015-02-16 20:19:13 +03:00
Alexander Udalov 1e50078f6f Delete dependency of 'serialization' on trove4j
Use HashMap of wrapped objects instead of THashMap with custom hashing strategy
2015-02-16 20:19:12 +03:00
nbilyk 121ada0cab JS lib: added missed arguments to Blob constructor.
#KT-6654 Fixed
2015-02-16 19:17:10 +03:00
nbilyk 6afe64dd14 JS lib: added canvas attributes parameter to HTMLCanvasElement::getContext 2015-02-16 19:17:10 +03:00
nbilyk f4411773c3 JS lib: added missed fields naturalWidth and naturalHeight to HTMLImageElement. 2015-02-16 19:17:10 +03:00