make rider better about process failing to start (#1235)

belav · Apr 19, 2024 · a2a547a · a2a547a
1 parent 31e0868
commit a2a547a
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 12 deletions.
diff --git a/Src/CSharpier.Rider/CHANGELOG.md b/Src/CSharpier.Rider/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 # csharpier-rider Changelog
 
+## [1.7.2]
+- Better error message when csharpier server fails to start
+
 ## [1.7.1]
 - Fix unicode issue with csharpier 0.28.0+
 

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.7.1
+pluginVersion = 1.7.2
 
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.

diff --git a/...harpier.Rider/src/main/java/com/intellij/csharpier/CSharpierProcessPipeMultipleFiles.java b/...harpier.Rider/src/main/java/com/intellij/csharpier/CSharpierProcessPipeMultipleFiles.java
@@ -17,7 +17,7 @@ public class CSharpierProcessPipeMultipleFiles implements ICSharpierProcess, Dis
     private Process process = null;
     private OutputStreamWriter stdin;
     private BufferedReader stdOut;
-    public boolean processFailedToStart;
+    private boolean processFailedToStart;
 
     public CSharpierProcessPipeMultipleFiles(String csharpierPath, boolean useUtf8, String version, Project project) {
         this.csharpierPath = csharpierPath;
@@ -58,6 +58,11 @@ public String getVersion() {
         return this.version;
     }
 
+    @Override
+    public boolean getProcessFailedToStart() {
+        return this.processFailedToStart;
+    }
+
     @Override
     public String formatFile(String content, String filePath) {
         if (this.processFailedToStart) {

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
@@ -220,11 +220,15 @@ private ICSharpierProcess setupCSharpierProcess(String directory, String version
             var installedVersion = version.split("\\.");
             var versionWeCareAbout = Integer.parseInt(installedVersion[1]);
 
+            ICSharpierProcess csharpierProcess;
             if (versionWeCareAbout >= 28) {
-                return new CSharpierProcessServer(customPath, version, this.project);
-            }
+                csharpierProcess = new CSharpierProcessServer(customPath, version, this.project);
+            } else if (versionWeCareAbout >= 12) {
+                var useUtf8 = versionWeCareAbout >= 14;
 
-            if (versionWeCareAbout < 12) {
+                csharpierProcess = new CSharpierProcessPipeMultipleFiles(customPath, useUtf8, version, this.project);
+            }
+            else {
                 if (!this.warnedForOldVersion) {
                     var content = "Please upgrade to CSharpier >= 0.12.0 for bug fixes and improved formatting speed.";
                     NotificationGroupManager.getInstance().getNotificationGroup("CSharpier")
@@ -234,14 +238,10 @@ private ICSharpierProcess setupCSharpierProcess(String directory, String version
                     this.warnedForOldVersion = true;
                 }
 
-
-                return new CSharpierProcessSingleFile(customPath, version, this.project);
+                csharpierProcess =  new CSharpierProcessSingleFile(customPath, version, this.project);
             }
 
-            var useUtf8 = versionWeCareAbout >= 14;
-
-            var csharpierProcess = new CSharpierProcessPipeMultipleFiles(customPath, useUtf8, version, this.project);
-            if (csharpierProcess.processFailedToStart) {
+            if (csharpierProcess.getProcessFailedToStart()) {
                 this.displayFailureMessage();
             }
 

diff --git a/Src/CSharpier.Rider/src/main/java/com/intellij/csharpier/CSharpierProcessServer.java b/Src/CSharpier.Rider/src/main/java/com/intellij/csharpier/CSharpierProcessServer.java
@@ -21,7 +21,7 @@ public class CSharpierProcessServer implements ICSharpierProcess2, Disposable {
     private Logger logger = CSharpierLogger.getInstance();
     private int port;
     private Process process = null;
-    public boolean processFailedToStart;
+    private boolean processFailedToStart;
 
     public CSharpierProcessServer(String csharpierPath, String version, Project project) {
         this.csharpierPath = csharpierPath;
@@ -131,6 +131,11 @@ public String getVersion() {
         return this.version;
     }
 
+    @Override
+    public boolean getProcessFailedToStart() {
+        return this.processFailedToStart;
+    }
+
     @Override
     public String formatFile(String content, String fileName) {
         var parameter = new FormatFileParameter();

diff --git a/Src/CSharpier.Rider/src/main/java/com/intellij/csharpier/CSharpierProcessSingleFile.java b/Src/CSharpier.Rider/src/main/java/com/intellij/csharpier/CSharpierProcessSingleFile.java
@@ -23,6 +23,11 @@ public String getVersion() {
         return this.version;
     }
 
+    @Override
+    public boolean getProcessFailedToStart() {
+        return false;
+    }
+
     @Override
     public String formatFile(String content, String fileName) {
 

diff --git a/Src/CSharpier.Rider/src/main/java/com/intellij/csharpier/ICSharpierProcess.java b/Src/CSharpier.Rider/src/main/java/com/intellij/csharpier/ICSharpierProcess.java
@@ -2,6 +2,7 @@
 
 interface ICSharpierProcess {
     String getVersion();
+    boolean getProcessFailedToStart();
     String formatFile(String content, String fileName);
     void dispose();
 }

diff --git a/Src/CSharpier.Rider/src/main/java/com/intellij/csharpier/NullCSharpierProcess.java b/Src/CSharpier.Rider/src/main/java/com/intellij/csharpier/NullCSharpierProcess.java
@@ -10,6 +10,11 @@ public String getVersion() {
         return "NULL";
     }
 
+    @Override
+    public boolean getProcessFailedToStart() {
+        return false;
+    }
+
     @Override
     public String formatFile(String content, String fileName) {
         return "";