Alexey Sedunov
ae37cc30a1
JS: Use the same output paths for JPS and Maven-based builds
...
#KT-22586 Fixed
2018-04-02 15:28:35 +03:00
Anton Bannykh
7b860eab36
Merge kotlin-experimental into kotlin standard library (KT-23055 fixed)
...
* kotlin-experimental.js has been already merged into kotlin.js
* change library name to kotlin in kotlin-experimental.meta.js in order to produce correct require calls
* concatenate kotlin-experimental.meta.js with kotlin.meta.js
* suppress multiple module declaration warning for such use case
2018-03-26 23:13:28 +03:00
Alexey Tsvetkov
8a82c1618c
Use Plugins DSL in Kotlin Gradle scripts
...
When plugins DSL is used, there is no need to
manually generate typesafe accessors for extensions and
conventions (by running `./gradlew kotlinDslAccessorsSnapshot`).
2018-03-26 16:09:29 +03:00
Mikhail Zarechenskiy
4ebd11a7ae
Refactoring: rename parameter to argument for annotation diagnostics
2018-03-22 03:59:55 +03:00
Alexey Tsvetkov
605bcc66a1
IC: add destination dir to start of classpath instead of end
...
Otherwise IC fails when a project declares a class with the same name
as in one of its dependencies.
The issue is relevant only for non-JPS IC (Gradle, Maven, etc.),
but I added the test for JPS too.
#KT-20516 fixed
2018-03-21 18:44:42 +03:00
Alexey Tsvetkov
2584143e92
Report correct source to output mapping for kjsm files
...
Now IC can correctly remove kjsm files when source files are changed
2018-03-19 18:04:33 +03:00
Zalim Bashorov
9970dd051f
Fix copyright's start year in generated tests
2018-03-14 15:04:58 +03:00
Alexander Udalov
3f3e05a9d2
Move essential metadata-related classes to 'metadata' and 'metadata.jvm'
2018-03-14 12:25:16 +01:00
Alexander Udalov
b07c6086cd
Remove dependency of NameResolverImpl on FqName
...
Remove AbstractJsProtoComparisonTest.getProtoData in favor of
(apparently copy-pasted) IncrementalJsCache.getProtoData
2018-03-14 12:25:12 +01:00
Alexander Udalov
e31f286444
Make NameResolver.getClassId extension instead of member
...
To get rid of dependency of NameResolver on ClassId
2018-03-14 12:25:11 +01:00
Alexander Udalov
27ad4f7d5d
Move ProtoBuf classes to package org.jetbrains.kotlin.metadata
2018-03-14 12:25:10 +01:00
Alexey Tsvetkov
0deec7983d
Revert "Provide custom ConstantAffectionResolver in JPS"
...
This reverts commit 772a935de6 .
The API in Intellij was changed, now the issue can be fixed only in
182.* branches.
2018-03-13 21:26:11 +03:00
Yan Zhulanow
34d1611ed4
Add Pill support to compiler and IDE modules
2018-03-02 03:15:17 +03:00
Ilya Gorbunov
5c0cc5f799
Move deprecated kotlin-runtime and reduced runtime for tests into stdlib
...
Rename mock-runtime-for-test project to kotlin-stdlib:jvm-minimal-for-test
2018-02-26 17:11:11 +03:00
Alexey Tsvetkov
d7644559eb
Perform a test lookup before build
...
#KT-22535 fixed
#KT-22995 fixed
2018-02-22 18:21:37 +03:00
Alexey Tsvetkov
7c9412a0b3
Avoid instanciating LookupStorage when clearing it
...
#KT-22535
#KT-22995
2018-02-22 18:21:37 +03:00
Alexey Tsvetkov
140ba0681a
Throw BuildDataCorruptedException when lookup operation cannot be performed
...
That is expected to force a rebuild (but it does not seem to be the case
in case of parallel build).
#KT-22535
#KT-22995
2018-02-22 18:21:37 +03:00
Alexey Tsvetkov
8ab9366ae5
Synchronize access to lookup storage in JPS
...
Storage operations are synchronized already,
but BuildDataManager.getStorage is not synchronized,
so maybe it is possible to create multiple LookupStorage
instances.
#KT-22535
#KT-22995
2018-02-22 18:21:37 +03:00
Alexey Tsvetkov
7881a305d9
Compare JS output files against file instead of hardcoded set
...
A difference is not obvious when two sets are compared:
there might be just one different element, but
sets would be printed in one line in iteration order
(which is non-fixed for hashsets).
Also the properties:
EXPECTED_JS_FILES_IN_OUTPUT_FOR_STDLIB_ONLY,
EXPECTED_JS_FILES_IN_OUTPUT_FOR_MODULE_STDLIB_ONLY,
EXPECTED_JS_FILES_IN_OUTPUT_NO_COPY,
EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_DEFAULT_DIR,
EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_CUSTOM_DIR
are hard to distinguish in code and are not convenient to edit.
2018-02-22 01:13:09 +03:00
Alexey Tsvetkov
772a935de6
Provide custom ConstantAffectionResolver in JPS
...
#KT-16091 fixed
2018-02-21 19:12:12 +03:00
Alexander Udalov
96e33dabcf
Fix JS stdlib file names in KotlinJpsBuildTest
...
Add "kotlin-experimental.js", "kotlin-experimental.meta.js" and refactor
surroundings
2018-02-16 17:09:34 +01:00
Alexey Tsvetkov
67a5cab343
Fix IC test data
...
Test data was broken starting from 0954d1ab1b
2018-02-14 16:09:07 +03:00
Alexander Udalov
7123202670
Add getExtensionOrNull utility for protobuf messages
2018-02-08 17:08:33 +01:00
Nikolay Krasko
f05e926670
Update idea to 173.3.4 (173.4548.28)
2018-02-03 00:15:45 +03:00
Vyacheslav Gerasimov
68b5dc756c
Remove intellij-core from testRuntime if full idea is already there
...
Looks like it makes tests flacky
2018-01-30 17:06:18 +03:00
Vyacheslav Gerasimov
29caa00f23
Add asm-all to jps-plugin dependencies
2018-01-30 17:06:18 +03:00
Ilya Chernikov
7e21573cf4
Convert the rest of the project to intellij repo prepared in buildSrc
2018-01-30 17:06:13 +03:00
Ilya Chernikov
a4f28cd94f
Make all dependencies to idea sdk intransitive
2018-01-30 17:06:11 +03:00
Ilya Chernikov
e76cd802d8
Fix jps tests
2018-01-30 17:06:11 +03:00
Ilya Chernikov
3912025e14
Convert jps module to intellij plugin
2018-01-30 17:06:07 +03:00
Alexey Tsvetkov
220fab0d3f
Test JPS with Daemon and IC
2018-01-16 21:09:57 +03:00
Alexey Tsvetkov
ca09be1411
Minor: move 'KotlinJpsBuildTestIncremental' to separate file
2018-01-16 21:09:57 +03:00
Nikolay Krasko
aee7329b89
Modify incremental test in 173 branch - files are not created anymore
2018-01-12 13:54:45 +03:00
Dmitry Jemerov
e80dae1802
Update copyright in generated tests
2018-01-10 11:55:28 +01:00
Alexey Tsvetkov
d7edbb8dfc
Track changes in inline function when friend paths are disabled in JS
2017-12-22 16:12:20 +03:00
Alexey Tsvetkov
a4d122478b
Replace testCancelLongKotlinCompilation with less flaky test
2017-12-22 16:12:20 +03:00
Alexey Tsvetkov
ee94a64718
Explicitly request rebuild when untracked java file is removed
...
Previously a rebuild was happenning because FileNotFoundException
was thrown when getting psiFile of removed file.
2017-12-22 16:12:20 +03:00
Alexey Tsvetkov
50bf74b909
Turn off class redeclaration test for JS IC temporarily
...
So the tests could be run on TC.
Turn on after KT-19846 is fixed.
2017-12-22 16:12:20 +03:00
Alexey Tsvetkov
0fee7883ed
Recompile only files from last iteration after compile error
2017-12-22 16:12:20 +03:00
Alexey Tsvetkov
ff2e3ecfc4
Add JS specific IC build log in test
...
JS IC compares proto using a source file path as a key,
so moving file causes recompilation of its usages
unlike JVM IC that uses a class file path as a key.
2017-12-22 16:12:20 +03:00
Alexey Tsvetkov
7712044146
Fix IC test build log diverged from JPS
...
JPS marks dirty direct usages of removed classes since 172.* before a build.
Generic IC also marks dirty all subclasses and their usages.
That is necessary because a method from a removed class could be used
through a subclass.
JPS and generic IC logs diverged in 172 branch, but non-JPS tests
were not run on CI.
2017-12-22 16:12:20 +03:00
Alexey Tsvetkov
a31f503fa5
Recompile all subclasses of removed classes
2017-12-22 16:12:19 +03:00
Alexey Tsvetkov
fec2d08d22
Compile actual and expected declarations together
...
#KT-20840 fixed
2017-12-22 16:12:19 +03:00
Alexander Podkhalyuzin
8203d1c3fe
Extracted Kotlin.JVM IDE into separate module
...
This change is required to have possibility to build plugin against
minor IDEs, which don't have Java. So we want to extract idea-jvm
2017-12-21 18:34:02 +03:00
Alexey Tsvetkov
18fae9e16d
Allow override removing temporary module files after build
...
For debug purposes
2017-12-18 21:19:15 +03:00
Alexey Tsvetkov
5bffef6de7
Allow customizing directory for temporary module files
2017-12-18 21:19:15 +03:00
Alexey Tsvetkov
37b00b91fc
Avoid generating too long path for temp module file
...
#KT-21841 fixed
2017-12-18 21:19:15 +03:00
Ilya Chernikov
f83dc0a067
Make daemon session retrieval more robust to the daemon failures
2017-12-18 16:49:53 +01:00
Ilya Chernikov
1101bb7fb4
Treat "daemon is dying" state as a case for fallback compilation strategy in jps
2017-12-18 16:49:52 +01:00
Alexey Tsvetkov
3f082346ae
Do not set api version to language version when language version is null
...
#KT-21852 fixed
#KT-21574 fixed
2017-12-18 16:22:07 +03:00