Skip to content

Commit 025ee79

Browse files
jwrenjwren
authored
Remove calls to the deprecated method Project.getBaseDir() (#8318)
1 parent 55e398f commit 025ee79

File tree

7 files changed

+26
-13
lines changed

7 files changed

+26
-13
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import com.intellij.openapi.actionSystem.*;
99
import com.intellij.openapi.project.Project;
10+
import com.intellij.openapi.project.ProjectUtil;
1011
import com.intellij.openapi.vfs.VirtualFile;
1112
import io.flutter.FlutterUtils;
1213
import org.jetbrains.annotations.NotNull;
@@ -47,7 +48,7 @@ public static boolean isIOsDirectory(@NotNull VirtualFile file) {
4748
}
4849

4950
protected static boolean isWithinAndroidDirectory(@NotNull VirtualFile file, @NotNull Project project) {
50-
final VirtualFile baseDir = project.getBaseDir();
51+
final VirtualFile baseDir = ProjectUtil.guessProjectDir(project);
5152
if (baseDir == null) {
5253
return false;
5354
}
@@ -62,7 +63,7 @@ protected static boolean isWithinAndroidDirectory(@NotNull VirtualFile file, @No
6263
}
6364

6465
protected static boolean isWithinIOsDirectory(@NotNull VirtualFile file, @NotNull Project project) {
65-
final VirtualFile baseDir = project.getBaseDir();
66+
final VirtualFile baseDir = ProjectUtil.guessProjectDir(project);
6667
if (baseDir == null) {
6768
return false;
6869
}
@@ -81,7 +82,7 @@ private static boolean isProjectDirectory(@NotNull VirtualFile file, @Nullable P
8182
return false;
8283
}
8384

84-
final VirtualFile baseDir = project.getBaseDir();
85+
final VirtualFile baseDir = ProjectUtil.guessProjectDir(project);
8586
return baseDir != null && baseDir.getPath().equals(file.getPath());
8687
}
8788

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import com.intellij.openapi.fileEditor.FileEditorManager;
1818
import com.intellij.openapi.fileEditor.TextEditor;
1919
import com.intellij.openapi.project.Project;
20+
import com.intellij.openapi.project.ProjectUtil;
2021
import com.intellij.openapi.ui.Messages;
2122
import com.intellij.openapi.util.SystemInfo;
2223
import com.intellij.openapi.vfs.VirtualFile;
@@ -171,7 +172,7 @@ protected static boolean isProjectFileName(@NotNull String name) {
171172
return null;
172173
}
173174

174-
final VirtualFile projectDir = project.getBaseDir();
175+
final VirtualFile projectDir = ProjectUtil.guessProjectDir(project);
175176
for (PubRoot root : PubRoots.forProject(project)) {
176177
if (root.isFlutterPlugin()) {
177178
final VirtualFile rootFile = root.getRoot();

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import com.intellij.openapi.actionSystem.impl.SimpleDataContext;
1010
import com.intellij.openapi.fileEditor.FileEditor;
1111
import com.intellij.openapi.project.Project;
12+
import com.intellij.openapi.project.ProjectUtil;
1213
import com.intellij.openapi.util.SystemInfo;
1314
import com.intellij.openapi.util.io.FileUtil;
1415
import com.intellij.openapi.vfs.VirtualFile;
@@ -39,7 +40,7 @@ public NativeEditorNotificationProvider(@NotNull Project project) {
3940
return null;
4041
}
4142

42-
VirtualFile root = project.getBaseDir();
43+
VirtualFile root = ProjectUtil.guessProjectDir(project);
4344
if (root == null) {
4445
return null;
4546
}

‎flutter-idea/src/io/flutter/run/bazelTest/BazelTestRunner.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.intellij.openapi.diagnostic.Logger;
2323
import com.intellij.openapi.module.Module;
2424
import com.intellij.openapi.project.Project;
25+
import com.intellij.openapi.project.ProjectUtil;
2526
import com.intellij.openapi.roots.ContentEntry;
2627
import com.intellij.openapi.roots.ModuleRootManager;
2728
import com.intellij.openapi.util.Key;
@@ -89,7 +90,7 @@ protected RunContentDescriptor runInDebugger(@NotNull BazelTestLaunchState launc
8990
final FlutterPositionMapper.Analyzer analyzer = FlutterPositionMapper.Analyzer.create(env.getProject(), launcher.getTestFile());
9091

9192
final BazelPositionMapper mapper =
92-
new BazelPositionMapper(env.getProject(), env.getProject().getBaseDir()/*this is different, incorrect?*/, resolver, analyzer,
93+
new BazelPositionMapper(env.getProject(), ProjectUtil.guessProjectDir(env.getProject()), resolver, analyzer,
9394
connector);
9495

9596
// Create the debug session.

‎flutter-idea/src/io/flutter/run/test/TestLaunchState.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import com.intellij.openapi.module.Module;
2020
import com.intellij.openapi.module.ModuleUtil;
2121
import com.intellij.openapi.project.Project;
22+
import com.intellij.openapi.project.ProjectUtil;
2223
import com.intellij.openapi.util.Key;
2324
import com.intellij.openapi.vfs.VirtualFile;
2425
import com.jetbrains.lang.dart.ide.runner.DartConsoleFilter;
@@ -136,7 +137,7 @@ private String getBaseDir() {
136137
if (root != null) {
137138
return root.getPath();
138139
}
139-
final VirtualFile baseDir = config.getProject().getBaseDir();
140+
final VirtualFile baseDir = ProjectUtil.guessProjectDir(config.getProject());
140141
return baseDir == null ? null : baseDir.getPath();
141142
}
142143

‎flutter-studio/src/io/flutter/actions/OpenAndroidModule.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import com.intellij.openapi.project.DumbAware;
1414
import com.intellij.openapi.project.Project;
1515
import com.intellij.openapi.project.ProjectManager;
16+
import com.intellij.openapi.project.ProjectUtil;
1617
import com.intellij.openapi.vfs.VirtualFile;
1718
import com.intellij.util.BitUtil;
1819
import io.flutter.FlutterMessages;
@@ -63,7 +64,7 @@ private static void openOrImportProject(@NotNull VirtualFile projectFile,
6364
GradleProjectImporter gradleImporter = GradleProjectImporter.getInstance();
6465
gradleImporter.importAndOpenProjectCore(null, true, projectFile);
6566
for (Project proj : ProjectManager.getInstance().getOpenProjects()) {
66-
if (projectFile.equals(proj.getBaseDir()) || projectFile.equals(proj.getProjectFile())) {
67+
if (projectFile.equals(ProjectUtil.guessProjectDir(proj)) || projectFile.equals(proj.getProjectFile())) {
6768
if (sourceFile != null && !sourceFile.isDirectory()) {
6869
OpenFileAction.openFile(sourceFile, proj);
6970
}

‎flutter-studio/src/io/flutter/android/AndroidModuleLibraryManager.java

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import com.intellij.openapi.progress.ProgressIndicator;
2020
import com.intellij.openapi.project.DumbService;
2121
import com.intellij.openapi.project.Project;
22+
import com.intellij.openapi.project.ProjectUtil;
2223
import com.intellij.openapi.project.impl.ProjectImpl;
2324
import com.intellij.openapi.project.impl.ProjectManagerImpl;
2425
import com.intellij.openapi.projectRoots.Sdk;
@@ -201,8 +202,10 @@ private void updateAndroidLibraries() {
201202

202203
private void doGradleSync(@NotNull Project flutterProject, @NotNull Function<Project, Void> callback) {
203204
// TODO(messick): Collect URLs for all Android modules, including those within plugins.
204-
VirtualFile dir = flutterProject.getBaseDir().findChild("android");
205-
if (dir == null) dir = flutterProject.getBaseDir().findChild(".android"); // For modules.
205+
final VirtualFile baseDir = ProjectUtil.guessProjectDir(flutterProject);
206+
if (baseDir == null) return;
207+
VirtualFile dir = baseDir.findChild("android");
208+
if (dir == null) dir = baseDir.findChild(".android"); // For modules.
206209
if (dir == null) return;
207210
EmbeddedAndroidProject androidProject = new EmbeddedAndroidProject(Paths.get(FileUtilRt.toSystemIndependentName(dir.getPath())));
208211
androidProject.init42(null);
@@ -270,9 +273,9 @@ public void rootsChanged(@NotNull ModuleRootEvent event) {
270273
}
271274
}
272275

273-
private static boolean hasAndroidDir(Project project) {
276+
private static boolean hasAndroidDir(@NotNull Project project) {
274277
if (FlutterSdkUtil.hasFlutterModules(project)) {
275-
VirtualFile base = project.getBaseDir();
278+
VirtualFile base = ProjectUtil.guessProjectDir(project);
276279
VirtualFile dir = base.findChild("android");
277280
if (dir == null) dir = base.findChild(".android");
278281
return dir != null;
@@ -289,7 +292,11 @@ private static void fileChanged(@NotNull final Project project, @NotNull final V
289292
if (LocalFileSystem.getInstance() != file.getFileSystem() && !ApplicationManager.getApplication().isUnitTestMode()) {
290293
return;
291294
}
292-
if (!VfsUtilCore.isAncestor(project.getBaseDir(), file, true)) {
295+
final VirtualFile baseDir = ProjectUtil.guessProjectDir(project);
296+
if (baseDir == null) {
297+
return;
298+
}
299+
if (!VfsUtilCore.isAncestor(baseDir, file, true)) {
293300
return;
294301
}
295302
getInstance(project).scheduleUpdate();

0 commit comments

Comments
 (0)