Save pub root for attach (#6764)

I think this fixes the monorepo-attach problem for add-to-app projects.
It works in a normal project, and should work for monorepo projects, but
I have not fully tested it.

I snuck in a couple minor bug fixes as well. Currently using IJ stable
for dev; EAP has some problems.

Fixes #6726

Author: stevemessick

flutter-idea/src/io/flutter/actions/AttachDebuggerAction.java

@@ -78,6 +78,7 @@ public void startCommand(@NotNull Project project, @NotNull FlutterSdk sdk, @Nul
     }
 
     final SdkAttachConfig sdkRunConfig = new SdkAttachConfig((SdkRunConfig)configuration);
+    sdkRunConfig.pubRoot = root;
     final Executor executor = RunFlutterAction.getExecutor(ToolWindowId.DEBUG);
     if (executor == null) {
       return;

flutter-idea/src/io/flutter/run/SdkAttachConfig.java

@@ -42,6 +42,8 @@
 
 public class SdkAttachConfig extends SdkRunConfig {
 
+  public PubRoot pubRoot;
+
   public SdkAttachConfig(SdkRunConfig config) {
     //noinspection ConstantConditions
     super(config.getProject(), config.getFactory(), config.getName());

flutter-idea/src/io/flutter/sdk/FlutterSearchableOptionContributor.java

@@ -28,14 +28,12 @@ public void processOptions(@NotNull SearchableOptionProcessor processor) {
     add(processor, FlutterBundle.message("settings.flutter.version"));
     add(processor, FlutterBundle.message("settings.open.inspector.on.launch"));
     add(processor, FlutterBundle.message("settings.hot.reload.on.save"));
-    add(processor, FlutterBundle.message("settings.enable.embedding.devtools"));
     add(processor, FlutterBundle.message("settings.enable.bazel.hot.restart"));
     add(processor, FlutterBundle.message("settings.allow.tests.in.sources"));
     add(processor, FlutterBundle.message("settings.allow.tests.tooltip"));
     add(processor, FlutterBundle.message("settings.font.packages"));
     add(processor, FlutterBundle.message("settings.show.all.configs"));
     add(processor, FlutterBundle.message("settings.show.all.configs.tooltip"));
-    add(processor, FlutterBundle.message("settings.enable.embedding.devtools.tooltip"));
     add(processor, FlutterBundle.message("settings.enable.androi.gradle.sync.tooltip"));
     add(processor, FlutterBundle.message("settings.experiments"));
     add(processor, FlutterBundle.message("settings.editor"));

flutter-studio/src/io/flutter/utils/AddToAppUtils.java

@@ -6,6 +6,7 @@
 package io.flutter.utils;
 
 //import static com.android.tools.idea.gradle.project.importing.GradleProjectImporter.ANDROID_PROJECT_TYPE;
+
 import static com.intellij.util.ReflectionUtil.findAssignableField;
 import static io.flutter.actions.AttachDebuggerAction.ATTACH_IS_ACTIVE;
 import static io.flutter.actions.AttachDebuggerAction.findRunConfig;
@@ -18,32 +19,37 @@
 import com.intellij.debugger.impl.DebuggerManagerListener;
 import com.intellij.debugger.impl.DebuggerSession;
 import com.intellij.execution.RunManagerEx;
+import com.intellij.execution.configurations.RunConfiguration;
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.application.Application;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.module.Module;
-import com.intellij.openapi.project.ModuleListener;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.project.ProjectType;
-import com.intellij.openapi.project.ProjectTypeService;
+import com.intellij.openapi.project.*;
+import com.intellij.openapi.vfs.LocalFileSystem;
+import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.ThreeState;
 import com.intellij.util.concurrency.AppExecutorUtil;
 import com.intellij.util.messages.MessageBusConnection;
 import com.intellij.util.messages.Topic;
 import io.flutter.FlutterUtils;
 import io.flutter.actions.AttachDebuggerAction;
 import io.flutter.pub.PubRoot;
+import io.flutter.run.SdkAttachConfig;
 import io.flutter.run.SdkRunConfig;
 import io.flutter.sdk.FlutterSdk;
+import com.intellij.openapi.diagnostic.Logger;
+
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.util.List;
 import java.util.Objects;
+
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class AddToAppUtils {
+  //private static final Logger LOG = Logger.getInstance(AddToAppUtils.class);
 
   private AddToAppUtils() {
   }
@@ -126,7 +132,6 @@ public void sourceGenerationFinished(@NotNull Project project) {
 
   @NotNull
   private static DebuggerManagerListener makeAddToAppAttachListener(@NotNull Project project) {
-
     return new DebuggerManagerListener() {
 
       DebugProcessListener dpl = new DebugProcessListener() {
@@ -144,22 +149,22 @@ public void processAttached(@NotNull DebugProcess process) {
             return;
           }
           // Launch flutter attach if a run config can be found.
-          if (findRunConfig(project) == null) {
+          @Nullable RunConfiguration runConfig = findRunConfig(project);
+          if (runConfig == null) {
             // Either there is no Flutter run config or there are more than one.
-            if (RunManagerEx.getInstanceEx(project).getSelectedConfiguration() instanceof SdkRunConfig) {
-              // The selected run config at this point is not Flutter, so we can't start the process automatically.
-              return;
-            }
+            return;
+          }
+          if (!(runConfig instanceof SdkAttachConfig)) {
+            // The selected run config at this point is not Flutter, so we can't start the process automatically.
+            return;
           }
           FlutterSdk sdk = FlutterSdk.getFlutterSdk(project);
           if (sdk == null) {
             return;
           }
           // If needed, DataContext could be saved by FlutterReloadManager.beforeActionPerformed() in project user data.
           DataContext context = DataContext.EMPTY_CONTEXT;
-          List<Module> modules = FlutterModuleUtils.findModulesWithFlutterContents(project);
-          assert modules.size() == 1; // TODO(messick) Need to change this if multiple :flutter sub-projects supported.
-          PubRoot pubRoot = PubRoot.forDirectory(Objects.requireNonNull(modules.get(0).getModuleFile()).getParent());
+          PubRoot pubRoot = ((SdkAttachConfig)runConfig).pubRoot;
           Application app = ApplicationManager.getApplication();
           project.putUserData(ATTACH_IS_ACTIVE, ThreeState.fromBoolean(true));
           // Note: Using block comments to preserve formatting.

gradle.properties

@@ -1,14 +1,14 @@
-name = "flutter-intellij"
+name="flutter-intellij"
 org.gradle.parallel=true
 org.gradle.jvmargs=-Xms1024m -Xmx4048m
 javaVersion=17
-dartVersion=232.6095.10
+dartVersion=231.9065
 flutterPluginVersion=1
-ide=android-studio
+ide=ideaIC
 testing=true
-buildSpec=2023.2
-baseVersion=232.6095.10
+buildSpec=2023.1
+baseVersion=231.7864.76
 smaliPlugin=com.android.tools.idea.smali
 langPlugin=org.intellij.intelliLang
 kotlin.stdlib.default.dependency=false
-ideVersion=2023.2
+ideVersion=2023.1.2