998e598846
Refactor JavaConstructorResolver
...
Extract methods, fix warnings, use JavaClass/JavaMethod instead of Psi
2013-09-04 21:55:01 +04:00
62868421cf
Minor, green code & move type transformer to "resolver/"
2013-09-04 21:55:01 +04:00
78f9cb7203
Get rid of PsiMemberWrapper
...
Continue migration, use the new Java* classes instead everywhere
2013-09-04 21:55:01 +04:00
245b9d1ab1
Minor, change method parameter from String to JvmClassName
2013-09-04 21:55:00 +04:00
55af245867
Migrate JavaClassResolver from PSI to JavaClass
...
Several places are still left and need special handling. The overall behavior
of the resolver should not change in this commit (except for maybe different
small operations like creating names, fq-names, ...)
2013-09-04 21:55:00 +04:00
de54f7d732
JavaClass, JavaPackage, JavaAnnotation
...
Create dumb wrappers over PSI elements, will be used for loading descriptors
from JVM reflection later (instead of PSI)
2013-09-04 21:55:00 +04:00
eaacff4566
Remove RuntimeHandleClassesMode
...
There were two usages of RuntimeHandleClassesMode.REPORT_ERROR: first in tests,
where it never occurred, second in JavaClassResolver, where it's now inlined
2013-09-04 21:55:00 +04:00
4eb9f28312
Remove useless PsiClass parameter
...
It was used only for a debug message and an assertion that never happened
2013-09-04 21:55:00 +04:00
cc81d12b55
Remove useless methods from PsiClassFinder
...
Their only implementations called methods on a parameter + a utility. Move the
utility to DescriptorResolverUtils
2013-09-04 21:55:00 +04:00
175a598e6d
Delete JavaBaseScope.getPsiElement()
2013-09-04 21:55:00 +04:00
d84ab4423f
Support enums as annotation arguments in deserialized Kotlin descriptors
2013-08-29 16:48:09 +04:00
de062274e9
Extract getEnumEntriesScope utility method
2013-08-29 16:48:09 +04:00
e0c9328969
Remove unused DependencyClassByQualifiedNameResolver#resolveNamespace
2013-08-26 22:15:08 +04:00
881a633ba0
Get rid of DescriptorSearchRule.ERROR_IF_FOUND_IN_KOTLIN
...
Rename other constants in DescriptorSearchRule
Inline methods with default values for DescriptorSearchRule
2013-08-26 22:07:36 +04:00
b634792356
Use VirtualFileFinder in AnnotationDescriptorDeserializer
2013-08-26 17:58:50 +04:00
7d50a8c6ea
Use VirtualFileFinder in JavaNamespaceResolver
2013-08-26 17:58:49 +04:00
e4988f9dba
Use VirtualFileFinder in JavaClassResolver
...
HACK: determine whether fqname is a name for class contained in class or namespace based on virtual file name
This commit introduces code duplication which is hard to avoid without major refactoring
2013-08-26 17:58:48 +04:00
52de4215b5
Introduce VirtualFileFinder interface
...
Provide different implementations in Cli and Ide
2013-08-26 17:58:47 +04:00
4e29aad1c1
Rework invalid abi version reporting
...
KotlinClassFileHeader is aware of older annotations
Psi is not used to report invalid Abi version in CLI
2013-08-26 17:58:44 +04:00
e0e2d50143
KotlinClassFileHeader now saves JvmClassName for processed class
...
Add utility methods
Refactor static method to member methods
2013-08-26 16:00:15 +04:00
fb07a4c1ab
Move SAM utils from MembersCache to SAMUtils
2013-08-26 16:00:09 +04:00
c5e37cc3de
Move classes around in frontend.java
...
Move Java<->Kotlin class mapping to 'mapping' package, move method mapping to
'kotlinSignature' (and make it package local), delete unused methods
2013-08-26 16:00:08 +04:00
ea7036d808
Minor, move utilities to where they are used
2013-08-26 16:00:07 +04:00
85e7b87ccd
Move java visibilities to JavaVisibilities class
...
Move related utilities to where they're used
2013-08-26 16:00:06 +04:00
e1a10eb419
Delete JavaInnerClassResolver
...
Move its two methods to the place where they are used
2013-08-26 16:00:05 +04:00
86013aacde
Delete PsiDeclarationProvider
...
And its two subclasses. Replace it by package-local MembersProvider, which is
used only in java scopes, and two factory methods (for package & for class)
2013-08-26 16:00:03 +04:00
e2d6234c9c
Simplify PsiDeclarationProvider
...
- simplify hierarchy, now there's only two kinds of providers: for packages and
for classes
- remove getters from providers and thus almost get rid of dependencies on them
from the outside resolver (the only usages left are those that call
getMembersCache)
2013-08-26 16:00:02 +04:00
d708dc6ed4
Delete JavaSemanticServices
...
Almost in all places only JavaDescriptorResolver was needed. The only exception
is JavaPackageScope which needs PsiClassFinder, that is now passed as a
constructor argument.
Also merge JavaPackageScopeWithoutMembers into its superclass JavaPackageScope
2013-08-26 16:00:01 +04:00
a0cbe80aca
Delete JavaSemanticServices.getTypeTransformer()
...
Two clients can depend on JavaTypeTransformer directly instead of
JavaSemanticServices
2013-08-26 16:00:00 +04:00
dbf324667f
Delete PsiDeclarationProviderFactory
2013-08-26 15:59:58 +04:00
2d7a5ebf36
Simplify injectors for frontend.java
...
- delete InjectorForJavaSemanticServices, replace its usages with
InjectorForJavaDescriptorResolver
- delete unneeded fields and parameters of InjectorForJavaDescriptorResolver
2013-08-26 15:59:57 +04:00
763572663e
Delete almost all code related to signature writing
...
Delete org.jetbrains.jet.rt.signature and jet.typeinfo packages from runtime,
refactor BothSignatureWriter so that it now writes only java generic signature
and saves parameter types and kinds
2013-08-26 15:59:54 +04:00
5d647cac94
Delete ScopeUtils, move its only method
2013-08-26 15:59:52 +04:00
78bd6faffc
Minor, refactor JetFilesProvider
2013-08-26 15:59:51 +04:00
155f3b3b96
Simplify TypeVariableResolver
2013-08-26 15:59:50 +04:00
cbdc157743
Delete PsiAnnotationWrapper
...
Merge its logic into KotlinSignatureAnnotation, move the latter to
resolve/java/kotlinSignature, delete resolve/java/kt package
2013-08-26 15:59:49 +04:00
bd54e070bb
Get rid of dependency on PsiClass from deserialized resolver
2013-08-26 15:59:48 +04:00
8746ee2895
Report ABI errors without PsiClass
2013-08-26 15:59:46 +04:00
19299daacd
Deserialize annotations on class object properties
...
Class object properties' backing fields are generated into static fields of the
containing class, not into fields of class object. For fields we now store the
flag which, if set, tells that this field should be looked for in the
containing class
2013-08-26 15:59:45 +04:00
32c5624531
Convert between byte[] and String[] efficiently
2013-08-26 15:59:44 +04:00
5ea38437c2
KotlinClassFileHeader determines what kind of annotation it contains
...
Add some stronger assertions about class file format
2013-08-26 15:59:42 +04:00
a131592c70
Refactor: Extract utilities related to reading KotlinClass and KotlinPackage annotations to a separate class KotlinClassFileHeader
2013-08-26 15:59:40 +04:00
f77dd0bad6
Remove JetTypeJetSignatureReader
2013-08-26 15:59:37 +04:00
a9b57a5535
Rearrange JvmStdlibNames, delete old annotations
...
Delete unused constants
Move constants related to abi to JvmAbi class
Constants related to annotation names are now in JvmAnnotationNames
Remove old annotation classes
Deprecate JetClass and JetPackageClass name constants
2013-08-26 15:59:36 +04:00
01735a0412
Do not write old annotations (JetClass and others)
2013-08-26 15:59:33 +04:00
4fe78e4e7b
Move utilities using annotations to determine whether PsiClass is kotlin class or package class to DescriptorResolverUtils
...
Fix some of the usages
PackageClassUtils uses more precise method name
2013-08-26 15:59:32 +04:00
7c49374dab
Minor: remove unused field
2013-08-26 15:59:31 +04:00
9be16bf94c
Remove logic in JavaPropertyResolver related to kotlin properties
...
Make logic in MembersCache clearer
Remove useless helper classes
2013-08-26 15:59:29 +04:00
f5c4075837
Remove PsiClassWrapper class
2013-08-26 15:59:28 +04:00
6c02f6aba8
Remove PsiParameterWrapper class
2013-08-26 15:59:27 +04:00
Alexander Udalov