Skip to content

Remove the FlutterExternalIdeActionGroup and associated OpenInAndroidStudioAction #7412

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jwren merged 1 commit into from
May 8, 2024
Merged

Remove the FlutterExternalIdeActionGroup and associated OpenInAndroidStudioAction #7412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions flutter-idea/src/io/flutter/actions/FlutterExternalIdeActionGroup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

/**
* This action has been removed from the plugin.xml as a required dependent method call {GradleProjectImporter.importAndOpenProjectCore()
* throws "configureNewProject should be used with new projects only".
* See https://github.com/flutter/flutter-intellij/issues/7103
*/
public class FlutterExternalIdeActionGroup extends DefaultActionGroup {
private static boolean isExternalIdeFile(AnActionEvent e) {
final VirtualFile file = e.getData(CommonDataKeys.VIRTUAL_FILE);
Expand Down
5 changes: 5 additions & 0 deletions flutter-idea/src/io/flutter/actions/OpenInAndroidStudioAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@

import java.io.File;

/**
* This action has been removed from the plugin.xml as a required dependent method call {GradleProjectImporter.importAndOpenProjectCore()
* throws "configureNewProject should be used with new projects only".
* See https://github.com/flutter/flutter-intellij/issues/7103
*/
public class OpenInAndroidStudioAction extends AnAction {
private static final String LABEL_FILE = FlutterBundle.message("flutter.androidstudio.open.file.text");
private static final String DESCR_FILE = FlutterBundle.message("flutter.androidstudio.open.file.description");
Expand Down
29 changes: 15 additions & 14 deletions resources/META-INF/plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,9 +368,9 @@
text="Open Flutter DevTools"
description="Open Flutter DevTools"/>
<separator/>
<action id="flutter.androidstudio.open" class="io.flutter.actions.OpenInAndroidStudioAction"
text="Open Android module in Android Studio"
description="Launch Android Studio to edit the Android module as a top-level project"/>
<!-- <action id="flutter.androidstudio.open" class="io.flutter.actions.OpenInAndroidStudioAction"-->
<!-- text="Open Android module in Android Studio"-->
<!-- description="Launch Android Studio to edit the Android module as a top-level project"/>-->
<action id="flutter.xcode.open" class="io.flutter.actions.OpenInXcodeAction"
text="Open iOS/macOS module in Xcode"
description="Launch Xcode to edit the iOS module as a top-level project"/>
Expand All @@ -391,7 +391,7 @@
<reference ref="flutter.pub.get"/>
<reference ref="flutter.pub.upgrade"/>
<separator/>
<reference ref="flutter.androidstudio.open"/>
<!-- <reference ref="flutter.androidstudio.open"/>-->
<reference ref="flutter.xcode.open"/>
<reference ref="flutter.appcode.open"/>
<separator/>
Expand All @@ -401,16 +401,17 @@
<separator/>
<add-to-group group-id="ProjectViewPopupMenu" relative-to-action="AddToFavorites" anchor="before"/>
</group>
<group id="FlutterExternalIdeActionGroup" class="io.flutter.actions.FlutterExternalIdeActionGroup">
<separator/>
<group text="Flutter" description="Flutter Tools" icon="FlutterIcons.Flutter" popup="true">
<reference ref="flutter.androidstudio.open"/>
<reference ref="flutter.xcode.open"/>
<reference ref="flutter.appcode.open"/>
</group>
<separator/>
<add-to-group group-id="ProjectViewPopupMenu" relative-to-action="AddToFavorites" anchor="before"/>
</group>
<!-- See comment at the top of FlutterExternalIdeActionGroup.-->
<!-- <group id="FlutterExternalIdeActionGroup" class="io.flutter.actions.FlutterExternalIdeActionGroup">-->
<!-- <separator/>-->
<!-- <group text="Flutter" description="Flutter Tools" icon="FlutterIcons.Flutter" popup="true">-->
<!-- <reference ref="flutter.androidstudio.open"/>-->
<!-- <reference ref="flutter.xcode.open"/>-->
<!-- <reference ref="flutter.appcode.open"/>-->
<!-- </group>-->
<!-- <separator/>-->
<!-- <add-to-group group-id="ProjectViewPopupMenu" relative-to-action="AddToFavorites" anchor="before"/>-->
<!-- </group>-->
<group id="FlutterBuildActionGroup" class="io.flutter.actions.FlutterBuildActionGroup">
<separator/>
<group text="Flutter" popup="true">
Expand Down
29 changes: 15 additions & 14 deletions resources/META-INF/plugin_template.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,9 @@
text="Open Flutter DevTools"
description="Open Flutter DevTools"/>
<separator/>
<action id="flutter.androidstudio.open" class="io.flutter.actions.OpenInAndroidStudioAction"
text="Open Android module in Android Studio"
description="Launch Android Studio to edit the Android module as a top-level project"/>
<!-- <action id="flutter.androidstudio.open" class="io.flutter.actions.OpenInAndroidStudioAction"-->
<!-- text="Open Android module in Android Studio"-->
<!-- description="Launch Android Studio to edit the Android module as a top-level project"/>-->
<action id="flutter.xcode.open" class="io.flutter.actions.OpenInXcodeAction"
text="Open iOS/macOS module in Xcode"
description="Launch Xcode to edit the iOS module as a top-level project"/>
Expand All @@ -125,7 +125,7 @@
<reference ref="flutter.pub.get"/>
<reference ref="flutter.pub.upgrade"/>
<separator/>
<reference ref="flutter.androidstudio.open"/>
<!-- <reference ref="flutter.androidstudio.open"/>-->
<reference ref="flutter.xcode.open"/>
<reference ref="flutter.appcode.open"/>
<separator/>
Expand All @@ -135,16 +135,17 @@
<separator/>
<add-to-group group-id="ProjectViewPopupMenu" relative-to-action="AddToFavorites" anchor="before"/>
</group>
<group id="FlutterExternalIdeActionGroup" class="io.flutter.actions.FlutterExternalIdeActionGroup">
<separator/>
<group text="Flutter" description="Flutter Tools" icon="FlutterIcons.Flutter" popup="true">
<reference ref="flutter.androidstudio.open"/>
<reference ref="flutter.xcode.open"/>
<reference ref="flutter.appcode.open"/>
</group>
<separator/>
<add-to-group group-id="ProjectViewPopupMenu" relative-to-action="AddToFavorites" anchor="before"/>
</group>
<!-- See comment at the top of FlutterExternalIdeActionGroup.-->
<!-- <group id="FlutterExternalIdeActionGroup" class="io.flutter.actions.FlutterExternalIdeActionGroup">-->
<!-- <separator/>-->
<!-- <group text="Flutter" description="Flutter Tools" icon="FlutterIcons.Flutter" popup="true">-->
<!-- <reference ref="flutter.androidstudio.open"/>-->
<!-- <reference ref="flutter.xcode.open"/>-->
<!-- <reference ref="flutter.appcode.open"/>-->
<!-- </group>-->
<!-- <separator/>-->
<!-- <add-to-group group-id="ProjectViewPopupMenu" relative-to-action="AddToFavorites" anchor="before"/>-->
<!-- </group>-->
<group id="FlutterBuildActionGroup" class="io.flutter.actions.FlutterBuildActionGroup">
<separator/>
<group text="Flutter" popup="true">
Expand Down