azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
90,430 Commits 1 Branch 0 Tags
f780b7b4f7445f7c4668b411ce9ba2894968d4e4
Commit Graph

90430 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yan Zhulanow f780b7b4f7 [CHERRY PICKED FROM IJ] Minor: Change checkIsAndroidStudio() method name so it better says what it does 
(cherry picked from commit d1b19564a9873fbdf4818a7ee325c771d0d8db7a)

GitOrigin-RevId: ae00f60d3dfc79aed15814de4e81a93e6a07008d
Original commit: https://github.com/JetBrains/intellij-community/commit/36f66c2a44b2ea42ba796a3a31f63d4751588e99
 2022-01-12 15:10:50 +01:00
Yan Zhulanow 24e195d7c1 [CHERRY PICKED FROM IJ] Fix tests with Gradle project importer 
Adds explicit 'android.dir' preference to 'local.properties' of a Gradle project so Android components don't get in the way.

(cherry picked from commit 3b83f67587bb04810f5de50d6a29ab7963bd24ec)

GitOrigin-RevId: 6d7063bb8c5253c828f9df22efdfdaf2910b99c3
Original commit: https://github.com/JetBrains/intellij-community/commit/1e326c986175c2bb14ad6711caafb96ff85def4a
 2022-01-12 15:10:50 +01:00
Yan Zhulanow 24ab459e3a [CHERRY PICKED FROM IJ] Disable JPS tests when run against Android Studio 
(cherry picked from commit 23113fd13f02cac9163a54b0183572e826510366)

GitOrigin-RevId: 259f5ca81c749b71cc81d6c690bb73fe3af0e538
Original commit: https://github.com/JetBrains/intellij-community/commit/aa709349738e2814bf725b294e6c7dca68efd3e7
 2022-01-12 15:10:50 +01:00
Dmitry Gridin ef27b134a2 [CHERRY PICKED FROM IJ] [tests] KotlinJpsBuildTest*: cleanup code 
GitOrigin-RevId: 626313b2a47cab2f63a721d3de33d97af42b01fb
Original commit: https://github.com/JetBrains/intellij-community/commit/50dbdf9d30afa914978abb97f45b82cf226a5d8d
 2022-01-12 15:10:49 +01:00
Dmitry Gridin 8debe8667e [CHERRY PICKED FROM IJ] CacheVersionManager: cleanup code 
GitOrigin-RevId: bf6d303235937d7a66a925c2a788919168513b99
Original commit: https://github.com/JetBrains/intellij-community/commit/a170915a47b7e0a72488aa222530ff7ccf32f053
 2022-01-12 15:10:49 +01:00
Dmitry Gridin 0ee7187e3e [CHERRY PICKED FROM IJ] KotlinBuilder: cleanup code 
GitOrigin-RevId: 156806aed03531438fcafdd8fba325a7101f01d9
Original commit: https://github.com/JetBrains/intellij-community/commit/021d5bc301c91e386ea363389f5d95c25d361531
 2022-01-12 15:10:48 +01:00
Dmitry Gridin 1f62859019 [CHERRY PICKED FROM IJ] [tests] fix KotlinModuleXmlGeneratorTest 
GitOrigin-RevId: 7a00a761e6294793bff13cc0ea9b84d571fb714a
Original commit: https://github.com/JetBrains/intellij-community/commit/ab3886e11b285975f4e0eb4ea9f67e907de71e3c
 2022-01-12 15:10:48 +01:00
Dmitry Gridin bb0b785c59 [CHERRY PICKED FROM IJ] KotlinJpsBuildTest: fix tests 
GitOrigin-RevId: 51f9595dfb5f0ba280bab935e5945384dfe7e487
Original commit: https://github.com/JetBrains/intellij-community/commit/18bf77b87f8b89f6a6827176ce61215f2a69f0c4
 2022-01-12 15:10:47 +01:00
Dmitry Gridin ba9bcee24d [CHERRY PICKED FROM IJ] pull up addJdk from AbstractKotlinJpsBuildTestCase to BaseKotlinJpsBuildTestCase to fix tests 
GitOrigin-RevId: fd76500448ab232b34b5aef3cfa51b75be91803b
Original commit: https://github.com/JetBrains/intellij-community/commit/ad2f48e57191253bcde4b100a4536dbbed990ff1
 2022-01-12 15:10:47 +01:00
Yan Zhulanow 58bc5b80a1 [CHERRY PICKED FROM IJ] Use RunAll in all Kotlin tearDown() implementations 
GitOrigin-RevId: f9409eb1f5640905f46a0241b5fec9338483f331
Original commit: https://github.com/JetBrains/intellij-community/commit/58982727a601c749187a5946015c8b51b7e7789b
 2022-01-12 15:10:46 +01:00
Nikita Bobko 7bbec26b2d [CHERRY PICKED FROM IJ] Fix compilation with intellij 
GitOrigin-RevId: 2fa9aa992b9d4673a641a7e1d06402c78ca29400
Original commit: https://github.com/JetBrains/intellij-community/commit/0f44ee9b644fa98801aec31468edc919c1abbb9f
 2022-01-12 15:10:46 +01:00
Yan Zhulanow 4ef18fe036 [CHERRY PICKED FROM IJ] Remove almost all dependencies to dist/ artifacts 
'kotlin-coroutines-experimental-compat' is to migrate.

GitOrigin-RevId: 94dd58c1b38e763403b1f4252853b52d3a9d2f98
Original commit: https://github.com/JetBrains/intellij-community/commit/5b3fa35e82fe3e686328ae62d83de99e7be46dc6
 2022-01-12 15:10:46 +01:00
Vladimir Dolzhenko 3acd977a36 [CHERRY PICKED FROM IJ] Disable tests those directly use compiler test data 
GitOrigin-RevId: 3714ee17fbe02ee8a2809709eeb481ddfa07e086
Original commit: https://github.com/JetBrains/intellij-community/commit/a52130d32ca8dc364912e390dd2747ae1df0aa66
 2022-01-12 15:10:45 +01:00
Nikita Bobko ae9d039006 [CHERRY PICKED FROM IJ] Fix compilation 
GitOrigin-RevId: e64c89f5224dab28a4782ba42e0d98d102d69855
Original commit: https://github.com/JetBrains/intellij-community/commit/9063fad8cf7f6a1c8f5228288a298fa84cee3e84
 2022-01-12 15:10:45 +01:00
Nikita Bobko 7d938590f9 [CHERRY PICKED FROM IJ] No more need for KotlinIdeForTestCompileRuntime use ForTestCompileRuntime instead 
`KotlinIdeForTestCompileRuntime` was temp class. We don't need it
anymore because `tests-common` migrated to `kotlin-ide` repo and
`ForTestCompileRuntime` now is under our control

GitOrigin-RevId: f871531fec3aa09ad911d0dc6b9273ab32dbbf23
Original commit: https://github.com/JetBrains/intellij-community/commit/67838fa145c21747d8aa89b728ceb623e27e9676
 2022-01-12 15:10:44 +01:00
Nikita Bobko e24deb8b8a [CHERRY PICKED FROM IJ] Use KotlinIdeForTestCompileRuntime instead of ForTestCompileRuntime 
GitOrigin-RevId: adc692b40320957c94fd3f619cb764e4ca108419
Original commit: https://github.com/JetBrains/intellij-community/commit/f4114cf684219e95f3e33341c2a2736a94098ed6
 2022-01-12 15:10:44 +01:00
Yan Zhulanow 19458f6eb3 [CHERRY PICKED FROM IJ] Remove outdated bunch files 
GitOrigin-RevId: e57db32af350993e04232ec7e359ec35a4a5d04c
Original commit: https://github.com/JetBrains/intellij-community/commit/774d4e17ae5abab198730ba9bcee0d554a09c0a4
 2022-01-12 15:10:43 +01:00
Yan Zhulanow f2825d56f4 [CHERRY PICKED FROM IJ] Fix compatibility issues with 2020.2 
GitOrigin-RevId: a6c350b66e593dbbc9b0d8baa4728b28b65db5c6
Original commit: https://github.com/JetBrains/intellij-community/commit/084a0c5d16fce153c5bd73a8d9761ce47e2e182e
 2022-01-12 15:10:43 +01:00
Nikita Bobko 3033cf0a03 [CHERRY PICKED FROM IJ] kotlin-ide migration: Normalization commit 
This commit is consequence of not accurate migration to kotlin-ide repo.
These changes appeared as a result of split of big chunk of first
commits in kotlin-ide repo. I don't know where from changes in this
commit come from.

It could be changes of "bunch switch" commit. Or changes of other
accidentally squashed commits

GitOrigin-RevId: 6d1e18c36e02a4ad228fe7ddc5bd056e98e1be36
Original commit: https://github.com/JetBrains/intellij-community/commit/c490f5864de6ef36964aa4ee34cdf7b3f35db384
 2022-01-12 15:10:43 +01:00
Yan Zhulanow 3a21275306 [CHERRY PICKED FROM IJ] Remove as36 bunch 
GitOrigin-RevId: 65d06150b5f4cd4d94a28ab8066e4441a8145c02
Original commit: https://github.com/JetBrains/intellij-community/commit/6f91376c537c1790b652a039f43911d75c1ce41f
 2022-01-12 15:10:42 +01:00
Nikita Bobko c06fc28930 Remove as42 bunch from JPS plugin 2022-01-12 15:10:42 +01:00
Nikita Bobko d9a752f823 Remove as41 bunch 2022-01-12 15:10:41 +01:00
Yan Zhulanow 17e336ea44 [CHERRY PICKED FROM IJ] Move the withIC() function to the test itself 
GitOrigin-RevId: 196571333c115c1f24eebc048dbfcca5c2189dfa
Original commit: https://github.com/JetBrains/intellij-community/commit/1a521c2ee63b3e777b1f955b2f4cb91c28a158be
 2022-01-12 15:10:41 +01:00
Dmitry Gridin 46cad3efe0 [CHERRY PICKED FROM IJ] [jps] convert KotlinBuilderService to Kotlin 
GitOrigin-RevId: e0bf79e6e00f5c6826c1338bcf99e50e536c9f52
Original commit: https://github.com/JetBrains/intellij-community/commit/948a7546bf9eafadab9a46f45189101e9f960b9b
 2022-01-12 15:10:40 +01:00
Dmitry Gridin af17b2d412 [CHERRY PICKED FROM IJ] Rename .java to .kt 
GitOrigin-RevId: c8b1b3c8d3a58b6858041235d6bb7bfa541e3a6c
Original commit: https://github.com/JetBrains/intellij-community/commit/23fbf46777007e8515591a5d65516d26e9812239
 2022-01-12 15:10:40 +01:00
Dmitry Gridin f66b2b2899 [CHERRY PICKED FROM IJ] [jps] convert SettingConstants to Kotlin 
GitOrigin-RevId: 664d09dd6abbf39624013cd1009f662efe7f4c0e
Original commit: https://github.com/JetBrains/intellij-community/commit/42811eb72492032ed25dd52cd7aa25511b4bdf90
 2022-01-12 15:10:40 +01:00
Dmitry Gridin 2f67e58d64 [CHERRY PICKED FROM IJ] Rename .java to .kt 
GitOrigin-RevId: 2d4e1a1b6e31f591b2ef420fe248605da4cdfd5a
Original commit: https://github.com/JetBrains/intellij-community/commit/b328bd7b76f3d73769274fadecf0e58bbe778613
 2022-01-12 15:10:39 +01:00
Dmitry Gridin 5141524603 [CHERRY PICKED FROM IJ] [jps] convert KotlinCommonJpsModelSerializerExtension to Kotlin 
GitOrigin-RevId: 437f6d66690434a9853d544015d93b17448f8f7c
Original commit: https://github.com/JetBrains/intellij-community/commit/2b8032aafcf561c7d834bb857eb5b3d32eff8317
 2022-01-12 15:10:39 +01:00
Dmitry Gridin f62b39f0e4 [CHERRY PICKED FROM IJ] Rename .java to .kt 
GitOrigin-RevId: e7d264797023a87cbbea90746bcf2959220bf046
Original commit: https://github.com/JetBrains/intellij-community/commit/f8c480074ada550f0cf4c36373218eee9fb2bfff
 2022-01-12 15:10:38 +01:00
Dmitry Gridin f74f613bc1 [CHERRY PICKED FROM IJ] [jps] convert CompilerRunnerConstants to Kotlin 
GitOrigin-RevId: 72575637ea72a14f25bdf9b25ae44255a9c40018
Original commit: https://github.com/JetBrains/intellij-community/commit/8ac14f4734d1c6d60f5b3874bacf54224abcf757
 2022-01-12 15:10:38 +01:00
Dmitry Gridin f801bce8a9 [CHERRY PICKED FROM IJ] Rename .java to .kt 
GitOrigin-RevId: 801635ed9cd9824365ee2b7969c6f822c7e37869
Original commit: https://github.com/JetBrains/intellij-community/commit/5f0b44bd74a8cc346f1536e310d84e3d70d2e73a
 2022-01-12 15:10:37 +01:00
Nikita Bobko 5d91e54f41 Merge Kotlin JPS plugin 
Kotlin JPS plugin existed in Kotlin repo before but was migrated to
intellij-community together with entire Kotlin plugin.
Now I return Kotlin JPS plugin back because it turned out that it's
easier to develop JPS in KT release cycle. Also I need to
unbundle Kotlin JPS plugin in scope of KTIJ-11633
 2022-01-12 15:10:21 +01:00
Nikita Bobko db7472a376 Rename: jps-plugin -> jps/jps-plugin 2022-01-12 15:09:45 +01:00
Alexander Shabalin d8f99d8974 [K/N] Avoid global dtors in suspension and logging 
^KT-50713

Merge-request: KT-MR-5426
Merged-by: Alexander Shabalin <Alexander.Shabalin@jetbrains.com>
 2022-01-12 13:28:43 +00:00
Sergey Igushkin eddf8c9e72 KT-50736: Fix the implementation of whenEvaluated 
Re-implement `whenEvaluated` using a constant number of calls to
`withPlugin` per project.

The approach with `plugins.all { ... }` introduced by the fix
of KT-50509 had an issue with Android plugins applied last in the build:
in those cases that implementation didn't dispatch the actions after
Android and instead fired them earlier in `afterEvaluate`, because
`hasPlugin` doesn't return true in the callback when that exact plugin
is applied.

This change preserves the performance similar to that of the previous
implementation.

Issue #KT-50736

Merge-request: KT-MR-5418
 2022-01-12 13:13:56 +00:00
Dmitriy Dolovov e6a2785118 Bump Kotlin/Native version to 1.7.0-dev-528 
Related to #KT-50591
 2022-01-12 16:05:32 +03:00
Victor Petukhov 1f1b5256b0 Postpone type enhancement improvements till 1.7 due to some found broken cases unmarked by warnings before 
^KT-49378 Fixed
 2022-01-12 15:58:50 +03:00
Andrey Uskov 2adc851f1b Don't use global state for keeping incremental compilation state 
Previously IC state was stored in System properties. As result parallel
compilation might cause incorrect state of IC, what led to corruption
of kotlin_module files. Now IC state is stored via CompilerArguments
and CompilerConfiguration
#KT-46038 Fixed
 2022-01-12 13:37:46 +03:00
Dmitriy Dolovov 99300bd885 [IR] IrModuleDeserializerKind API cleanup 
Related to #KT-50591
 2022-01-12 11:05:12 +03:00
Roman Golyshev 54cca88279 KT-50728 Enforce receiver type resolve 
When stdlib is represented as a source dependency (which seems to be the
case in the `kotlin` project), it will be resolved lazily for the IDE.
Same thing can happen if someone decides to "extend" the stdlib
by declaring their declaration in the `kotlin` package

In both of those cases, we need to make sure that receiver type is fully
resolved before trying to get a `coneType` from it

N.B. To make resolve tests work, I've added a separate folder
`withAllowedKotlinPackage` to the `testData`, because in the default
test setup it is not allowed to extend the `kotlin` package by user's
definitions

^KT-50728 Fixed
 2022-01-11 22:23:57 +00:00
Sergey Igushkin 3ac472ceb3 Fix Android unit test tasks not running in allTests 
The Android unit test tasks were not created by the Kotlin Gradle
plugin, so the plugin didn't add the
tadk dependencies to its aggregating
`allTests` task.

Issue #KT-38456
Issue #KT-44227
 2022-01-11 22:15:14 +00:00
Dmitriy Dolovov 8ea6221932 Minor: Update comment 2022-01-11 22:05:01 +03:00
Dmitriy Dolovov 716ca3c319 [IR] Do best effort explaining IR linker issue to the user if computation of the detailed IR linker error message failed due to unexpected error 
Related to #KT-50591
 2022-01-11 21:53:12 +03:00
Dmitriy Dolovov cb5a052227 [IR] Distinguish IrModuleDeserializers with and w/o underlying KLIBs 
Fixes #KT-50591
 2022-01-11 21:53:06 +03:00
Jinseong Jeon 7ff468d9e3 FIR LC: populate only const property on multi-file facade 2022-01-11 21:30:54 +03:00
Denis.Zharkov 0da24ff4e2 FIR: Fix smartcast case after equals on class from different module 
^KT-50534 Relates
 2022-01-11 20:45:56 +03:00
Denis.Zharkov a33d9df0cd NI: Support forking inference with heuristics 
Mostly, it only affects FIR

It partially allows to consider several variance of constraints like
A<Int> & A<T> <: A<X_var> that are mostly brought by smart casts

^KT-49542 Fixed
^KT-50489 Relates
 2022-01-11 20:45:55 +03:00
Denis.Zharkov 62673c7e1b NI: Do not use asConstraintSystemCompleterContext before completion 2022-01-11 20:45:54 +03:00
Denis.Zharkov 1d258635a2 NI: Get rid of confusing asConstraintSystemCompletionContext 
NB: there is a different asConstraintSystemCompleterContext that might have side effects
 2022-01-11 20:45:53 +03:00
Denis.Zharkov 47d74a16f2 NI: Get rid of redundant asPostponedArgumentsAnalyzerContext calls 2022-01-11 20:45:53 +03:00