jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-05-16 15:53:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,915 Commits 3,641 Branches 23,353 Tags
a8e2893494de0315306a618e6a5dff32cb0873f5
Commit Graph

461 Commits

Author SHA1 Message Date
Denis Zharkov
5297b4974f Adjust descriptor renderer to latest parsing changes 
- `constructor` keyword expected in primary constructor with non-empty modifier list
- annotation list should be preceeded by '@'
 2015-05-20 09:24:56 +03:00
Alexander Udalov
2fe05c6f11 Parse and resolve annotations on supertypes 2015-05-14 18:58:08 +03:00
Dmitry Jemerov
4bdf598bfe compiler testdata: s/trait/interface 2015-05-12 19:43:17 +02:00
Dmitry Jemerov
9975bb8935 replace 'trait' keyword with 'interface' in user-visible messages and code generation tools 2015-05-12 11:49:37 +02:00
Denis Zharkov
c5af4b42b4 Extract common logic for annotation entries collection 
Before this change annotation entries starting with '@' within expressions hadn't been resolved

Note that order of annotation entries in result may change according to order of children in PSI (see changed testData)
 2015-05-07 22:36:15 +03:00
Alexander Udalov
0732b78853 Serialize/deserialize annotations on types 2015-04-29 01:03:55 +03:00
Alexander Udalov
d2cd7b00bb Map intrinsic companion objects in JavaToKotlinClassMap 
Get rid of multiple usages of IntrinsicObjects where JavaToKotlinClassMap was
already used, simplify code, and support loading of *CompanionObject as Kotlin
built-in companions from Java code.

Also fix a small bug where Boolean was considered a class with an intrinsic
companion in IntrinsicObjects, although it was not
 2015-04-24 02:09:26 +03:00
Denis Zharkov
6ca7d2aad7 Regenerate test data 
Add properties for Java annotations
 2015-04-23 08:27:41 +03:00
Denis Zharkov
98ffa3b475 Render Class-constant as javaClass<T>() 2015-04-16 10:40:20 +03:00
Denis Zharkov
294eb1dceb Load annotation parameter's type for ctr as contravariant 
See comment in code
 2015-04-16 10:40:20 +03:00
Denis Zharkov
8f0e290dec Create additional constructor for java annotation with Class-parameter 
One of them with KClass<*> parameters and other with java.lang.Class<*>.

It's needed just for backward compatibility, and second one is deprecared.
 2015-04-16 10:40:20 +03:00
Denis Zharkov
f5111180c3 Load Class<?> as KClass<*> for Java annotations parameters 2015-04-16 10:40:20 +03:00
Alexander Udalov
5c06204658 Move ExpectLoadError from tests to testData 
To avoid loading all sources under "compiler/tests" in each test. Saves about
20-25% when running LoadJavaTestGenerated
 2015-04-10 20:26:33 +03:00
Alexander Udalov
0202217135 Fix JVM signatures involving multi-dimensional array types 
Apparently ASM's Type#getElementType returns the type of the array even if it's
multi-dimensional, so the loop was incorrect
 2015-04-07 20:06:23 +03:00
Denis Zharkov
9b1443954f Refine loading annotation parameters from java 
- Parameter named `value` is always first
- Array parameter represented as vararg iff its name is `value` and all
  other parameters have default values

 #KT-2576 Fixed
 #KT-6641 Fixed
 #KT-6220 Fixed
 #KT-6652 Fixed
 2015-04-07 19:31:29 +03:00
Alexander Udalov
6279421094 Minor, add test on Java enum with specialized entry 2015-04-02 21:57:53 +03:00
Alexander Udalov
72aa3d1465 Use mock JDK in compiler tests where full JDK is not needed 
- move some of boxWithStdlib tests under fullJdk/ directory, where they will be
  compiled against the full JDK
- introduce FULL_JDK in-text directive for the reflection test as only 4 tests
  out of 654 needed the full JDK
 2015-04-02 21:57:48 +03:00
Pavel V. Talanov
06916d98c6 default -> companion: replace all mentions of default and default object 2015-03-17 15:47:39 +03:00
Andrey Breslav
266485add3 Serialization of star projections fixed 2015-03-11 19:38:14 +03:00
Andrey Breslav
61989ba245 KT-6815 Representing raw types when used as supertypes for Java classes 
#KT-6815 Fixed
 2015-03-11 18:27:37 +03:00
Alexander Udalov
e95d22dcfe Refactor ReflectJavaConstructor.getValueParameters() 
See https://youtrack.jetbrains.com/issue/KT-6886 for more information
 2015-03-11 16:42:25 +03:00
Alexander Udalov
1054f004aa Load annotations on constructors and parameters of Kotlin reflected classes 2015-03-11 16:42:24 +03:00
Alexander Udalov
4fb420f3f1 Fix deserialization of enum annotation arguments at runtime 2015-03-11 16:42:23 +03:00
Alexander Udalov
a14b301f31 Resolve annotations on all reflected elements 
Annotation in NestedEnumArgument test is made public, because we try to load
annotation argument values eagerly and fail, since you can't invoke methods
reflectively on an object of a non-effectively-public class
 2015-03-11 16:42:19 +03:00
Alexander Udalov
c90f11b7e6 Support Java symbols in runtime descriptor loading 2015-03-11 16:42:18 +03:00
Alexander Udalov
73e4287aee Initial support of annotation loading at runtime 
In order to locate an annotated entity, we need to implement almost the whole
Java element model (which will be used anyway for Java descriptor loading)
 2015-03-11 16:42:17 +03:00
Alexander Udalov
ca8831097f Resolve annotations on Java constructors 
Also add tests on custom annotations on fields and methods
 2015-03-07 02:32:14 +03:00
Pavel V. Talanov
59f192ef90 Replace 'class object' with 'default object' in renderers and test data 
Includes changes to decompiled text
Old syntax is used in builtins and project code for now
 2015-03-06 19:36:54 +03:00
Pavel V. Talanov
989f07962b Write to trace in case class qualifier is a short reference to default object 
This allows to fix some cases when there is a difference between explicit and short reference to default object
Fix shorten reference, optimize imports and import insert helper for default objects
ShortenReferences always transforms default object references to shorter form for now
Fix DescriptorUtils#getFqName() for default objects (affects test data mostly)
Fix DescriptorUtils#getImportableDescriptor()
 2015-03-03 13:04:30 +03:00
Pavel V. Talanov
cceb5738c8 Can't omit default object name in imports and types 
There should be only one way to denote a type (A.Default.B can't be denoted as A.B)
 2015-03-03 13:04:28 +03:00
Pavel V. Talanov
ca3096a948 Prohibit inner classes in objects 
Using inner classes in objects makes little sense since objects have single static instance
 2015-02-20 14:47:37 +03:00
Pavel V. Talanov
7b837e2631 Updata test data: txt files for diagnostics tests 2015-02-16 15:38:36 +03:00
Pavel V. Talanov
72f94963ab Tests: add resolve test for named class object 2015-02-16 15:38:28 +03:00
Andrey Breslav
0f0f205248 Serializing information about star projections 2015-02-02 19:52:02 +03:00
Andrey Breslav
fecf6f9fdf Star projection information preserved in substitutions 
#KT-6700 Fixed
 2015-02-02 19:52:01 +03:00
Andrey Breslav
9c469a7dff Don't make generated methods of local data classes LOCAL 2015-01-29 16:07:30 +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
Svetlana Isakova
7b09e85717 Added check for incompatible variance modifiers and repeated modifiers 2014-12-27 00:55:25 +03:00
Svetlana Isakova
d2becce1ac Make vararg argument of java annotation have 'out' type 2014-12-27 00:55:23 +03:00
Svetlana Isakova
d1556331ef Simplified signatures propagation for vararg types 
(do not change flexible types)
 2014-12-27 00:55:23 +03:00
Svetlana Isakova
da8fdbd23e More tests for varargs updated 2014-12-12 23:08:28 +03:00
Stanislav Erokhin
f640f82ed0 Add serialization for PRIVATE_TO_THIS 2014-12-08 18:24:30 +03:00
Alexander Udalov
1f68c94ce6 Fix several bugs in serialization of inner generic classes 
- Interner was working incorrectly with parents
- nested classes were serialized in codegen out of any context

 #KT-5660 Fixed
 2014-11-25 23:16:26 +03:00
Pavel V. Talanov
40addaed13 Fix wrong deserialization order 
For case when property and function have the same name or
extension and non-extension member have the same name
 2014-11-14 17:09:14 +03:00
Pavel V. Talanov
d2cfcfa659 Fix test data after changes to renderer and descriptors 2014-11-14 17:09:05 +03:00
Pavel V. Talanov
8016766b23 Extension/non-Extension members are deserialized in correct order 2014-11-14 16:18:33 +03:00
Pavel V. Talanov
028e9105af Add test for enum class with inner classes 2014-11-14 16:18:32 +03:00
Pavel V. Talanov
eba5843468 Test order of enum entries in deserialized classes 2014-11-14 16:18:28 +03:00
Pavel V. Talanov
01cf60b834 Separate tests for ordering of deserialized members 2014-11-14 16:18:27 +03:00
Alexander Udalov
be08e33463 Minor, change annotation in test data 
To fix this case in an upcoming test which adds retention(runtime) to all
annotations (which resulted in duplicate annotation here)
 2014-11-11 18:10:43 +03:00