Skip to content

Commit b8ebee6

Browse files
committed
Prevent the NativeEditorNotificationProvider from passing flutter.androidstudio.open as a valid action id.
Additionally, nullability annotations were added to method signatures. This is follow up on flutter#7412 This resolves flutter#7488
1 parent 4957057 commit b8ebee6

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

flutter-idea/src/io/flutter/editor/NativeEditorNotificationProvider.java

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,30 +49,35 @@ public EditorNotificationPanel createNotificationPanel(@NotNull VirtualFile file
4949
return createPanelForFile(file, findRootDir(file, project.getBaseDir()));
5050
}
5151

52-
private EditorNotificationPanel createPanelForFile(VirtualFile file, VirtualFile root) {
52+
@Nullable
53+
private EditorNotificationPanel createPanelForFile(@NotNull VirtualFile file, @Nullable VirtualFile root) {
5354
if (root == null) {
5455
return null;
5556
}
5657
return createPanelForAction(file, root, getActionName(root));
5758
}
5859

59-
private EditorNotificationPanel createPanelForAction(VirtualFile file, VirtualFile root, String actionName) {
60+
@Nullable
61+
private EditorNotificationPanel createPanelForAction(@NotNull VirtualFile file, @NotNull VirtualFile root, @Nullable String actionName) {
6062
if (actionName == null) {
6163
return null;
6264
}
6365
final NativeEditorActionsPanel panel = new NativeEditorActionsPanel(file, root, actionName);
6466
return panel.isValidForFile() ? panel : null;
6567
}
6668

67-
private static String getActionName(VirtualFile root) {
69+
@Nullable
70+
private static String getActionName(@Nullable VirtualFile root) {
6871
if (root == null) {
6972
return null;
7073
}
7174

72-
if (root.getName().equals("android")) {
73-
return "flutter.androidstudio.open";
74-
}
75-
else if (root.getName().equals("ios")) {
75+
// See https://github.com/flutter/flutter-intellij/issues/7103
76+
//if (root.getName().equals("android")) {
77+
// return "flutter.androidstudio.open";
78+
//}
79+
//else
80+
if (root.getName().equals("ios")) {
7681
return "flutter.xcode.open";
7782
}
7883
else if (root.getName().equals("macos")) {

0 commit comments

Comments
 (0)