idea/android.git
44 hours agoIDEA-239640 Start working from Empty Project master
Dmitry Avdeev [Fri, 11 Jun 2021 14:21:19 +0000 (17:21 +0300)]
IDEA-239640 Start working from Empty Project

setting JDK automatically if missed

GitOrigin-RevId: c7571918d3d0fc127247b9b76ca041b98bb4106d

3 days ago`UsageGroup`: remove `UsageView` parameter from `#getText`, rename `#getText` ->...
Daniil Ovchinnikov [Wed, 9 Jun 2021 16:55:02 +0000 (18:55 +0200)]
`UsageGroup`: remove `UsageView` parameter from `#getText`, rename `#getText` -> `#getPresentableGroupText`

GitOrigin-RevId: cd3839eb4e2f5f8f7c68e499ae27e16efba2fd02

3 days ago`UsageGroup`: don't depend on `UsageView` in implementations of `#getText`
Daniil Ovchinnikov [Wed, 9 Jun 2021 12:48:17 +0000 (14:48 +0200)]
`UsageGroup`: don't depend on `UsageView` in implementations of `#getText`

GitOrigin-RevId: e9b0203a690c40b311f3492af5eea762d28db29b

4 days agoandroid: fix deprecated usages of Storage.file to value
Kirill Likhodedov [Sun, 6 Jun 2021 15:57:59 +0000 (18:57 +0300)]
android: fix deprecated usages of Storage.file to value

GitOrigin-RevId: b0ff4e4a1222128dddb40ecedc3b3c57514c7f52

4 days ago[project model] use ReadAction to process modules in project
Nikolay Chashnikov [Wed, 9 Jun 2021 13:20:38 +0000 (16:20 +0300)]
[project model] use ReadAction to process modules in project

Otherwise, modules returned from ModuleManager::getModules may be disposed if concurrent thread removes them.

GitOrigin-RevId: 84000584747d4185fd05810266971202abbaea1e

4 days agoMove write safe invokeLater with modality to a better place, write javadoc for it
Dmitry Trofimov [Wed, 9 Jun 2021 12:45:57 +0000 (14:45 +0200)]
Move write safe invokeLater with modality to a better place, write javadoc for it

GitOrigin-RevId: 1f5d2712366a677166a4bff5fb9f692cf3ee1017

5 days agoAndroid: Tests: honor env.GRADLE_USER_HOME when masking paths in ProjectDumper
Andrei Kuznetsov [Tue, 8 Jun 2021 15:14:01 +0000 (18:14 +0300)]
Android: Tests: honor env.GRADLE_USER_HOME when masking paths in ProjectDumper

GitOrigin-RevId: 91433d38216b71b17b44f86f07b52dc60acfa2d9

5 days agoAndroid: update reference data for LintModelSnapshotComparisonTest and SourceProvider...
Andrei Kuznetsov [Tue, 8 Jun 2021 09:57:13 +0000 (12:57 +0300)]
Android: update reference data for LintModelSnapshotComparisonTest and SourceProvidersSnapshotComparisonTest

GitOrigin-RevId: 9547aca4eaf5d6038e236876337152cf29a115ac

5 days agoFix Android Studio relative paths that go above sources root in IDEA
Andrei Kuznetsov [Tue, 8 Jun 2021 09:13:09 +0000 (12:13 +0300)]
Fix Android Studio relative paths that go above sources root in IDEA

GitOrigin-RevId: 7c8e65edf861f2c80aec21e8d0e8dc096c8ddf57

5 days agoAndroid: move registration of VisualizationToolSettings and VisualizationToolProjectS...
Andrei Kuznetsov [Mon, 7 Jun 2021 13:07:57 +0000 (16:07 +0300)]
Android: move registration of VisualizationToolSettings and VisualizationToolProjectSettings to designer.xml

... where they are declared. This is to avoid `com.intellij.diagnostic.PluginException: ClassNotFound` in tests

GitOrigin-RevId: 4d0937749919978ef8a654a01224bef890e6e70a

5 days ago`UsageGroup`: add default `#update` implementation 212.4037 idea/212.4037.9
Daniil Ovchinnikov [Mon, 7 Jun 2021 15:38:40 +0000 (17:38 +0200)]
`UsageGroup`: add default `#update` implementation

GitOrigin-RevId: e993f78084ebf87f90bd319a9df2cce2fc1bfbad

5 days ago`UsageGroup`: add default `#isValid` implementation
Daniil Ovchinnikov [Mon, 7 Jun 2021 15:34:36 +0000 (17:34 +0200)]
`UsageGroup`: add default `#isValid` implementation

GitOrigin-RevId: 158d9ede157742ea9d911bfa3c6c8c0a7699f6ce

5 days ago`UsageGroup`: add default `#getFileStatus` implementation
Daniil Ovchinnikov [Mon, 7 Jun 2021 15:23:36 +0000 (17:23 +0200)]
`UsageGroup`: add default `#getFileStatus` implementation

GitOrigin-RevId: f85955c00871cf55cc6a4ee6491f1afbf651b50a

5 days ago`UsageGroup`: add default `#getIcon` implementation
Daniil Ovchinnikov [Mon, 7 Jun 2021 15:12:22 +0000 (17:12 +0200)]
`UsageGroup`: add default `#getIcon` implementation

GitOrigin-RevId: dcdd58ad9a590aa1e3bebe12ee124c5d359e47ed

8 days agoAndroid: fix wrong android-sdk path in tests on windows and mac
Andrei Kuznetsov [Fri, 4 Jun 2021 23:34:39 +0000 (02:34 +0300)]
Android: fix wrong android-sdk path in tests on windows and mac

GitOrigin-RevId: 734dc5b038f2f148af0b0faf9043f14ba772ab91

8 days agoAndroid: fix race condition on VSF content in tests
Andrei Kuznetsov [Fri, 4 Jun 2021 23:17:26 +0000 (02:17 +0300)]
Android: fix race condition on VSF content in tests

PropertiesFiles now uses VFS to update properties (see Change-Id: Iaf1361c399f3ca49c7f747c9878018c22241afed). VFS should be up-to-date before patcher is invoked.
+ cleanup: remove unused function

GitOrigin-RevId: 9a231474311cf6a2c206f286f527f56d68f55c56

8 days agoIDEA-268850 [merge-android-42] android tests: update reference data for AndroidGradle...
Andrei Kuznetsov [Wed, 2 Jun 2021 20:35:42 +0000 (23:35 +0300)]
IDEA-268850 [merge-android-42] android tests: update reference data for AndroidGradleProjectViewSnapshotComparisonTest

GitOrigin-RevId: 1d1fe12207853575f2e4a07976d1576174f2e5ab

9 days ago[project model] refactoring: get rid of usages of internal LanguageLevelModuleExtensi...
Nikolay Chashnikov [Thu, 3 Jun 2021 13:53:02 +0000 (16:53 +0300)]
[project model] refactoring: get rid of usages of internal LanguageLevelModuleExtensionImpl

This is needed to convert LanguageLevelModuleExtension to take data from workspace model (IDEA-266774).

GitOrigin-RevId: 616f63b6a19b314d607237731776bcf439253ca8

10 days ago'DataSpell Jupyter working directory icon': compilation fix
Dmitriy.Panov [Thu, 3 Jun 2021 09:54:11 +0000 (12:54 +0300)]
'DataSpell Jupyter working directory icon': compilation fix

GitOrigin-RevId: 87b201c06313072ae9930467427f38e4c5db8e01

10 days ago'DataSpell Jupyter working directory icon' from 7b501d23c from git@github.com:JetBrai...
Dmitriy Panov [Thu, 3 Jun 2021 09:34:53 +0000 (09:34 +0000)]
'DataSpell Jupyter working directory icon' from 7b501d23c from git@github.com:JetBrains/IntelliJIcons.git

GitOrigin-RevId: 1b21a1e0f75322459aa985e16470dd24a55ebb2c

10 days agoIDEA-267210: Android: fix `Cyclic extension initialization` in com.android.tools...
Andrei Kuznetsov [Wed, 2 Jun 2021 19:12:59 +0000 (22:12 +0300)]
IDEA-267210: Android: fix `Cyclic extension initialization` in com.android.tools.idea.lint.AndroidLintIdeSupport

Also, it does not make sense to check extension list size in constructor: all the EPs should eventually become dynamic so extensions can be added and removed dynamically. For the same (dynamic) reason instances should not be stored in static fields (this may prevent plugin classloader from being unloaded)

In this particular case service might be a better choice than an extension point

GitOrigin-RevId: df28ae0f8a64856099a22a85d6c9524cdefddbcb

12 days agoIDEA-268850 [merge-android-42] fix gradle sync on JDK 1.8
Andrei Kuznetsov [Mon, 31 May 2021 23:56:36 +0000 (02:56 +0300)]
IDEA-268850 [merge-android-42] fix gradle sync on JDK 1.8

Move classes injected into Gradle Daemon to a separate module (intellij.android.gradle-tooling[.impl]) and compile it to bytecode level 1.7. Note that kotlin classes are compiled to 1.6.

GitOrigin-RevId: b60d12f4d8c14ec7c67925c3cfa2374edd57252b

12 days agoIDEA-268850 [merge-android-42] move `getEmbeddedJdk8Path` from `AndroidGradleTests...
Andrei Kuznetsov [Mon, 31 May 2021 23:49:30 +0000 (02:49 +0300)]
IDEA-268850 [merge-android-42] move `getEmbeddedJdk8Path` from `AndroidGradleTests` to `com.android.testutils.TestUtils`

GitOrigin-RevId: 843afa8e0648220585fd7658be261666288909dc

2 weeks agoIDEA-268850 [merge-android-42] fix missing listener registration (bad merge)
Andrei Kuznetsov [Sat, 29 May 2021 22:20:45 +0000 (01:20 +0300)]
IDEA-268850 [merge-android-42] fix missing listener registration (bad merge)

GitOrigin-RevId: 8316c2f1aa8d998deec1fcbd5a1504c9e45a2a74

2 weeks agoIDEA-268850 [merge-android-42] simplify test environment: get rid of environment...
Andrei Kuznetsov [Sat, 29 May 2021 20:15:28 +0000 (23:15 +0300)]
IDEA-268850 [merge-android-42] simplify test environment: get rid of environment variables

Now all the paths are calculated relative to community home in IntelliJ

GitOrigin-RevId: 0086fe1cfcba7563375057a60cf01f7563b74aae

2 weeks agoIDEA-268850 [merge-android-42] cleanup setupAndroidSdk task: kotlin dependencies...
Andrei Kuznetsov [Sat, 29 May 2021 18:30:55 +0000 (21:30 +0300)]
IDEA-268850 [merge-android-42] cleanup setupAndroidSdk task: kotlin dependencies are not needed anymore

GitOrigin-RevId: f1efa37275a356029ce71616b2c6d8b9d553c0be

2 weeks agoIDEA-268850 [merge-android-42] update test environment configuration
Andrei Kuznetsov [Sat, 29 May 2021 18:16:45 +0000 (21:16 +0300)]
IDEA-268850 [merge-android-42] update test environment configuration

JDK11, Layoutlib resources 27.2.0.2, Prebuilt Android SDK 4.2.0.0 (platform;30 build-tools;30.0.3)

GitOrigin-RevId: 284edd6e518ee6b5789655b63c5691e4e0e1ec66

2 weeks agoIDEA-268850 [merge-android-42] merge fresh IJ master
Andrei Kuznetsov [Sat, 29 May 2021 17:14:54 +0000 (20:14 +0300)]
IDEA-268850 [merge-android-42] merge fresh IJ master

GitOrigin-RevId: 82dc3097254245138205c0261d80302c9248dbf4

2 weeks agoIDEA-268850 [merge-android-42] re-apply Sebastiano Poggi 15.05.2021, 0:33 PKGS-701...
Andrei Kuznetsov [Sat, 29 May 2021 12:06:24 +0000 (15:06 +0300)]
IDEA-268850 [merge-android-42] re-apply Sebastiano Poggi 15.05.2021, 0:33 PKGS-701 Fix installed packages config changes

changes from e67e9b1ecf44c0ae100dd8008d85a97e2d0891cd

GitOrigin-RevId: 67ca03ecb6329f0861a15cfe087d508ff7837acc

2 weeks agoIDEA-268850 [merge-android-42] fix android plugin layout
Andrei Kuznetsov [Sat, 29 May 2021 10:31:42 +0000 (13:31 +0300)]
IDEA-268850 [merge-android-42] fix android plugin layout

GitOrigin-RevId: eccaac31373b373fed14d67cbfaffa4f8900ba3f

2 weeks agoIDEA-268850 [merge-android-42] reduce logging: SafeArgs produces too many stacktraces...
Andrei Kuznetsov [Sat, 29 May 2021 10:29:19 +0000 (13:29 +0300)]
IDEA-268850 [merge-android-42] reduce logging: SafeArgs produces too many stacktraces with severity INFO

Keep stacktraces only in debug logging. In info log only keep short info message. Class name is not needed, because it is already contained in the logger name.

GitOrigin-RevId: 5156015b43f90d8b5e9b8ed30328b0b073a21243

2 weeks agoIDEA-243924 [lang] Deprecate SdkType#getIconForAddAction 212.3724 idea/212.3724.21 idea/212.3724.25 pycharm/212.3724.23
Louis Vignier [Thu, 27 May 2021 20:56:35 +0000 (22:56 +0200)]
IDEA-243924 [lang] Deprecate SdkType#getIconForAddAction

GitOrigin-RevId: 9f546e55c559cfeea621874f55d5518643827dcd

2 weeks ago[workspace model] Remove old implementation of `ModuleManager`
Mikhail Mazurkevich [Wed, 26 May 2021 11:02:08 +0000 (14:02 +0300)]
[workspace model] Remove old implementation of `ModuleManager`

GitOrigin-RevId: 43cd3ed0e202ed4a59d8a8da194636c2cc9ed6ff

2 weeks ago'Flatten testPassed.svg' from b1399b012 from git@github.com:JetBrains/IntelliJIcons...
Dmitriy.Panov [Wed, 26 May 2021 21:36:49 +0000 (00:36 +0300)]
'Flatten testPassed.svg' from b1399b012 from git@github.com:JetBrains/IntelliJIcons.git: compilation fix

GitOrigin-RevId: 4a07a448dee2feb9bfe6c72e3a7bec3f15e1562f

2 weeks ago'Flatten testPassed.svg' from b1399b012 from git@github.com:JetBrains/IntelliJIcons.git
Dmitriy Panov [Wed, 26 May 2021 21:30:31 +0000 (00:30 +0300)]
'Flatten testPassed.svg' from b1399b012 from git@github.com:JetBrains/IntelliJIcons.git

GitOrigin-RevId: 94aa4ee9177f6a6302304c420e8907a4b1a15174

2 weeks agoIDEA-268850 [merge-android-42] update downloadable resources versions: 27.1.1.x>27...
Andrei Kuznetsov [Wed, 26 May 2021 18:30:02 +0000 (21:30 +0300)]
IDEA-268850 [merge-android-42] update downloadable resources versions: 27.1.1.x>27.2.0.y

GitOrigin-RevId: f97180a02f6be81efe3e0a419431af51f7e118f6

2 weeks agoIDEA-268850 [merge-android-42] remove dependency android.gradle.dsl>android.common
Andrei Kuznetsov [Wed, 26 May 2021 14:46:22 +0000 (17:46 +0300)]
IDEA-268850 [merge-android-42] remove dependency android.gradle.dsl>android.common

android.gradle.dsl is included into IC as a separate plugin. It is useful if it does not depend on android plugin.

GitOrigin-RevId: d0fcd17d4b076b5a6972b9225f97323ab68bde20

2 weeks agocleanup signatures and deprecate methods in `PopupHandler` 2
Gregory.Shrago [Tue, 25 May 2021 12:20:54 +0000 (15:20 +0300)]
cleanup signatures and deprecate methods in `PopupHandler` 2

GitOrigin-RevId: faee6a955a1782a4d934275c2e9985b5a5e30dab

2 weeks agoIDEA-268850 [merge-android-42] cleanup: fix licenses for android libraries
Andrei Kuznetsov [Wed, 26 May 2021 12:15:45 +0000 (15:15 +0300)]
IDEA-268850 [merge-android-42] cleanup: fix licenses for android libraries

GitOrigin-RevId: 0d840204e69be4502f84245a00b2558f0d227e55

2 weeks agoIDEA-268850 [merge-android-42] cleanup: project consistency tests
Andrei Kuznetsov [Wed, 26 May 2021 08:43:07 +0000 (11:43 +0300)]
IDEA-268850 [merge-android-42] cleanup: project consistency tests

Remove empty/unused modules, add missing modules, sync community and ultimate modules and kubraries

GitOrigin-RevId: c94acf1d6a7cae617b4ffbea1692f1822784c154

2 weeks agoIDEA-268850 [merge-android-42] cleanup: remove studio-plugin-xxx lib references ...
Andrei Kuznetsov [Tue, 25 May 2021 17:52:44 +0000 (20:52 +0300)]
IDEA-268850 [merge-android-42] cleanup: remove studio-plugin-xxx lib references (target libraries do not exist in AOSP)

Also remove studio-sdk library and references to intellij.android.adt.branding module (which has moved to tools/idea sources in AOSP)

GitOrigin-RevId: 5e5420e4f07b080c868823602f2284807647aae5

2 weeks agoIDEA-268850 [merge-android-42] rename modules AOSP > IJ style
Andrei Kuznetsov [Tue, 25 May 2021 17:41:11 +0000 (20:41 +0300)]
IDEA-268850 [merge-android-42] rename modules AOSP > IJ style

GitOrigin-RevId: 6def4630c5970378734d7f984491af8bd304ed95

2 weeks agoIDEA-268850 [merge-android-42] tests: override com.android.testutils.TestUtils from...
Andrei Kuznetsov [Tue, 25 May 2021 13:31:22 +0000 (16:31 +0300)]
IDEA-268850 [merge-android-42] tests: override com.android.testutils.TestUtils from tools/base in IDEA tests

tools/base is not available in IDEA sources. AOSP paths often do not work in IDEA because of different project layout (IDEA has no single WORKSPACE ROOT for android modules). Provide own implementation that added earlier in test classpath.

GitOrigin-RevId: a3df5749e70bfc63191484a2baa715f0903a08f2

2 weeks agoIDEA-268850 [merge-android-42] use maven artifacts instead of locally bazel-built...
Andrei Kuznetsov [Tue, 25 May 2021 13:15:23 +0000 (16:15 +0300)]
IDEA-268850 [merge-android-42] use maven artifacts instead of locally bazel-built jars

GitOrigin-RevId: 63542b2596dee5f3b96b7b5464b3ee481b01ca77

2 weeks agoIDEA-268850 [merge-android-42] tests: fix technical failures in tests
Andrei Kuznetsov [Tue, 25 May 2021 09:28:18 +0000 (12:28 +0300)]
IDEA-268850 [merge-android-42] tests: fix technical failures in tests

GitOrigin-RevId: 0845930fa66a6e88438a102a543f625a20d4c989

2 weeks agoIDEA-268850 [merge-android-42] compilation: `sun.swing` is not exported from java...
Andrei Kuznetsov [Tue, 25 May 2021 09:24:16 +0000 (12:24 +0300)]
IDEA-268850 [merge-android-42] compilation: `sun.swing` is not exported from java.desktop

GitOrigin-RevId: eac2a9084351257fe32a0510a8685c2d2bf3065c

2 weeks agoIDEA-268850 [merge-android-42] re-apply c530205e7d: IDEA-264378 Android Layout Editor...
Andrei Kuznetsov [Tue, 25 May 2021 09:21:43 +0000 (12:21 +0300)]
IDEA-268850 [merge-android-42] re-apply c530205e7d: IDEA-264378 Android Layout Editor does not show issues in the issues panel

Root cause: it is not legal to query DataContext from a background thread. The fix is to pass `null`, because passed DataContext is never used. Started e-mail discussion about parameter removal (it is almost never a good idea to pass DataContext outside the method where it was obtained).  (cherry picked from commit 548fd485c121f7eb24aa24f4ab4cb2fbe5a4cb00)  IJ-CR-7134

GitOrigin-RevId: 7e8816749bab3b05e551b7da747c56a14033e39a

2 weeks agoIDEA-268850 [merge-android-42] fix compilation after merge
Andrei Kuznetsov [Tue, 25 May 2021 09:17:03 +0000 (12:17 +0300)]
IDEA-268850 [merge-android-42] fix compilation after merge

GitOrigin-RevId: 01b7752ec4ef4a5cca1b256841dde75044190700

2 weeks agoIDEA-268850 [merge-android-42] tests: fix IAE at HProfReadBufferSlidingWindow
Andrei Kuznetsov [Fri, 21 May 2021 18:05:42 +0000 (21:05 +0300)]
IDEA-268850 [merge-android-42] tests: fix IAE at HProfReadBufferSlidingWindow

IllegalAccessError: class com.android.tools.idea.diagnostics.hprof.util.HProfReadBufferSlidingWindow (in unnamed module @0x36d842ff) cannot access class jdk.internal.ref.Cleaner (in module java.base) because module java.base does not export jdk.internal.ref to unnamed module @0x36d842ff

GitOrigin-RevId: 6637dc0360e5aede9d526c4117af06a29ee4c9ce

2 weeks agodeprecate `installUnknownPopupHandler`
Gregory.Shrago [Mon, 24 May 2021 16:16:38 +0000 (19:16 +0300)]
deprecate `installUnknownPopupHandler`

Some action-place shall always be provided (even if it is just a class name).

GitOrigin-RevId: 835633138e2ceee9364a8150e2050e98dfbbbe68

2 weeks agoDBE-13276 revise visibility of new data source actions in project view
Alexander.Kass [Thu, 20 May 2021 09:05:29 +0000 (12:05 +0300)]
DBE-13276 revise visibility of new data source actions in project view

GitOrigin-RevId: 5d2334dd9c7a396ce7c53210794d73b92f49baba

3 weeks agoIDEA-268850 [merge-android-42] don't use project as parent disposable
Andrei Kuznetsov [Fri, 21 May 2021 17:59:31 +0000 (20:59 +0300)]
IDEA-268850 [merge-android-42] don't use project as parent disposable

In IDEA users may decide to unload plugin at any moment, so project may outlive own project services, and all the services/listeners belonging to a plugin should be able to terminate before project shutdown.

GitOrigin-RevId: a756acd18c56f115868a959bb01ccd991db03723

3 weeks agoIDEA-268850 [merge-android-42] compilation: extract and move SelectedVariant and...
Andrei Kuznetsov [Fri, 21 May 2021 17:29:07 +0000 (20:29 +0300)]
IDEA-268850 [merge-android-42] compilation: extract and move SelectedVariant and friends to gradle-tooling module

Because they are used from build process and we want to compile them with JDK 1.8. Nothing new: in IDEA they have always been there. AS 4.2 code has these classes re-written from java to kotlin, so they migrated to android.core for technical reasons.

GitOrigin-RevId: 2fe119ad62d927f4d650fcd158c1d8603ea991b4

3 weeks agoIDEA-268850 [merge-android-42] compilation: unambiguous fixes (API changes and other...
Andrei Kuznetsov [Fri, 21 May 2021 17:25:29 +0000 (20:25 +0300)]
IDEA-268850 [merge-android-42] compilation: unambiguous fixes (API changes and other technical problems)

GitOrigin-RevId: b438a6f6fc41187244671795bd8636c02d817d8a

3 weeks agoIDEA-268850 [merge-android-42] compilation: remove code that depends on modified...
Andrei Kuznetsov [Fri, 21 May 2021 17:20:51 +0000 (20:20 +0300)]
IDEA-268850 [merge-android-42] compilation: remove code that depends on modified intellij platform

Classes like `com.intellij.analytics.AndroidStudioAnalytics` do not exist in canonical intellij platform.

GitOrigin-RevId: 1371faedddf3154420706cb1229cf2b7b3d50be7

3 weeks agoIDEA-268850 [merge-android-42] compilation: fix compile classpath (imls), prefer...
Andrei Kuznetsov [Fri, 21 May 2021 16:57:01 +0000 (19:57 +0300)]
IDEA-268850 [merge-android-42] compilation: fix compile classpath (imls), prefer AOSP entries order where possible

GitOrigin-RevId: 83b6328eb34092ebb37cfb8a74c39bd8d797f2f3

3 weeks agoIDEA-268850 [merge-android-42] compilation: update sdk-tools/prebuilts and precompile...
Andrei Kuznetsov [Fri, 21 May 2021 16:18:04 +0000 (19:18 +0300)]
IDEA-268850 [merge-android-42] compilation: update sdk-tools/prebuilts and precompiled project libraries

GitOrigin-RevId: 621a5e1c0726fffc5fc38afcf993270bcfa81ef1

3 weeks agoIDEA-268850 [merge-android-42] compilation: IDEA has no WORKSPACE root, and does...
Andrei Kuznetsov [Fri, 21 May 2021 15:57:13 +0000 (18:57 +0300)]
IDEA-268850 [merge-android-42] compilation: IDEA has no WORKSPACE root, and does not bundle all the android resources

Fix the code to work with IDEA files layout in test (we use several independent roots instead of single WORKSPACE root, see `AndroidTestPaths`).

In dist IDEA does not bundle large Android resource files in order to minimize distribution size. These files are downloaded on demand in IDEA (e.g. via `installPathProvider`).

GitOrigin-RevId: f517e391fdcd88043be1d35443d0301d19969714

3 weeks agoIDEA-268850 [merge-android-42] compilation: `java.nio` is preferred over `java.io`
Andrei Kuznetsov [Fri, 21 May 2021 15:53:58 +0000 (18:53 +0300)]
IDEA-268850 [merge-android-42] compilation: `java.nio` is preferred over `java.io`

GitOrigin-RevId: 1d262c9c454af1ff6cae7ca046a379b709a111cc

3 weeks agoIDEA-268850 [merge-android-42] compilation: move some classes from studio-gradle...
Andrei Kuznetsov [Fri, 21 May 2021 15:39:57 +0000 (18:39 +0300)]
IDEA-268850 [merge-android-42] compilation: move some classes from studio-gradle-tooling-impl back to android.core

These files needs to be untied from android.core code and moved again to studio-gradle-tooling-impl

GitOrigin-RevId: 5106b5ce85c132374871793cd6998d84f9a658c7

3 weeks agoIDEA-268850 [merge-android-42] re-generate icon classes
Andrei Kuznetsov [Thu, 20 May 2021 16:58:46 +0000 (19:58 +0300)]
IDEA-268850 [merge-android-42] re-generate icon classes

GitOrigin-RevId: 68b73e53aa0f38d16e4620acb0b0c8ebed579e70

3 weeks agoIDEA-268850 [merge-android-42] compilation: move gradle-dsl-impl and gradle-dsl-kotli...
Andrei Kuznetsov [Thu, 20 May 2021 14:37:07 +0000 (17:37 +0300)]
IDEA-268850 [merge-android-42] compilation: move gradle-dsl-impl and gradle-dsl-kotlin-impl back to gradle-dsl

GitOrigin-RevId: ad1762400784684cde8a0033d59df57d2e6c62c8

3 weeks agoMove LocalDataSource to database.core.impl
Dmitry Trofimov [Fri, 21 May 2021 09:50:20 +0000 (11:50 +0200)]
Move LocalDataSource to database.core.impl

That move required to extract credentials and ssh-related models to a separate modules remote-api and ssh-core.

GitOrigin-RevId: 8d0bae07fcb6820d2dbf0637603526c878ad2827

3 weeks ago[Android] Update project model usage for the new workspace model
Alex Plate [Fri, 21 May 2021 10:44:54 +0000 (13:44 +0300)]
[Android] Update project model usage for the new workspace model

Modification of artifact properties has no effect without calling for artifact.setProperties

GitOrigin-RevId: 539efe7fbec579b606f38b1b828a19daec942c11

3 weeks agoIDEA-268850 [merge-android-42] move files to their final destinations after merge
Andrei Kuznetsov [Wed, 19 May 2021 15:55:11 +0000 (18:55 +0300)]
IDEA-268850 [merge-android-42] move files to their final destinations after merge

GitOrigin-RevId: df9b9abdcd14999a805abc01129f39a86161c392

3 weeks agoIDEA-268850 [merge-android-42] merge using resolve strategy and resolve merge conflicts
Andrei Kuznetsov [Wed, 19 May 2021 13:38:02 +0000 (16:38 +0300)]
IDEA-268850 [merge-android-42] merge using resolve strategy and resolve merge conflicts

GitOrigin-RevId: 604c8d1a7966c1ec26edbca4a61a1bc0c7b950f7

3 weeks agocall hierarchy: cleanup
Alexey Kudravtsev [Thu, 20 May 2021 12:54:36 +0000 (14:54 +0200)]
call hierarchy: cleanup

GitOrigin-RevId: b011f25e47f0d6c7a28927baaa3913ef961627ba

3 weeks ago[usage-view] Set up ranks for standard grouping rules
Alexander.Bashkirov [Thu, 13 May 2021 08:20:26 +0000 (11:20 +0300)]
[usage-view] Set up ranks for standard grouping rules

GitOrigin-RevId: 0d9e7c67a0eac742d59dbfbd9ba0666766b6c06c

3 weeks agoIDEA-231364 Implement Find Usages tool window. Fix yaml, UsageViewTest and UnusedReso...
Kirill Kirichenko [Tue, 18 May 2021 08:23:40 +0000 (11:23 +0300)]
IDEA-231364 Implement Find Usages tool window. Fix yaml, UsageViewTest and UnusedResourcesTest.

GitOrigin-RevId: a2208e829ca4251291e9c92df9893f3e6f59bd73

3 weeks agoIDEA-231364 Implement Find Usages tool window. Fix kotlin and android tests.
Kirill Kirichenko [Fri, 14 May 2021 14:40:06 +0000 (17:40 +0300)]
IDEA-231364 Implement Find Usages tool window. Fix kotlin and android tests.

GitOrigin-RevId: dbb994dcb19442d3fc17b7efa71cff8ab6c7f431

3 weeks ago[android] migrate usages of deprecated IntelliJ API which is scheduled for removal
Nikolay Chashnikov [Mon, 17 May 2021 14:33:08 +0000 (17:33 +0300)]
[android] migrate usages of deprecated IntelliJ API which is scheduled for removal

GitOrigin-RevId: e0cdd031de57be2e004a978e1b31056c7664c729

3 weeks ago[android] clean up: remove deprecated API
Nikolay Chashnikov [Mon, 17 May 2021 11:43:50 +0000 (14:43 +0300)]
[android] clean up: remove deprecated API

GitOrigin-RevId: 993e61e2dabeb0f7fd521de4e18c4e5fe42caf69

3 weeks ago[android] get rid of method overriding deprecated 'getGradleJdk' method
Nikolay Chashnikov [Mon, 17 May 2021 11:43:15 +0000 (14:43 +0300)]
[android] get rid of method overriding deprecated 'getGradleJdk' method

The base method isn't called anymore.

GitOrigin-RevId: ba026d3af5b95459cb1971e14645572e43ad1c3b

3 weeks ago[android] migrate usages of deprecated icons TreeDownArrow and TreeRightArrow
Nikolay Chashnikov [Mon, 17 May 2021 10:40:39 +0000 (13:40 +0300)]
[android] migrate usages of deprecated icons TreeDownArrow and TreeRightArrow

GitOrigin-RevId: 2b6e257f1f2253da20eaf77838eb98f807c9e04e

3 weeks agoremove a comment added by mistake 212.3116 idea/212.3116.29 idea/212.3116.43
Konstantin Bulenkov [Mon, 17 May 2021 11:14:13 +0000 (13:14 +0200)]
remove a comment added by mistake

GitOrigin-RevId: d32b8bfb8a37f80da6a6d09ddb8556fcd00b81c0

3 weeks ago[android] get rid of usages of scheduled for removal API
Nikolay Chashnikov [Fri, 14 May 2021 17:04:55 +0000 (20:04 +0300)]
[android] get rid of usages of scheduled for removal API

GitOrigin-RevId: ad6de375cf90df3a75f7dabb1fc872582e4345bb

3 weeks ago[kotlin] proofread RemoveParcelableAction intention
Dmitry Gridin [Mon, 17 May 2021 09:37:16 +0000 (16:37 +0700)]
[kotlin] proofread RemoveParcelableAction intention

GitOrigin-RevId: 0b6038ab69cd38fbdc837f4c5a20a6bf702a9374

4 weeks agoPKGS-701 Fix installed packages config changes
Sebastiano Poggi [Fri, 14 May 2021 21:33:16 +0000 (23:33 +0200)]
PKGS-701 Fix installed packages config changes

GitOrigin-RevId: e67e9b1ecf44c0ae100dd8008d85a97e2d0891cd

4 weeks agoIDEA-268850 [merge-android-42] move files to their base location before merge
Andrei Kuznetsov [Fri, 14 May 2021 13:59:52 +0000 (16:59 +0300)]
IDEA-268850 [merge-android-42] move files to their base location before merge

This is to help git handle file moves

GitOrigin-RevId: e35a373551350d6c0929fc33f1c235116ee7675d

4 weeks agoIDEA-268850 [merge-android-42] move files to their base location before merge
Andrei Kuznetsov [Fri, 14 May 2021 14:24:11 +0000 (17:24 +0300)]
IDEA-268850 [merge-android-42] move files to their base location before merge

This is to help git handle file moves

GitOrigin-RevId: 6962f81b589eb7fc177567b933a59ad213467330

4 weeks agopropagate `AnActionResult` to `AnActionListener`
Gregory.Shrago [Fri, 14 May 2021 11:06:43 +0000 (14:06 +0300)]
propagate `AnActionResult` to `AnActionListener`

GitOrigin-RevId: 33bf3eca770bbbf1d2680584c287889f3220075b

4 weeks agoIDEA-268850 [merge-android-42] rename modules to AOSP-style before merge
Andrei Kuznetsov [Tue, 11 May 2021 11:07:15 +0000 (14:07 +0300)]
IDEA-268850 [merge-android-42] rename modules to AOSP-style before merge

GitOrigin-RevId: 2b45a753595774eb89f2ebac4c7b9f96f2851273

4 weeks agoAndroid cleanup: remove abandoned `org.jetbrains.idea.gradle.dsl.upToDateChecker...
Andrei Kuznetsov [Fri, 14 May 2021 09:46:06 +0000 (12:46 +0300)]
Android cleanup: remove abandoned `org.jetbrains.idea.gradle.dsl.upToDateChecker` EP left after studio 4.1 merge

This EP was needed to decouple gradle-dsl modules and android modules. In 4.1 code has changed, and this EP is not needed anymore.

GitOrigin-RevId: 15de208b32e784ce0d06c155e48c6ffb909d2f3f

4 weeks agoReformat the file. Need to change the file to workaround incremental kotlin compiler bug
Andrei Kuznetsov [Thu, 13 May 2021 13:56:03 +0000 (16:56 +0300)]
Reformat the file. Need to change the file to workaround incremental kotlin compiler bug

GitOrigin-RevId: 95c685930e1941879ac7e86104d6a5a94835c06a

4 weeks agoAndroid cleanup: fix missed rename (SourcesAndJavadoc -> AdditionalClassifierArtifact...
Andrei Kuznetsov [Thu, 13 May 2021 13:49:02 +0000 (16:49 +0300)]
Android cleanup: fix missed rename (SourcesAndJavadoc -> AdditionalClassifierArtifacts) from 4.1 AOSP merge

see 5f2be138 kovalp <kovalp@google.com> on 16.01.2020 at 21:06

Rename SourcesAndJavadoc -> AdditionalClassifierArtifacts

Bug: 147725125
Test: existing
Change-Id: I5e25cd2f2deb3a58e607808a1955562cb843f177

GitOrigin-RevId: 8b8232ad99a314575f1350e84124df4333aa6e8a

4 weeks agoAndroid cleanup: remove abandoned files left after studio 4.1 merge
Andrei Kuznetsov [Thu, 13 May 2021 13:45:58 +0000 (16:45 +0300)]
Android cleanup: remove abandoned files left after studio 4.1 merge

These files were removed in AOSP, but were accidentally restored during merge to IJ

GitOrigin-RevId: 023774d4ce3c732edbda71386e845e223ff0fe14

4 weeks agoAndroid cleanup: move kotlin files to correct directory following java package layout...
Andrei Kuznetsov [Thu, 13 May 2021 13:40:40 +0000 (16:40 +0300)]
Android cleanup: move kotlin files to correct directory following java package layout convention

GitOrigin-RevId: 19c9b0792dfc72c20785a8166e3607140ff0ea66

4 weeks agoIDEA-268948: Android: Cannot add new fragments to the Navigation Graph (no toolbar)
Andrei Kuznetsov [Wed, 12 May 2021 10:08:32 +0000 (13:08 +0300)]
IDEA-268948: Android: Cannot add new fragments to the Navigation Graph (no toolbar)

Currently IDEA does not bundle assistant module => assistant actions cannot be found in runtime. NPE occurred, but was silently discarded.

GitOrigin-RevId: 12ed2f14cb674bfdb2a3c198fec563a0c210fc95

4 weeks agoMerge branch 'studio-4.1.1' into studio-4.2.0 using 'ours' strategy
Andrei Kuznetsov [Tue, 11 May 2021 12:31:59 +0000 (15:31 +0300)]
Merge branch 'studio-4.1.1' into studio-4.2.0 using 'ours' strategy

GitOrigin-RevId: 8a8a0d0d07c7648d6f2d5867eb1a9aba20fb2445

4 weeks ago[platform] tidying up notifications API
Roman Shevchenko [Mon, 10 May 2021 08:17:47 +0000 (10:17 +0200)]
[platform] tidying up notifications API

GitOrigin-RevId: c399534e946bdd286d7be6cbc43339aae8397db1

5 weeks ago[test framework] reducing direct Log4J usage
Roman Shevchenko [Fri, 7 May 2021 16:08:00 +0000 (18:08 +0200)]
[test framework] reducing direct Log4J usage

GitOrigin-RevId: 9a9b3c6b1dea6e5c02ed121656df045c360bedfe

6 weeks agoIDEA-254379: rename `intellij.android.kotlin-dependencies` to `intellij.kotlin.plugin...
Andrei Kuznetsov [Fri, 30 Apr 2021 19:49:56 +0000 (22:49 +0300)]
IDEA-254379: rename `intellij.android.kotlin-dependencies` to `intellij.kotlin.plugin.community.main`

GitOrigin-RevId: 7910658a36e3eb9d91e1ddfdf104c4ef9a10f693

6 weeks agoIDEA-254379: Get rid of two kotlin plugins: replace KotlinPlugin lib with intellij...
Andrei Kuznetsov [Fri, 30 Apr 2021 18:59:27 +0000 (21:59 +0300)]
IDEA-254379: Get rid of two kotlin plugins: replace KotlinPlugin lib with intellij.android.kotlin-dependencies module

KotlinPlugin is referencing jars that are created after compilation. That's why this library is not suitable for anything except being a RUNTIME dependency. Module, on the other hand, can be used in any scope.

intellij.android.kotlin-dependencies will be renamed to intellij.kotlin.plugin.community.main in the following commit.

GitOrigin-RevId: 168c597b6f385489c783c6731a9964b93c3821b8

6 weeks agoIDEA-254379: convert `COMPILE` dependencies on intellij.android.kotlin-dependencies...
Andrei Kuznetsov [Fri, 30 Apr 2021 18:01:17 +0000 (21:01 +0300)]
IDEA-254379: convert `COMPILE` dependencies on intellij.android.kotlin-dependencies to `PROVIDED` in Android plugin

Kotlin plugin is distributed independently from Android plugin, therefore all the references should be either PROVIDED, TEST or RUNTIME. Don't use COMPILE scope because this will fail test for licenses (jars transitively available through kotlin plugin are not bundled to IDEA, do not have and do not need license notes)

GitOrigin-RevId: 359347e17b73da7cb205b44dad1c97258cb67024

6 weeks agodeprecate `ActionUtil.performActionDumbAware`
Gregory.Shrago [Fri, 30 Apr 2021 04:08:24 +0000 (07:08 +0300)]
deprecate `ActionUtil.performActionDumbAware`

In most cases `IndexNotReadyException` is already handled in the context,
otherwise `ActionUtil.performActionDumbAwareWithCallbacks` is a better way.

GitOrigin-RevId: 6f973752a018791e86d975be1914ad1325d9c4b8

6 weeks agoreuse `ActionUtil` methods in tests
Gregory.Shrago [Fri, 30 Apr 2021 02:37:11 +0000 (05:37 +0300)]
reuse `ActionUtil` methods in tests

Cleanup explicit `beforeActionPerformedUpdate` calls.

GitOrigin-RevId: b8fb393edb4250ea5b193f11e89ced3a3b33655d

6 weeks agointroduce `ActionUtil.performDumbAwareWithCallbacks`
Gregory.Shrago [Thu, 29 Apr 2021 23:02:02 +0000 (02:02 +0300)]
introduce `ActionUtil.performDumbAwareWithCallbacks`

1. Make that method the single place for calling
`ActionManagerEx.fire[Before/After]ActionPerformed`.
2. Call `fireAfterActionPerformed` in a finally block
3. Try to support the new FUS logic

GitOrigin-RevId: 2c18c066f884eaf22dc814c385254cd1519899ae

6 weeks agoIDEA-266355: Android: remove workaround for distributionSha256Sum in gradle/wrapper...
Andrei Kuznetsov [Fri, 30 Apr 2021 12:20:55 +0000 (15:20 +0300)]
IDEA-266355: Android: remove workaround for distributionSha256Sum in gradle/wrapper/gradle-wrapper.properties

Underlying issue on gradle-tooling side has been fixed in TAPI 6.3: https://github.com/gradle/gradle/issues/9361 (IDEA now bundles TAPI 6.8)

GitOrigin-RevId: cb631338706833c366a05f6317c9353e01b27bd1

6 weeks agoSafe fix for IDEA-266355: don't validate gradle-wrapper.properties in AndroidGradlePr...
Andrei Kuznetsov [Fri, 30 Apr 2021 11:55:25 +0000 (14:55 +0300)]
Safe fix for IDEA-266355: don't validate gradle-wrapper.properties in AndroidGradleProjectResolver

Underlying issue on gradle-tooling side has been fixed in TAPI 6.3: https://github.com/gradle/gradle/issues/9361 (IDEA now bundles TAPI 6.8)

Also make sure that `JdkImportCheck` and `displayInternalWarningIfForcedUpgradesAreDisabled` only invoked in Android Studio

GitOrigin-RevId: 61b91cd366abfb898ddefcfa70ac64384ade05ec

6 weeks agodeprecate and remove usages of IdeFocusManager's setTypeaheadEnabled and typeAheadUnt...
Dmitry Batrak [Fri, 30 Apr 2021 08:22:53 +0000 (11:22 +0300)]
deprecate and remove usages of IdeFocusManager's setTypeaheadEnabled and typeAheadUntil methods

those methods have no impact currently except logging an exception in certain circumstances

GitOrigin-RevId: 3a79db5740294a5b680b31357f1d7c3e174af9f1