Change helpers.getReferenceLinkImageData().shortcuts from Set to Map …

…using the same schema as .references (fixes #685).
DavidAnson · Dec 23, 2022 · 86a4a7d · 86a4a7d
1 parent f000a33
commit 86a4a7d
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 18 deletions.
diff --git a/demo/markdownlint-browser.js b/demo/markdownlint-browser.js
@@ -792,7 +792,7 @@ module.exports.emphasisMarkersInContent = emphasisMarkersInContent;
 function getReferenceLinkImageData(lineMetadata) {
     // Initialize return values
     const references = new Map();
-    const shortcuts = new Set();
+    const shortcuts = new Map();
     const definitions = new Map();
     const duplicateDefinitions = [];
     const definitionLineIndices = [];
@@ -882,20 +882,23 @@ function getReferenceLinkImageData(lineMetadata) {
                     }
                     const referenceIndex = referenceindex +
                         (topLevel ? -lineOffsets[lineIndex] : contentIndex);
+                    const referenceDatum = [
+                        lineIndex,
+                        referenceIndex,
+                        matchString.length,
+                        matchText.length,
+                        (matchLabel || "").length
+                    ];
                     if (shortcutLink) {
                         // Track separately due to ambiguity in "text [text] text"
-                        shortcuts.add(label);
+                        const shortcutData = shortcuts.get(label) || [];
+                        shortcutData.push(referenceDatum);
+                        shortcuts.set(label, shortcutData);
                     }
                     else {
                         // Track reference and location
                         const referenceData = references.get(label) || [];
-                        referenceData.push([
-                            lineIndex,
-                            referenceIndex,
-                            matchString.length,
-                            matchText.length,
-                            matchLabel.length
-                        ]);
+                        referenceData.push(referenceDatum);
                         references.set(label, referenceData);
                     }
                     // Check for links embedded in brackets

diff --git a/helpers/helpers.js b/helpers/helpers.js
@@ -824,7 +824,7 @@ module.exports.emphasisMarkersInContent = emphasisMarkersInContent;
 function getReferenceLinkImageData(lineMetadata) {
   // Initialize return values
   const references = new Map();
-  const shortcuts = new Set();
+  const shortcuts = new Map();
   const definitions = new Map();
   const duplicateDefinitions = [];
   const definitionLineIndices = [];
@@ -920,19 +920,22 @@ function getReferenceLinkImageData(lineMetadata) {
           }
           const referenceIndex = referenceindex +
             (topLevel ? -lineOffsets[lineIndex] : contentIndex);
+          const referenceDatum = [
+            lineIndex,
+            referenceIndex,
+            matchString.length,
+            matchText.length,
+            (matchLabel || "").length
+          ];
           if (shortcutLink) {
             // Track separately due to ambiguity in "text [text] text"
-            shortcuts.add(label);
+            const shortcutData = shortcuts.get(label) || [];
+            shortcutData.push(referenceDatum);
+            shortcuts.set(label, shortcutData);
           } else {
             // Track reference and location
             const referenceData = references.get(label) || [];
-            referenceData.push([
-              lineIndex,
-              referenceIndex,
-              matchString.length,
-              matchText.length,
-              matchLabel.length
-            ]);
+            referenceData.push(referenceDatum);
             references.set(label, referenceData);
           }
           // Check for links embedded in brackets