Commit Graph

62 Commits

Author SHA1 Message Date
Alexander Udalov feb4dd7b8f Drop 'OBJECT$' field deprecated in M11 2015-07-06 16:19:54 +03:00
Denis Zharkov eb7114bd53 Add 'constructor' keyword in whole project where needed 2015-06-12 09:55:15 +03:00
Alexey Sedunov 95438c7b5d Light Classes: Fix ClassCastException for KotlinNoOriginLightField 2015-06-11 13:52:59 +03:00
Alexey Sedunov bbc644f4c8 Refactoring: Unify getClassOrObject() and getContainingClassOrObject() functions in constructor PSI 2015-06-11 13:52:58 +03:00
Alexey Sedunov 1ea2c24562 Light Classes: Primary constructor fixes 2015-06-11 13:52:48 +03:00
Pavel V. Talanov f335e9f6b2 Fix a problem where a sequence of out-of-block completions could lead to an inconsistent resolve session provided for a synthetic copy of a file 2015-06-03 21:22:10 +03:00
Denis Zharkov c054dc19e3 Get rid of assumption that primary ctr is a child of JetClass
As it can be contained within JetObjectDeclaration
2015-06-02 13:18:53 +03:00
Valentin Kipyatkov 8fd6a64be9 Refactored methods for val/var in PSI 2015-06-01 18:23:34 +03:00
Alexey Sedunov 26c4efb587 Light Elements: Filter out nulls when converting Kotlin declarations to corresponding light elements
#EA-64403 Fixed
2015-05-30 18:16:25 +03:00
Valentin Kipyatkov 006c02b569 Getting rid of confusing methods on PsiElement's 2015-05-29 13:55:47 +03:00
Alexander Udalov 48b18f18d3 Restore explicit imports of Kotlin function types in Java
This is a follow-up to 738a84e259 and
d4965a4f3e. Optimize imports in all files
affected in those commits, drop temporary _.kt
2015-05-26 18:46:27 +03:00
Alexander Udalov 738a84e259 Temporary hack to migrate functions to package kotlin.jvm.functions
Add a file in package 'kotlin.jvm.functions' to the project and replace
explicit imports of functions 'kotlin.Function{n}' to two imports 'kotlin.*'
and 'kotlin.jvm.functions.*', so that the codebase can be compiled both by the
old and by the new compiler
2015-05-26 15:04:34 +03:00
Evgeny Gerashchenko 2568fc92cb Supported Kotlin in Java's automatic parameter renamer. 2015-05-22 17:18:07 +03:00
Yan Zhulanow b2220ca98a Annotation collector compiler plugin 2015-05-21 15:48:06 +03:00
Nikolay Krasko 6b64ae77f3 Test light classes from sources have priority over decompiled light classes 2015-05-15 15:29:31 +03:00
Dmitry Jemerov cce1be3892 rename JetClass.isTrait() to isInterface(); rename ClassKind.TRAIT to INTERACE 2015-04-29 16:50:19 +02:00
Nikolay Krasko 90cdb19324 Add origin for generated jvm overloads and tweak equals methods to distinguish them
- KT-7586 Strange navigation issue

 #KT-7586 Fixed
2015-04-29 15:20:31 +03:00
Pavel V. Talanov ac2cb9af74 Remove some usages of KotlinBuiltIns.getInstance()
Introduce DeclarationDescriptor.builtIns extension to get builtins where descriptors are available
Introduce various utilities in KotlinBuiltIns to check for primitive types and get fq names of builtins
2015-04-28 12:49:34 +03:00
Evgeny Gerashchenko f5677d8424 Converted JetPsiUtil.getElementTextWithContext() to Kotlin extension function. 2015-04-22 14:10:00 +03:00
Nikolay Krasko ca98b19aba Wrong package light file with package class 2015-04-01 02:02:07 +03:00
Nikolay Krasko 055be2850f Fix accept() in light methods elements to avoid treating them as ClsElements 2015-04-01 02:02:01 +03:00
Nikolay Krasko 4e04d9b887 Add more toString() methods and additional wrapping for Kotlin elements 2015-04-01 02:01:55 +03:00
Denis Zharkov a4018d9eae Run "Add 'init' keyword in whole project" quickfix 2015-03-31 20:20:23 +03:00
Denis Zharkov 741c9febe2 Modify various usages of old PSI structure of primary ctor 2015-03-31 20:20:22 +03:00
Pavel V. Talanov ed218c473a Get rid of 'class object' usages in code and builtins
Replace some comments and library usages as well
2015-03-25 18:28:00 +03:00
Denis Zharkov 0debd1ce6f Make IDE parts using light methods work with JetFunction 2015-03-18 10:56:34 +03:00
Denis Zharkov 25de64c6ab Support class rename in place of secondary ctor call 2015-03-18 10:56:31 +03:00
Pavel V. Talanov 06916d98c6 default -> companion: replace all mentions of default and default object 2015-03-17 15:47:39 +03:00
Pavel V. Talanov 2a6facaef6 default -> companion: default object -> class object in project code, builtins and libs code 2015-03-17 15:46:48 +03:00
Evgeny Gerashchenko ccd1701f78 Supported renaming of default object. Named only objects are supported
yet.
2015-03-16 14:11:39 +03:00
Pavel V. Talanov 9ecf95532e Replace 'class object' with default object in project code 2015-03-10 18:07:46 +03:00
Michael Bogdanov 37006ad566 Annotate additional files through bytecode toolwindow analysis 2015-02-20 10:16:22 +03:00
Pavel V. Talanov d6a942a574 Remove all deprecated OBJECT$ usages from project code 2015-02-18 19:33:56 +03:00
Nikolay Krasko 45a3b47664 Fix compilation once again 2015-02-18 18:51:56 +03:00
Nikolay Krasko 20b7a55bf2 Add overrides in order to fix compilation errors 2015-02-18 18:51:55 +03:00
Nikolay Krasko a49a206de3 Get containing file from original method 2015-02-18 18:51:54 +03:00
Alexander Udalov 63959c2ebf Drop temporary workaround, problem is fixed now 2015-02-10 16:32:47 +03:00
Alexander Udalov 192e69e90b Minor, add toString() to JavaElementFinder.FindClassesRequest 2015-02-09 21:14:03 +03:00
Alexander Udalov ebed59e26a Fix temporary workaround: bridge was not generated 2015-02-09 19:23:19 +03:00
Alexander Udalov 720942b05f Temporary workaround for compilation errors in KotlinLightClassForPackage 2015-02-09 12:41:59 +03:00
Nikolay Krasko 6f6a65cb8d Convert to LinkedHashSet 2015-02-06 23:53:17 +03:00
Nikolay Krasko 9173c59969 Fix deprecated warning 2015-02-06 23:53:16 +03:00
Nikolay Krasko de22bfbde9 Refactoring: extract method createFakeClsFile 2015-02-06 23:53:16 +03:00
Nikolay Krasko 8dd910bd36 Convert to Kotlin KotlinLightClassForPackage: fixes for j2k converter 2015-02-06 23:53:15 +03:00
Nikolay Krasko a4e2c3b6fa Convert to Kotlin KotlinLightClassForPackage: j2k converter 2015-02-06 23:53:14 +03:00
Nikolay Krasko 082ac7a05f Convert to Kotlin KotlinLightClassForPackage: file rename 2015-02-06 23:53:13 +03:00
Nikolay Krasko c9c3a1c924 Get containing with deferred stub evaluation
Tested in org.jetbrains.kotlin.idea.quickfix.QuickFixMultiFileTestGenerated.CreateFromUsage.CreateVariable.Parameter#testPlatformType
Resolve of Java element triggers resolve for all classes in package in IDE. One of them is Kotlin light class for package. In case when
some declarations in that packages has references to Java class from current package, compiler goes to recursion.
2015-02-06 23:53:12 +03:00
Alexey Sedunov 11b60f6604 Light Classes: Delegate getUseScope() to original elements
#KT-6699 Fixed
2015-02-04 23:38:18 +03:00
Alexander Udalov 1c87464695 Change properties to methods in light class hierarchy
There's a Kotlin-Java-Kotlin hierarchy with an abstract property in a
superclass and its implementation (as a get-method) in the Java subclass, which
caused problems because Kotlin subclass can't have both (different symbols,
same JVM signatures)
2015-02-04 14:57:49 +03:00
Alexander Udalov 17227bb4fe Rename org.jetbrains.kotlin.plugin -> org.jetbrains.kotlin.idea 2015-01-13 01:14:31 +03:00