XML Completion element apply generate invalid XML content

Fixes eclipse-lemminx/lemminx#1373 Signed-off-by: azerr <[email protected]>
angelozerr · Dec 2, 2022 · 501b694 · 501b694
1 parent eef51c1
commit 501b694
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -643,6 +643,14 @@
       "[xsl]": {
         "editor.autoClosingBrackets": "never",
         "files.trimFinalNewlines": true
+      },
+      "[dtd]": {
+        "editor.autoClosingBrackets": "never",
+        "files.trimFinalNewlines": true
+      },
+      "[svg]": {
+        "editor.autoClosingBrackets": "never",
+        "files.trimFinalNewlines": true
       }
     },
     "commands": [
@@ -691,4 +699,4 @@
       }
     ]
   }
-}
+}
diff --git a/src/client/xmlClient.ts b/src/client/xmlClient.ts
@@ -148,7 +148,7 @@ function getLanguageClientOptions(
     errorHandler: new ClientErrorHandler('XML', context),
     synchronize: {
       //preferences starting with these will trigger didChangeConfiguration
-      configurationSection: ['xml', '[xml]', 'files.trimFinalNewlines', 'files.trimTrailingWhitespace', 'files.insertFinalNewline']
+      configurationSection: ['xml', '[xml]', 'files.trimFinalNewlines', 'files.trimTrailingWhitespace', 'files.insertFinalNewline', 'editor.linkedEditing']
     },
     middleware: {
       workspace: {

diff --git a/src/settings/settings.ts b/src/settings/settings.ts
@@ -221,6 +221,7 @@ export function getXMLSettings(javaHome: string | undefined, logfile: string, ex
   xml['xml']['format']['trimFinalNewlines'] = workspace.getConfiguration('files').get('trimFinalNewlines', true);
   xml['xml']['format']['trimTrailingWhitespace'] = workspace.getConfiguration('files').get('trimTrailingWhitespace', false);
   xml['xml']['format']['insertFinalNewline'] = workspace.getConfiguration('files').get('insertFinalNewline', false);
+  xml['xml']['linkedEditingEnabled'] = workspace.getConfiguration('editor')['linkedEditing'] || false;
   xml['xml']['telemetry'] = {
     enabled: workspace.getConfiguration('redhat.telemetry').get('enabled', false)
   };
@@ -246,7 +247,7 @@ export function getXMLSettings(javaHome: string | undefined, logfile: string, ex
       xml['xml']['fileAssociations'].push(element);
     }
   });
-  
+
   // Apply variable substitutions for file associations
   xml['xml']['fileAssociations'] = [...getVariableSubstitutedAssociations(xml['xml']['fileAssociations'])];