Skip to content

Prevent the NativeEditorNotificationProvider from passing flutter.androidstudio.open as a valid action id. #7551

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
Jul 2, 2024
Merged

Prevent the NativeEditorNotificationProvider from passing flutter.androidstudio.open as a valid action id. #7551

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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Next
- Resolve "Exception: Cannot invoke "org..AnAction.getTemplatePresentation()" exception (#7488)
- Resolve Released EditorImpl held by lambda in FlutterReloadManager (#7507)
- Configure the Project view for Flutter in AS, when creating a new Flutter project (#4470)
- Migrate to Kotlin UI DSL Version 2 (#7310)
Expand Down
19 changes: 12 additions & 7 deletions flutter-idea/src/io/flutter/editor/NativeEditorNotificationProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,30 +49,35 @@ public EditorNotificationPanel createNotificationPanel(@NotNull VirtualFile file
return createPanelForFile(file, findRootDir(file, project.getBaseDir()));
}

private EditorNotificationPanel createPanelForFile(VirtualFile file, VirtualFile root) {
@Nullable
private EditorNotificationPanel createPanelForFile(@NotNull VirtualFile file, @Nullable VirtualFile root) {
if (root == null) {
return null;
}
return createPanelForAction(file, root, getActionName(root));
}

private EditorNotificationPanel createPanelForAction(VirtualFile file, VirtualFile root, String actionName) {
@Nullable
private EditorNotificationPanel createPanelForAction(@NotNull VirtualFile file, @NotNull VirtualFile root, @Nullable String actionName) {
if (actionName == null) {
return null;
}
final NativeEditorActionsPanel panel = new NativeEditorActionsPanel(file, root, actionName);
return panel.isValidForFile() ? panel : null;
}

private static String getActionName(VirtualFile root) {
@Nullable
private static String getActionName(@Nullable VirtualFile root) {
if (root == null) {
return null;
}

if (root.getName().equals("android")) {
return "flutter.androidstudio.open";
}
else if (root.getName().equals("ios")) {
// See https://github.com/flutter/flutter-intellij/issues/7103
//if (root.getName().equals("android")) {
// return "flutter.androidstudio.open";
//}
//else
if (root.getName().equals("ios")) {
return "flutter.xcode.open";
}
else if (root.getName().equals("macos")) {
Expand Down
1 change: 1 addition & 0 deletions resources/META-INF/plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
<![CDATA[
<h1>Next</h1>
<ul>
<li>Resolve &quot;Exception: Cannot invoke &quot;org..AnAction.getTemplatePresentation()&quot; exception (#7488)</li>
<li>Resolve Released EditorImpl held by lambda in FlutterReloadManager (#7507)</li>
<li>Configure the Project view for Flutter in AS, when creating a new Flutter project (#4470)</li>
<li>Migrate to Kotlin UI DSL Version 2 (#7310)</li>
Expand Down