Commit Graph

1666 Commits

Author SHA1 Message Date
Nikolay Krasko 1121d9b316 EA-38789 Fix "Name is null for OBJECT_DECLARATION object" 2012-09-12 19:58:45 +04:00
Nikolay Krasko 603d85f29d EA-39113 Fail for "object { fun testing() = 12 }" 2012-09-11 21:29:40 +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
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
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 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
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 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 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
Evgeny Gerashchenko 44a70669d7 Minor. 2012-09-07 17:52:32 +04:00
Kirill Berezin 82a5beddea do not copy overrides for the delegated methods, it causes failure of delegation to traits which extend other traits 2012-09-06 20:27:43 +04:00
Kirill Berezin 1061e1ef69 do not generate delegates when the class already has such method either declared or delegated (report an ambiguity in this case)
Merge conflict resolved by committer
2012-09-06 20:27:43 +04:00
Natalia 4303083945 KT-322 Prohibit inheriting classes from enums
#KT-322 Fixed
2012-09-06 17:24:37 +04:00
Natalia 07cf73ecef KT-2697 Prohibit enum inheritance
#KT-2697 Fixed
2012-09-06 17:24:36 +04:00
Svetlana Isakova bdf189ed71 fixes after merge
(added module configuration parameter)
2012-09-05 18:55:19 +04:00
Svetlana Isakova 8e5e309440 preserve order while collect overrides 2012-09-05 18:55:19 +04:00
Svetlana Isakova fedf080a59 changes in MutableMap trait 2012-09-05 18:55:17 +04:00
Svetlana Isakova bab20717ee KT-2688 Provide mutable/immutable interfaces for Java collections
#KT-2688 fixed
2012-09-05 18:55:16 +04:00
Svetlana Isakova 6fe49398a6 added 'getKotlinAnalogsForJavaStandardClasses'
to most of module configurations
2012-09-05 18:55:16 +04:00
Svetlana Isakova 726bcb5465 KT-2606 Filter java.util.* import
#KT-2606 fixed
 added FilteringScope
2012-09-05 18:55:16 +04:00
Svetlana Isakova a04f6ee263 extracted method reportHasKotlinAnalog 2012-09-05 18:55:16 +04:00
Svetlana Isakova fb6e1e5dc3 added ERROR_CONFIGURATION to not to confuse it with empty configuration 2012-09-05 18:55:16 +04:00
Svetlana Isakova d642d2266b KT-2641 Warn on using j.l.Iterable in Kotlin code
#KT-2641 fixed
2012-09-05 18:55:16 +04:00
Svetlana Isakova 22227663de add 'isSafe' to FqNameUnsafe 2012-09-05 18:55:16 +04:00
Svetlana Isakova e70db866ad add 'getKotlinAnalogs' to ModuleConfiguration 2012-09-05 18:55:15 +04:00
Svetlana Isakova 7073b12d11 add ModuleConfiguration to injectors
(to be able to use it in TypeResolver)
2012-09-05 18:55:15 +04:00
Andrey Breslav 7c4322cd2c Condition do not declare variables any more 2012-09-05 15:04:49 +04:00
Andrey Breslav d4cdbbccff DataFLowInfo doesn't flow from when-checks 2012-09-05 14:18:41 +04:00
Andrey Breslav 756ca9b284 DataFlowInfo treatment adjusted for absence of complex patterns
As patterns in when are no longer recursively nested, teh code is simplified.
Also, instead of keeing a Map<JetPattern, DataFlowInfo> patternsToDataFlowInfo in ExpressionTypingContext,
we fall back for a slice in the trace.

Refactoring: DataFlowInfos class introduced to repace a Pair<DFI, DFI>

 #KT-2359 In Progress
2012-09-05 14:18:40 +04:00
Andrey Breslav 70f3da109d Removing obsolete PSI classes, error message and CF-handling
#KT-2359 In Progress
2012-09-05 14:18:40 +04:00
Andrey Breslav 10d453ce6a Removing grammar/parsing support for complext patterns
#KT-2359 In progress
2012-09-05 14:18:40 +04:00
Andrey Breslav 73384529c7 Proper toString() for DataFlowInfo 2012-09-05 14:18:39 +04:00
Andrey Breslav 755c830714 Comment deleted 2012-09-05 14:18:39 +04:00
Natalia.Ukhorskaya b113059c2c KT-2709 Optimizing import removes reference to class when in code val from its class object is used
#KT-2709 Fixed
2012-09-05 11:39:42 +04:00
Nikolay Krasko d4564a41e3 EA-38865 Fail for convention functions names 2012-09-04 22:56:12 +04:00
Nikolay Krasko c8ac9b4997 Remove old comments 2012-09-04 17:21:34 +04:00