fix: isModified returning true when not modified

Author: BFergerson

plugin/src/main/java/spp/jetbrains/sourcemarker/settings/PluginConfigurationPanel.java

@@ -28,14 +28,15 @@
 import com.intellij.ui.components.JBScrollPane;
 import com.intellij.util.ui.JBUI;
 import org.jetbrains.annotations.Nullable;
+import spp.protocol.platform.general.Service;
 
 import javax.swing.*;
 import java.awt.*;
 import java.util.*;
+import java.util.List;
 import java.util.stream.Collectors;
 
 import static spp.jetbrains.sourcemarker.PluginBundle.message;
-import static spp.protocol.SourceServices.Instance.INSTANCE;
 
 public class PluginConfigurationPanel {
     private JPanel myWholePanel;
@@ -60,25 +61,19 @@ public class PluginConfigurationPanel {
     private SourceMarkerConfig config;
     private CertificatePinPanel myCertificatePins;
 
-    public PluginConfigurationPanel(SourceMarkerConfig config) {
+    public PluginConfigurationPanel(SourceMarkerConfig config, List<Service> availableServices) {
         this.config = config;
         myServiceSettingsPanel.setBorder(IdeBorderFactory.createTitledBorder(message("service_settings")));
         myGlobalSettingsPanel.setBorder(IdeBorderFactory.createTitledBorder(message("plugin_settings")));
         myPortalSettingsPanel.setBorder(IdeBorderFactory.createTitledBorder(message("portal_settings")));
         portalZoomSpinner.setModel(new SpinnerNumberModel(1.0, 0.5, 2.0, 0.1));
 
-        if (INSTANCE.getLiveService() != null) {
-            INSTANCE.getLiveService().getServices().onComplete(it -> {
-                if (it.succeeded()) {
-                    it.result().forEach(service -> serviceComboBox.addItem(service.getName()));
-
-                    if (config.getServiceName() != null) {
-                        serviceComboBox.setSelectedItem(config.getServiceName());
-                    }
-                } else {
-                    it.cause().printStackTrace();
-                }
-            });
+        availableServices.forEach(service -> serviceComboBox.addItem(service.getName()));
+        if (config.getServiceName() != null) {
+            if (availableServices.stream().noneMatch(service -> service.getName().equals(config.getServiceName()))) {
+                serviceComboBox.addItem(config.getServiceName());
+            }
+            serviceComboBox.setSelectedItem(config.getServiceName());
         }
 
         //todo: shouldn't need to manually update locale text
@@ -110,7 +105,10 @@ public JComponent getContentPane() {
     boolean isModified() {
         if (config.getOverride()) return false;
 
-        if (!Arrays.equals(Arrays.stream(rootSourcePackageTextField.getText().split(",")).filter(s -> !s.isEmpty()).toArray(), config.getRootSourcePackages().toArray())) {
+        if (!Arrays.equals(
+                Arrays.stream(rootSourcePackageTextField.getText().split(",")).filter(s -> !s.isEmpty()).toArray(),
+                config.getRootSourcePackages().stream().filter(s -> !s.isEmpty()).toArray())
+        ) {
             return true;
         }
         if (!Objects.equals(autoResolveEndpointNamesCheckBox.isSelected(), config.getAutoResolveEndpointNames())) {

plugin/src/main/kotlin/spp/jetbrains/sourcemarker/settings/SourceMarkerConfigurable.kt

@@ -21,9 +21,11 @@ import com.intellij.openapi.options.Configurable
 import com.intellij.openapi.project.DumbService
 import com.intellij.openapi.project.ProjectManager
 import io.vertx.core.json.Json
+import io.vertx.kotlin.coroutines.await
 import kotlinx.coroutines.runBlocking
 import spp.jetbrains.sourcemarker.PluginBundle.message
 import spp.jetbrains.sourcemarker.SourceMarkerPlugin
+import spp.protocol.SourceServices
 import javax.swing.JComponent
 
 /**
@@ -56,7 +58,10 @@ class SourceMarkerConfigurable : Configurable {
     override fun createComponent(): JComponent {
         if (form == null) {
             val config = SourceMarkerPlugin.getConfig(ProjectManager.getInstance().openProjects[0])
-            form = PluginConfigurationPanel(config)
+            val availServices = runBlocking {
+                SourceServices.Instance.liveService?.getServices()?.let { it.await() } ?: emptyList()
+            }
+            form = PluginConfigurationPanel(config, availServices)
             form!!.applySourceMarkerConfig(config)
         }
         return form!!.contentPane as JComponent