From f13711ad301155ed0b63313ecbd84d704233637c Mon Sep 17 00:00:00 2001
From: Lloyd McKenzie <lloyd@lmckenzie.com>
Date: Tue, 19 Nov 2024 21:58:15 -0700
Subject: [PATCH] Ensure details about the primary bindings appear after the
 primary binding, not after additional bindings

https://github.com/HL7/fhir-ig-publisher/issues/869
---
 .../StructureDefinitionRenderer.java          | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/renderers/StructureDefinitionRenderer.java b/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/renderers/StructureDefinitionRenderer.java
index 2d98ba92..4fcba613 100644
--- a/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/renderers/StructureDefinitionRenderer.java
+++ b/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/renderers/StructureDefinitionRenderer.java
@@ -810,6 +810,17 @@ else if (!tx.hasDescription())
     if (brd.suffix != null) {
       b.append(brd.suffix);
     }
+    if (tx.hasValueSet()) {
+      b.append("<div><code>"+Utilities.escapeXml(tx.getValueSet())+"</code><button title=\"Click to copy URL\" class=\"btn-copy\" data-clipboard-text=\""+Utilities.escapeXml(tx.getValueSet())+"\"></button></div>");
+      if (link != null) {
+        if (Utilities.isAbsoluteUrlLinkable(link)) {
+          b.append("<div>from <a href=\""+Utilities.escapeXml(link)+"\">"+Utilities.escapeXml(link)+"</a></div>");
+        } else {
+          b.append("<div>from "+Utilities.escapeXml(link)+"</div>");
+        }
+      }
+    } else {
+    }
     AdditionalBindingsRenderer abr = new AdditionalBindingsRenderer(igp, corePath, sd, path, gen, this, sdr);
     if (tx.hasExtension(ToolingExtensions.EXT_MAX_VALUESET)) {
       abr.seeMaxBinding(ToolingExtensions.getExtension(tx, ToolingExtensions.EXT_MAX_VALUESET));
@@ -826,17 +837,6 @@ else if (!tx.hasDescription())
       abr.render(x.getChildNodes(), true);
       b.append(new XhtmlComposer(true, true).compose(x));
     }
-    if (tx.hasValueSet()) { 
-      b.append("<div><code>"+Utilities.escapeXml(tx.getValueSet())+"</code><button title=\"Click to copy URL\" class=\"btn-copy\" data-clipboard-text=\""+Utilities.escapeXml(tx.getValueSet())+"\"></button></div>");
-      if (link != null) {
-        if (Utilities.isAbsoluteUrlLinkable(link)) {
-          b.append("<div>from <a href=\""+Utilities.escapeXml(link)+"\">"+Utilities.escapeXml(link)+"</a></div>");  
-        } else {
-          b.append("<div>from "+Utilities.escapeXml(link)+"</div>");  
-        }
-      }
-    } else {
-    }
     b.append("</td>");
     b.append("</tr>\r\n");
   }