file associations should be unique by pattern, not system id

Fixes #1053 Signed-off-by: David Thompson <[email protected]>
redhat-developer · Mar 3, 2025 · 5a4cbb1 · 5a4cbb1
1 parent 18766de
commit 5a4cbb1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/api/xmlExtensionApiImplementation.ts b/src/api/xmlExtensionApiImplementation.ts
@@ -43,7 +43,7 @@ export function getXmlExtensionApiImplementation(languageClient: LanguageClient,
     addXMLFileAssociations: (fileAssociations: XMLFileAssociation[]) => {
       const externalfileAssociations = externalXmlSettings.xmlFileAssociations;
       fileAssociations.forEach(element => {
-        if (!externalfileAssociations.some(fileAssociation => fileAssociation.systemId === element.systemId)) {
+        if (!externalfileAssociations.some(fileAssociation => fileAssociation.pattern === element.pattern)) {
           externalfileAssociations.push(element);
         }
       });
@@ -54,7 +54,7 @@ export function getXmlExtensionApiImplementation(languageClient: LanguageClient,
     removeXMLFileAssociations: (fileAssociations: XMLFileAssociation[]) => {
       const externalfileAssociations = externalXmlSettings.xmlFileAssociations;
       fileAssociations.forEach(element => {
-        const itemIndex = externalfileAssociations.findIndex(fileAssociation => fileAssociation.systemId === element.systemId) //returns -1 if item not found
+        const itemIndex = externalfileAssociations.findIndex(fileAssociation => fileAssociation.pattern === element.pattern) //returns -1 if item not found
         if (itemIndex > -1) {
           externalfileAssociations.splice(itemIndex, 1);
         }

diff --git a/src/settings/settings.ts b/src/settings/settings.ts
@@ -243,7 +243,7 @@ export function getXMLSettings(javaHome: string | undefined, logfile: string, ex
     }
   })
   externalXmlSettings.xmlFileAssociations.forEach(element => {
-    if (!xml['xml']['fileAssociations'].some(fileAssociation => fileAssociation.systemId === element.systemId)) {
+    if (!xml['xml']['fileAssociations'].some(fileAssociation => fileAssociation.pattern === element.pattern)) {
       xml['xml']['fileAssociations'].push(element);
     }
   });