From 456f2c8afb5715e79b2ab7dca690a9f07c5d3ca4 Mon Sep 17 00:00:00 2001
From: Andy McFadden <fadden@fadden.com>
Date: Wed, 18 Mar 2020 17:57:07 -0700
Subject: [PATCH] Trim annotations off of labels in HTML names

When generating the HTML anchor name element we need to remove the
trailing '?' from the label.  It wasn't present in the hrefs, so all
links to annotated labels were broken.
---
 SourceGen/Exporter.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/SourceGen/Exporter.cs b/SourceGen/Exporter.cs
index d8ce1ce..5433003 100644
--- a/SourceGen/Exporter.cs
+++ b/SourceGen/Exporter.cs
@@ -667,7 +667,10 @@ namespace SourceGen {
                     // need to ensure that the label is unique and all references point to the
                     // correct instance.  We can't get that from the Parts list.
                 } else {
-                    anchorLabel = "<a name=\"" + LABEL_LINK_PREFIX + parts.Label +
+                    string trimLabel = Symbol.TrimAndValidateLabel(parts.Label,
+                        mFormatter.NonUniqueLabelPrefix, out bool isValid, out bool unused1,
+                        out bool unused2, out bool unused3, out Symbol.LabelAnnotation unusedAnno);
+                    anchorLabel = "<a name=\"" + LABEL_LINK_PREFIX + trimLabel +
                         "\">" + parts.Label + "</a>";
                 }
             }