Skip to content
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

Fix the IntelliJ freeze issue 7968 #7981

Merged
merged 1 commit into from
Mar 25, 2025
Merged

Fix the IntelliJ freeze issue 7968 #7981

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
17 changes: 5 additions & 12 deletions flutter-idea/src/io/flutter/pub/PubRoot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import com.intellij.openapi.actionSystem.CommonDataKeys;
import com.intellij.openapi.actionSystem.LangDataKeys;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ReadAction;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleManager;
import com.intellij.openapi.project.Project;
Expand All @@ -19,7 +18,6 @@
import com.intellij.openapi.util.Computable;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiFile;
import com.intellij.util.concurrency.AppExecutorUtil;
import com.jetbrains.lang.dart.util.DotPackagesFileUtil;
import io.flutter.FlutterUtils;
import org.jetbrains.annotations.NotNull;
Expand Down Expand Up @@ -141,18 +139,11 @@ public static PubRoot forDirectory(@Nullable VirtualFile dir) {
if (dir == null || !dir.isDirectory() || dir.getPath().endsWith("/")) {
return null;
}
VirtualFile pubspec = null;
try {
pubspec = ReadAction.nonBlocking(() -> {
return dir.findChild(PUBSPEC_YAML);
}).submit(AppExecutorUtil.getAppExecutorService()).get();
} catch (Exception e) {
// do nothing
}

final VirtualFile pubspec = dir.findChild(PUBSPEC_YAML);
if (pubspec == null || !pubspec.exists() || pubspec.isDirectory()) {
return null;
} else {
}
else {
return new PubRoot(dir, pubspec);
}
}
Expand Down Expand Up @@ -194,6 +185,7 @@ public String getRelativePath(@NotNull VirtualFile file) {

/**
* Returns true if the given file is a directory that contains tests.
*
* @noinspection BooleanMethodIsAlwaysInverted
*/
public boolean hasTests(@NotNull VirtualFile dir) {
Expand Down Expand Up @@ -314,6 +306,7 @@ public VirtualFile getPackagesFile() {
/**
* Returns true if the packages are up-to-date with regard to the `pubspec.yaml`. The `.packages` file is used if no
* `.tool/package_config.json` is found. The default value returned is to return false.
*
* @noinspection BooleanMethodIsAlwaysInverted
*/
public boolean hasUpToDatePackages() {
Expand Down