Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Dec 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Src/CSharpier.Rider/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Src/CSharpier.Rider/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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("\\")
);
}
}
Loading