Commit Graph

55327 Commits

Author SHA1 Message Date
Sergey Rostov 85adee9804 Gradle, js, npm: resolve and warn about clashes in packages_imported
#KT-31697 Fixed
2019-06-04 10:00:59 +03:00
Sergey Rostov 46a1ec28bf Gradle, npm: implement semver comparision 2019-06-04 10:00:58 +03:00
Sergey Rostov 619ee8717b Gradle, npm: extract semver utils to separate file 2019-06-04 10:00:58 +03:00
Sergey Rostov 42bcb81c08 Gradle, npm, imported packages: import multiple version to different dirs 2019-06-04 10:00:58 +03:00
Sergey Rostov e557a3c3f2 Gradle, ProcessedFilesCache: delete everything on version change 2019-06-04 10:00:57 +03:00
Sergey Rostov 5b6c467e22 Gradle, ProcessedFilesCache: report target values clash 2019-06-04 10:00:57 +03:00
Sergey Rostov 5b21c935a4 Gradle, JS, NpmResolver: save imported packages cache state before calling npm 2019-06-04 10:00:56 +03:00
Sergey Rostov fdbee7a99a Gradle, js, NPM: select one version between tools and all of compile configurations
#KT-31696 Fixed
2019-06-04 10:00:56 +03:00
Sergey Rostov a37b38e891 Gradle, minor: remove unused import 2019-06-04 10:00:56 +03:00
Mikhael Bogdanov bce774eda5 Jvm Ir. IrIntrinsicMethods.kt optimization: avoid 'IrClass.functions' call if it not necessary 2019-06-04 08:45:46 +02:00
Mikhael Bogdanov 30ab11575d Jvm Ir. Optimization: avoid 'IrClass.functions' call if it not necessary 2019-06-04 08:45:45 +02:00
Dmitriy Dolovov 171e226d58 Move 'cidrPluginsEnabled' Gradle flag to local.properties 2019-06-04 08:42:47 +03:00
Dmitriy Dolovov bbdb5e5f0f Reworked joint build (kotlin + kotlin-ultimate)
- Root buildscript classpath no more depends on buildSrc.jar from kotlin-ultimate. This allows to have stable joint builds - w/o occasional "Unresolved reference" errors in buildscripts.
- kotlin-ultimate modules are now included into Kotlin project when two conditions are met: 1) Gradle parameter 'cidrPluginsEnabled' is turned on; 2) kotlin-ultimate Git repo is checked out right to the Kotlin project root (assuming there is 'kotlin-ultimate' directory inside the project root).
2019-06-04 08:42:22 +03:00
Igor Yakovlev db4ba238eb Avoid to call delegate from isInheritorDeep in UL-class
(plus small refacrotoring)
2019-06-03 17:23:41 +03:00
Igor Yakovlev eaa36d4d27 Fix kotlin.Deprecated annotation for UL-classes 2019-06-03 17:23:41 +03:00
Igor Yakovlev 2a729082a0 Add UltraLightFacadeClassTest 2019-06-03 17:23:41 +03:00
Igor Yakovlev 8707edfaa3 Disable to mangling facade functions + refactoring 2019-06-03 17:23:40 +03:00
Igor Yakovlev ac85849721 Avoid access to delegate from KtUltraLightClass 2019-06-03 17:23:40 +03:00
Igor Yakovlev 3889b70f1e Avoid clsDelegate access from (UL-)KtLightClassForFacade 2019-06-03 17:23:40 +03:00
Igor Yakovlev fa6b21357b Add cache to KLightClassForFacade 2019-06-03 17:23:40 +03:00
Igor Yakovlev 24253e21d0 Add ultraKtLightClassForFacade multifile support 2019-06-03 17:23:40 +03:00
Igor Yakovlev 86e9018f49 Add text functions to KtLightClassForFacade 2019-06-03 17:23:39 +03:00
Igor Yakovlev 852a4bc0ca Add support UL for FileFacade 2019-06-03 17:23:39 +03:00
Anton Bannykh e996705b45 JS: simplify package metadata cache invalidation 2019-06-03 15:53:00 +03:00
Anton Bannykh 8ab9ef2afa JS: don't visit all descriptors on metadata serialization 2019-06-03 15:53:00 +03:00
Ilya Chernikov 0a6ade88cc Fix classpath detection from classloader resources 2019-06-03 13:57:20 +02:00
Sergey Igushkin 27aa3a573e Fix MPP source set dependencies missing in Android tests (KT-29343)
Add Kotlin source set dependencies to the Android source sets, and also
add aggregated Kotlin compilation dependencies to the dedicated
Android source sets of the Android variants.

Issue #KT-29343 Fixed
2019-06-03 14:53:38 +03:00
Sergey Igushkin 988df517dd Gradle HMPP support fixes after review
* Add version to project structure metadata
* Use a data class for module dependencies in project structure
* Use task registering API for new tasks
* Simplify code
* Extract compatibility wrappers
* Fix multi-file dependencies that transformations silently ignored
2019-06-03 14:47:09 +03:00
Sergey Igushkin 5d7bd6c01a Add API for IDE import of metadata dependency transformations 2019-06-03 14:47:08 +03:00
Sergey Igushkin 3c3a338770 Setup versions consistently only among published source sets
The common source sets that are not published (like commonTest) should
not affect dependency resolution for other source sets.

Signed-off-by: Sergey Igushkin <hotkeytlt@gmail.com>
2019-06-03 14:47:07 +03:00
Sergey Igushkin 0c9d962f9f MPP granular source set metadata support 2019-06-03 14:47:07 +03:00
Sergey Igushkin fcb006b42a (minor) Rewrite CompilationSourceSetUtil
Add the API to access compilations by source set, which will be widely
needed for further MPP logic.
2019-06-03 14:46:51 +03:00
Alexander Gorshenev 10a54c2581 Moved the common klib writer from Kotlin/Native to util-klib 2019-06-03 14:38:48 +03:00
Alexander Gorshenev 7ddbd8ca80 Moved the common klib reader functionality from Kotlin/Native to util-klib 2019-06-03 14:38:48 +03:00
Alexander Gorshenev d1390365de Moved basic classes from konan/utils to util-io 2019-06-03 14:38:48 +03:00
Igor Yakovlev f5190f195d Add correct UL-method hasTypeParameters realization (#KT-30970 Fixed)
Incorrect realization is breaking-down of IDEA generic-type inference algorithm that leads to SOE.
2019-06-03 14:11:06 +03:00
Ilya Kirillov f660faed97 New J2K: Wrap single annotation parameter to arrayOf if array type is required
#KT-31726 fixed
2019-06-03 13:02:48 +03:00
Dmitry Gridin 7bc2fcd657 Convert RemoveCurlyBracesFromTemplateIntention to inspection
Relates to #KT-31717
2019-06-03 16:37:37 +07:00
Dmitry Gridin 7f4d2891e8 Cleanup ReplacementPerformer 2019-06-03 16:36:50 +07:00
Dmitry Gridin f5e83d7b47 Explicit package prefix should override implicit
#KT-29716 Fixed
2019-06-03 16:35:58 +07:00
Dmitry Gridin 20114a0868 Minor: cleanup packageUtils 2019-06-03 16:35:58 +07:00
Dmitry Gridin f6a61e8034 Minor: cleanup ChangePackageIntention 2019-06-03 16:35:58 +07:00
Dmitry Gridin 4fa83a2fd7 Decrease severity of PackageDirectoryMismatchInspection to INFO
#KT-31716 Fixed
2019-06-03 16:35:58 +07:00
Dmitriy Novozhilov ef91960fe9 [NI] Fix testdata after enabling NI in IDE tests 2019-06-03 12:13:31 +03:00
Dmitry Savvinov dca23f871c Allow to force-require syntetic SAM-adapters even in NI
This is needed for some IDE clients, particularly, completion: even
though presenting only non-converted member (e.g., 'foo(Consumer<Int>')
is nominally OK, as resolution with NI is smart enough to accept 'foo { }'
for such a call, it is inconvenient for users (for example, hitting
enter would insert round brackets instead of a figure brackets)

This commit adds very-very narrow API (borderline hacky) in
JavaSyntheticScopes, to allow clients explicitly ask for a scopes with
force-enabled synthetic conversions. It fixes several tests, which had
started to fail after corresponding commit about NI and SAM-adapters
(fe5976d7f4), e.g.:
- Java8BasicCompletionTestGenerated.testCollectionMethods
- Java8BasicCompletionTestGenerated.testStreamMethods
- JvmBasicCompletionTestGenerated$Common$StaticMembers.testJavaStaticMethods
- JvmBasicCompletionTestGenerated$Java.testSAMAdaptersStatic
- JvmWithLibBasicCompletionTestGenerated.testSamAdapter
- JvmWithLibBasicCompletionTestGenerated.testSamAdapterAndGenerics

Note that changes are made in ReferenceVariantsHelper, which is used by
several other clients in IDE. Presumably, those changes are needed for
them too.
2019-06-03 10:46:53 +03:00
Dmitry Savvinov eda975d317 Minor: reformat ReferenceVariantsHelper.kt 2019-06-03 10:46:53 +03:00
Sergey Rostov 00f8f09274 Gradle, js, npm: don't setup package manager without npm dependencies
#KT-31729 Fixed
2019-06-03 10:00:27 +03:00
Dmitry Savvinov 8caafa874e Advance Kotlin versions in some Gradle Tests
Those versions have been resolved from -dev repository, which got
cleared and those tests started to fail.

In long term, it would be nice to not use fixed Kotlin versions in
tests, but for now we just advance it to prevent tests from failing.
2019-06-03 08:17:25 +03:00
Mikhail Zarechenskiy e15cb67e29 Fix exception from UAST on attempt to map non-fixed type variable
#KT-31723 Fixed
 #EA-126269 Fixed
 #EA-143705 Fixed
 #EA-143703 Fixed
 #EA-143694 Fixed
2019-06-03 02:04:56 +03:00
Mikhail Zarechenskiy 91bd11a6db Fix UAST tests for new-inference: adapt SAM-converted descriptors 2019-06-03 02:04:55 +03:00