azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,496 Commits 1 Branch 0 Tags
4f80f6d715f7f2bddd346b80fbff49f4b330c4e9
Commit Graph

1171 Commits

Author SHA1 Message Date
Vyacheslav Gerasimov 16b314f860 as32: Remove JavaBuilderExtension from AS 3.2 C10 2018-04-13 21:33:16 +03:00
Vyacheslav Gerasimov a6bd0f618e as32: Remove platform-api & platform-impl from build scripts 
since they are not present in AS 3.2 C10
 2018-04-13 21:33:14 +03:00
Vyacheslav Gerasimov 4299455dc1 as32: Update to AS 3.2 C10 2018-04-13 21:33:03 +03:00
Alexey Tsvetkov bd50ad87ba Use KotlinCoreEnvironment for parsing Kotlin in IC 
Creating and disposing CoreApplicationEnvironment on each call leads to
problems with parallel builds, while KotlinCoreEnvironment
avoids disposing application environment in case of parallel builds.

    #KT-23694 fixed
 2018-04-11 19:56:15 +03:00
Alexey Tsvetkov 39f7ecc9a3 181: Reimplement constant search in JPS 
The API in Intellij have been changed after the PR was merged
(see https://github.com/JetBrains/intellij-community/commit/8227d8e2dd4d98d2ff248a1b193ba31831ddef50)

This commit implements new API.
Also mocked Kotlin constant search is removed from JPS tests.
Mocked Java search is in place, but now
it is does not use hardcoded file and constant names.

   #KT-16091 fixed
 2018-04-11 16:28:38 +03:00
Vyacheslav Gerasimov a0e20eefc6 181: Fix dependencies for 181 2018-04-11 16:28:29 +03:00
Simon Ogorodnik e9caa54afa as31: Remove dependencies on jps/test 2018-04-11 16:28:18 +03:00
Nikolay Krasko 4c8f366e46 172: [Tests] Revert "Modify incremental test in 173 branch - files are not create anymore" 
This reverts commit 0cc5d163d7d620565a28681dab31f3d3061a1324.
 2018-04-11 16:27:56 +03:00
Alexander Udalov d2ed73eb78 Enable all Java 9 tests 2018-04-05 12:38:48 +02:00
Alexey Tsvetkov 6f59b6da8e Use daemon if available for parsing files in JPS 2018-04-03 21:11:12 +03:00
Alexey Tsvetkov 3eb968807e Invalidate usages of removed classes before round 
#KT-23165 fixed
 2018-04-03 21:11:12 +03:00
Alexey Tsvetkov 8cd0f13f2b Convert KotlinSourceFileCollector: simplify after conversion 2018-04-03 21:11:11 +03:00
Alexey Tsvetkov 3f36f472b3 Convert KotlinSourceFileCollector: actual conversion 2018-04-03 21:11:11 +03:00
Alexey Tsvetkov 336d63c0a3 Convert KotlinSourceFileCollector: rename file 2018-04-03 21:11:11 +03:00
Alexey Tsvetkov bd779cb26e Remove usages of deprecated API 2018-04-03 21:11:11 +03:00
Alexey Tsvetkov 58e4b704c6 Replace reflection with direct call 2018-04-03 21:11:11 +03:00
Alexey Tsvetkov fa9c80e05c Convert CompilerRunnerUtil: actual conversion 2018-04-03 21:11:11 +03:00
Alexey Tsvetkov f27b6c0d8d Convert CompilerRunnerUtil: rename file 2018-04-03 21:11:11 +03:00
Alexey Tsvetkov 455fe7fe61 Reformat jps-plugin module 2018-04-03 21:11:11 +03:00
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