Tweak the logic around validating installs so it doesn't bomb out and… (

#1339) … provides a better log. #1337
belav · Aug 28, 2024 · 4d51407 · 4d51407
1 parent 12fb058
commit 4d51407
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/Src/CSharpier.Rider/CHANGELOG.md b/Src/CSharpier.Rider/CHANGELOG.md
@@ -2,8 +2,9 @@
 
 # csharpier-rider Changelog
 
-## [1.8.1]
+## [1.8.2]
 - Possible fix for issue with OSX not being able to run dotnet tool list command
+- Better handling of error when validating custom install of csharpier
 
 ## [1.8.0]
 - Use dotnet tool list to find both local and global installs of csharpier.

diff --git a/Src/CSharpier.Rider/gradle.properties b/Src/CSharpier.Rider/gradle.properties
@@ -3,7 +3,7 @@
 
 pluginGroup = com.intellij.csharpier
 pluginName = csharpier
-pluginVersion = 1.8.1
+pluginVersion = 1.8.2
 
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.

diff --git a/Src/CSharpier.Rider/src/main/java/com/intellij/csharpier/CSharpierProcessProvider.java b/Src/CSharpier.Rider/src/main/java/com/intellij/csharpier/CSharpierProcessProvider.java
@@ -149,7 +149,7 @@ private String findCSharpierVersionInToolOutput(
 
  this.logger.debug(
  "Running 'dotnet tool list" + (isGlobal ? "-g" : "") + "' to look for version"
- );
+  );
  this.logger.debug("Output was: \n " + output);
 
  if (output == null) {

diff --git a/Src/CSharpier.Rider/src/main/java/com/intellij/csharpier/CustomPathInstaller.java b/Src/CSharpier.Rider/src/main/java/com/intellij/csharpier/CustomPathInstaller.java
@@ -67,10 +67,14 @@ private boolean validateInstall(String pathToDirectoryForVersion, String version
  command,
  env,
  new File(pathToDirectoryForVersion)
- ).trim();
+ );
+
+ if (output == null) {
+ return false;
+ }
 
  this.logger.debug(this.getPathForVersion(version) + "--version output: " + version);
- var versionWithoutHash = output.split(Pattern.quote("+"))[0];
+ var versionWithoutHash = output.trim().split(Pattern.quote("+"))[0];
  this.logger.debug("Using " + versionWithoutHash + " as the version number.");
 
  if (versionWithoutHash.equals(version)) {

diff --git a/Src/CSharpier.Rider/src/main/java/com/intellij/csharpier/ProcessHelper.java b/Src/CSharpier.Rider/src/main/java/com/intellij/csharpier/ProcessHelper.java
@@ -50,7 +50,7 @@ public static String executeCommand(
  if (exitVal == 0) {
  return result.toString().trim();
  }
- logger.debug(errorResult.toString());
+ logger.debug("ErrorOutput: " + errorResult);
  } catch (Exception e) {
  logger.error(e);
  }