Skip to content

Commit 87ad370

Browse files
committed
Fix some dumb mistakes
1 parent cc2e389 commit 87ad370

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

Src/CSharpier.Rider/gradle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33

44
pluginGroup = com.intellij.csharpier
55
pluginName = csharpier
6-
pluginVersion = 1.5.0-beta1
6+
pluginVersion = 1.5.0-beta2
77

88
# See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
99
# for insight into build numbers and IntelliJ Platform versions.
1010
pluginSinceBuild = 203
1111

1212
# IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties
1313
platformType = RD
14-
# trying to change this to a higher version results in builds that don't work, but it isn't clear why. The only reason to go
15-
# to higher versions seems to be to get deprecated notices, so things are probably fine as is for now.
14+
# trying to change this to a higher version results in builds that don't work - format on save doesn't work and the right click action
15+
# is never available
1616
platformVersion = 2021.2.1
1717

1818
# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html

Src/CSharpier.Rider/src/main/java/com/intellij/csharpier/CSharpierProcessProvider.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import java.time.Instant;
2626
import java.util.HashMap;
2727
import java.util.Map;
28+
import java.util.regex.Pattern;
2829

2930
public class CSharpierProcessProvider implements DocumentListener, Disposable, IProcessKiller {
3031
private final CustomPathInstaller customPathInstaller;
@@ -163,6 +164,7 @@ private String getCSharpierVersion(String directoryThatContainsFile) {
163164
var version = ProcessHelper.ExecuteCommand(command, env, new File(directoryThatContainsFile));
164165

165166
this.logger.debug("dotnet csharpier --version output: " + version);
167+
version = version.split(Pattern.quote("+"))[0];
166168

167169
return version == null ? "" : version;
168170
}
@@ -236,6 +238,7 @@ private ICSharpierProcess setupCSharpierProcess(String directory, String version
236238
if (csharpierProcess.processFailedToStart) {
237239
this.displayFailureMessage();
238240
}
241+
return csharpierProcess;
239242

240243
} catch (Exception ex) {
241244
this.logger.error(ex);

0 commit comments

Comments
 (0)