Commit Graph

12196 Commits

Author SHA1 Message Date
Natalia.Ukhorskaya 96f8403d1c Cache module type 2013-10-01 14:03:29 +04:00
Natalia.Ukhorskaya ea5122e0de After runtime library update an unrelated jar is affected
#KT-4035 Fixed
2013-10-01 11:57:50 +04:00
Natalia.Ukhorskaya b78815a415 Update path to sources for kotlin-runtime library 2013-10-01 11:57:49 +04:00
Alexander Udalov 5fa489b7d3 Add 'topLevelMemberInvocation.twoModules' test to CompileBinaryTestData 2013-09-30 22:43:18 +04:00
Alexander Udalov f7db95f63c Minor refactoring in DeserializedClassDescriptor 2013-09-30 22:43:18 +04:00
Alexander Udalov a97bb80216 Serialize FQ names of Kotlin classes
This helps to avoid a nasty hack with loading inner Kotlin classes in JDR,
which makes it a bit easier to 'lazify' JDR, since now the container of a
Kotlin class is no longer required to be resolved eagerly before resolution of
the class itself
2013-09-30 22:43:18 +04:00
Alexander Udalov a16db2c773 Regenerate ProtoBuf files 2013-09-30 22:43:17 +04:00
Alexander Udalov 91cbe3e239 Move ClassSerializationUtil to 'compiler-tests' module
It's not used in 'serialization'
2013-09-30 22:43:17 +04:00
Alexander Udalov ee92ebe941 Move Kotlin descriptor loading to kotlin/ package 2013-09-30 22:43:17 +04:00
Alexander Udalov fa9307d08c Delete unused method from VirtualFileFinder 2013-09-30 22:43:17 +04:00
Alexander Udalov b42a3e6f6c Write KotlinPackageFragment annotation to package$src classes 2013-09-30 22:43:17 +04:00
Alexander Udalov afa1f5c947 Move nested class to top-level 2013-09-30 22:43:17 +04:00
Alexander Udalov 84f64a5dfb Refactor KotlinClassFileHeader
Split into two subclasses: KotlinClass/KotlinPackage-annotated classes and
JetClass/JetPackage-annotated classes
2013-09-30 22:43:17 +04:00
Alexander Udalov e4d538c668 Move KotlinClassFileHeader to header/ package 2013-09-30 22:43:16 +04:00
Alexander Udalov 1f466ff57d Simplify logic in KotlinClassFileHeader
When processing annotations, we should ensure not only that we have no more
than one KotlinClass/KotlinPackage annotation, but any supported header type at
all. Also instead of throwing an exception it's safer to just log the error
2013-09-30 22:43:16 +04:00
Alexander Udalov 92cc0ddd1f KotlinClassFileHeader is now nullable everywhere
'null' means there's no header. This makes all of KotlinClassFileHeader's
fields non-null
2013-09-30 22:43:16 +04:00
Alexander Udalov 9e9b3c7284 Make KotlinClassFileHeader immutable, make its inner class nested 2013-09-30 22:43:16 +04:00
Alexander Udalov e981681d3e Remove KotlinClassFileHeader.HeaderType.NONE
Use null instead
2013-09-30 22:43:16 +04:00
Alexander Udalov b4d9fb75d8 Minor refactorings in KotlinClassFileHeader 2013-09-30 22:43:15 +04:00
Alexander Udalov b9ce7f9289 Remove dependency of annotation deserializer on ASM Type 2013-09-30 22:43:15 +04:00
Alexander Udalov ed6f908049 Move JavaProtoBufUtil utilities to where they're used
Serialization goes to backend: it's not needed in runtime, at least in the
state in which it is now (dependent on ASM).

Deserialization goes to AnnotationDescriptorDeserializer. Inline some methods,
remove unneeded abstractions.

This removes dependency of serialization.java on ASM
2013-09-30 22:43:15 +04:00
Alexander Udalov dfb0908da0 Move 8bit<->7bit logic to a separate class 2013-09-30 22:43:15 +04:00
Svetlana Isakova a3f9cef354 fixed bug: 'isStatement' for function body == 'hasBlockBody'
not vice versa
2013-09-30 21:06:05 +04:00
Pavel V. Talanov fa8ca4e781 Refactor: Improve code clarity in DelegationResolver
Filter out non-overridable descriptors earlier for possible optimization
Report error to trace even if name identifier is null
2013-09-30 20:54:44 +04:00
Pavel V. Talanov 9eeda58747 Fix for MakeOverriddenMemberOpenFix
Fixes bugs which led to BindingContextUtils#descriptorToDeclaration throwing exception
2013-09-30 20:54:43 +04:00
Pavel V. Talanov 9599f7d98c Test for delegated members being overridden 2013-09-30 20:54:42 +04:00
Pavel V. Talanov 51a6bcb727 Test for reporting clashes with multiple delegated methods
Verifies that the order in which traits are inherited is irrelevant
2013-09-30 20:54:41 +04:00
Pavel V. Talanov 04105fae65 Refactor DelegationResolver into method object to simplify code 2013-09-30 20:54:40 +04:00
Pavel V. Talanov 1a3603652c Refactor DelegationResolver so that lazy and eager resolve share the code
Also fix an exception in LazyClassMemberScope
2013-09-30 20:54:39 +04:00
Pavel V. Talanov 6fb7a79a1f Refactor DelegationResolver
Fix an issue in lazy resolve : filter out methods from delegated traits superclass
2013-09-30 20:54:38 +04:00
Pavel V. Talanov c3a5a9b7b5 Minor optimization for tests 2013-09-30 20:54:37 +04:00
Pavel V. Talanov dc9c3b1a97 Fix JetTestCaseBuilder#getHomeDirectory() having wrong separators on Windows 2013-09-30 20:54:36 +04:00
Pavel V. Talanov 10797db588 Create test for resolving with compiled kotlin dependency
Test for resolving fake overrides from binaries
2013-09-30 20:54:35 +04:00
Evgeny Gerashchenko 0749fc8cbb Got rid of VFS magic. 2013-09-30 20:54:34 +04:00
Evgeny Gerashchenko d62f946238 Minor. Added comment. 2013-09-30 20:54:34 +04:00
Evgeny Gerashchenko 42a6543c25 Packing mock library to jar to avoid VFS magic. 2013-09-30 20:54:33 +04:00
Evgeny Gerashchenko dd4939a5ec Using LightProjectDescriptor in navigate to library tests.
1.5x faster execution and reusable code.
2013-09-30 20:54:32 +04:00
Evgeny Gerashchenko 1332cbc1c1 Minor. Moved method to subclass. 2013-09-30 20:54:31 +04:00
Evgeny Gerashchenko aec54bcbac Got rid of protected fields. 2013-09-30 20:54:30 +04:00
Evgeny Gerashchenko d5e86c38de Minor. Inlined field. 2013-09-30 20:54:29 +04:00
Erokhin Stanislav 2329c9cdfa Use javac2 compiler from Idea lib in ant build: generate @NotNull assertions 2013-09-30 16:02:44 +04:00
Mikhael Bogdanov 625efe1be1 Update to idea 132.425 2013-09-30 12:39:40 +04:00
Alexey Sedunov 48ddd7678d Separate tree structures for local and non-local root declarations 2013-09-27 19:20:47 +04:00
Alexey Sedunov c93d35ad57 Use KotlinCallHierarchyNodeDescriptor for Kotlin declarations only 2013-09-27 19:20:46 +04:00
Alexey Sedunov 5b7881f40c Call Hierarchy: Add support of local declarations 2013-09-27 19:20:45 +04:00
Alexey Sedunov 41ea7da1e3 Implement call hierarchy 2013-09-27 19:20:44 +04:00
Alexey Sedunov e4936549ee Extract isConstructor() check 2013-09-27 19:20:43 +04:00
Alexander Udalov 07f1e61146 Remove unneeded asserts from JavaSupertypeResolver
Don't do anything special if a Java class happens to extend jet.JetObject: it's
not a Kotlin class and we should collect all its supertypes correctly
2013-09-27 16:01:55 +04:00
asedunov b2bcbdfb7a Merge pull request #307 from eterverda/master
Fixed wrong annotations for android.os.Parcel, android.content.ComponentName and android.os.Message
2013-09-27 04:24:19 -07:00
Andrey Breslav a4f29bacae Javac target JVM version explicitly specified
When compiling from command line on a machine with Java 7 installed you get class format errors when running on Java 6 later
2013-09-26 09:05:00 -07:00