Merge pull request #1 from jebeaudet/enabled-in-tests

Add enabled in tests switch and global kill switch

Author: jebeaudet

build.gradle

@@ -1,12 +1,12 @@
 plugins {
     id 'java'
-    id 'org.jetbrains.intellij' version '1.1.6'
+    id 'org.jetbrains.intellij' version '1.12.0'
 }
 
 group 'io.github.jebeaudet'
-version '1.1.0'
+version project.properties['pluginVersion']
 
-sourceCompatibility = 1.8
+sourceCompatibility = 11
 
 repositories {
     mavenCentral()
@@ -17,11 +17,15 @@ dependencies {
 
 // See https://github.com/JetBrains/gradle-intellij-plugin/
 intellij {
-    version.set('2021.2.1')
+    version.set(project.properties['intellijVersion'])
     updateSinceUntilBuild.set(false)
     plugins = ['java']
 }
 
+runIde {
+    autoReloadPlugins = true
+}
+
 signPlugin {
   certificateChain = System.getenv("CERTIFICATE_CHAIN")
   privateKey = System.getenv("PRIVATE_KEY")
@@ -32,4 +36,9 @@ publishPlugin {
   token = System.getenv("PUBLISH_TOKEN")
 }
 
+patchPluginXml {
+    version.set(project.properties['pluginVersion'])
+    sinceBuild.set(project.properties['sinceBuild'])
+}
+
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'

doc/image/screen/global_jvm_parameter.jpg

@@ -0,0 +1,3 @@
+pluginVersion=1.2.0
+sinceBuild=213
+intellijVersion=2021.3

doc/image/screen/global_jvm_parameter.png

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle.properties

@@ -10,13 +10,17 @@
 
 import io.github.jebeaudet.idea.jvm.util.JVMArgumentsSetterPersistence;
 
+import java.util.Set;
+
 public class JVMArgumentsSetterProgramPatcher extends JavaProgramPatcher
 {
+    private static final Set<String> TEST_TYPES = Set.of("JUnit", "TestNG");
     @Override
     public void patchJavaParameters(Executor executor, RunProfile configuration, JavaParameters javaParameters)
     {
-        if (configuration instanceof RunConfiguration) {
-            String jvmArguments = JVMArgumentsSetterPersistence.getJvmArguments();
+        if (JVMArgumentsSetterPersistence.getIsEnabled() && configuration instanceof RunConfiguration) {
+            String runType = ((RunConfiguration) configuration).getType().getId();
+            String jvmArguments = JVMArgumentsSetterPersistence.getJvmArguments(runType != null && TEST_TYPES.contains(runType));
             if (StringUtils.isNotBlank(jvmArguments)) {
                 javaParameters.getVMParametersList().addParametersString(jvmArguments);
             }

gradle/wrapper/gradle-wrapper.jar

@@ -3,24 +3,37 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.swing.*;
 import javax.swing.table.AbstractTableModel;
 
+import com.intellij.openapi.util.NlsContexts;
+import com.intellij.util.ui.ColumnInfo;
 import com.intellij.util.ui.EditableModel;
+import com.intellij.util.ui.SortableColumnModel;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * @author huzunrong
  * @author jebeaudet
  * @since 1.0
  */
-public class JVMArgumentsTableModel extends AbstractTableModel implements EditableModel
+public class JVMArgumentsTableModel extends AbstractTableModel implements EditableModel, SortableColumnModel
 {
     private static final long serialVersionUID = 6183423505608059672L;
 
     private List<Object[]> list = new ArrayList<>();
 
-    private String[] head = { "", "Name", "Value" };
+    private String[] head = { "Enabled", "Name", "Value", "Tests" };
+
+    private Class<?>[] typeArray = { Boolean.class, Object.class, Object.class, Boolean.class };
+
+    private ColumnInfo[] columnInfos = new ColumnInfo[]{
+            new ToolTipColumnInfo("Enabled", "Enable/Disable the argument"),
+            new ToolTipColumnInfo("Name", "Argument key"),
+            new ToolTipColumnInfo("Value", "Argument value (can be blank for non JVM arguments)"),
+            new ToolTipColumnInfo("Tests", "Whether the argument is added to test run configurations")
+    };
 
-    private Class<?>[] typeArray = { Boolean.class, Object.class, Object.class };
 
     public List<Object[]> getList()
     {
@@ -70,9 +83,9 @@ public boolean isCellEditable(int rowIndex, int columnIndex)
         return true;
     }
 
-    public void addRow(boolean enable, String name, String value)
+    public void addRow(boolean enable, String name, String value, boolean testEnabled)
     {
-        list.add(new Object[] { enable, name, value });
+        list.add(new Object[] { enable, name, value,testEnabled });
         fireTableRowsInserted(getRowCount() - 1, getRowCount());
     }
 
@@ -85,8 +98,7 @@ public void clear()
     @Override
     public void addRow()
     {
-        list.add(new Object[] { true, "", "" });
-        fireTableRowsInserted(getRowCount() - 1, getRowCount());
+        addRow(true, "", "", true);
     }
 
     @Override
@@ -110,4 +122,48 @@ public void removeRow(int idx)
         list.remove(idx);
         fireTableRowsDeleted(0, getRowCount());
     }
+
+    @Override
+    public ColumnInfo[] getColumnInfos() {
+        return columnInfos;
+    }
+
+    @Override
+    public void setSortable(boolean aBoolean) {
+    }
+
+    @Override
+    public boolean isSortable() {
+        return false;
+    }
+
+    @Override
+    public Object getRowValue(int row) {
+        return null;
+    }
+
+    @Override
+    public RowSorter.@Nullable SortKey getDefaultSortKey() {
+        return null;
+    }
+
+    private static class ToolTipColumnInfo extends ColumnInfo {
+        private final String toolTip;
+
+        public ToolTipColumnInfo(String name, String toolTip) {
+            super(name);
+            this.toolTip=toolTip;
+        }
+
+        @Nullable
+        public String getTooltipText() {
+            return toolTip;
+        }
+
+        @Nullable
+        @Override
+        public Object valueOf(Object o) {
+            return null;
+        }
+    }
 }