From bfedce474ed46f46f83cdb1b97d5a93513fd5e04 Mon Sep 17 00:00:00 2001 From: Bela VanderVoort Date: Mon, 23 Dec 2024 10:39:12 -0600 Subject: [PATCH] =?UTF-8?q?Ignoring=20files=20in=20"\"=20when=20reporting?= =?UTF-8?q?=20that=20csharpier=20needs=20to=20be=20insta=E2=80=A6=20(#1412?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit …lled globally closes #1395 --- Src/CSharpier.Rider/CHANGELOG.md | 3 +++ Src/CSharpier.Rider/gradle.properties | 4 ++-- .../com/intellij/csharpier/CSharpierProcessProvider.java | 2 +- .../main/java/com/intellij/csharpier/InstallerService.java | 7 ++++--- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Src/CSharpier.Rider/CHANGELOG.md b/Src/CSharpier.Rider/CHANGELOG.md index a7e1f826d..c79f6a9ec 100644 --- 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 index 58cbbcbf1..c556af915 100644 --- 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.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. @@ -11,7 +11,7 @@ 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 index 75e6710f8..abbf9720d 100644 --- 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 index 5e7263f2b..a48e9551f 100644 --- 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("\\") ); } }