Fix duplicate macros in the completion.

moetelo · Jul 24, 2024 · 242d0b7 · 242d0b7
1 parent 926d2cb
commit 242d0b7
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/packages/language-server/src/completions/variableProperties.ts b/packages/language-server/src/completions/variableProperties.ts
@@ -111,20 +111,22 @@ export async function variableProperties(
 
     const importedDocument = await documentCache.resolveImport(document, variableName, pos);
     if (importedDocument) {
-        const localMacros = importedDocument.locals.macro.map(macroToCompletionItem);
+        const localMacros = importedDocument.locals.macro;
 
         if (importedDocument !== document) {
-            return localMacros;
+            return localMacros.map(macroToCompletionItem);
         }
 
         const scopedMacros = importedDocument
             .getScopeAt(pointToPosition(cursorNode.startPosition))
-            ?.macro.map(macroToCompletionItem) || [];
+            ?.macro || [];
 
-        return [
+        const allMacros = new Set([
             ...localMacros,
             ...scopedMacros,
-        ];
+        ]);
+
+        return [...allMacros].map(macroToCompletionItem);
     }
 
     return [];