Commit Graph

90488 Commits

Author SHA1 Message Date
Nikita Bobko ca716fd226 Regenerate tests 2022-01-12 15:25:16 +01:00
Nikita Bobko 7ed2eb5c40 Drop a couple of tests from MultiplatformJpsTestWithGeneratedContentGenerated
Those tests were dropped in intellij repo (in repo JPS plugin was
located before) in this commit:
https://github.com/JetBrains/intellij-community/commit/6575a8b00a8f1797dd952c7dff5c5db44d8c45d3
2022-01-12 15:25:15 +01:00
Nikita Bobko fb01b46f6a GenerateTests.kt: restore Kotlin JPS plugin tests schema 2022-01-12 15:25:15 +01:00
Nikita Bobko 3daec9b9ce Use Java 11 in :jps:jps-plugin module in order to fix compilation
IntelliJ uses Java 11 so it forces us to use Java 11 in JPS

This commit fixes:
```
public class DataContainerVersionChangedTestGenerated extends AbstractDataContainerVersionChangedTest {
       ^
  bad class file: /home/bobko/.gradle/caches/modules-2/files-2.1/com.jetbrains.intellij.platform/test-framework/203.8084.24/ba5c6b3b0eae0a083dc30e866c362094f5072853/test-framework-203.8084.24.jar(com/intellij/testFramework/UsefulTestCase.class)
    class file has wrong version 55.0, should be 52.0
    Please remove or make sure it appears in the correct subdirectory of the classpath.
```
2022-01-12 15:25:15 +01:00
Nikita Bobko aa5ad13b92 [cleanup] Drop bunch files from Kotlin JPS plugin 2022-01-12 15:25:14 +01:00
Ilya Kirillov 25bcfab396 Fix compilation after removing pre-release flag from compiler (2)
Original commit: https://jetbrains.team/p/ij/repositories/intellij/revision/69aa6a57c1f782a940578c28581e71fcf85cd152
2022-01-12 15:25:14 +01:00
Nikita Bobko 59abe71f56 Drop all usages of Callbacks.ConstantAffectionResolver
This commit fixes deprecation API usage (deprecated in intellij) which is actually
an error (because of -Werror)

KotlinJavaBuilderExtension implements only one method (getConstantSearch) which is
deprecated and the method is actually not called in since 202 IDEA (minimum
supported IDEA right now is 203).

KotlinJavaBuilderExtension originally appeared in 39f7ecc9a3
in order to fix KT-16091. The fact that we ignored the depreaction caused the issue
regression. Luckily, we already fixes the issue again but this API usage is useless so
can be safely droped
2022-01-12 15:25:14 +01:00
Nikita Bobko 01df50e175 Fix warnings in Kotlin JPS plugin (which are errors, actually, because of -Werror) 2022-01-12 15:25:13 +01:00
Nikita Bobko 3b3a7f4566 Add jps-common/test source root 2022-01-12 15:25:13 +01:00
Nikita Bobko 047272e56f Attach JPS plugin modules to the project model 2022-01-12 15:25:12 +01:00
Nikita Bobko 208e271b4e Kotlin JPS plugin: fix paths in tests 2022-01-12 15:25:12 +01:00
Nikita Bobko e3634c1635 Fix org.jetbrains.kotlin.jps.build.KotlinJpsBuildTest#testSourcePackageLongPrefix
The test started failing after cherry-picking it from intellij repo
(in intellij repo it was passing without this commit)
2022-01-12 15:25:12 +01:00
Nikita Bobko 158e3d2020 Unmute some JPS tests which actually pass 2022-01-12 15:25:11 +01:00
Nikita Bobko a08da0f5ce Regenerate Kotlin JPS plugin tests after cherry-picking its commits from intellij repository 2022-01-12 15:25:11 +01:00
Nikita Bobko 8d2755db4f Fix KotlinModuleXmlGeneratorTest
modules.xml testData was renamed from idea/testData/modules.xml/
2022-01-12 15:25:11 +01:00
Nikita Bobko 735d46efb4 Freezable.{frozen, unfrozen} refactoring: add type safety 2022-01-12 15:25:10 +01:00
Nikita Bobko 8a289440ce Kotlin JPS plugin: add "version" setting
Part of KTIJ-11633
2022-01-12 15:25:10 +01:00
Nikita Bobko 02bef14710 Refactor how JPS finds it's home. Now it's more reliable
Part of KTIJ-11633
2022-01-12 15:25:10 +01:00
Nikita Bobko 9bdd38ad72 Introduce kotlin-jps-common-for-ide and kotlin-jps-plugin-classpath artifacts
KTIJ-11633
2022-01-12 15:25:09 +01:00
Nikita Bobko a9cdca40c3 Compilation fixes 2022-01-12 15:25:09 +01:00
Nikita Bobko 01c82da8d2 [jps] Fix Kotlin JPS commits compilation after cherry-pick from intellij/master 2022-01-12 15:11:07 +01:00
Nikita Bobko 29384c7a65 [jps] Fix compilation JDK Path Kotlin extensions 2022-01-12 15:11:06 +01:00
Nikita Bobko 7238e64912 [jps] Fix KotlinJpsBundle by adding jps resource dir 2022-01-12 15:11:06 +01:00
Nikita Bobko 2b2bc4400e [CHERRY PICKED FROM IJ] Avoid adding unnecessary intellij.platform.core into JPS classpath just to be able to use DynamicBundle
DynamicBundle functionality isn't used actually. com.intellij.AbstractBundle is enough

GitOrigin-RevId: 50d30ab3d2cdc5ab8f3e1a1b449ace62e1f0f12b
Original commit: https://github.com/JetBrains/intellij-community/commit/88ab1b0a74ceef1756d953a5ef648f45a8a7f32d
2022-01-12 15:11:05 +01:00
Yaroslav.Chernyshev 3556853347 [CHERRY PICKED FROM IJ] [Gradle, Importing] Fix missed optimization
GitOrigin-RevId: 4839fb3bd88b135992a4bd1963b566ed77225b28
Original commit: https://github.com/JetBrains/intellij-community/commit/08fe803d3a03a0a89e67a0b24c41d7494b981a5e
2022-01-12 15:11:05 +01:00
Yaroslav.Chernyshev 6cc7566b2e [CHERRY PICKED FROM IJ] [Gradle, Importing] Attach KotlinGradleSourceSetData nodes to KotlinGradleProjectData instead GradleProjectData
It fixes issues in AS, when GradleProjectData for variants are not created

GitOrigin-RevId: dbd023d0f4fba8b14870aa8952ac0b395a2e4096
Original commit: https://github.com/JetBrains/intellij-community/commit/1c9630cf220df2b380aaf54f28497e41245d8ed6
2022-01-12 15:11:05 +01:00
Nikita Bobko ace99c5d4f [CHERRY PICKED FROM IJ] KotlinChunk.Companion#calculateTargetDependencies - don't forget to add dependency from "tests" to "production"
I recently simplified `calculateTargetDependencies` 9f0fa45e441bc6764fe13d2055d6eaece54f5d7c but I
accidentaly changed the logic. This commit returns accidentaly removed logic

GitOrigin-RevId: bde45bc14ad82fcef976b5cce9c6a601ce129230
Original commit: https://github.com/JetBrains/intellij-community/commit/2e845a1122917238049421fd8a99af0da58ecc12
2022-01-12 15:11:04 +01:00
Stanislav Erokhin 4d732dea10 [CHERRY PICKED FROM IJ] [kotlin:tests] Fix JsKlibLookupTrackerTestGenerated
GitOrigin-RevId: e29e30f421a9106cae754eaac790b44444fe0af3
Original commit: https://github.com/JetBrains/intellij-community/commit/ae227bdee04004c10e17d3cf9c647887bf4e32af
2022-01-12 15:11:04 +01:00
Nikita Bobko 1009ee4333 [CHERRY PICKED FROM IJ] [cleanup] Make KotlinChunk.{dependencies, dependents}.set private
GitOrigin-RevId: b244d3f69ba56ec4514feca524620e8b91b89d3e
Original commit: https://github.com/JetBrains/intellij-community/commit/397c46637ba7e5afdeaf480b98c766d9484a7128
2022-01-12 15:11:03 +01:00
Nikita Bobko 8583808231 [CHERRY PICKED FROM IJ] [cleanup] Simplify KotlinTargetsIndexBuilder#calculateTargetDependencies implementation
GitOrigin-RevId: 9f0fa45e441bc6764fe13d2055d6eaece54f5d7c
Original commit: https://github.com/JetBrains/intellij-community/commit/c6e794bc6e17bf198b1b0a59ff102e87278f7ca5
2022-01-12 15:11:03 +01:00
Nikita Bobko b252897a01 [CHERRY PICKED FROM IJ] [cleanup] Inline VersionView.RELEASED_VERSION
The variable is redundant

GitOrigin-RevId: 99e0e06f8eda6410c41a67b88db50d4d8b5f52ca
Original commit: https://github.com/JetBrains/intellij-community/commit/8b09416812def39f15cdcd7e836129ca6ccc2094
2022-01-12 15:11:02 +01:00
Nikita Bobko fd843ad4be [CHERRY PICKED FROM IJ] [refactoring] Make it possible to run all tests in kotlin.jps-plugin module
When anonymous class is used then attempt to run all tests ends up with:
```
Internal Error occurred.
org.junit.platform.commons.JUnitException: TestEngine with ID 'junit-vintage' failed to discover tests
	at org.junit.platform.launcher.core.EngineDiscoveryOrchestrator.discoverEngineRoot(EngineDiscoveryOrchestrator.java:160)
	at org.junit.platform.launcher.core.EngineDiscoveryOrchestrator.discoverSafely(EngineDiscoveryOrchestrator.java:134)
	at org.junit.platform.launcher.core.EngineDiscoveryOrchestrator.discover(EngineDiscoveryOrchestrator.java:108)
	at org.junit.platform.launcher.core.EngineDiscoveryOrchestrator.discover(EngineDiscoveryOrchestrator.java:80)
	at org.junit.platform.launcher.core.DefaultLauncher.discover(DefaultLauncher.java:110)
	at org.junit.platform.launcher.core.DefaultLauncher.execute(DefaultLauncher.java:86)
	at org.junit.platform.launcher.core.DefaultLauncherSession$DelegatingLauncher.execute(DefaultLauncherSession.java:86)
	at org.junit.platform.launcher.core.SessionPerRequestLauncher.execute(SessionPerRequestLauncher.java:53)
	at com.intellij.junit5.JUnit5IdeaTestRunner.startRunnerWithArgs(JUnit5IdeaTestRunner.java:71)
	at com.intellij.rt.junit.IdeaTestRunner$Repeater$1.execute(IdeaTestRunner.java:38)
	at com.intellij.rt.execution.junit.TestsRepeater.repeat(TestsRepeater.java:11)
	at com.intellij.rt.junit.IdeaTestRunner$Repeater.startRunnerWithArgs(IdeaTestRunner.java:35)
	at com.intellij.rt.junit.JUnitStarter.prepareStreamsAndStart(JUnitStarter.java:235)
	at com.intellij.rt.junit.JUnitStarter.main(JUnitStarter.java:54)
Caused by: org.junit.platform.commons.JUnitException: ClassSelector [className = 'org.jetbrains.kotlin.jps.build.RelocatableJpsCachesTest$runTestAndCopyKotlinCaches$testCase$1'] resolution failed
	at org.junit.platform.launcher.listeners.discovery.AbortOnFailureLauncherDiscoveryListener.selectorProcessed(AbortOnFailureLauncherDiscoveryListener.java:39)
	at org.junit.platform.engine.support.discovery.EngineDiscoveryRequestResolution.resolveCompletely(EngineDiscoveryRequestResolution.java:102)
	at org.junit.platform.engine.support.discovery.EngineDiscoveryRequestResolution.run(EngineDiscoveryRequestResolution.java:82)
	at org.junit.platform.engine.support.discovery.EngineDiscoveryRequestResolver.resolve(EngineDiscoveryRequestResolver.java:113)
	at org.junit.vintage.engine.discovery.VintageDiscoverer.discover(VintageDiscoverer.java:42)
	at org.junit.vintage.engine.VintageTestEngine.discover(VintageTestEngine.java:64)
	at org.junit.platform.launcher.core.EngineDiscoveryOrchestrator.discoverEngineRoot(EngineDiscoveryOrchestrator.java:152)
	... 13 more
Caused by: org.junit.platform.commons.PreconditionViolationException: displayName must not be null or blank
	at org.junit.platform.commons.util.Preconditions.condition(Preconditions.java:281)
	at org.junit.platform.commons.util.Preconditions.notBlank(Preconditions.java:249)
	at org.junit.platform.engine.support.descriptor.AbstractTestDescriptor.<init>(AbstractTestDescriptor.java:89)
	at org.junit.vintage.engine.descriptor.VintageTestDescriptor.<init>(VintageTestDescriptor.java:53)
	at org.junit.vintage.engine.descriptor.RunnerTestDescriptor.<init>(RunnerTestDescriptor.java:50)
	at org.junit.vintage.engine.discovery.ClassSelectorResolver.createRunnerTestDescriptor(ClassSelectorResolver.java:79)
	at org.junit.vintage.engine.discovery.ClassSelectorResolver.lambda$resolveTestClass$1(ClassSelectorResolver.java:70)
	at org.junit.platform.engine.support.discovery.EngineDiscoveryRequestResolution$DefaultContext.createAndAdd(EngineDiscoveryRequestResolution.java:246)
	at org.junit.platform.engine.support.discovery.EngineDiscoveryRequestResolution$DefaultContext.addToParent(EngineDiscoveryRequestResolution.java:209)
	at org.junit.vintage.engine.discovery.ClassSelectorResolver.resolveTestClass(ClassSelectorResolver.java:70)
	at org.junit.vintage.engine.discovery.ClassSelectorResolver.resolve(ClassSelectorResolver.java:47)
	at org.junit.platform.engine.support.discovery.EngineDiscoveryRequestResolution.lambda$resolve$2(EngineDiscoveryRequestResolution.java:134)
	at java.base/java.util.stream.ReferencePipeline$3$1.accept(ReferencePipeline.java:195)
	at java.base/java.util.ArrayList$ArrayListSpliterator.tryAdvance(ArrayList.java:1632)
	at java.base/java.util.stream.ReferencePipeline.forEachWithCancel(ReferencePipeline.java:127)
	at java.base/java.util.stream.AbstractPipeline.copyIntoWithCancel(AbstractPipeline.java:502)
	at java.base/java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:488)
	at java.base/java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:474)
	at java.base/java.util.stream.FindOps$FindOp.evaluateSequential(FindOps.java:150)
	at java.base/java.util.stream.AbstractPipeline.evaluate(AbstractPipeline.java:234)
	at java.base/java.util.stream.ReferencePipeline.findFirst(ReferencePipeline.java:543)
	at org.junit.platform.engine.support.discovery.EngineDiscoveryRequestResolution.resolve(EngineDiscoveryRequestResolution.java:185)
	at org.junit.platform.engine.support.discovery.EngineDiscoveryRequestResolution.resolve(EngineDiscoveryRequestResolution.java:125)
	at org.junit.platform.engine.support.discovery.EngineDiscoveryRequestResolution.resolveCompletely(EngineDiscoveryRequestResolution.java:91)
	... 18 more
```

GitOrigin-RevId: 80ff99794a65c49619888a2bcc4398683ef82f67
Original commit: https://github.com/JetBrains/intellij-community/commit/220690ba53f8772499603b082f92b28138a25716
2022-01-12 15:11:02 +01:00
Nikita Bobko ebf87a21fe [CHERRY PICKED FROM IJ] IJ-MR-16150 [Kotlin JPS] Drop unused KotlinJpsCompilerArgumentsProvider
* I failed to find any implementations of this interface
* API Watcher doesn't show any implementations either
* Any meaningful code changes around this extension point
  hasn't been ever done since it's introduction in 2014

The extension point was once used in Android Extensions, as they supported JPS.
Since that time, JPS support was practically dropped in Android projects, and
we decided to delete the extension.

GitOrigin-RevId: 170c97194b27152189ce05b828a53116b746db38
Original commit: https://github.com/JetBrains/intellij-community/commit/248c9b4947f7ea535d5f70e511554b05851f7ec7
2022-01-12 15:11:02 +01:00
Yaroslav.Chernyshev 93d569d090 [CHERRY PICKED FROM IJ] Fix KotlinFacetSettings serialization issues for compiler arguments
GitOrigin-RevId: 29d3bab972fc797fab7244c16df21763055db0c4
Original commit: https://github.com/JetBrains/intellij-community/commit/4e9f0bfaef343536930276ba27f582a95613d121
2022-01-12 15:11:01 +01:00
Nikita Bobko 5f41e3044b [CHERRY PICKED FROM IJ] [refactoring] Remove unused PathFunctionPairKeyDescriptor & PathCollectionExternalizer classes
GitOrigin-RevId: 6997f426f0912bb06da2e6fe1eb20e3d071dbc2a
Original commit: https://github.com/JetBrains/intellij-community/commit/002855167085323051a051d0c147fa747f5cddce
2022-01-12 15:11:01 +01:00
Nikita Bobko 779a5c40c0 [CHERRY PICKED FROM IJ] [refactoring] IdePlatformKind: remove unnecessary generic parameter
It seems that it's not used anymore after 82906a0f35ea13673a8a3b3bfaee94a568eff215

GitOrigin-RevId: 229d3b0573873c2da661712f6fce194816436ca7
Original commit: https://github.com/JetBrains/intellij-community/commit/70e4b14a5a37b8d591df2663725fd1d2c6881628
2022-01-12 15:11:00 +01:00
Roman Ivanov 983f487f6c [CHERRY PICKED FROM IJ] [kotlin] optimisation: make argument modification for each chunk lazy
GitOrigin-RevId: 0f8b66d14f0816a108afa749548420489e875f3b
Original commit: https://github.com/JetBrains/intellij-community/commit/1f23948ddbce1069b4deadec64d9c53272d95ae3
2022-01-12 15:11:00 +01:00
Aleksei.Cherepanov dfdbfb70dc [CHERRY PICKED FROM IJ] Fix performance problem in KotlinTargetsIndex creation
Creation of KotlinTargetsIndex takes too long,
even if Java project doesn't have any Kotlin files.
Remove function hasJsStdLib, as it takes too much time
because of recursively checking all dependencies (migrate to facets)
Also fix tests: Add Kotlin JS facet, where its needed

#KT-34351 Fixed

Original commit: c74f471a82

GitOrigin-RevId: 94e18cd48d71e9fec8acb1987763bf1ef7485f42
Original commit: https://github.com/JetBrains/intellij-community/commit/f442fe58333bf301133b7d04ac55a143a789cf2d
2022-01-12 15:11:00 +01:00
Yaroslav Chernyshev f6d9e53b66 [CHERRY PICKED FROM IJ] [Import] Introduce new version of KotlinFacetSettings, improve serialization of compiler arguments
^KTIJ-13451 Fixed

GitOrigin-RevId: 17ff1ea6c947b7582b445004959c42e54819d31a
Original commit: https://github.com/JetBrains/intellij-community/commit/14bd2509ad37f0c818f6753b097d4c138fba5d89
2022-01-12 15:10:59 +01:00
Vladimir Dolzhenko 1c634ee6e2 [CHERRY PICKED FROM IJ] [kotlin] i18n kotlin jps
GitOrigin-RevId: 7aad0a02ca6511dbbe659c2933acf535a587c268
Original commit: https://github.com/JetBrains/intellij-community/commit/c62ec25b24dcb2933394f90a36f352a4a69622ff
2022-01-12 15:10:59 +01:00
Vladimir Dolzhenko 91f34662e4 [CHERRY PICKED FROM IJ] [kotlin] revert kotlin jps i18n
GitOrigin-RevId: 364e32312675500087616e41bf651b8ed29d3cfd
Original commit: https://github.com/JetBrains/intellij-community/commit/ca5307ef2e2254289eed8c94aaa970cb79ddccb2
2022-01-12 15:10:58 +01:00
Vladimir Dolzhenko cb0955a82d [CHERRY PICKED FROM IJ] [kotlin] i18n
GitOrigin-RevId: 0a55f4d8b088328c83e1af233f7f34ffd51e2382
Original commit: https://github.com/JetBrains/intellij-community/commit/3b2e2d8afdaafde31d52eb32cffae9c4aae6704b
2022-01-12 15:10:58 +01:00
sebastian.sellmair 169ecabd2c [CHERRY PICKED FROM IJ] [Kotlin] Support internal visibility provided by associated compilations
^KTIJ-7662 Verification Pending

GitOrigin-RevId: c806293e3b7f2a2baf451fdb6ea8412f19777787
Original commit: https://github.com/JetBrains/intellij-community/commit/94b49d63c2f02876390e01cb9d61c7a4e6d938eb
2022-01-12 15:10:57 +01:00
Mikhail Zarechenskiy 8b2f4d1ef0 [CHERRY PICKED FROM IJ] [kotlin] update testdata for incremental jps tests
Since Kotlin 1.5 SAM conversion are working via invokedynamic

GitOrigin-RevId: a6ba80fe559619f79ce1caf4e04e0cdeb1f2487a
Original commit: https://github.com/JetBrains/intellij-community/commit/846889f31c982dd3015b585309c36d05c29e98b6
2022-01-12 15:10:57 +01:00
Mikhail Zarechenskiy 3cf5d218a2 [CHERRY PICKED FROM IJ] [kotlin] misc: update testdata after switching to 1.5
GitOrigin-RevId: 3901d27f26b349b4fbf40d50bad6a37f06c1182e
Original commit: https://github.com/JetBrains/intellij-community/commit/974ddc03c2228a1135ff84658c04424a72684d2e
2022-01-12 15:10:57 +01:00
Dmitry Gridin edb619a004 [CHERRY PICKED FROM IJ] [kotlin] compiler index: fix initialization issues
* move some constants to kotlin.jps-common module
* depends on kotlin.jps-common instead of kotlin.jps-plugin

^KTIJ-16709
^KTIJ-18939 Fixed
^EA-297958 Fixed

GitOrigin-RevId: 305b67aeb75a4c55f734bf2a773b36b0f0e50ac9
Original commit: https://github.com/JetBrains/intellij-community/commit/e7e6e8b26c159b828bbe015a8dc700bc7d88a673
2022-01-12 15:10:56 +01:00
Dmitry Gridin b141d6b936 [CHERRY PICKED FROM IJ] [kotlin] compiler index: implement jps part
^KTIJ-16709

GitOrigin-RevId: f68ff2ef8c1d287c0d3ab0ca92ba0d316bda4c5a
Original commit: https://github.com/JetBrains/intellij-community/commit/cb138014488d97c7243d1be6ac3a27593ceef7a2
2022-01-12 15:10:56 +01:00
Vladimir Dolzhenko 988d65c82f [CHERRY PICKED FROM IJ] Drop deprecated ServiceManager.getService
GitOrigin-RevId: 6306778c910fcb6c6c63bc38369435c3cd235db5
Original commit: https://github.com/JetBrains/intellij-community/commit/bac13e569558071e720d900add84c6c29b950ac4
2022-01-12 15:10:55 +01:00
Dmitry Gridin 54bb3ef3fe [CHERRY PICKED FROM IJ] [kotlin] replace parent.resolve with resolveSibling
IJ-CR-8752

GitOrigin-RevId: 8348dd8bdd644a0b985c2c9915bf3140701ac5ff
Original commit: https://github.com/JetBrains/intellij-community/commit/3035c229615621b8a9c4e96b32cca53373c98b2a
2022-01-12 15:10:55 +01:00
Dmitry Gridin 0839b6a62b [CHERRY PICKED FROM IJ] [kotlin] migrate some io operations to nio
FLEET-T-2032

GitOrigin-RevId: a616d57c763cda61386ddb754ea45ee075764eaf
Original commit: https://github.com/JetBrains/intellij-community/commit/99b6620c424773a42f44fdf398c98fbaa3b55b5c
2022-01-12 15:10:54 +01:00