Try resolving non-aliased targets to local SimpleName if exists

Trinovantes · Jun 30, 2024 · 56d7552 · 56d7552
1 parent 122d3b8
commit 56d7552
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 5 deletions.
diff --git a/src/Parser/Resolver/SimpleNameResolver.ts b/src/Parser/Resolver/SimpleNameResolver.ts
@@ -128,17 +128,19 @@ export class SimpleNameResolver {
                 return null
             }
 
-            const target = this._simpleNameToTarget.get(simpleName)
-            if (!target) {
+            const docTarget = this._simpleNameToTarget.get(simpleName)
+            if (!docTarget) {
                 return null
             }
 
-            if (!target.isAlias) {
-                return target.target
+            const candidateTargetName = normalizeSimpleName(docTarget.target)
+            const isTargetTangible = (!docTarget.isAlias && docTarget.target.startsWith('#')) || (!docTarget.isAlias && !this._simpleNameToTarget.has(candidateTargetName))
+            if (isTargetTangible) {
+                return docTarget.target
             }
 
             seenSimpleNames.add(simpleName)
-            simpleName = normalizeSimpleName(target.target)
+            simpleName = candidateTargetName
         }
     }
 

diff --git a/tests/unit/RstNode/ExplicitMarkup/Hyperlink.test.ts b/tests/unit/RstNode/ExplicitMarkup/Hyperlink.test.ts
@@ -887,4 +887,50 @@ describe('HyperlinkRef', () => {
             [HyperlinkTarget id:4 children:0 label:"Foo<Bar>" target:"${goodUrl}" resolvedUrl:"${goodUrl}"]: #
         `)
     })
+
+    describe('when HyperlinkRef seems to be alias but target resolves to an existing local SimpleName, it prioritizes the local SimpleName', () => {
+        const input = `
+            See \`if/else/elif\`_
+
+            if/else/elif
+            ^^^^^^^^^^^^
+        `
+
+        testParser(input, [
+            {
+                type: RstNodeType.Paragraph,
+                children: [
+                    {
+                        type: RstNodeType.Text,
+                        text: 'See ',
+                    },
+                    {
+                        type: RstNodeType.HyperlinkRef,
+                        text: 'if/else/elif',
+                    },
+                ],
+            },
+            {
+                type: RstNodeType.Section,
+                text: 'if/else/elif',
+                data: {
+                    level: 1,
+                },
+            },
+        ])
+
+        testGenerator(input, `
+            <p>
+                See <a href="#if-else-elif">if/else/elif</a>
+            </p>
+
+            <h1 id="if-else-elif">
+                if/else/elif
+            </h1>
+        `, `
+            See [if/else/elif](#if-else-elif)
+
+            # if/else/elif {#if-else-elif}
+        `)
+    })
 })