Merge branch 'flutter:master' into feat/optional-android-dep

Author: AlexV525

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,14 @@
+- Thanks for your contribution! Please replace this text with a description of what this PR is changing or adding and why, list any relevant issues, and review the contribution guidelines below.
+
+---
+
+- [ ] I’ve reviewed the contributor guide and applied the relevant portions to this PR.
+
+<details>
+  <summary>Contribution guidelines:</summary><br>
+
+- See our [contributor guide]([https://github.com/dart-lang/sdk/blob/main/CONTRIBUTING.md](https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview) for general expectations for PRs.
+- Larger or significant changes should be discussed in an issue before creating a PR.
+- Dart contributions to our repos should follow the [Dart style guide](https://dart.dev/guides/language/effective-dart) and use `dart format`.
+- Java and Kotlin contributions should strive to follow Java and Kotlin best practices ([discussion](https://github.com/flutter/flutter-intellij/issues/8098)).
+</details>

.github/workflows/presubmit.yaml

@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: [2024.1, 2024.2, 2024.3, 2025.1]
+        version: [2024.3, 2025.1]
     steps:
       - name: checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683

.gitignore

@@ -13,10 +13,9 @@ flutter-gui-tests/.gradle/
 flutter-gui-tests/guitest.log
 flutter-intellij.jar
 flutter-intellij.zip
-third_party/lib/*.jar
 third_party/lib/jxbrowser/*
-!third_party/lib/jxbrowser/jxbrowser-7.41.2.jar
-!third_party/lib/jxbrowser/jxbrowser-swing-7.41.2.jar
+!third_party/lib/jxbrowser/jxbrowser-8.6.0.jar
+!third_party/lib/jxbrowser/jxbrowser-swing-8.6.0.jar
 !third_party/lib/java-string-similarity-2.0.0.jar
 material-design-icons/
 out/

.idea/inspectionProfiles/Project_Default.xml

@@ -24,3 +24,4 @@ Wagner Silvestre <[email protected]>
 Eli Albert <[email protected]>
 Mohamed El Sayed <[email protected]>
 Edwin Ludik <[email protected]>
+Japnit Singh <[email protected]>

AUTHORS

@@ -1,3 +1,26 @@
+# 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
+- 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
+- Fix broken devtools inspector source navigation (#8041)
+
+# 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
 - Restored Test with coverage run configuration feature (#7810)
 - Upgrade `org.jetbrains.intellij.platform` to 2.2.1 from 2.1.0 (#7936)

CHANGELOG.md

@@ -5,15 +5,21 @@ Contributing to Flutter Plugin for IntelliJ
 * [Contributing to Flutter Plugin for IntelliJ](#contributing-to-flutter-plugin-for-intellij)
   * [Contributing code](#contributing-code)
   * [Getting started](#getting-started)
-  * [Setting environments](#setting-environments)
+  * [Environment set-up](#environment-set-up)
+  * [IntelliJ set-up](#intellij-set-up)
+    * [Configure "Project Structure" settings](#configure-project-structure-settings)
+    * [Configure the Gradle settings](#configure-the-gradle-settings)
+    * [Build and run the plugin](#build-and-run-the-plugin)
     * [Handle symlinks](#handle-symlinks)
   * [Provision Tool](#provision-tool)
   * [Running plugin tests](#running-plugin-tests)
     * [Using test run configurations in IntelliJ](#using-test-run-configurations-in-intellij)
     * [Using the plugin tool on the command line](#using-the-plugin-tool-on-the-command-line)
   * [Adding platform sources](#adding-platform-sources)
   * [Working with Android Studio](#working-with-android-studio)
-  * [Working with Embedded DevTools (JxBrowser)](#working-with-embedded-devtools-jxbrowser)
+  * [Flutter DevTools Integration](#flutter-devtools-integration)
+    * [Working with Embedded DevTools (JxBrowser)](#working-with-embedded-devtools-jxbrowser)
+    * [Developing with local DevTools](#developing-with-local-devtools)
 <!-- TOC -->
 
 ## Contributing code
@@ -71,7 +77,7 @@ name and contact info to the [AUTHORS](AUTHORS) file.
       ```
       In your shell configuration file (e.g. `.bashrc` or `.zshrc`), set your `JAVA_HOME` env variable to match that version.
       ```shell
-      export JAVA_HOME=`/usr/libexec/java_home -v 23.0.2
+      export JAVA_HOME=`/usr/libexec/java_home -v 23.0.2`
       ```
 
 3. Set your `FLUTTER_SDK` path in the configuration file for your shell environment.
@@ -92,13 +98,13 @@ name and contact info to the [AUTHORS](AUTHORS) file.
 4. Set your `DARK_SDK` path in the configuration file for your shell environment.
     - In your shell configuration file (e.g. `.bashrc` or `.zshrc`), set your `DART_SDK` env variable to match the Dart SDK in your Flutter SDK. This should look like the `FLUTTER_SDK` path (added above) with `/bin/cache/dart-sdk` appened to the end. 
     ```shell
-    export DART_SDK="$HOME/path/to/flutter/bin/cache/dart-sdk`"
+    export DART_SDK="$HOME/path/to/flutter/bin/cache/dart-sdk"
     ```
 
 5. Add `DART_SDK`, `FLUTTER_SDK` and `JAVA_HOME` to your `PATH`.
     - In your shell configuration file (e.g. `.bashrc` or `.zshrc`), below where your `JAVA_HOME`, `FLUTTER_SDK`, `DART_SDK` env variables were set, add the following line:
     ```shell
-    export PATH=$DART_SDK/bin:$FLUTTER_SDK/bin:$JAVA_HOME/bin:$PATH"
+    export PATH=$DART_SDK/bin:$FLUTTER_SDK/bin:$JAVA_HOME/bin:$PATH
     ```
 
 6. Update your current `PATH`.
@@ -144,6 +150,7 @@ name and contact info to the [AUTHORS](AUTHORS) file.
     - `dart pub get`
     - `(cd tool/plugin; dart pub get)`
     - `bin/plugin 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
 
@@ -176,21 +183,21 @@ name and contact info to the [AUTHORS](AUTHORS) file.
     Internal Java Platform: IDEA JBR 21
     ``` 
 
-3. Set the SDK for the Project
+4. Set the SDK for the Project
     - Select "Project Settings > Project"
     - Change the "SDK" selection to the **IntelliJ Platform Plugin SDK** you added in step 3.
     - When you are done, your settings should look something like:
     ```
     SDK: IntelliJ IDEA Community Edition IC-243.23654.189
     ```
 
-4. Configure the modules for the Project
+5. Configure the modules for the Project
     - Select "Project Settings > Modules"
     - Select the `flutter-intellij > flutter-idea` module
     - Switch to the "Paths" window
     - Select the **Inherit project compile output path** option then apply.
 
-5. Change the modules SDK to the Project SDK
+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
     - Switch to the "Dependencies" window
@@ -257,7 +264,7 @@ A problem occurred configuring project ':flutter-idea'.
 > Source directory 'X:\path\to\your\flutter-intellij\flutter-idea\resources' is not a directory.
 ```
 
-Check out if the directory is a symlink by open the link in IDEA, and it'll display as:
+Check if the directory is a symlink by opening the link in IDEA, and it'll display as:
 
 ```symlink
 ../resources
@@ -269,8 +276,8 @@ Delete the file, then re-clone the repo using the below command:
 git clone -c core.symlinks=true https://github.com/<your_name_here>/flutter-intellij
 ```
 
-**NOTE**: Avoid symlinks addition during development as possible as you can,
-since they can lead to various of file-based issues during the development.
+**NOTE**: Avoid adding symlinks during development if you can,
+since they can lead to various file-based issues during development.
 
 ## Provision Tool
 

CONTRIBUTING.md

@@ -33,7 +33,7 @@ plugins {
   // https://github.com/JetBrains/intellij-platform-gradle-plugin/releases
   // https://plugins.gradle.org/plugin/org.jetbrains.kotlin.jvm
   id("org.jetbrains.intellij.platform") version "2.5.0"
-  id("org.jetbrains.kotlin.jvm") version "2.1.20"
+  id("org.jetbrains.kotlin.jvm") version "2.1.21-RC2"
 }
 
 // TODO(mossmana) These properties are duplicated in flutter-idea/build.gradle.kts and flutter-studio/build.gradle.kts. Should be consolidated.
@@ -60,12 +60,18 @@ println("javaVersion: $javaVersion")
 println("group: $group")
 
 var jvmVersion: JvmTarget
-if (javaVersion == "17") {
-  jvmVersion = JvmTarget.JVM_17
-} else if (javaVersion == "21") {
-  jvmVersion = JvmTarget.JVM_21
-} else {
-  throw IllegalArgumentException("javaVersion must be defined in the product matrix as either \"17\" or \"21\", but is not for $ideaVersion")
+jvmVersion = when (javaVersion) {
+  "17" -> {
+    JvmTarget.JVM_17
+  }
+
+  "21" -> {
+    JvmTarget.JVM_21
+  }
+
+  else -> {
+    throw IllegalArgumentException("javaVersion must be defined in the product matrix as either \"17\" or \"21\", but is not for $ideaVersion")
+  }
 }
 kotlin {
   compilerOptions {
@@ -75,12 +81,18 @@ kotlin {
 }
 
 var javaCompatibilityVersion: JavaVersion
-if (javaVersion == "17") {
-  javaCompatibilityVersion = JavaVersion.VERSION_17
-} else if (javaVersion == "21") {
-  javaCompatibilityVersion = JavaVersion.VERSION_21
-} else {
-  throw IllegalArgumentException("javaVersion must be defined in the product matrix as either \"17\" or \"21\", but is not for $ideaVersion")
+javaCompatibilityVersion = when (javaVersion) {
+  "17" -> {
+    JavaVersion.VERSION_17
+  }
+
+  "21" -> {
+    JavaVersion.VERSION_21
+  }
+
+  else -> {
+    throw IllegalArgumentException("javaVersion must be defined in the product matrix as either \"17\" or \"21\", but is not for $ideaVersion")
+  }
 }
 java {
   sourceCompatibility = javaCompatibilityVersion
@@ -93,27 +105,33 @@ dependencies {
     // https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-dependencies-extension.html#default-target-platforms
     if (ideaProduct == "android-studio") {
       androidStudio(ideaVersion)
-    } else { // if (ideaProduct == "IC") {
-      intellijIdeaCommunity(ideaVersion)
+    } else {
+      when (ideaProduct) {
+        "IU" -> intellijIdeaUltimate(ideaVersion)
+        "IC" -> intellijIdeaCommunity(ideaVersion)
+        else -> throw IllegalArgumentException("ideaProduct must be defined in the product matrix as either \"IU\" or \"IC\", but is not for $ideaVersion")
+      }
     }
     testFramework(TestFrameworkType.Platform)
 
     // Plugin dependency documentation:
     // https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-dependencies-extension.html#plugins
     val bundledPluginList = mutableListOf(
+      "com.google.tools.ij.aiplugin",
       "com.intellij.java",
       "com.intellij.properties",
       "JUnit",
       "Git4Idea",
       "org.jetbrains.kotlin",
       "org.jetbrains.plugins.gradle",
-      "org.intellij.intelliLang")
+      "org.jetbrains.plugins.yaml",
+      "org.intellij.intelliLang"
+    )
+    val pluginList = mutableListOf("Dart:$dartPluginVersion")
     if (ideaProduct == "android-studio") {
       bundledPluginList.add("org.jetbrains.android")
       bundledPluginList.add("com.android.tools.idea.smali")
-    }
-    val pluginList = mutableListOf("Dart:$dartPluginVersion")
-    if (ideaProduct == "IC") {
+    } else {
       pluginList.add("org.jetbrains.android:$androidPluginVersion")
     }
 
@@ -130,6 +148,7 @@ dependencies {
   }
 }
 
+
 intellijPlatform {
   pluginConfiguration {
     version = flutterPluginVersion
@@ -138,8 +157,46 @@ intellijPlatform {
       untilBuild = untilBuildInput
     }
   }
-}
 
+  // Verifier documentation
+  // https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-extension.html#intellijPlatform-pluginVerification
+  // https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-extension.html#intellijPlatform-pluginVerification-ides
+  pluginVerification {
+    // https://github.com/JetBrains/intellij-plugin-verifier/?tab=readme-ov-file#specific-options
+    // https://github.com/JetBrains/intellij-plugin-verifier
+    cliPath = file("./third_party/lib/verifier-cli-1.384-all.jar")
+    failureLevel = listOf(
+      // TODO(team) Ideally all of the following FailureLevels should be enabled:
+      // TODO(team) Create a tracking issue for each of the following validations
+//      VerifyPluginTask.FailureLevel.COMPATIBILITY_WARNINGS,
+//      VerifyPluginTask.FailureLevel.COMPATIBILITY_PROBLEMS,
+//      VerifyPluginTask.FailureLevel.DEPRECATED_API_USAGES, // https://github.com/flutter/flutter-intellij/issues/7718
+//      VerifyPluginTask.FailureLevel.SCHEDULED_FOR_REMOVAL_API_USAGES,
+      VerifyPluginTask.FailureLevel.EXPERIMENTAL_API_USAGES,
+//      VerifyPluginTask.FailureLevel.INTERNAL_API_USAGES,
+//      VerifyPluginTask.FailureLevel.OVERRIDE_ONLY_API_USAGES,
+      VerifyPluginTask.FailureLevel.NON_EXTENDABLE_API_USAGES,
+      VerifyPluginTask.FailureLevel.PLUGIN_STRUCTURE_WARNINGS,
+//      VerifyPluginTask.FailureLevel.MISSING_DEPENDENCIES,
+      VerifyPluginTask.FailureLevel.INVALID_PLUGIN,
+//      VerifyPluginTask.FailureLevel.NOT_DYNAMIC,
+    )
+    verificationReportsFormats = VerifyPluginTask.VerificationReportsFormats.ALL
+    subsystemsToCheck = VerifyPluginTask.Subsystems.ALL
+    // Mute and freeArgs documentation
+    // https://github.com/JetBrains/intellij-plugin-verifier/?tab=readme-ov-file#specific-options
+    // https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-faq.html#mutePluginVerifierProblems
+    freeArgs = listOf(
+      "-mute",
+      "TemplateWordInPluginId,ForbiddenPluginIdPrefix,TemplateWordInPluginName"
+    )
+    ides {
+      ide(IntelliJPlatformType.AndroidStudio, ideaVersion)
+      // Note, ideally we would have additional targets identified here, however we have been unsuccessful in adding
+      // "recomended()" or select {} support with current versions of gradle & the verifier tool.
+    }
+  }
+}
 // Documentation for printProductsReleases:
 // https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-faq.html#how-to-check-the-latest-available-eap-release
 tasks {
@@ -174,4 +231,16 @@ tasks {
       dependsOn(":flutter-studio:prepareSandbox")
     }
   }
-}
+}
+
+// A task to print the classpath used for compiling an IntelliJ plugin
+// Run with `./third_party/gradlew printCompileClasspath --no-configuration-cache `
+tasks.register("printCompileClasspath") {
+  doLast {
+    println("--- Begin Compile Classpath ---")
+    configurations.getByName("compileClasspath").forEach { file ->
+      println(file.absolutePath)
+    }
+    println("--- End Compile Classpath ---")
+  }
+}

build.gradle.kts

@@ -2,11 +2,14 @@
 
 ### Simulating a fresh install
 
-To simulate a fresh install, you need to delete any accrued application state.  To do this, you'll want to delete select folders in your plugin sandbox (location found in the `Sandbox Home` field in `Project structure | SDKs | [your IntelliJ IDEA plugin SDK]`.
+To simulate a fresh install, you need to delete any accrued application state.  To do this, you'll want to delete select folders in your plugin sandbox.
+(To find your sandbox, launch the `runIde` run/debug configuration and in this newly launched IDE instance, open `Help > Show Log in Finder` (macOS) or 
+`Help > Show Log in Explorer` (Windows), or `Help > Show Log in Files` (Linux). The log directory is usually inside a system folder, which itself is
+inside your sandbox.)
 
 * **config** folder contains IDE app-level configuration, including app-level libraries, SDKs, recent projects, etc.
 * **system** folder contains indexes and caches, deleting it is similar to File | Invalidate Caches action.
 * **plugins** folder contains plugins that you additionally manually installed to the started IDE.  (Likely don't want to delete `Dart`.)
 * **test** folder will also appear as soon as you run some tests. (Deleting it when tests fail with no visible reason can sometimes help.)
 
-(_**NOTE:**_ after removing configuration info, you may need to re-prepare the `flutter-intellij` plugin for deployment in order for it to show up in your fresh runtime workbench: `Build > Prepare Plugin Module 'flutter-intellij' For Deployment`.)
+(_**NOTE:**_ after removing configuration info, you may need to re-prepare the `flutter-intellij` plugin for deployment in order for it to show up in your fresh runtime workbench: `Build > Prepare Plugin Module 'flutter-intellij' For Deployment`.)