fix: fix mapping, client config, debug suspend changes

angelozerr · angelozerr · commit 42501ed64324 · 2025-03-22T14:53:10.000+01:00
Signed-off-by: azerr &lt;azerr@redhat.com&gt;
diff --git a/src/main/java/com/redhat/devtools/lsp4ij/LanguageServersRegistry.java b/src/main/java/com/redhat/devtools/lsp4ij/LanguageServersRegistry.java
@@ -451,6 +451,7 @@ private void removeAssociationsFor(LanguageServerDefinition definition) {
         boolean mappingsChanged = !Objects.deepEquals(settings.getMappings(), request.mappings());
         boolean configurationContentChanged = !Objects.equals(settings.getConfigurationContent(), request.configurationContent());
         boolean initializationOptionsContentChanged = !Objects.equals(settings.getInitializationOptionsContent(), request.initializationOptionsContent());
+        boolean clientConfigurationContentChanged = !Objects.equals(settings.getClientConfigurationContent(), request.clientConfigurationContent());
         // Not checking whether client config changed because that shouldn't result in a LanguageServerChangedEvent
 
         settings.setServerName(request.name());
@@ -464,7 +465,7 @@ private void removeAssociationsFor(LanguageServerDefinition definition) {
         settings.setMappings(request.mappings());
 
         if (nameChanged || commandChanged || userEnvironmentVariablesChanged || includeSystemEnvironmentVariablesChanged ||
-                mappingsChanged || configurationContentChanged || initializationOptionsContentChanged) {
+                mappingsChanged || configurationContentChanged || initializationOptionsContentChanged || clientConfigurationContentChanged) {
             // Notifications
             LanguageServerDefinitionListener.LanguageServerChangedEvent event = new LanguageServerDefinitionListener.LanguageServerChangedEvent(
                     request.project(),
@@ -475,7 +476,8 @@ private void removeAssociationsFor(LanguageServerDefinition definition) {
                     includeSystemEnvironmentVariablesChanged,
                     mappingsChanged,
                     configurationContentChanged,
-                    initializationOptionsContentChanged);
+                    initializationOptionsContentChanged,
+                    clientConfigurationContentChanged);
             if (notify) {
                 handleChangeEvent(event);
             }
diff --git a/src/main/java/com/redhat/devtools/lsp4ij/server/definition/LanguageServerDefinitionListener.java b/src/main/java/com/redhat/devtools/lsp4ij/server/definition/LanguageServerDefinitionListener.java
@@ -25,6 +25,7 @@ public interface LanguageServerDefinitionListener {
 
     abstract class LanguageServerDefinitionEvent {
         protected final Project project;
+
         LanguageServerDefinitionEvent(@NotNull Project project) {
             this.project = project;
         }
@@ -65,6 +66,7 @@ class LanguageServerChangedEvent extends LanguageServerDefinitionEvent {
         public final boolean mappingsChanged;
         public final boolean configurationChanged;
         public final boolean initializationOptionsContentChanged;
+        public final boolean clientConfigurationContentChanged;
 
         public LanguageServerChangedEvent(@NotNull Project project,
                                           @NotNull LanguageServerDefinition serverDefinition,
@@ -74,7 +76,8 @@ public LanguageServerChangedEvent(@NotNull Project project,
                                           boolean includeSystemEnvironmentVariablesChanged,
                                           boolean mappingsChanged,
                                           boolean configurationContentChanged,
-                                          boolean initializationOptionsContentChanged) {
+                                          boolean initializationOptionsContentChanged,
+                                          boolean clientConfigurationContentChanged) {
             super(project);
             this.serverDefinition = serverDefinition;
             this.nameChanged = nameChanged;
@@ -84,6 +87,7 @@ public LanguageServerChangedEvent(@NotNull Project project,
             this.mappingsChanged = mappingsChanged;
             this.configurationChanged = configurationContentChanged;
             this.initializationOptionsContentChanged = initializationOptionsContentChanged;
+            this.clientConfigurationContentChanged = clientConfigurationContentChanged;
         }
     }
 
diff --git a/src/main/java/com/redhat/devtools/lsp4ij/settings/LanguageServerView.java b/src/main/java/com/redhat/devtools/lsp4ij/settings/LanguageServerView.java
@@ -101,7 +101,7 @@ public boolean isModified() {
                     && isEquals(this.getCommandLine(), settings.getCommandLine())
                     && Objects.equals(this.getEnvData().getEnvs(), settings.getUserEnvironmentVariables())
                     && this.getEnvData().isPassParentEnvs() == settings.isIncludeSystemEnvironmentVariables()
-                    && Objects.equals(this.getMappings(), settings.getMappings())
+                    && Objects.deepEquals(this.getMappings(), settings.getMappings())
                     && isEquals(this.getConfigurationContent(), settings.getConfigurationContent())
                     && isEquals(this.getConfigurationSchemaContent(), settings.getConfigurationSchemaContent())
                     && isEquals(this.getInitializationOptionsContent(), settings.getInitializationOptionsContent())
@@ -179,18 +179,27 @@ public void reset() {
                 List<ServerMappingSettings> languageMappings = userDefinedLanguageServerSettings.getMappings()
                         .stream()
                         .filter(mapping -> !StringUtils.isEmpty(mapping.getLanguage()))
+                        .map(mapping ->
+                            ServerMappingSettings.createLanguageMappingSettings(mapping.getLanguage(), mapping.getLanguageId())
+                        )
                         .collect(Collectors.toList());
                 this.setLanguageMappings(languageMappings);
 
                 List<ServerMappingSettings> fileTypeMappings = userDefinedLanguageServerSettings.getMappings()
                         .stream()
                         .filter(mapping -> !StringUtils.isEmpty(mapping.getFileType()))
+                        .map(mapping ->
+                            ServerMappingSettings.createFileTypeMappingSettings(mapping.getFileType(), mapping.getLanguageId())
+                        )
                         .collect(Collectors.toList());
                 this.setFileTypeMappings(fileTypeMappings);
 
                 List<ServerMappingSettings> fileNamePatternMappings = userDefinedLanguageServerSettings.getMappings()
                         .stream()
                         .filter(mapping -> mapping.getFileNamePatterns() != null)
+                        .map(mapping ->
+                                ServerMappingSettings.createFileNamePatternsMappingSettings(mapping.getFileNamePatterns(), mapping.getLanguageId())
+                        )
                         .collect(Collectors.toList());
                 this.setFileNamePatternMappings(fileNamePatternMappings);
             }
diff --git a/src/main/java/com/redhat/devtools/lsp4ij/settings/UserDefinedLanguageServerSettings.java b/src/main/java/com/redhat/devtools/lsp4ij/settings/UserDefinedLanguageServerSettings.java
@@ -111,9 +111,9 @@ public UserDefinedLanguageServerSettingsListener.LanguageServerSettingsChangedEv
             if (debugPortChanged) {
                 existing.setDebugPort(newSettings.getDebugPort());
             }
-            boolean debugSuspendChanged = newSettings.isDebugSuspend() != newSettings.isDebugSuspend();
+            boolean debugSuspendChanged = newSettings.isDebugSuspend() != existing.isDebugSuspend();
             if (debugSuspendChanged) {
-                existing.setDebugSuspend(existing.isDebugSuspend());
+                existing.setDebugSuspend(newSettings.isDebugSuspend());
             }
             boolean errorReportingKindChanged = newSettings.getErrorReportingKind() != null && !(isEquals(existing.getErrorReportingKind(), newSettings.getErrorReportingKind()));
             if (errorReportingKindChanged) {

Original file line number	Diff line number	Diff line change
`@@ -111,9 +111,9 @@ public UserDefinedLanguageServerSettingsListener.LanguageServerSettingsChangedEv`
`111`	`111`	`if (debugPortChanged) {`
`112`	`112`	`existing.setDebugPort(newSettings.getDebugPort());`
`113`	`113`	`}`
`114`		`- boolean debugSuspendChanged = newSettings.isDebugSuspend() != newSettings.isDebugSuspend();`
	`114`	`+ boolean debugSuspendChanged = newSettings.isDebugSuspend() != existing.isDebugSuspend();`
`115`	`115`	`if (debugSuspendChanged) {`
`116`		`- existing.setDebugSuspend(existing.isDebugSuspend());`
	`116`	`+ existing.setDebugSuspend(newSettings.isDebugSuspend());`
`117`	`117`	`}`
`118`	`118`	`boolean errorReportingKindChanged = newSettings.getErrorReportingKind() != null && !(isEquals(existing.getErrorReportingKind(), newSettings.getErrorReportingKind()));`
`119`	`119`	`if (errorReportingKindChanged) {`