Merge branch 'master' into cq_dep_coverageRunner

Author: pq

.github/workflows/presubmit.yaml

@@ -18,17 +18,11 @@ permissions:
 jobs:
   presubmit:
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        version: [2024.3, 2025.1]
     steps:
       - name: checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      - name: build ${{ matrix.version }}
+      - name: build
         run: ./tool/github.sh
-        env:
-          IDEA_VERSION: ${{ matrix.version }}
   checker:
     runs-on: ubuntu-latest
     strategy:

.github/workflows/presubmit.yaml.template

@@ -16,17 +16,11 @@ permissions:
 jobs:
   presubmit:
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        version: [@VERSIONS@]
     steps:
       - name: checkout
         uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
-      - name: build ${{ matrix.version }}
+      - name: build
         run: ./tool/github.sh
-        env:
-          IDEA_VERSION: ${{ matrix.version }}
   checker:
     runs-on: ubuntu-latest
     strategy:

.gitignore

@@ -47,7 +47,3 @@ lib/kotlin*
 .gradle
 /build/
 gradle-app.setting
-gradle/wrapper/gradle-wrapper.jar
-
-# User specific configuration based on current Intellij SDKs.
-gradle.properties

CHANGELOG.md

@@ -1,27 +1,46 @@
-# 86
+## 87.1
+
+- Register VM service with DTD (#8436)
+- Fix for ClassCastException: BadgeIcon on flutter runs (#8426)
+- Fix the FlutterDependencyInspection for the analyzer workspaces (#8428)
+
+## 87
+
+- Fixes to Flutter test execution (#8233, #8325)
+- Make Android dependencies optional, allowing the plugin to be used in more Jetbrains products (Rider, etc) (#7949, #8375)
+- Internal: support for logging to a dedicated plugin log file (#8253)
+- Fixes to ensure the Property Editor loads on all project opens (#8268)
+- Fix the hang after opening a new project in Android Studio (#8390)
+
+## 86
+
 - New message in DevTools windows for "Dock unpinned" IntelliJ feature (#8181)
 - Fixes for Slow Operation notifications in the IDEA platform (#7792)
 - Fix in Flutter project creation flow (#8259)
 - Many code health improvements and code cleanups (#8025, #8027, #8021)
 - Migration of deprecated API usages (#7718)
 - Fix for empty menu item in the device selector (#8264)
 
-# 85.3
+## 85.3
+
 - Add Property Editor side panel (#7957)
 - Support removed for IDEA 2024.1 (Koala) and 2024.2 (Ladybug) (#8073)
 - Various cleanups including migrating slow operations to non-blocking calls (#8089)
 
-# 85.2
+## 85.2
+
 - Fix broken devtools inspector source navigation (#8041)
 
-# 85.1
+## 85.1
+
 - Fix the disappearance of the New Flutter Project menu item (#8040)
 - Add back the device name with the running tab (#7948)
 - Update the `org.jetbrains.intellij.platform` version to `2.5.0` (#8038)
 - Replace deprecated ComboBoxWithBrowserButton (#7931)
 - Fix Flutter Outline View event over-subscriptions (#7980)
 
-# 85
+## 85
+
 - Restored Test with coverage run configuration feature (#7810)
 - Upgrade `org.jetbrains.intellij.platform` to 2.2.1 from 2.1.0 (#7936)
 - Fix for DevTool windows not appearing (#8029)
@@ -33,35 +52,42 @@
 - Cleanup: removal of the deprecated Performance page window (#7816)
 - Migrated all instances of EditorNotifications.Provider to the new API (#7830)
 
-# 84
+## 84
+
 - This version was not shipped due to issue #7968
 
-# 83
+## 83
+
 - First version for Meerkat, Android Studio 2024.3 (#7799)
 - Message in the Flutter Outline window that the window is now deprecated (#7778)
 - Testing and cleanup now that the code is migrated to the new Gradle Plugin (#7670)
 
-# 82.2
+## 82.2
+
 - Release of the plugin for 2024.3 (#7670)
 - Migration to IntelliJ Platform Gradle Plugin (2.x) (#7670)
 - The Flutter coverage runner support has been removed (#7670)
 
-# 82.1
+## 82.1
+
 - Fix for Cannot invoke "com.intellij.openapi.wm.ToolWindow.setAvailable(boolean)" issue -- thanks to @parlough (#7691)
 - New SDK notification to notify of old Flutter SDK usage (#7763)
 - Progress on migrating off of old IDEA APIs (#7718)
 - Significant code cleanup
 
-# 82
+## 82
+
 - Various DevTools integration improvements (#7626) (#7621)
 - Removal of the old Performance page, now replaced by DevTools (#7624)
 - Add an option to reload a DevTools window (#7617)
 - Fix to the developer build (#7625)
 
-# 81.1
+## 81.1
+
 - Initial support 2024.2 & Android Studio Ladybug Canary 6 (#7595)
 
-# 81
+## 81
+
 - New icons to match "New UI" features in IntelliJ and Android Studio (#6595)
 - Restore Flutter test icons in the editor gutter (#7505)
 - Fix widget tree highlighting in the editor (#7522)
@@ -71,7 +97,8 @@
 - Configure the Project view for Flutter in AS, when creating a new Flutter project (#4470)
 - Migrate to Kotlin UI DSL Version 2 (#7310)
 
-# 80
+## 80
+
 - Resolve debugger issue with the new Dart macro file uri format (#7449)
 - Hide deep links window when insufficient SDK version (#7478)
 - Fix exceptions out of FlutterSampleNotificationProvider (#5634)

CONTRIBUTING.md

@@ -52,7 +52,7 @@ name and contact info to the [AUTHORS](AUTHORS) file.
    If you already have a fork and are now installing a development environment on a new machine,
    make sure you've updated your fork with the master branch
    so that you don't use stale configuration options from long ago.
-4. `git clone -c core.symlinks=true https://github.com/<your_name_here>/flutter-intellij`
+4. `git clone https://github.com/<your_name_here>/flutter-intellij`
 5. `cd flutter-intellij`
 6. `git remote add upstream https://github.com/flutter/flutter-intellij`
    The name `upstream` can be whatever you want.
@@ -117,27 +117,6 @@ name and contact info to the [AUTHORS](AUTHORS) file.
     - [IntelliJ Downloads](https://www.jetbrains.com/idea/download/)
     - Either the community edition (free) or Ultimate will work.
 
-2. Create a `gradle.properties` file.
-   - In the root directory, create an empty `gradle.properties` file (`touch gradle.properties`)
-   - Add the following to the file:
-   ```
-    name = "flutter-intellij"
-    buildSpec=2024.3
-    flutterPluginVersion=1
-    ideaProduct=android-studio
-    ideaVersion=2024.3.1.7
-    baseVersion=243.22562.59
-    dartPluginVersion= 243.21565.120
-    androidPluginVersion=
-    sinceBuild=243
-    untilBuild=253.*
-    testing=true
-    kotlin.stdlib.default.dependency=false
-    org.gradle.parallel=true
-    org.gradle.jvmargs=-Xms1024m -Xmx4048m
-    ```
-    - **[Note]** If you want, you can manually change these properties to target different versions of IntelliJ. See `product-matrix.json` to find which configurations are supported.
-
 3. Start IntelliJ IDEA with the `flutter-intellij` project.
    - If you see a popup with "Gradle build scripts found",
      **confirm loading the Gradle project, and wait until syncing is done.**
@@ -149,7 +128,7 @@ name and contact info to the [AUTHORS](AUTHORS) file.
     - `cd path/to/flutter-intellij`
     - `dart pub get`
     - `(cd tool/plugin; dart pub get)`
-    - `bin/plugin test`
+    - `./gradlew test`
     - Note: If there are Dart errors during build originating in the `tool/plugin` directory, try deleting the contents of the `pubspec.lock` file and re-running the pub get steps. This will allow you to get a fresh set of pub packages.
 
 ### Configure "Project Structure" settings
@@ -193,13 +172,14 @@ name and contact info to the [AUTHORS](AUTHORS) file.
 
 5. Configure the modules for the Project
     - Select "Project Settings > Modules"
-    - Select the `flutter-intellij > flutter-idea` module
+    - Select the `flutter-intellij` module
     - Switch to the "Paths" window
     - Select the **Inherit project compile output path** option, then apply.
+    - Do the same for the subdirectories, `main` and `test`.
 
 6. Change the modules SDK to the Project SDK
     - Select "Project Settings > Modules"
-    - Select all the sub-directories under the `flutter-intellij > flutter-idea` module
+    - Select all the subdirectories under the `flutter-intellij` module
     - Switch to the "Dependencies" window
     - Change the "Module SDK" selection to `Project SDK`.
 
@@ -255,30 +235,6 @@ name and contact info to the [AUTHORS](AUTHORS) file.
     - Expand `Edit configuration templates...` and verify that Flutter is present.
     - Click [+] and verify that Flutter is present.
 
-### Handle symlinks
-
-If exceptions like these occurred:
-
-```
-A problem occurred configuring project ':flutter-idea'.
-> Source directory 'X:\path\to\your\flutter-intellij\flutter-idea\resources' is not a directory.
-```
-
-Check if the directory is a symlink by opening the link in IDEA, and it'll display as:
-
-```symlink
-../resources
-```
-
-Delete the file, then re-clone the repo using the below command:
-
-```shell
-git clone -c core.symlinks=true https://github.com/<your_name_here>/flutter-intellij
-```
-
-**NOTE**: Avoid adding symlinks during development if you can,
-since they can lead to various file-based issues during development.
-
 ## Provision Tool
 
 This is not currently required. However, for debugging unit tests, it may be handy; please ignore for now.
@@ -326,27 +282,17 @@ To be able to debug a single test class or test method, you need to do the follo
 The test configuration can be tricky due to the IntelliJ platform versioning.
 The plugin tool (below) can be a more reliable way to run tests.
 
-### Using the plugin tool on the command line
+### Using the command line
 
 To run unit tests on the command line:
 
-```
-bin/plugin test
-```
-
-See `TestCommand` in `tool/plugin/lib/plugin.dart` for more options.
-
-It is also possible to run tests directly with Gradle, which would allow passing more command-line arguments:
-
 ```
 ./gradlew test
 ```
 
 If you wanted to run a subset of the tests, you could do so this way.
 See the [Gradle docs](https://docs.gradle.org/current/userguide/java_testing.html)
 for more info about testing.
-*However*, you must have run the tests once using the plugin tool,
-to ensure all the dependencies have been configured.
 
 ## Adding platform sources
 
@@ -361,31 +307,6 @@ Sometimes browsing the source code of IntelliJ helps understand platform details
   Accept all the root folders found by the IDE after scanning.
 - Do the same for the `intellij-plugins` repo to get Dart plugin sources. Sync to the same version as before.
 
-## Working with Android Studio
-
-Android Studio cannot use the Gradle-based project definition,
-so it still needs the `flutter-intellij-community.iml` file.
-Obviously, unit tests can only be run from the command line.
-
-1. Initialize Android Studio sources.
-2. Checkout Flutter plugin sources, tip of the tree.
-3. Follow the directions for setting up the Dart plugin sources in
-   `intellij-plugins/Dart/README.md` with these changes:
-    - you do not need to clone the intellij-community repo
-    - open studio-main/tools/adt/idea in IntelliJ
-    - possibly skip running `intellij-community/getPlugins.sh`
-4. Checkout Dart plugin sources.
-5. Using the Project Structure editor, import
-    - intellij-plugins/Dart/Dart-community.iml (if there are lots of errors, see step 7)
-    - flutter-intellij/flutter-intellij-community.iml
-6. Using the Project Structure editor, expand the tree to show `intellij > android > adt > ui`.
-   Select the `ui` module, then add a module dependency from it to `flutter-intellij-community`.
-   Also, add a dependency on the Dart module unless using step 7.
-7. (Optional, when Dart sources are not usable.) Make sure the `flutter-intellij-community` module
-   has a dependency on a library named `Dart`. It should be pre-defined, but if it is out of date,
-   then adjust it to point to `flutter-intellij/third_party/lib/dart-plugin/xxx.yyyy/Dart.jar`.
-   Delete the Dart module from the Project Structure modules list.
-
 ## Flutter DevTools Integration
 
 ### Working with Embedded DevTools (JxBrowser)