Merge pull request #37 from sburlyaev/feature/36-new-rider-toolbar

Add Terminal button to 'RightToolbarSideGroup'
siarheiburliayeu · Dec 26, 2021 · 6e3d223 · 6e3d223
2 parents 55ecb1f + a71f09e
commit 6e3d223
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'java'
-    id 'org.jetbrains.intellij' version '0.6.5'
+    id 'org.jetbrains.intellij' version '0.7.3'
 }
 
 group 'com.sburlyaev.terminal.plugin'
@@ -13,11 +13,11 @@ repositories {
 }
 
 dependencies {
-    testCompile group: 'junit', name: 'junit', version: '4.12'
+    testImplementation group: 'junit', name: 'junit', version: '4.13.2'
 }
 
 intellij {
-    version 'IC-2020.2'
+    version 'IC-2021.3'
     updateSinceUntilBuild false
 }
 
@@ -38,7 +38,6 @@ patchPluginXml {
       which will be replaced at runtime with the actual project directory.
   """
     changeNotes """
-      - Added support for kitty and Terminator
-      <br>- Replaced deprecated API
+      - Added Terminal button to 'Right Toolbar Side Group' (used as a default for Rider 2021.3+)
   """
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/com/sburlyaev/cmd/plugin/settings/PluginSettings.java b/src/main/java/com/sburlyaev/cmd/plugin/settings/PluginSettings.java
@@ -11,7 +11,7 @@
         storages = @Storage("nativeTerminalPlugin.xml"))
 public class PluginSettings implements PersistentStateComponent<PluginSettingsState> {
 
-    private PluginSettingsState PluginSettingsState;
+    private PluginSettingsState pluginSettingsState;
 
     public static PluginSettings getInstance() {
         return ServiceManager.getService(PluginSettings.class);
@@ -20,11 +20,11 @@ public static PluginSettings getInstance() {
     @Nullable
     @Override
     public PluginSettingsState getState() {
-        return PluginSettingsState;
+        return pluginSettingsState;
     }
 
     @Override
     public void loadState(@NotNull PluginSettingsState state) {
-        PluginSettingsState = state;
+        pluginSettingsState = state;
     }
-}
+}
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -26,8 +26,9 @@
                 text="Terminal"
                 description="Open the project directory in external terminal"
                 icon="Icons.TERMINAL_ICON">
-            <add-to-group group-id="NavBarToolBar" anchor="first"/>
             <add-to-group group-id="MainToolBar" anchor="last"/>
+            <add-to-group group-id="NavBarToolBar" anchor="first"/>
+            <add-to-group group-id="RightToolbarSideGroup" anchor="first"/> <!-- Rider 2021.3 -->
         </action>
         <action id="com.sburlyaev.cmd.plugin.actions.OpenInTerminal"
                 class="com.sburlyaev.cmd.plugin.actions.OpenSelectedDirectoryAction"