43 hours ago[Gradle RC] added backward compatibility for kotlin and android RC producers behaviour master
Sergei Vorobyov [Wed, 15 Sep 2021 17:43:36 +0000 (20:43 +0300)]
[Gradle RC] added backward compatibility for kotlin and android RC producers behaviour

GitOrigin-RevId: 187a4c0a761f0f4da81f3c440745da7218cfd97f

3 days agouse if possible (IJ-CR-14090) 213.3714
Sergey Simonchik [Mon, 13 Sep 2021 21:10:04 +0000 (00:10 +0300)]
use if possible (IJ-CR-14090)

GitOrigin-RevId: 49b7e524e4556e5a1f53f1df8f73faba66dfa5dc

5 days agosupport downloads greater than 2GB in NetUtils#copyStreamContent (IDEA-277209)
Sergey Simonchik [Sat, 11 Sep 2021 20:43:32 +0000 (23:43 +0300)]
support downloads greater than 2GB in NetUtils#copyStreamContent (IDEA-277209)

GitOrigin-RevId: 255a2c6e60d877f75d2bfa5b952af61cb12e3968

6 days ago[android] cleanup: get rid of usages of deprecated methods
Nikolay Chashnikov [Fri, 10 Sep 2021 10:58:54 +0000 (13:58 +0300)]
[android] cleanup: get rid of usages of deprecated methods

GitOrigin-RevId: 92cc3d7e7d28eb14104e099a77c86cff89d9e6f8

6 days ago[android] cleanup: get rid of usages of deprecated constructors in run configurations
Nikolay Chashnikov [Fri, 10 Sep 2021 10:15:25 +0000 (13:15 +0300)]
[android] cleanup: get rid of usages of deprecated constructors in run configurations

GitOrigin-RevId: 5077f556f42cf99ba4422ad86250b938e68e5f6f

7 days ago[gradle] Report changed paths from path modification tracker in Android Task executio...
Nikita Skvortsov [Fri, 10 Sep 2021 12:48:56 +0000 (15:48 +0300)]
[gradle] Report changed paths from path modification tracker in Android Task execution code IJ-CR-14010

GitOrigin-RevId: 22340e30ba145d1da55e8617861726ed61b525a8

7 days agoKTIJ-18482 rename SampleResolutionService
Anastasia Ivanova [Thu, 2 Sep 2021 08:41:58 +0000 (10:41 +0200)]
KTIJ-18482 rename SampleResolutionService

GitOrigin-RevId: 2eeee8405a9c5b44fb3e4d4b13fc4a00485a4b9f

7 days ago[cwm] android integration migrated to the new plugin model
Andrew Kozlov [Fri, 23 Jul 2021 20:54:04 +0000 (22:54 +0200)]
[cwm] android integration migrated to the new plugin model

GitOrigin-RevId: 63365b6de88dcc530e2ba3777a39b9d7e5efd445

8 days agoAndroid: moved to
Vyacheslav Karpukhin [Mon, 6 Sep 2021 17:42:33 +0000 (19:42 +0200)]
Android: moved to package

GitOrigin-RevId: 1c07f0862ef2fd80f1db647ba29ba7732791787c

9 days ago[platform] dropping parallel `Compressor` implementation; migrating to NIO
Roman Shevchenko [Wed, 8 Sep 2021 13:16:44 +0000 (15:16 +0200)]
[platform] dropping parallel `Compressor` implementation; migrating to NIO

GitOrigin-RevId: f54c4c98f2c3ec71306f77cefedec76dee849816

9 days agoreplace error-prone LoggerErrorProcessor.setInstance() with pull-style executeWith...
Alexey Kudravtsev [Tue, 7 Sep 2021 15:29:02 +0000 (17:29 +0200)]
replace error-prone LoggerErrorProcessor.setInstance() with pull-style executeWith(); fix broken usages; port to the new method

GitOrigin-RevId: 6ded83deb2793102c7934bef745f23dbff696366

9 days ago[IDEA-270680] Use an ellipsis character in the Android bundle
Alex Plate [Tue, 7 Sep 2021 15:32:19 +0000 (18:32 +0300)]
[IDEA-270680] Use an ellipsis character in the Android bundle

GitOrigin-RevId: 7ef9c82637a785cba8b6e83baaa58828016591de

9 days agoIJ-CR-13208 cleanup auto-reload project tracker API
Sergei Vorobyov [Tue, 7 Sep 2021 15:26:43 +0000 (18:26 +0300)]
IJ-CR-13208 cleanup auto-reload project tracker API

removed useless scheduleProjectNotificationUpdate

GitOrigin-RevId: 61f7242cff345f1678c1647942db7c670401e223

10 days agoEA-365549 - reloadBreakpoints on EDT
Egor Ushakov [Tue, 7 Sep 2021 10:46:24 +0000 (13:46 +0300)]
EA-365549 - reloadBreakpoints on EDT

GitOrigin-RevId: 3d5738d41dc08e77fdbd665a3ed1158281b9f5d8

11 days ago[kotlin] Use the correct qualified name of the KaptGradleModel (KTIJ-19590)
Yan Zhulanow [Sun, 5 Sep 2021 14:30:35 +0000 (23:30 +0900)]
[kotlin] Use the correct qualified name of the KaptGradleModel (KTIJ-19590)

This is a temporary patch in order to fix Gradle import with the Android plugin enabled.
The proper fix would be depending on the original classes of the Kotlin IDE plugin, or using the newer 'org.jetbrains.kotlin:gradle-tooling' dependency.

KaptGradleModel was moved in 42c8c347c095253115314f31fd251f4dbc66de0c during the Kotlin plugin migration to the new plugin model.

GitOrigin-RevId: f519b4910eedefea97586d39a6b86b355238af39

2 weeks ago[kotlin] Extract Kotlin project model classes to a separate module
Yan Zhulanow [Wed, 1 Sep 2021 13:28:57 +0000 (22:28 +0900)]
[kotlin] Extract Kotlin project model classes to a separate module

GitOrigin-RevId: 4d3b10f5039111b067750a947ced0075550bde5f

2 weeks ago[kotlin] Move classes in kotlin.gradle.gradle-tooling to org.jetbrains.kotlin.idea...
Yan Zhulanow [Wed, 1 Sep 2021 12:06:09 +0000 (21:06 +0900)]
[kotlin] Move classes in kotlin.gradle.gradle-tooling to org.jetbrains.kotlin.idea.gradle package

GitOrigin-RevId: 42c8c347c095253115314f31fd251f4dbc66de0c

2 weeks ago[javadoc] Implemented syntax highlighting for javadocs
Alexander Bashkirov [Wed, 1 Sep 2021 11:01:28 +0000 (14:01 +0300)]
[javadoc] Implemented syntax highlighting for javadocs

GitOrigin-RevId: 4544b607c251f14c294cbf6b25d689c7350f6f01

2 weeks ago[android] moving deprecated class used only in AS into their sources
Roman Shevchenko [Wed, 1 Sep 2021 15:53:33 +0000 (17:53 +0200)]
[android] moving deprecated class used only in AS into their sources

GitOrigin-RevId: f0cf0d29ff19dd331cfd9c57cd7d5568c43b0ab7

2 weeks ago[platform] improving reading/setting custom VM options API; migrating usages
Roman Shevchenko [Tue, 31 Aug 2021 10:23:53 +0000 (12:23 +0200)]
[platform] improving reading/setting custom VM options API; migrating usages

...; switching the implementation to NIO (IDEA-240526 preparatory work)

GitOrigin-RevId: b04e9f56a730b4b881dd5892bf6bb3083465e498

2 weeks ago[kotlin] Move the rest of components registered in kotlin.gradle.gradle-java to the...
Yan Zhulanow [Thu, 29 Jul 2021 10:25:08 +0000 (19:25 +0900)]
[kotlin] Move the rest of components registered in kotlin.gradle.gradle-java to the module

GitOrigin-RevId: 2f11dfd901f391550ebfba2577ec576902b4dcbb

2 weeks ago[kotlin] Migrate kotlin.compiler-plugins.kapt to the new plugin model
Yan Zhulanow [Wed, 28 Jul 2021 12:58:22 +0000 (21:58 +0900)]
[kotlin] Migrate kotlin.compiler-plugins.kapt to the new plugin model

GitOrigin-RevId: 779633d3bcd209ced1f382a5346337bb72a2167b

2 weeks ago[kotlin] Put Gradle/Java-related components of kotlin.compiler-plugins.kapt to the...
Yan Zhulanow [Wed, 28 Jul 2021 11:00:54 +0000 (20:00 +0900)]
[kotlin] Put Gradle/Java-related components of kotlin.compiler-plugins.kapt to the appropriate package

GitOrigin-RevId: a29089f002b7f26e04fa93c69bd763478dde660e

3 weeks ago[Gradle] Add separate language filetype for Gradle script files IDEA-276227
Vladislav.Soroka [Wed, 25 Aug 2021 16:20:39 +0000 (19:20 +0300)]
[Gradle] Add separate language filetype for Gradle script files IDEA-276227

GitOrigin-RevId: 29b0bd27e7c3fe15ae96a6bf086a79c307df0d3c

3 weeks ago[Gradle, Import] Introduce KotlinSourceSetData for Kotlin Multiplatform module nodes 213.2094
Yaroslav Chernyshev [Wed, 11 Aug 2021 14:41:22 +0000 (17:41 +0300)]
[Gradle, Import] Introduce KotlinSourceSetData for Kotlin Multiplatform module nodes

UserData property "kotlinSourceSet" is now Deprecated

GitOrigin-RevId: 4490d8aa256ccbdbdfb8d02b4ff29e2faa7d4366

3 weeks agoRationalize PlatformCoreDataKeys usages
Dmitry Trofimov [Tue, 24 Aug 2021 20:52:00 +0000 (23:52 +0300)]
Rationalize PlatformCoreDataKeys usages

GitOrigin-RevId: a07b3295a4af22918daa19f521888645f16e8017

3 weeks agocleanup: simplify Alarm instantiation
Alexey Kudravtsev [Mon, 23 Aug 2021 13:40:55 +0000 (15:40 +0200)]
cleanup: simplify Alarm instantiation

GitOrigin-RevId: 33647c89f86d3689034cd7b584ff95eca62c4e5d

4 weeks agofix signature types in lang-api to correct wildcards
Alexey Kudravtsev [Thu, 19 Aug 2021 15:53:21 +0000 (17:53 +0200)]
fix signature types in lang-api to correct wildcards

GitOrigin-RevId: 4988c60904e4cf83e758500dd980195d1cdbe992

4 weeks agofix module dependencies which are unresolved or duplicated
Alexey Kudravtsev [Tue, 17 Aug 2021 10:46:07 +0000 (12:46 +0200)]
fix module dependencies which are unresolved or duplicated

GitOrigin-RevId: fb991dfcefb0663e9ccd6167681cff6642bd57f7

5 weeks ago[i18n] annotate documentation-related EP implementations
Daniil Ovchinnikov [Thu, 12 Aug 2021 14:01:24 +0000 (16:01 +0200)]
[i18n] annotate documentation-related EP implementations

GitOrigin-RevId: 6c7902de7362d28fe8b96a68b49116396fbcb702

5 weeks ago[IntelliJ project configuration] switch to the old backend for Kotlin compiler
Nikolay Chashnikov [Thu, 12 Aug 2021 13:06:39 +0000 (16:06 +0300)]
[IntelliJ project configuration] switch to the old backend for Kotlin compiler

The new JVM IR backend used by default when language version is 1.5 makes 'Rebuild Project' longer by 15% (see KT-48233).

GitOrigin-RevId: d03c12d2d6272278fe401acf8d19ea7191ee09c9

5 weeks agoDB Tree: rename getSelected…() functions to get names corrected (depending on the...
Leonid Bushuev [Sun, 8 Aug 2021 20:25:13 +0000 (22:25 +0200)]
DB Tree: rename getSelected…() functions to get names corrected (depending on the result collection)

GitOrigin-RevId: 306557aae9f2c5642ae52d36a0e8b09c919ad186

5 weeks agomigration to Kotlin 1.5: replace min/max calls by corresponding *OrNull variants
Nikolay Chashnikov [Fri, 6 Aug 2021 16:06:42 +0000 (19:06 +0300)]
migration to Kotlin 1.5: replace min/max calls by corresponding *OrNull variants

Otherwise, compilation fails if language version is set to 1.5.

GitOrigin-RevId: f04b132882bb5de9374835c51b16342220df77a8

5 weeks agomigration to Kotlin 1.5: add explicit spread operator to pass array as vararg
Nikolay Chashnikov [Fri, 6 Aug 2021 16:04:47 +0000 (19:04 +0300)]
migration to Kotlin 1.5: add explicit spread operator to pass array as vararg

Otherwise, code won't compile with language version 1.5 because of KT-35224.

GitOrigin-RevId: f3edc6198782e0357dc71e2e93ea77812f628af1

5 weeks agomigration to Kotlin 1.5: don't pass empty arrays as varargs
Nikolay Chashnikov [Fri, 6 Aug 2021 16:04:21 +0000 (19:04 +0300)]
migration to Kotlin 1.5: don't pass empty arrays as varargs

Otherwise, code won't compile with language version 1.5 because of KT-35224.

GitOrigin-RevId: 9078ed7a2a602d29a632050679e0984393a1b590

6 weeks agoMove functional parameter the last position to ease Kotlin interoperability
Dmitry Trofimov [Wed, 4 Aug 2021 20:50:02 +0000 (23:50 +0300)]
Move functional parameter the last position to ease Kotlin interoperability

GitOrigin-RevId: d69ff747dac91dff4fe206e956ea9c33ca4f5ab7

6 weeks agoRevert changes to Messages class in sake of compatibility
Dmitry Trofimov [Wed, 4 Aug 2021 00:39:13 +0000 (03:39 +0300)]
Revert changes to Messages class in sake of compatibility

GitOrigin-RevId: 248ce364a55af1c661b1923f6401f35cd5dcc5bc

6 weeks agoFinally decouple db.connectivity from platform.ide
Dmitry Trofimov [Tue, 3 Aug 2021 14:01:03 +0000 (17:01 +0300)]
Finally decouple db.connectivity from platform.ide

GitOrigin-RevId: ca8996c15b2830f2b9a5c03fcd7c1c40ca76bede

6 weeks agoRemove dependency platform.ssh->platform.ide
Dmitry Trofimov [Tue, 3 Aug 2021 10:14:29 +0000 (13:14 +0300)]
Remove dependency platform.ssh->platform.ide

Among other changes Messages API moved to platform.ide.core and decoupled from implementation

GitOrigin-RevId: 3e31014cbbf0c46e2c212e3742f629bea5e61cbe

6 weeks agoDecouple macro and lang-core from platform.ide
Dmitry Trofimov [Mon, 2 Aug 2021 22:23:15 +0000 (01:23 +0300)]
Decouple macro and lang-core from platform.ide

GitOrigin-RevId: 5003782d2b7902744b0fd6e62eb8238f7789c866

6 weeks agoEditorNotificationPanel more streamlined API for background colors
Alexander.Kirsanov [Sun, 1 Aug 2021 13:23:11 +0000 (16:23 +0300)]
EditorNotificationPanel more streamlined API for background colors

GitOrigin-RevId: e3e3bf275ddfb7f3721fa0689ec4b3f5bcf27d7e

6 weeks agocleanup deprecated `createCustomComponent` implementations
Gregory.Shrago [Fri, 30 Jul 2021 23:57:09 +0000 (02:57 +0300)]
cleanup deprecated `createCustomComponent` implementations

GitOrigin-RevId: b45d583fd486f55834de8d26307fbd89641f9e2a

7 weeks ago[android] fix configuration of Maven libraries db-compiler and db-compilerCommon...
Nikolay Chashnikov [Thu, 29 Jul 2021 14:25:26 +0000 (17:25 +0300)]
[android] fix configuration of Maven libraries db-compiler and db-compilerCommon modules

The library configurations need to explicitly exclude transitive dependencies, otherwise their will be included into the library when it's reloaded.

GitOrigin-RevId: 44e687136c2c1920be1183ec9cc37a84d9318b01

7 weeks agoCWM-3329: Android Studio can't open "Manage license" window
Andrei Kuznetsov [Tue, 27 Jul 2021 13:37:05 +0000 (16:37 +0300)]
CWM-3329: Android Studio can't open "Manage license" window

GitOrigin-RevId: b29ab2c4c1fbf73b1c0d70d3d147d6638a3851a1

7 weeks ago[kotlin] Move Gradle-dependent classes of the Kotlin IDE plugin's 'gradle-idea' modul...
Yan Zhulanow [Wed, 14 Jul 2021 16:11:25 +0000 (01:11 +0900)]
[kotlin] Move Gradle-dependent classes of the Kotlin IDE plugin's 'gradle-idea' module to the appropriate package

GitOrigin-RevId: f8fa126b6a99f565368e49c501c950004640ca66

7 weeks agocleanup: use factory method for IdeModifiableModelsProvider instead of instantiating...
Nikolay Chashnikov [Tue, 27 Jul 2021 16:23:03 +0000 (19:23 +0300)]
cleanup: use factory method for IdeModifiableModelsProvider instead of instantiating implementation class directly

GitOrigin-RevId: aaf5d84b2203db1d18a0201d0d050914b6737478

7 weeks agoExtract ui from credentialStore
Dmitry Trofimov [Mon, 26 Jul 2021 20:14:30 +0000 (22:14 +0200)]
Extract ui from credentialStore

GitOrigin-RevId: 2547b085afa0824c8b9746a947bb2be4e599b846

7 weeks agoDo not create test tasks for KMP modules.
Karima Ichou [Thu, 14 Jan 2021 16:21:37 +0000 (16:21 +0000)]
Do not create test tasks for KMP modules.

test tasks creation should be delegated to
KotlinMPPGradleTestTasksProvider instead.

Bug: 176999821
Test: verified manually
Change-Id: If89aa954cdabbca9730299aa519237cfec387df3

GitOrigin-RevId: 534540442121325b1f8349d10df8f066378783df

7 weeks agoFilter out non-android modules when getting gradle test tasks.
Karima Ichou [Fri, 27 Nov 2020 19:28:58 +0000 (19:28 +0000)]
Filter out non-android modules when getting gradle test tasks.

Before checking if a test source is a unitTest artifact or not, we need
to check if its module is an Android moduleor not.

Bug: 173107350
Test: added
Change-Id: I6e75c5ef9029583e3a02ceb9e18401c3f9454014

GitOrigin-RevId: e5f16444354c09cd6b5e7ed121d9d10aa4f4443c

7 weeks agoFix creating AndroidTest package run configuration when using GRADLE
Karima Ichou [Thu, 8 Oct 2020 14:20:39 +0000 (15:20 +0100)]
Fix creating AndroidTest package run configuration when using GRADLE

When using GRADLE test runner for unit test, and when AndroidTest and
unit tests have the same package name, creating a "all in package"
androidTest run configuration does run unit tests instead.
This is due to the fact that GRADLE finds that both androidTest and
unitTests have the same test tasks.
As we use GRADLE only for unit tests, it doesn't make sense generating
test tasks for androidTest artifacts.
This change adds a fix to only create gradle test task for unit tests

bug: 173106394
bug: 173107350
Test: added
Change-Id: I54a458f672f889acb5eddc4d7aa9a61ac5be13cb

GitOrigin-RevId: 3faad95f07334f55c2ea5f3e8c711765e4dc1e7a

7 weeks agoMake the Android Gradle test tasks more specific.
Karima Ichou [Wed, 11 Nov 2020 11:14:29 +0000 (11:14 +0000)]
Make the Android Gradle test tasks more specific.

Add the gradle path to the test tasks. This is important for cases where
we have different packages with same name, an in which case we can only
tell the difference by checking that the path is different.

Bug: 173107350
Test: Added.
Change-Id: I4810bb016c54cb4ba32f2c4ddbc8f571735432b7

GitOrigin-RevId: fe4f9a8e8853e469cb09071b8a8c3d5d8be0e691

8 weeks agoCWM: DeviceAndSearchPanel: add explanatory comments 213.1558
Andrei Kuznetsov [Thu, 22 Jul 2021 16:47:27 +0000 (19:47 +0300)]
CWM: DeviceAndSearchPanel: add explanatory comments

GitOrigin-RevId: 34f5aa7112f385019eb0345d50d36e683b826d92

8 weeks agoIDEA-254443: Android plugin's "Store/Restore Default Layout" actions override platfor...
Andrei Kuznetsov [Thu, 22 Jul 2021 16:41:11 +0000 (19:41 +0300)]
IDEA-254443: Android plugin's "Store/Restore Default Layout" actions override platform actions but not translated

GitOrigin-RevId: e668ce04a9a9d14e594cbbe44bc9e95f7d27f04e

8 weeks agoComponentManagerImpl - do not implement MutablePicoContainer
Vladimir Krivosheev [Tue, 20 Jul 2021 09:44:20 +0000 (11:44 +0200)]
ComponentManagerImpl - do not implement MutablePicoContainer

GitOrigin-RevId: 8d895f4bfcec3db8d04d6fc79774375ab04cb2a9

8 weeks agoCWM-1983,CWM-2940,CWM-1156: enable android project view and logcat in CWM guest
Andrei Kuznetsov [Mon, 19 Jul 2021 19:09:48 +0000 (22:09 +0300)]
CWM-1983,CWM-2940,CWM-1156: enable android project view and logcat in CWM guest

GitOrigin-RevId: 77d802316dc6982f3d8c27ccef49989d91e25e9e

8 weeks agoCWM-2940: RdConverter for DeviceAndSearch panel (android logcat)
Andrei Kuznetsov [Thu, 1 Jul 2021 09:22:21 +0000 (12:22 +0300)]
CWM-2940: RdConverter for DeviceAndSearch panel (android logcat)

CWM generic toolwindow framework does not support GroupLayout yet. Do manual conversion of the DeviceAndSearchPanel to linear-like layout. This conversion is an approximation: on the guest there is no distinction between wide/narrow cases, and all the widgets (except the checkbox) are always scaled proportionally. (on the host they are scaled proportionally up to 500px, then only search field is scaled)

GitOrigin-RevId: 2e8f9c3e453852bc5b7cb00e13a970f41fa8da81

8 weeks agoCWM-2940: Android: add mirroring for Logcat toolwindow
Andrei Kuznetsov [Mon, 19 Jul 2021 17:43:40 +0000 (20:43 +0300)]
CWM-2940: Android: add mirroring for Logcat toolwindow

GitOrigin-RevId: fee30a6892e2cae48463563940dad5f281a4cb85

8 weeks agoCWM-1156: add support for Android project view on cwm guest
Andrei Kuznetsov [Mon, 19 Jul 2021 17:34:59 +0000 (20:34 +0300)]
CWM-1156: add support for Android project view on cwm guest

GitOrigin-RevId: a7af425a0628f312b2ed3f974e38f128b0ad361b

8 weeks agoremove ASM from OpenAPI module dependencies
Alexey Kudravtsev [Fri, 16 Jul 2021 16:31:12 +0000 (18:31 +0200)]
remove ASM from OpenAPI module dependencies

GitOrigin-RevId: 70024ffc9ad8dea40a2d2db12e282948a834a7b8

2 months agoavoid duplicated okio, flatbuffers
Vladimir Krivosheev [Thu, 15 Jul 2021 13:22:16 +0000 (15:22 +0200)]
avoid duplicated okio, flatbuffers

GitOrigin-RevId: 74186f4e0e3780c257fa45457212d87240401d58

2 months agoAndroid: fix flaky tests (DaemonMemorySettingsTests): test data is written via java...
Andrei Kuznetsov [Fri, 16 Jul 2021 15:05:31 +0000 (18:05 +0300)]
Android: fix flaky tests (DaemonMemorySettingsTests): test data is written via, but accessed via VFS

... without necessary synchronization (VFS sees no file)

Additionally, remove `System.clearProperty("user.home")`. It is not expected that it ever evaluates to `null` (see `com.intellij.util.SystemProperties.getUserHome`)

GitOrigin-RevId: 747cce73d4a5d6b462f1d76423505f8cf9e79115

2 months ago[kotlin] Untie Gradle and Groovy integration from each other
Yan Zhulanow [Wed, 9 Jun 2021 07:26:32 +0000 (16:26 +0900)]
[kotlin] Untie Gradle and Groovy integration from each other

GitOrigin-RevId: 70a1bb8eae96eaa854ca28f92f1d7ec09b5b60f3

2 months agoAndroid: fix bad dependency in tests
Andrei Kuznetsov [Thu, 15 Jul 2021 10:45:39 +0000 (13:45 +0300)]
Android: fix bad dependency in tests

`` is referencing `` which has corrupted pom file (no <dependency> tag inside <dependencies> block).

GitOrigin-RevId: 6a1210106ad8261020e807e3a2ba191d1a2ce3c4

2 months agoremove Velocity from api modules
Alexey Kudravtsev [Thu, 15 Jul 2021 09:41:40 +0000 (11:41 +0200)]
remove Velocity from api modules

GitOrigin-RevId: 12ac133fe8550b0442910270284d63819997ad32

2 months agoAndroid: fix bad merge in test code
Andrei Kuznetsov [Thu, 15 Jul 2021 09:00:46 +0000 (12:00 +0300)]
Android: fix bad merge in test code

GitOrigin-RevId: 37dea4b5df869cde02404186d0a049daf75b56fe

2 months ago[Dsl] Don't add non-expressions to ExpressionLists
Christophe Rhodes [Thu, 8 Jul 2021 16:49:38 +0000 (17:49 +0100)]
[Dsl] Don't add non-expressions to ExpressionLists

In resolving qualified expressions to DslElements, lookup of some
special blocks is hard-coded.  Those lookups should only resolve to
special blocks (or projects) if they are the first
lookup (i.e. implicitly on the project) rather than all the
time.  (TODO: actually they should succeed if the resultElement is a

The treatment of `ext` here is not correct in that it does not support
extra properties on ExtensionAware elements other than the project.
However, in that respect it now mirrors the treatment of extra
properties elsewhere in resolution, so even if the number of sources of
confusion remains the same, there are fewer distinct kinds of confusion

This fixes the symptom exhibited in EA-297573 from JetBrains.

Bug: none
Test: added
Change-Id: I57bfb53b3851266539729648137007a8405d5f4a

GitOrigin-RevId: 7a94a1129acfa9fe29a79cbac2f67d981879d9ed

2 months agoAndroid: fix compilation after cherry-pick (some code depends on newer android plugin...
Andrei Kuznetsov [Wed, 14 Jul 2021 17:55:34 +0000 (20:55 +0300)]
Android: fix compilation after cherry-pick (some code depends on newer android plugin sources, than we have in IDEA: 4.2)

This commit should be skipped during IDEA>AOSP merge

GitOrigin-RevId: 4b1d863b071386e539b849598275956be099a75c

2 months ago[Dsl] Be more robust to invalid syntax
Christophe Rhodes [Thu, 8 Jul 2021 15:41:32 +0000 (16:41 +0100)]
[Dsl] Be more robust to invalid syntax

Finding a match using the INDEX_PATTERN used does not explicitly
distinguish between matching a property and matching a dereference.
This means that some invalid syntaxes could continuously match the
INDEX_PATTERN, leading to attempts to insert null into a collection data

Add checks against this, and furthermore remove the checks against
groupCount() whose intent was probably to check whether a particular
branch of the match had succeeded but instead check a static property of
the matcher.

This fixes the symptoms shown in EA-329164 from JetBrains.

Bug: none
Test: added
Change-Id: Iae67501dc583719640f09bd6249d02f26b50bc40

GitOrigin-RevId: 714689ea0edf55202361d1167342ca46030e1dd7

2 months agoAndroid: NPE in AndroidProjectRule caused by incorrect assumption that junit's `Descr...
Andrei Kuznetsov [Wed, 14 Jul 2021 15:39:03 +0000 (15:39 +0000)]
Android: NPE in AndroidProjectRule caused by incorrect assumption that junit's `Description#testClass` may not be null

When running via gant, `org.junit.runner.Description` is loaded by different classloader than ``. `Description#getTestClass` produces `null`, because `CompactResourcePickerTest` is not in JUnit's classloader. Use string manipulation instead.

GitOrigin-RevId: b58d67fcf68db6c3552b761e2c906b8b93aa0c0b

2 months agoAndroid: Suppress "Slow operations" assertion in IDEA
Andrei Kuznetsov [Tue, 13 Jul 2021 18:17:42 +0000 (18:17 +0000)]
Android: Suppress "Slow operations" assertion in IDEA

GitOrigin-RevId: fe8d2ce898f9b958f53d0ad593c8178ac9c92828

2 months agoAndroid: avoid using `ActionPlaces.UNKNOWN`
Andrei Kuznetsov [Tue, 13 Jul 2021 16:33:10 +0000 (19:33 +0300)]
Android: avoid using `ActionPlaces.UNKNOWN`

Exception message suggests: "Please do not use ActionPlaces.UNKNOWN or the empty place. Any string unique enough to deduce the toolbar location will do."

GitOrigin-RevId: 394176a0cbbf57a48f12617e30870cb8fac71c20

2 months agoEA-268350: NewAndroidComponentAction: it is not allowed to access indices from UI...
Andrei Kuznetsov [Tue, 13 Jul 2021 13:13:14 +0000 (16:13 +0300)]
EA-268350: NewAndroidComponentAction: it is not allowed to access indices from UI thread

Move `NewAndroidComponentAction#update` to background thread

GitOrigin-RevId: 1676ad80705c9797b55779d2ddab2af2288e7692

2 months agoIDEA-273440: Android: fix incorrect threading in AndroidRunConfiguration
Andrei Kuznetsov [Tue, 13 Jul 2021 15:59:21 +0000 (15:59 +0000)]
IDEA-273440: Android: fix incorrect threading in AndroidRunConfiguration

In all the cases, except the case of the running app, `getExecutorIcon` produces default icon. Remove the code that is "lifted" from the platform: only handle cases that Android Plugin aware of (and should be able to handle)

GitOrigin-RevId: 8af574d7729ca00ff0eea92926bec24705dc3648

2 months agorefactor addTimerListener method with unused parameter
Konstantin Bulenkov [Sat, 10 Jul 2021 21:40:36 +0000 (23:40 +0200)]
refactor addTimerListener method with unused parameter

GitOrigin-RevId: 03232855ca067af47155ed5cc8cb92ead9ccb71a

2 months agoIDEA-273150: Android: update layoutlib (use jb-layoutlib with stripped protobuf frame...
Andrei Kuznetsov [Thu, 8 Jul 2021 18:27:15 +0000 (18:27 +0000)]
IDEA-273150: Android: update layoutlib (use jb-layoutlib with stripped protobuf framework classes)

Fixes `java.lang.LinkageError: loader constraint violation` on classes from protobuf-java (e.g. ``)

GitOrigin-RevId: 65ce39d724a9fde6fe98320e5f10bd292632b6da

2 months agoreplace primitive wrapper constructor calls with the corresponding .valueOf() method...
Alexey Kudravtsev [Wed, 7 Jul 2021 22:32:32 +0000 (00:32 +0200)]
replace primitive wrapper constructor calls with the corresponding .valueOf() method call since the former are really deprecated in JDK 17

GitOrigin-RevId: 7e0b1425c62765fe7ce44bf0c17f427636a38d09

2 months ago[IntelliJ project configuration] adapt settings of Kotlin facet to Kotlin 1.5 plugin
Nikolay Chashnikov [Wed, 7 Jul 2021 10:52:45 +0000 (10:52 +0000)]
[IntelliJ project configuration] adapt settings of Kotlin facet to Kotlin 1.5 plugin

Kotlin 1.5 doesn't write tag for 'jvmTarget' option if its value is '1.8', and does write it if its value is '1.6', so this change is needed to avoid modified iml files if the project is opened with Kotlin plugin 1.5 (see KTIJ-19019).

GitOrigin-RevId: 8fc21bf185ac8c23675123b904f25af5defcc98e

2 months agoreport extension class if failed to create instance
Vladimir Krivosheev [Tue, 6 Jul 2021 11:33:22 +0000 (13:33 +0200)]
report extension class if failed to create instance

GitOrigin-RevId: cbbcf45ae3723ef1abdf42381e6fc6d7bed7f55c

2 months agoIDEA-272331: Android: fix bad merge (wrong EP namespace in naveditor.xml)
Andrei Kuznetsov [Mon, 5 Jul 2021 21:23:16 +0000 (21:23 +0000)]
IDEA-272331: Android: fix bad merge (wrong EP namespace in naveditor.xml)

GitOrigin-RevId: 2440612dd70033c6bcdb1140c1dbea9091b5a5d3

2 months agoIDEA-270482: Android: Could not load wear devices: java.lang.NumberFormatException...
Andrei Kuznetsov [Mon, 5 Jul 2021 19:08:29 +0000 (19:08 +0000)]
IDEA-270482: Android: Could not load wear devices: java.lang.NumberFormatException: For input string: ""

GitOrigin-RevId: 2699e2d8053ab824969de87d57b40860553cdefc

2 months agoIDEA-273016,IDEA-255753: Android: add missing description to PreviewMultipleParameter...
Andrei Kuznetsov [Mon, 5 Jul 2021 16:58:08 +0000 (19:58 +0300)]
IDEA-273016,IDEA-255753: Android: add missing description to PreviewMultipleParameterProvidersInspection

GitOrigin-RevId: 324aab44cc7053c04eb8f8a3f8b62f1bcbee5d48

2 months agoFix Compose Preview inspection bundle messages
Amaury Medeiros [Thu, 22 Oct 2020 17:13:33 +0000 (20:13 +0300)]
Fix Compose Preview inspection bundle messages

The `displayName` property of localInspection expects a string, not a bundle
key, so now we're using `key` instead. Also, added some missing keys and
made small clean ups to Inspections.kt.

Bug: N/A
Test: N/A. Visual.
Change-Id: Ida27de55b8522070515b81c74bafa402eade6d24

GitOrigin-RevId: af12bf68deede0ff42c163da029f908588bc79ce
# Conflicts:
# community/android/compose-designer/src/META-INF/compose-designer.xml
# community/android/compose-designer/src/com/android/tools/idea/compose/preview/
# community/android/compose-designer/src/com/android/tools/idea/compose/preview/Inspections.kt

GitOrigin-RevId: e72547534e13d0ab1651ac631e2cd283dc325c96

2 months agoIDEA-270939: Sync already in progress for project 'xxx'
Andrei Kuznetsov [Fri, 2 Jul 2021 17:17:03 +0000 (17:17 +0000)]
IDEA-270939: Sync already in progress for project 'xxx'

It is not an error that sync is invoked multiple times for the same IDE project. It will be invoked once per linked project.
It is not correct to track sync state per IDE project, it should be tracked per linked gradle project.

GitOrigin-RevId: 1a15d97468db25965c6717373fdeb2edad31374a

2 months agoAssociation between LocalDataSource && SqlDataSource
Alexander.Kass [Fri, 2 Jul 2021 06:37:45 +0000 (09:37 +0300)]
Association between LocalDataSource && SqlDataSource

GitOrigin-RevId: ec1b33ded47aed8ed6dc69440817c69dbcdb0107

2 months ago[Gradle] update bundled Gradle TAPI IDEA-270533
Vladislav.Soroka [Fri, 2 Jul 2021 11:30:12 +0000 (11:30 +0000)]
[Gradle] update bundled Gradle TAPI IDEA-270533

GitOrigin-RevId: 32582f8f069b654f13758c83415c764cb13e0edd

2 months agoDBE-13276 one more time reduce data source actions visibility
Alexander.Kass [Wed, 30 Jun 2021 10:56:39 +0000 (13:56 +0300)]
DBE-13276 one more time reduce data source actions visibility

GitOrigin-RevId: f7c6ec1a208632404be7339c04c2ccd1fb2a6626

2 months ago[kotlin] fix compilation, coroutineState/coroutineSupport flag was removed in 1.5
Mikhail Zarechenskiy [Mon, 7 Jun 2021 13:28:26 +0000 (16:28 +0300)]
[kotlin] fix compilation, coroutineState/coroutineSupport flag was removed in 1.5

GitOrigin-RevId: abd5aaeaf7c9a94ba3b7cab3e19265a091516567

2 months ago[misc] update settings: default JVM target is 1.8 in Kotlin 1.5
Mikhail Zarechenskiy [Mon, 31 May 2021 11:02:40 +0000 (14:02 +0300)]
[misc] update settings: default JVM target is 1.8 in Kotlin 1.5

GitOrigin-RevId: 3c0c7acc29bff79b58799a49fc50562bf3c2f7e1

2 months ago[misc] update settings: default JVM target is 1.8 in Kotlin 1.5
Mikhail Zarechenskiy [Mon, 31 May 2021 11:07:10 +0000 (14:07 +0300)]
[misc] update settings: default JVM target is 1.8 in Kotlin 1.5

GitOrigin-RevId: 5c31373de25a11e3c5dc3426939a6f0796504389

2 months agoKotlin's intentions descriptions
Andrei Klunnyi [Fri, 2 Jul 2021 01:16:02 +0000 (04:16 +0300)]
Kotlin's intentions descriptions

After revisit the following resources were
1. removed as outdated:
 - RedoParcelableAction
 - KotlinSignatureAnnotationIntention
2. moved to a proper module to work as expected:
 - KotlinAndroidAddStringResource
 - MavenPluginSourcesMoveToBuild
 - OperatorToFunctionIntention

 GitOrigin-RevId: ce5a1a24e438abe500a152ac92e8b11b3aaac869

2 months agoDelete KotlinVersionsTest
Matthew Gharrity [Mon, 26 Apr 2021 23:16:59 +0000 (02:16 +0300)]
Delete KotlinVersionsTest

Currently there is no need for the versions of the Kotlin IDE plugin
and the Kotlin Gradle plugin to match during testing.

Bug: 185003887
Bug: 186464956
Test: n/a
Change-Id: I8cb3dae234b7ed93f856b7bc18b355f441b0718e

2 months agoIDEA-258250: Android SDK Manager fails on Mac M1 (aarch64)
Andrei Kuznetsov [Mon, 28 Jun 2021 09:39:54 +0000 (09:39 +0000)]
IDEA-258250: Android SDK Manager fails on Mac M1 (aarch64)

GitOrigin-RevId: 697f081be22f0a04e680f683744a18f3b11f5901

2 months agoAndroid: Use `AnActionEvent#getPresentation` instead of `getTemplatePresentation... 213.527
Andrei Kuznetsov [Thu, 24 Jun 2021 16:57:54 +0000 (19:57 +0300)]
Android: Use `AnActionEvent#getPresentation` instead of `getTemplatePresentation` in `GetAdbAction#update`

`getTemplatePresentation().setEnabled(...)` does not affect button state. In most cases users get inconsistent behavior: action appears enabled, but cannot be invoked.

GitOrigin-RevId: 0ab50cc79e50b9cdb80905f5d4bb16d83c088cdc

2 months agoAndroid cleanup: StartupWizard action was removed in e07bbea11afa5055fd0c7dc45f1cb421...
Andrei Kuznetsov [Thu, 24 Jun 2021 16:35:41 +0000 (19:35 +0300)]
Android cleanup: StartupWizard action was removed in e07bbea11afa5055fd0c7dc45f1cb421c5ba982c

Artem Khvastunov 05.05.2021, 14:22 IDEA-249516 remove implementations of CustomizeIDEWizardStepsProvider

GitOrigin-RevId: de6136777a26f4d2416740a79e0d405d5861fd82

2 months agoAndroid: `Infer Annotations` is actually `Infer Support Annotations`; it should not...
Andrei Kuznetsov [Thu, 24 Jun 2021 16:09:19 +0000 (19:09 +0300)]
Android: `Infer Annotations` is actually `Infer Support Annotations`; it should not be shown in non-android projects

Also `getTemplatePresentation().setVisible(false)` almost never does what one might think it supposed to. Action is still visible in Analyze menu in Android Studio, but it cannot be discovered via Find Action. Use `event.presentation` instead to avoid ambiguity.

GitOrigin-RevId: 34b40225eba432a754f98d15535f9629cfcff507

2 months ago[android] allow to search for pro files in libraries
Anna Kozlova [Thu, 24 Jun 2021 13:05:32 +0000 (15:05 +0200)]
[android] allow to search for pro files in libraries


GitOrigin-RevId: dfa0d8b9fae3e2ec45acfb37e1dc1cc9f4853531

2 months ago[android] do not include proguard files when dealing with local ktProperties (KTIJ...
Anna Kozlova [Mon, 21 Jun 2021 09:51:41 +0000 (11:51 +0200)]
[android] do not include proguard files when dealing with local ktProperties (KTIJ-614)

don't search for pro files in libraries as well

GitOrigin-RevId: c3c6e36ece898fa4cd412ec5b8ff23ec0252afa6

2 months agosort semicolon-separated extensions within "extensions" attribute of <fileType> in...
Alexey Kudravtsev [Fri, 18 Jun 2021 23:40:19 +0000 (01:40 +0200)]
sort semicolon-separated extensions within "extensions" attribute of <fileType> in plugin.xml to ease the maintenance

GitOrigin-RevId: 06b3061fdb7bfed840a7bb58e4725e3351b37b40

2 months agoIJP-630 (wip) Better class names for ActionOnSaveInfoProvider implementations
Alexander Doroshko [Fri, 18 Jun 2021 14:43:56 +0000 (17:43 +0300)]
IJP-630 (wip) Better class names for ActionOnSaveInfoProvider implementations

GitOrigin-RevId: c945594fe9e5b1a7b96eb20e4c97e207197b6fe5

2 months agocleanup
Alexey Kudravtsev [Fri, 18 Jun 2021 14:00:26 +0000 (16:00 +0200)]

GitOrigin-RevId: 5532d59179fdf99b623312978a922228f833fcb2