Skip to content

Commit dd5a521

Browse files
jwrenjwren
authored
Remove the FlutterExternalIdeActionGroup and associated OpenInAndroidStudioAction (#7412)
This will resolve the issue #7103
1 parent 19cc669 commit dd5a521

File tree

4 files changed

+40
-28
lines changed

4 files changed

+40
-28
lines changed

‎flutter-idea/src/io/flutter/actions/FlutterExternalIdeActionGroup.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@
1515
import org.jetbrains.annotations.NotNull;
1616
import org.jetbrains.annotations.Nullable;
1717

18+
/**
19+
* This action has been removed from the plugin.xml as a required dependent method call {GradleProjectImporter.importAndOpenProjectCore()
20+
* throws "configureNewProject should be used with new projects only".
21+
* See https://github.com/flutter/flutter-intellij/issues/7103
22+
*/
1823
public class FlutterExternalIdeActionGroup extends DefaultActionGroup {
1924
private static boolean isExternalIdeFile(AnActionEvent e) {
2025
final VirtualFile file = e.getData(CommonDataKeys.VIRTUAL_FILE);

‎flutter-idea/src/io/flutter/actions/OpenInAndroidStudioAction.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@
3333

3434
import java.io.File;
3535

36+
/**
37+
* This action has been removed from the plugin.xml as a required dependent method call {GradleProjectImporter.importAndOpenProjectCore()
38+
* throws "configureNewProject should be used with new projects only".
39+
* See https://github.com/flutter/flutter-intellij/issues/7103
40+
*/
3641
public class OpenInAndroidStudioAction extends AnAction {
3742
private static final String LABEL_FILE = FlutterBundle.message("flutter.androidstudio.open.file.text");
3843
private static final String DESCR_FILE = FlutterBundle.message("flutter.androidstudio.open.file.description");

‎resources/META-INF/plugin.xml

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -368,9 +368,9 @@
368368
text="Open Flutter DevTools"
369369
description="Open Flutter DevTools"/>
370370
<separator/>
371-
<action id="flutter.androidstudio.open" class="io.flutter.actions.OpenInAndroidStudioAction"
372-
text="Open Android module in Android Studio"
373-
description="Launch Android Studio to edit the Android module as a top-level project"/>
371+
<!-- <action id="flutter.androidstudio.open" class="io.flutter.actions.OpenInAndroidStudioAction"-->
372+
<!-- text="Open Android module in Android Studio"-->
373+
<!-- description="Launch Android Studio to edit the Android module as a top-level project"/>-->
374374
<action id="flutter.xcode.open" class="io.flutter.actions.OpenInXcodeAction"
375375
text="Open iOS/macOS module in Xcode"
376376
description="Launch Xcode to edit the iOS module as a top-level project"/>
@@ -391,7 +391,7 @@
391391
<reference ref="flutter.pub.get"/>
392392
<reference ref="flutter.pub.upgrade"/>
393393
<separator/>
394-
<reference ref="flutter.androidstudio.open"/>
394+
<!-- <reference ref="flutter.androidstudio.open"/>-->
395395
<reference ref="flutter.xcode.open"/>
396396
<reference ref="flutter.appcode.open"/>
397397
<separator/>
@@ -401,16 +401,17 @@
401401
<separator/>
402402
<add-to-group group-id="ProjectViewPopupMenu" relative-to-action="AddToFavorites" anchor="before"/>
403403
</group>
404-
<group id="FlutterExternalIdeActionGroup" class="io.flutter.actions.FlutterExternalIdeActionGroup">
405-
<separator/>
406-
<group text="Flutter" description="Flutter Tools" icon="FlutterIcons.Flutter" popup="true">
407-
<reference ref="flutter.androidstudio.open"/>
408-
<reference ref="flutter.xcode.open"/>
409-
<reference ref="flutter.appcode.open"/>
410-
</group>
411-
<separator/>
412-
<add-to-group group-id="ProjectViewPopupMenu" relative-to-action="AddToFavorites" anchor="before"/>
413-
</group>
404+
<!-- See comment at the top of FlutterExternalIdeActionGroup.-->
405+
<!-- <group id="FlutterExternalIdeActionGroup" class="io.flutter.actions.FlutterExternalIdeActionGroup">-->
406+
<!-- <separator/>-->
407+
<!-- <group text="Flutter" description="Flutter Tools" icon="FlutterIcons.Flutter" popup="true">-->
408+
<!-- <reference ref="flutter.androidstudio.open"/>-->
409+
<!-- <reference ref="flutter.xcode.open"/>-->
410+
<!-- <reference ref="flutter.appcode.open"/>-->
411+
<!-- </group>-->
412+
<!-- <separator/>-->
413+
<!-- <add-to-group group-id="ProjectViewPopupMenu" relative-to-action="AddToFavorites" anchor="before"/>-->
414+
<!-- </group>-->
414415
<group id="FlutterBuildActionGroup" class="io.flutter.actions.FlutterBuildActionGroup">
415416
<separator/>
416417
<group text="Flutter" popup="true">

‎resources/META-INF/plugin_template.xml

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,9 @@
102102
text="Open Flutter DevTools"
103103
description="Open Flutter DevTools"/>
104104
<separator/>
105-
<action id="flutter.androidstudio.open" class="io.flutter.actions.OpenInAndroidStudioAction"
106-
text="Open Android module in Android Studio"
107-
description="Launch Android Studio to edit the Android module as a top-level project"/>
105+
<!-- <action id="flutter.androidstudio.open" class="io.flutter.actions.OpenInAndroidStudioAction"-->
106+
<!-- text="Open Android module in Android Studio"-->
107+
<!-- description="Launch Android Studio to edit the Android module as a top-level project"/>-->
108108
<action id="flutter.xcode.open" class="io.flutter.actions.OpenInXcodeAction"
109109
text="Open iOS/macOS module in Xcode"
110110
description="Launch Xcode to edit the iOS module as a top-level project"/>
@@ -125,7 +125,7 @@
125125
<reference ref="flutter.pub.get"/>
126126
<reference ref="flutter.pub.upgrade"/>
127127
<separator/>
128-
<reference ref="flutter.androidstudio.open"/>
128+
<!-- <reference ref="flutter.androidstudio.open"/>-->
129129
<reference ref="flutter.xcode.open"/>
130130
<reference ref="flutter.appcode.open"/>
131131
<separator/>
@@ -135,16 +135,17 @@
135135
<separator/>
136136
<add-to-group group-id="ProjectViewPopupMenu" relative-to-action="AddToFavorites" anchor="before"/>
137137
</group>
138-
<group id="FlutterExternalIdeActionGroup" class="io.flutter.actions.FlutterExternalIdeActionGroup">
139-
<separator/>
140-
<group text="Flutter" description="Flutter Tools" icon="FlutterIcons.Flutter" popup="true">
141-
<reference ref="flutter.androidstudio.open"/>
142-
<reference ref="flutter.xcode.open"/>
143-
<reference ref="flutter.appcode.open"/>
144-
</group>
145-
<separator/>
146-
<add-to-group group-id="ProjectViewPopupMenu" relative-to-action="AddToFavorites" anchor="before"/>
147-
</group>
138+
<!-- See comment at the top of FlutterExternalIdeActionGroup.-->
139+
<!-- <group id="FlutterExternalIdeActionGroup" class="io.flutter.actions.FlutterExternalIdeActionGroup">-->
140+
<!-- <separator/>-->
141+
<!-- <group text="Flutter" description="Flutter Tools" icon="FlutterIcons.Flutter" popup="true">-->
142+
<!-- <reference ref="flutter.androidstudio.open"/>-->
143+
<!-- <reference ref="flutter.xcode.open"/>-->
144+
<!-- <reference ref="flutter.appcode.open"/>-->
145+
<!-- </group>-->
146+
<!-- <separator/>-->
147+
<!-- <add-to-group group-id="ProjectViewPopupMenu" relative-to-action="AddToFavorites" anchor="before"/>-->
148+
<!-- </group>-->
148149
<group id="FlutterBuildActionGroup" class="io.flutter.actions.FlutterBuildActionGroup">
149150
<separator/>
150151
<group text="Flutter" popup="true">

0 commit comments

Comments
 (0)