Skip to content

Use proper package file #5340

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
merged 1 commit into from
Mar 22, 2021
Merged

Use proper package file #5340

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
6 changes: 5 additions & 1 deletion src/io/flutter/pub/PubRoot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,9 +280,13 @@ public VirtualFile getPackagesFile() {
}

/**
* Returns true if the packages file is up to date.
* Returns true if the packages are up to date wrt pubspec.yaml.
*/
public boolean hasUpToDatePackages() {
final VirtualFile configFile = getPackageConfigFile();
if (configFile != null) {
return pubspec.getTimeStamp() < configFile.getTimeStamp();
}
final VirtualFile packagesFile = getPackagesFile();
if (packagesFile == null) {
return false;
Expand Down
6 changes: 3 additions & 3 deletions src/io/flutter/sdk/FlutterSdkUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,13 +261,13 @@ public static void enableDartSdk(@NotNull final Project project) {
public static String guessFlutterSdkFromPackagesFile(@NotNull Module module) {
// First, look for .dart_tool/package_config.json
for (PubRoot pubRoot : PubRoots.forModule(module)) {
final VirtualFile packagesFile = pubRoot.getPackageConfigFile();
if (packagesFile == null) {
final VirtualFile configFile = pubRoot.getPackageConfigFile();
if (configFile == null) {
continue;
}
// parse it
try {
final String contents = new String(packagesFile.contentsToByteArray(true /* cache contents */));
final String contents = new String(configFile.contentsToByteArray(true /* cache contents */));
final JsonElement element = new JsonParser().parse(contents);
if (element == null) {
continue;
Expand Down