Skip to content

Avoid duplicate work in DartSdkUtil.getSdkVersion #98

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −20
Open

Avoid duplicate work in DartSdkUtil.getSdkVersion #98

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
30 changes: 10 additions & 20 deletions third_party/src/main/java/com/jetbrains/lang/dart/sdk/DartSdkUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import javax.swing.event.DocumentEvent;
import javax.swing.text.JTextComponent;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
Expand All @@ -40,30 +39,21 @@ public final class DartSdkUtil {

public static @Nullable @NlsSafe String getSdkVersion(final @NotNull String sdkHomePath) {
final File versionFile = new File(sdkHomePath + "/version");
if (versionFile.isFile()) {
final String cachedVersion = ourVersions.get(Pair.create(versionFile, versionFile.lastModified()));
if (cachedVersion != null) return cachedVersion;
if (!versionFile.isFile()) {
return null;
}

final String version = readVersionFile(sdkHomePath);
if (version != null) {
ourVersions.put(Pair.create(versionFile, versionFile.lastModified()), version);
return version;
final Pair<File, Long> versionPair = Pair.create(versionFile, versionFile.lastModified());
final String cachedVersion = ourVersions.get(versionPair);
if (cachedVersion != null) {
return cachedVersion;
}

return null;
}

private static String readVersionFile(final String sdkHomePath) {
final File versionFile = new File(sdkHomePath + "/version");
if (versionFile.isFile() && versionFile.length() < 100) {
try {
return FileUtil.loadFile(versionFile).trim();
}
catch (IOException e) {
/* ignore */
}
final String version = FileUtil.loadFileOrNull(versionFile);
if (version != null) {
return ourVersions.put(versionPair, version);
}

return null;
}

Expand Down
Loading