Ignoring files in "\" when reporting that csharpier needs to be insta… (

#1412) …lled globally closes #1395
belav · Dec 23, 2024 · bfedce4 · bfedce4
1 parent 6d285fe
commit bfedce4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/Src/CSharpier.Rider/CHANGELOG.md b/Src/CSharpier.Rider/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 # csharpier-rider Changelog
 
+## [1.8.3]
+- Don't notify about installing csharpier globally for files in the directory '\'
+
 ## [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

diff --git a/Src/CSharpier.Rider/gradle.properties b/Src/CSharpier.Rider/gradle.properties
@@ -3,15 +3,15 @@
 
 pluginGroup = com.intellij.csharpier
 pluginName = csharpier
-pluginVersion = 1.8.2
+pluginVersion = 1.8.3
 
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.
 pluginSinceBuild = 222
 
 # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
 platformType = RD
-platformVersion = 2022.2.1
+platformVersion = 2024.1
 
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22

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
@@ -78,7 +78,7 @@ private void findAndWarmProcess(String filePath) {
         if (lastWarmed + 5000 > now) {
             return;
         }
-        this.logger.debug("Ensure there is a csharpier process for " + directory);
+        this.logger.debug("Ensure there is a csharpier process for " + filePath);
         this.lastWarmedByDirectory.put(directory, now);
         var version = this.csharpierVersionByDirectory.getOrDefault(directory, null);
         if (version == null) {

diff --git a/Src/CSharpier.Rider/src/main/java/com/intellij/csharpier/InstallerService.java b/Src/CSharpier.Rider/src/main/java/com/intellij/csharpier/InstallerService.java
@@ -61,9 +61,10 @@ public void displayInstallNeededMessage(
     private boolean ignoreDirectory(String directoryThatContainsFile) {
         var normalizedPath = directoryThatContainsFile.replace('\\', '/');
         return (
-            StringUtils.containsIgnoreCase(normalizedPath, "resharper-host/DecompilerCache") ||
-            StringUtils.containsIgnoreCase(normalizedPath, "resharper-host/SourcesCache") ||
-            directoryThatContainsFile.equals("/")
+                StringUtils.containsIgnoreCase(normalizedPath, "resharper-host/DecompilerCache") ||
+                        StringUtils.containsIgnoreCase(normalizedPath, "resharper-host/SourcesCache") ||
+                        directoryThatContainsFile.equals("/") ||
+                        directoryThatContainsFile.equals("\\")
         );
     }
 }