Commit Graph

15830 Commits

Author SHA1 Message Date
Nikolay Krasko 82ddbb9d39 Minor: remove warnings 2014-05-30 00:04:01 +04:00
Alexander Udalov 796912bfcb Provide implicit receiver to extension property initializer
This is safe because initializers for extension properties are forbidden
anyway, we'll just won't be generating noisy error messages about non-existent
'this'
2014-05-29 21:24:06 +04:00
Alexander Udalov a78b7fb31f Don't add initializer to extension property on override/implement 2014-05-29 21:24:06 +04:00
Alexander Udalov d78d4bc44c Disallow extension properties with backing fields
#KT-1682 Fixed
2014-05-29 21:24:05 +04:00
Alexander Udalov ea31f372aa Check for syntax/diagnostic errors in some tests 2014-05-29 21:24:05 +04:00
Alexander Udalov 2b5bc6b63d Fix logic of forcing method return type to be wrapped
Return type must be wrapped if any super-method in the hierarchy, not just the
direct super-method, returns a reference type (as opposed to a primitive type)

Actually there was a test reflecting this, but it wasn't running because of an
unfixed diagnostic error
2014-05-29 21:24:02 +04:00
Alexander Udalov 33f8c49275 Minor, change test case according to its name 2014-05-29 21:07:34 +04:00
Alexander Udalov 6210e45fbc Minor, improve test case for KT-1157
Multithreaded version was not working correctly and was throwing NPEs in the
log sometimes
2014-05-29 21:07:34 +04:00
Alexander Udalov 8a84d07645 Fix warnings in JVM codegen tests
Add generics where needed, add nullability annotations, etc.
Also delete some testcases from ArrayGenTest which will never be supported
2014-05-29 21:07:34 +04:00
Svetlana Isakova beb7dc4524 Supported moving a labeled lambda outside parentheses 2014-05-29 17:18:47 +04:00
Svetlana Isakova 41df522234 Merge pull request #472 from wutalman/move_lambda
KT-4889: (Bug fix) Intention to move lambda outside parentheses now handles commas
2014-05-29 17:11:41 +04:00
Alexey Sedunov 4678a5866a Light Classes: Track original declaration for Kotlin light fields
#KT-4902 Fixed
2014-05-28 21:06:01 +04:00
Alexey Sedunov ab5e0c8c9c Move: Retain imports when moving top-level declaration
#KT-5049 Fixed
2014-05-28 21:06:00 +04:00
Andrey Breslav df413c0b47 cast() method in DiagnosticFactory 2014-05-28 14:53:30 +04:00
Natalia Ukhorskaya d6cc62e12c Merge remote-tracking branch 'origin/pr/465'
Conflicts:
	libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
2014-05-28 12:12:07 +04:00
Andrey Breslav caeb978c7a Fix for EA-41250 - E: _JetLexer.zzScanError - Could not match input 2014-05-27 18:49:31 +04:00
Andrey Breslav e50eb73fb1 Throw exceptions (not errors) from lexer
+ Add more data to the exception message
2014-05-27 18:17:46 +04:00
Evgeny Gerashchenko 453fdb0dbe Moved tool window factory into tool window class. 2014-05-27 16:37:32 +04:00
Evgeny Gerashchenko cd3ffb6564 Removed resolve tool window since it is not used. 2014-05-27 16:37:31 +04:00
Natalia Ukhorskaya 3557977588 Evaluate expression: ClassCastException trying evaluate kotlin expression from java file
EA-56624 Fixed
2014-05-27 13:42:56 +04:00
Natalia Ukhorskaya 0c2120b578 Evaluate expression: add debug expression inside block for function literals
EA-56887 Fixed
2014-05-27 13:42:55 +04:00
Natalia Ukhorskaya 545b8ac7c3 Add information about codeFragment and sourceFile for exceptions from Evaluate Expression 2014-05-27 13:42:55 +04:00
Natalia Ukhorskaya ec6809ccae Evaluate expression: pass this as first parameter 2014-05-27 13:42:54 +04:00
Nikolay Krasko a2f369b610 Update to IDEA 135.909 (13.1.3) 2014-05-27 12:34:51 +04:00
Alexander Udalov cc94010d07 Fix broken test data file 2014-05-26 16:49:10 +04:00
Alexander Udalov afd3127054 Create and store necessary codegens in MemberCodegen 2014-05-26 16:48:20 +04:00
Alexander Udalov 5b99b0ceb0 Make ClassBuilderOnDemand extend ClassBuilder
Introduce DelegatingClassBuilder, refactor RemappingClassBuilder to use it
2014-05-26 16:48:20 +04:00
Alexander Udalov 9e325b3ebe Remove heuristic from PackageCodegen
Implement the logic in a more straightforward way, move the heuristic to
JavaElementFinder where it was also used
2014-05-26 16:48:19 +04:00
Alexander Udalov 9dd81bdb3d Refactor PackageCodegen and ClassBuilderOnDemand
Make ClassBuilderOnDemand non-abstract and create its instance directly in
PackageCodegen's constructor
2014-05-26 16:48:19 +04:00
Alexander Udalov 4ee7d2e72a Simplify ClassFileFactory
Get rid of outdated assertions, mark createText() as TestOnly, add
NotNull/Nullable annotations.

Inline useless forClass/forTraitImpl/... methods, because this way it's simpler
and some code was already using newVisitor() anyway
2014-05-26 16:48:18 +04:00
Alexander Udalov ae27ac1661 Minor, reorder code in ExpressionCodegen 2014-05-26 16:48:18 +04:00
Alexander Udalov 7857bc32de Merge ParentCodegenAware and ParentCodegenAwareImpl
Unextend ExpressionCodegen from ParentCodegenAware and make its
getParentCodegen() non-null. This fixes some nullability warnings related to
getParentCodegen()
2014-05-26 16:48:17 +04:00
Alexander Udalov a1d752c7ae Minor, fix parameter type in MemberCodegen 2014-05-26 15:31:32 +04:00
Alexander Udalov 4ec8000121 Minor cleanup in FieldOwnerContext 2014-05-26 15:31:32 +04:00
Mikhael Bogdanov 69ef648005 Write outer class info for closures 2014-05-26 14:48:37 +04:00
Mikhael Bogdanov 9773015548 Fix visibility for main script function 2014-05-26 14:48:37 +04:00
Mikhael Bogdanov 449e26ce6d New tests for outer class info 2014-05-26 14:48:34 +04:00
Mikhael Bogdanov 1a164cade8 OuterClassInfo refactoring 2014-05-26 12:43:41 +04:00
Valentin Kipyatkov 2ddcae68e8 Fixed KT-5077 Code completion inserts FQ names inside lambda
#KT-5077 Fixed
2014-05-23 19:16:23 +04:00
Zack Grannan b2858e5b82 Added ConvertToConcatenatedStringIntention 2014-05-23 16:27:46 +04:00
Nikolay Krasko 8e2878a6eb Minor: annotate parameter 2014-05-23 15:36:31 +04:00
Nikolay Krasko 80d6b0800e Make ResolveSessionForBodies.resolveToDescriptor() work for local declarations (EA-56877)
Fix (EA-56877)
2014-05-23 15:36:31 +04:00
Nikolay Krasko 89f80db98f Refactoring: more suitable method 2014-05-23 15:36:30 +04:00
Nikolay Krasko a8642c8636 Refatoring: rewrite in PsiTreeUtil style 2014-05-23 15:36:29 +04:00
Nikolay Krasko 84fb54fcdb More information for EA-48954 2014-05-23 15:36:29 +04:00
Nikolay Krasko 34a9d9e91d Minor: remove warnings 2014-05-23 15:36:28 +04:00
Mikhael Bogdanov 950840b8c7 KT-5076 Error on inlining into object
#KT-5076 Fixed
2014-05-23 11:59:05 +04:00
Alexander Udalov 0bd482d271 Minor, don't create unnecessary map in OverrideResolver 2014-05-22 19:32:11 +04:00
Alexander Udalov f3e8ba072d Minor, fix "visibility modifier" positioning strategy for objects
It's not reproducible at the moment, but will matter if more diagnostics use
this positioning strategy
2014-05-22 19:32:11 +04:00
Alexander Udalov 3c3d120004 Prohibit implicit overrides with lesser visibility
A non-abstract super-declaration is allowed to stand as 'an implementation' of
a fake override only if its visibility is not less than visibilities of all
other super-declarations

 #KT-2491 Fixed
2014-05-22 19:32:10 +04:00