Merge branch 'main' into editorconfig

belav · Aug 7, 2023 · cdc5048 · cdc5048
2 parents b40eef5 + 4564ad8
commit cdc5048
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/Src/CSharpier.Rider/CHANGELOG.md b/Src/CSharpier.Rider/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 # csharpier-rider Changelog
 
+## [1.3.8]
+- Add displayName attribute to CSharpier options window to speed up Settings dialog.
+
 ## [1.3.7]
 - Support for 2023.1-beta
 

diff --git a/Src/CSharpier.Rider/gradle.properties b/Src/CSharpier.Rider/gradle.properties
@@ -4,7 +4,7 @@
 pluginGroup = com.intellij.csharpier
 pluginName = csharpier
 # SemVer format -> https://semver.org
-pluginVersion = 1.3.7
+pluginVersion = 1.3.8
 
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.

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
@@ -1,11 +1,9 @@
 package com.intellij.csharpier;
 
-import com.esotericsoftware.minlog.Log;
 import com.intellij.openapi.diagnostic.Logger;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
-import java.io.OutputStream;
 
 public class CSharpierProcessSingleFile implements ICSharpierProcess {
     Logger logger = CSharpierLogger.getInstance();
@@ -44,7 +42,7 @@ public String formatFile(String content, String fileName) {
                 return result;
             }
             else {
-                Log.error(result);
+                this.logger.error(result);
             }
         } catch (Exception e) {
             this.logger.error("error", e);

diff --git a/Src/CSharpier.Rider/src/main/resources/META-INF/plugin.xml b/Src/CSharpier.Rider/src/main/resources/META-INF/plugin.xml
@@ -15,6 +15,7 @@
         <notificationGroup id="CSharpier" displayType="STICKY_BALLOON"/>
         <postStartupActivity implementation="com.intellij.csharpier.CSharpierStartup"/>
         <projectConfigurable
+                displayName="CSharpier"
                 parentId="tools"
                 id="com.intellij.csharpier.CSharpierSettingsComponent"
                 instance="com.intellij.csharpier.CSharpierSettingsComponent"/>