Commit Graph

272 Commits

Author SHA1 Message Date
Alexander Udalov 33a9f3abd1 Move all annotation FQ names to JvmAnnotationNames
Delete reflected usages of annotation classes (JetValueParameter.class,
KotlinSignature.class, etc.). It's wrong: this is a dependency on the old
runtime, whereas the compiler should work with the new one
2014-03-02 19:55:28 +04:00
Alexander Udalov ac71911720 Get rid of "jet" in comments, assertions, READMEs, etc.
Replace with "kotlin"

 #KT-2896 Fixed
2014-03-02 19:55:11 +04:00
Alexander Udalov aef0fabd53 Move jet.Kotlin* annotations to package "kotlin.jvm.internal"
Also rename poorly named KotlinPackageFragment -> KotlinPackagePart
2014-03-02 19:54:58 +04:00
Alexander Udalov 0da92e22a2 Move jet.JetObject -> kotlin.jvm.internal.KObject
Don't use JetObject as a marker class in KotlinRuntimeLibraryUtil anymore,
since there are other classes for this purpose (KotlinPackage, Unit)
2014-03-02 19:54:58 +04:00
Alexander Udalov 3dcd85bdb4 Add toString() to Any, fix all tests
#KT-4517 Fixed
2014-03-02 19:54:49 +04:00
Alexander Udalov ec30d52978 Delete Hashable, pull up its members to Any
Extensions on nullable types remain in Library.kt

 #KT-1741 Obsolete
 #KT-2805 Obsolete
 #KT-1365 Fixed
 #KT-4517 In Progress
2014-03-02 19:54:08 +04:00
Alexander Udalov 9537b68724 Load 'equals' parameter from Java code with the name 'other'
This fixes a lot of warnings on mixed Kotlin+Java code about different names
for the same parameter because we always loaded 'equals' parameter with the
name 'p0', whereas in Kotlin we usually name it 'other'
2014-02-28 21:48:29 +04:00
Nikolay Krasko 0448736a4c Refactoring: remove unused methods 2014-02-20 16:27:49 +04:00
Pavel V. Talanov 4a3ccc4eac JDR: do not create package fragment for class statics if class cannot be resolved
This keeps behaviour consistent in rare cases when JavaClass can be found but not resolved
As of now this can happen in IDE if we take PsiClass from index but file structure is wrong so we can't resolve the class
Add test which documents this case
2014-02-11 17:17:34 +04:00
Pavel V. Talanov e4a0221abc Remove PackageFragmentDescriptor#getProvider method
PackageFragmentProvider should be hidden from the client of PackageFramentDescriptor
2014-02-11 17:17:05 +04:00
Pavel V. Talanov cd6a71ef81 Refactor JDR: add explicit binding between java classes and packages for their statics
Get rid of Kind in JavaPackageFragmentDescriptor and create subclass which exposes additional function
Add method in JavaClassDescriptor to get correponding package fragment
Remove JavaDescriptorResolver from context
2014-02-11 17:17:04 +04:00
Pavel V. Talanov 00a5e7ab15 Refactor JDR: remove some of the usages of JavaDescriptorResolver class 2014-02-11 17:17:03 +04:00
Pavel V. Talanov 16a2a5cd62 Refactor JDR: minor extract function in LazyJavaPackageFragmentProvider 2014-02-11 17:17:02 +04:00
Pavel V. Talanov 2fe2a50b14 Refactor JDR: use JavaResolverCache in LazyJavaPackageFragmentProvider directly
Remove LazyJavaClassResolverWithCache
This actually can affect behaviour because JavaResolverCache has slightly different logic (uses CLASS key in BindingContext as opposed to FQNAME_TO_CLASS_DESCRIPTOR)
2014-02-11 17:17:01 +04:00
Pavel V. Talanov 18d088cb71 Refactor JDR: create LazyJavaPackageFragmentProvider in injector 2014-02-11 17:17:00 +04:00
Pavel V. Talanov 737f538ea7 Minor: use orEmpty() instead of ?: listOf() in LazyJavaPackageFragmentProvider 2014-02-11 17:16:59 +04:00
Pavel V. Talanov 4153182fd2 Refactor JDR: minor, extract class 2014-02-11 17:16:58 +04:00
Evgeny Gerashchenko ce7e0a7457 Fixed problem with overriding method with non-trivial raw type (when erased type parameter has upper bound)
Also added cases for the code which was changed.
2014-02-06 13:52:59 +04:00
Andrey Breslav 8dc9aecbf8 DescriptorSearchRule removed 2014-02-05 18:12:01 +04:00
Andrey Breslav aa0dde3a78 Old implementation of JavaDescriptorResolver deleted 2014-02-05 18:12:01 +04:00
Andrey Breslav 9f918d48b5 JavaDescriptorResolver always uses lazy mode 2014-02-05 18:12:01 +04:00
Andrey Breslav 76c722b81c Utilities moved closer to their usages and rewritten to Kotlin 2014-02-05 18:12:00 +04:00
Andrey Breslav e119ca27ca AnnotationLoadingUtil created. Relevant code/constants moved there 2014-02-05 18:11:51 +04:00
Andrey Breslav aed1ccf771 getKotlinBuiltinClassDescriptor() moved to DescriptorResolverUtils 2014-02-05 18:07:35 +04:00
Andrey Breslav 3d1f2c25e2 resolveCompileTimeConstantValue() rewritten to Kotlin 2014-02-05 18:07:35 +04:00
Andrey Breslav 6aca05023a OBJECT_FQ_NAME moved to DescriptorResolverUtils 2014-02-05 18:07:35 +04:00
Natalia Ukhorskaya 36810c5bbb Move IS_PURE for constant inside CompileTimeConstant 2014-01-28 18:21:45 +04:00
Natalia Ukhorskaya 3f429116e5 Add constructor parameter for compileTimeConstant (can be used in annotation) 2014-01-28 18:21:44 +04:00
Alexander Udalov c1777f28f9 Fix NPE in annotation deserializer 2014-01-23 22:02:59 +04:00
Andrey Breslav ca7d5a2988 Java annotation resolution made lazy 2014-01-22 19:04:43 +04:00
Andrey Breslav 6ce0b9b919 Annotations used instead of List<AnnotationDescriptor> 2014-01-20 16:17:54 +04:00
Andrey Breslav 1af71c4dbe Using common storage manager for all lazy services 2014-01-20 16:17:53 +04:00
Evgeny Gerashchenko 292f0e4a38 Introduced lazy type and some related optimizations. 2014-01-16 20:34:10 +04:00
Nikolay Krasko 72d3b46fc6 Revert "Add method for getting all classifiers with given name from the scope"
This reverts commit 97759f5bb7.
2014-01-15 22:01:04 +04:00
Andrey Breslav ca5cf6f3cc Infinite recursion broken for subpackage search 2014-01-15 16:16:22 +04:00
Andrey Breslav 6fe122e7db Correct nullability when loading annotations from Java 2014-01-15 16:16:22 +04:00
Andrey Breslav 8be8ab9c9b Useless method removed
Package fragments do not nest, do there's no need to account for subpackages in member scopes
2014-01-15 16:16:22 +04:00
Andrey Breslav ff6cbca797 Cryptic-looking functions (iif, eq, neq etc) removed 2014-01-15 16:16:21 +04:00
Andrey Breslav 935fae70ea Prefer sources to binaries in JDR 2014-01-15 16:16:20 +04:00
Andrey Breslav 5a49b6fda5 Loading classes with wrong ABI version as Java classes 2014-01-15 16:16:20 +04:00
Andrey Breslav 2e4d166d6f Loading deseralized descriptors integrated with loading from bare Java code 2014-01-15 16:16:19 +04:00
Andrey Breslav 672594cb92 Deserialization made available through context 2014-01-15 16:16:19 +04:00
Andrey Breslav 2febcb175d Minor: typo fixed 2014-01-15 16:16:18 +04:00
Andrey Breslav 308e438671 Java package fragment's provider is JavaPackageFragmentProvider 2014-01-15 16:16:18 +04:00
Andrey Breslav 1f382ca744 JavaDescriptorResolver exposes ModuleDescriptor 2014-01-15 16:16:17 +04:00
Andrey Breslav 48ac30a933 Add getPackageFragment() to JavaDescriptorResolver 2014-01-15 16:16:16 +04:00
Andrey Breslav cedbc0ea53 Add default supertype to enum class objects 2014-01-15 16:16:15 +04:00
Andrey Breslav 5d9c11a61e JavaDescriptorResolver returns LazyJavaPackageFragmentProvider in LAZY mode 2014-01-15 16:16:14 +04:00
Andrey Breslav ada79588f6 Names of subpackages and classes are computed in LazyJavaPackageFragmentProvider 2014-01-15 16:16:14 +04:00
Andrey Breslav c01705f542 Unneeded subclasses replaced by factory methods 2014-01-15 16:16:14 +04:00