Check if gem available in default plugin location

PyvesB · Jul 16, 2024 · dd1ce86 · dd1ce86
1 parent 53b6e89
commit dd1ce86
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/...ugin/src/main/java/io/github/pyvesb/eclipse_solargraph/preferences/StringPreferences.java b/...ugin/src/main/java/io/github/pyvesb/eclipse_solargraph/preferences/StringPreferences.java
@@ -18,9 +18,9 @@
 
 public enum StringPreferences implements Preference<String> {
 
-	GEM_PATH("GemPath", "Solargraph executable:", CommandHelper.findPath(isWindows() ? "solargraph.bat" : "solargraph")),
+	GEM_PATH("GemPath", "Solargraph executable:", CommandHelper.findPath(isWindows() ? "solargraph.bat" : "solargraph", true)),
 	RUBY_DIR("RubyDir", "Override Ruby bin directory:", CommandHelper.findDirectory("ruby")),
-	READAPT_PATH("ReadaptPath", "Readapt executable:", CommandHelper.findPath(isWindows() ? "readapt.bat" : "readapt"));
+	READAPT_PATH("ReadaptPath", "Readapt executable:", CommandHelper.findPath(isWindows() ? "readapt.bat" : "readapt", true));
 
 	private final String key;
 	private final String desc;

diff --git a/...argraph-plugin/src/main/java/io/github/pyvesb/eclipse_solargraph/utils/CommandHelper.java b/...argraph-plugin/src/main/java/io/github/pyvesb/eclipse_solargraph/utils/CommandHelper.java
@@ -30,7 +30,7 @@ public class CommandHelper {
 	private static final AtomicReference<String> DEFAULT_SHELL_MACOS = new AtomicReference<>();
 
 	public static String findDirectory(String executable) {
-		String executablePath = findPath(executable);
+		String executablePath = findPath(executable, false);
 		if (!executablePath.isEmpty()) {
 			File executableDirectory = new File(executablePath).getParentFile();
 			if (executableDirectory != null && executableDirectory.isDirectory()) {
@@ -40,7 +40,13 @@ public static String findDirectory(String executable) {
 		return "";
 	}
 
-	public static String findPath(String executable) {
+	public static String findPath(String executable, boolean searchInDefaultPluginLocation) {
+		if (searchInDefaultPluginLocation) {
+			String defaultPluginLocation = GemHelper.getPluginStateLocation() + File.separator + executable;
+			if (new File(defaultPluginLocation).exists()) {
+				return defaultPluginLocation;
+			}
+		}
 		String locationCommand = (isWindows() ? "where " : "which ") + executable;
 		try {
 			Process process = new ProcessBuilder(getPlatformCommand(locationCommand)).redirectErrorStream(true).start();

diff --git a/...-solargraph-plugin/src/main/java/io/github/pyvesb/eclipse_solargraph/utils/GemHelper.java b/...-solargraph-plugin/src/main/java/io/github/pyvesb/eclipse_solargraph/utils/GemHelper.java
@@ -60,7 +60,7 @@ public static void scheduleUpdate(String gem, long delay, StringPreferences path
 		new CommandJob(gem, plarformCommand, "Update in progress").schedule(delay);
 	}
 
-	private static String getPluginStateLocation() {
+	static String getPluginStateLocation() {
 		return Platform.getStateLocation(FrameworkUtil.getBundle(GemHelper.class)).toOSString();
 	}