Commit Graph

3539 Commits

Author SHA1 Message Date
Alex Tkachman 0a2f808ec0 test case and fixes for object and classes inner for enum entry 2012-09-12 20:48:12 +03:00
Alexander Udalov ccfa5f8c2c Do not lookup expressions in closures when building signatures
#KT-2764 Fixed
(EA-38857)
2012-09-12 21:16:47 +04:00
Alex Tkachman ca65574bce no need for context lookup of enclosing singletons #KT-2695 fixed 2012-09-12 19:41:26 +03:00
Nikolay Krasko 1121d9b316 EA-38789 Fix "Name is null for OBJECT_DECLARATION object" 2012-09-12 19:58:45 +04:00
Alex Tkachman 6c4102bf23 simple case (no closures) of class level objects #KT-2398 fixed 2012-09-12 17:35:51 +03:00
Alexander Udalov 6822d9496f Fix backend tests on Windows
Make getMultiFileNamespaceInternalName work when given PsiFile contains mixed
path separators in its name.
2012-09-12 16:59:25 +04:00
Alex Tkachman 79c04038fb accessor for private constructors #KT-2716 fixed
also on the way done small refactoring of JetTypeMapper
- few code duplicates replace by methods
- mapToCallableMethod(ConstructorDescriptor) introduced
2012-09-12 10:31:48 +03:00
Alex Tkachman fb4d6610a8 unification of accessable descriptor lookup between functions and properties 2012-09-12 09:20:10 +03:00
Alex Tkachman 5080ca9eb0 extracted method for accessibleFunctionDescriptor 2012-09-12 08:32:38 +03:00
Nikolay Krasko b6e2381861 EA-36473 Wrap method for JetLightClass with invalid fq name 2012-09-11 21:29:42 +04:00
Nikolay Krasko 9a645dca3e Ability to get correct fqName for JvmClassName with names for class objects and traits 2012-09-11 21:29:41 +04:00
Nikolay Krasko 603d85f29d EA-39113 Fail for "object { fun testing() = 12 }" 2012-09-11 21:29:40 +04:00
Nikolay Krasko ec6af86761 Small formatting fix 2012-09-11 21:29:39 +04:00
Nikolay Krasko 44fe00afb4 Use constant instead of string literals 2012-09-11 21:29:38 +04:00
Nikolay Krasko 9c7587e221 Correct spelling in method name 2012-09-11 21:29:37 +04:00
Andrey Breslav 068c6795fe Fixing tests 2012-09-11 21:02:05 +04:00
Andrey Breslav 91a9b6539f EA-37910 - UOE: DescriptorUtils.getSubstitution
The corresponding method reworked to be less of a hack
Tests added
2012-09-11 20:52:11 +04:00
Andrey Breslav a632d53e58 DFS Utility class used in TypeHierarchyResolver 2012-09-11 20:52:11 +04:00
Andrey Breslav ab18b12165 DFS utility class factored out of CommonSupertypes 2012-09-11 20:52:10 +04:00
Alex Tkachman 6a0e4d1593 name clash when several files of the same package has different paths but the same name #KT-2713 Fixed 2012-09-11 17:05:23 +03:00
Alex Tkachman ec549895e8 fix for NPE when lookup names in objects/closure in constructors #KT-2719 Fixed 2012-09-11 16:16:09 +03:00
Alexander Udalov bb92655ecd Prohibit creation of JetLightClass on built-ins
If we allow JetLightClass to be created on built-in types, a normal codegen
would be launched, with a mapping from Kotlin to Java types enabled, every time
IDE requests built-in classes. Codegen would then try to make something
meaningless, e.g. create a class for a primitive type (since our jet.Boolean is
mapped to primitive boolean). This would result in different exceptions when
navigating to built-in library from IDE.

Add a helpful error message to ClassFileFactory if we ever again produce
classes for primitive types.
2012-09-11 17:08:33 +04:00
Alex Tkachman 4eea0cafb9 test for obsolete KT-2626 2012-09-11 15:51:16 +03:00
Natalia.Ukhorskaya 199f10034b KT-2744 Unneeded error message when the only super type is not resolved
#KT-2744 Fixed
2012-09-11 15:17:13 +04:00
Svetlana Isakova c03190910c test change
returned check for unimported reference to test
2012-09-10 20:15:20 +04:00
Svetlana Isakova b2b3d6273e improved test 2012-09-10 20:15:20 +04:00
Svetlana Isakova 2c118084d1 extracted method 'getInnerClassByName' 2012-09-10 20:15:20 +04:00
Svetlana Isakova 1d63ed4db5 double quote(') in DefaultErrorMessages
to make the message the right argument for MessageFormat
2012-09-10 20:15:19 +04:00
Alex Tkachman b343602f0e reformat code & optimize import 2012-09-10 15:54:16 +03:00
Andrey Breslav ddaa6159bf Formatting 2012-09-10 11:19:46 +04:00
Alex Tkachman 53f145b533 optimization of delegates by val property 2012-09-08 09:34:02 +03:00
Svetlana Isakova cd5521d6dc rename error 2012-09-07 19:03:07 +04:00
Svetlana Isakova 1dfe212844 minor 2012-09-07 19:03:06 +04:00
Svetlana Isakova 7c0bebe631 make parameter moduleConfiguration @NotNull
(in 'processImportReference')
2012-09-07 19:03:06 +04:00
Svetlana Isakova 1760d56017 removed unnecessary more util method 2012-09-07 19:03:06 +04:00
Svetlana Isakova 3bd79fa701 introduced interface PlatformToKotlinClassMap
changed method in ModuleConfiguration (now it returns PlatformToKotlinClassMap)
JavaToKotlinTypesMap implements PlatformToKotlinClassMap
'importAllUnderDeclaration' in Importer uses PlatformToKotlinClassMap
2012-09-07 19:03:06 +04:00
Alexander Udalov c0dc1e6742 NamespaceComparator now serializes kind, if it's not DECLARATION.
Lots of test data changed to include members' kinds.
2012-09-07 19:00:08 +04:00
Alexander Udalov cb13995057 Write callable member's kind to JetMethod annotation
Reuse deprecated kind() parameter in JetMethod annotation to store
CallableMemberDescriptor.Kind if it's not DECLARATION.

JavaDescriptorResolver doesn't always resolve members to DECLARATION
anymore, instead it deserializes member's kind from the annotation.

Create DescriptorKindUtils to convert Kind to int value and back.
2012-09-07 19:00:07 +04:00
Alexander Udalov 8a33d390a2 Change newHashSet() to newLinkedHashSet()
This helps in debugging blinking tests, where the outcome is dependent on
the order of elements in a Set
2012-09-07 19:00:06 +04:00
Alexander Udalov 9fc208cfad Support data class componentN functions in lazy resolve
Lazy resolve LoadKotlin test class regenerated.
No new diagnostic tests (run lazy resolve diagnostic test generator for
this purpose).

 #KT-2628 Fixed
2012-09-07 19:00:06 +04:00
Alexander Udalov 67211fde40 Check componentN functions for overload conflicts 2012-09-07 19:00:05 +04:00
Alexander Udalov fbeaaf5fbb Check componentN functions for override conflicts
Check if newly generated component functions happen to override something
which they're not supposed to.
Create new slice to store mapping from annotation descriptors to
corresponding PSI elements, which is used by override checker to report
errors in data classes on.
2012-09-07 19:00:04 +04:00
Alexander Udalov c29312043c Refactor OverrideResolver.checkOverrideForMember()
Create CheckOverrideReportStrategy interface to report override errors
(will be used later for synthesized members override checks).

Add diagnostic test on OVERRIDING_FINAL_MEMBER, as no such test happened
to exist before.
2012-09-07 19:00:04 +04:00
Alexander Udalov 2aadfa47ee Write typeinfo annotations of generated componentN methods
Add some LoadKotlin testcases to test that.
2012-09-07 19:00:03 +04:00
Alexander Udalov 2c84389a45 Codegen for "componentN" functions for data classes 2012-09-07 19:00:02 +04:00
Alexander Udalov b93db69a24 Resolve "componentN" functions for data classes
Reuse existing (but not used) VALUE_PARAMETER_AS_PROPERTY in
BindingContext to store mapping from constructor's value parameters to
property descriptors.

Create a new slice DATA_CLASS_COMPONENT_FUNCTION to store mapping from
constructor's value parameters to generated componentN functions.
2012-09-07 19:00:01 +04:00
Alexander Udalov 410922c58d CallableMemberDescriptor.Kind.SYNTHESIZED
Introduce CallableMemberDescriptor.Kind.SYNTHESIZED for members which
neither are declared nor do appear as overrides of anything, but rather
are generated by the compiler.
2012-09-07 19:00:01 +04:00
Alexander Udalov 95dddadb36 Present "data" annotation to standard library 2012-09-07 19:00:00 +04:00
Andrey Breslav b46187a560 KT-2739 Error type inferred for hashSet(Pair, Pair, Pair)
#KT-2739 Fixed
2012-09-07 18:24:22 +04:00
Alexander Udalov 213157a3c5 Regenerate diagnostic tests 2012-09-07 17:58:03 +04:00