diff --git a/intellij-nette-tester.jar b/intellij-nette-tester.jar index 41cb3cb..03d6989 100644 Binary files a/intellij-nette-tester.jar and b/intellij-nette-tester.jar differ diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml index e3f845b..8e61419 100644 --- a/resources/META-INF/plugin.xml +++ b/resources/META-INF/plugin.xml @@ -6,7 +6,7 @@ messages.TesterBundle Github + Github

This plugin integrates Nette Tester into PhpStorm IDE.

@@ -18,27 +18,27 @@
  • Added run line markers to run TestCase or test methods
  • Added support for run configuration in Docker
  • Added support for Nette Tester 2.0
  • -
  • Fixed Compatibility with PHPStorm 2019.2 (#43)
  • -
  • Fixed bug java.lang.NullPointerException on phpstorm startup (#45)
  • +
  • Fixed Compatibility with PHPStorm 2019.2 (#43)
  • +
  • Fixed bug java.lang.NullPointerException on phpstorm startup (#45)
  • 2.0.0-beta.3

    2.0.0-beta.2

    I know I said this release branch would be feature-frozen, but... well... not just yet. I'm far too excited about bringing the new features to be able to postpone them. Semver doesn't play well with the plugin's distribution channel anyway. Here they come:

    2.0.0-beta.1

    diff --git a/resources/META-INF/pluginIcon.svg b/resources/META-INF/pluginIcon.svg new file mode 100644 index 0000000..429e6a0 --- /dev/null +++ b/resources/META-INF/pluginIcon.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/cz/jiripudil/intellij/nette/tester/projectSettings/TesterProjectSettings.java b/src/cz/jiripudil/intellij/nette/tester/projectSettings/TesterProjectSettings.java index 925bc1b..f2615fb 100644 --- a/src/cz/jiripudil/intellij/nette/tester/projectSettings/TesterProjectSettings.java +++ b/src/cz/jiripudil/intellij/nette/tester/projectSettings/TesterProjectSettings.java @@ -12,7 +12,7 @@ @Tag("testerSettings") public class TesterProjectSettings { @NotNull private String defaultExtension = "phpt"; - @NotNull private String testerVersion = "< 2.0"; + @NotNull private String testerVersion = ">= 2.0"; @Nullable private String bootstrapFile; @NotNull private List namespaceMappings = new ArrayList<>(); diff --git a/src/cz/jiripudil/intellij/nette/tester/projectSettings/editor/TesterConfigurableForm.java b/src/cz/jiripudil/intellij/nette/tester/projectSettings/editor/TesterConfigurableForm.java index 0c02fbc..f0acdb9 100644 --- a/src/cz/jiripudil/intellij/nette/tester/projectSettings/editor/TesterConfigurableForm.java +++ b/src/cz/jiripudil/intellij/nette/tester/projectSettings/editor/TesterConfigurableForm.java @@ -63,8 +63,8 @@ public void apply() { return; } - settings.setDefaultExtension((String) defaultExtensionCombobox.getSelectedItem()); - settings.setTesterVersion((String) testerVersionCombobox.getSelectedItem()); + settings.setDefaultExtension(StringUtil.notNullize((String) defaultExtensionCombobox.getSelectedItem())); + settings.setTesterVersion(StringUtil.notNullize((String) testerVersionCombobox.getSelectedItem())); settings.setBootstrapFile(bootstrapFileField.getText()); // lists work with references which complicates detecting modification, cloning each item helps @@ -79,7 +79,7 @@ public void reset() { } defaultExtensionCombobox.setSelectedItem(settings.getDefaultExtension()); - testerVersionCombobox.setSelectedItem(settings.getTesterVersion()); + testerVersionCombobox.setSelectedItem(settings.getTesterVersion().equals("> 2.0") ? ">= 2.0" : settings.getTesterVersion()); bootstrapFileField.setText(settings.getBootstrapFile()); // lists work with references which complicates detecting modification, cloning each item helps @@ -97,7 +97,7 @@ private void createUIComponents() { defaultExtensionCombobox = new ComboBox<>(new String[]{"phpt", "php"}); testerVersionLabel = new JBLabel(TesterBundle.message("settings.testerVersion")); - testerVersionCombobox = new ComboBox<>(new String[]{"< 2.0", "> 2.0"}); + testerVersionCombobox = new ComboBox<>(new String[]{"< 2.0", ">= 2.0"}); bootstrapFileLabel = new JBLabel(TesterBundle.message("settings.bootstrapFile")); bootstrapFileField = new TextFieldWithBrowseButton();