Merge pull request #1315 from vadi2/fix-show-inherited-invariants

fix show-inherited-invariants:false hiding a profile's own invariants

Author: grahamegrieve

org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/renderers/StructureDefinitionRenderer.java

@@ -1125,7 +1125,7 @@ public void addVariation(ElementDefinitionConstraintComponent c, String id) {
       // 'primary' indicates if this is the initial definition of the constraint or if it's a subsequently profiled
       // version of the constraint.  The logic here could probably use some work, but all it does is make sure the
       // 'official' one comes first, so it's not critical that there are issues.
-      if (!c.hasSource() || c.getSource().equals(sd.getUrl()) || (c.getSource().startsWith("http://hl7.org/fhir/StructureDefinition/") && !c.getSource().substring(41).contains("/"))) {
+      if (isOwnInvariant(c) || (c.getSource().startsWith("http://hl7.org/fhir/StructureDefinition/") && !c.getSource().substring(41).contains("/"))) {
         if (primary == null) {
           primary = variations.get(constraintHash(c));
           if (primary==null)
@@ -1190,6 +1190,28 @@ else if (constraint.hasSource() && constraint.getSource().equals("http://hl7.org
     }
   }
 
+  /**
+   * True when a constraint belongs to this profile itself (i.e. it is not inherited from a base
+   * definition), so it must still be shown when inherited invariants are suppressed
+   * (show-inherited-invariants:false). A constraint with no source, or whose source matches this
+   * profile's canonical url - ignoring any |version suffix that pin-canonicals may append - is "own".
+   */
+  private boolean isOwnInvariant(ElementDefinitionConstraintComponent c) {
+    return !c.hasSource() || sameCanonical(c.getSource(), sd.getUrl());
+  }
+
+  private static boolean sameCanonical(String a, String b) {
+    return unversionedUrl(a).equals(unversionedUrl(b));
+  }
+
+  private static String unversionedUrl(String u) {
+    if (u == null) {
+      return "";
+    }
+    int i = u.indexOf('|');
+    return i >= 0 ? u.substring(0, i) : u;
+  }
+
   public List<ElementDefinition> elementsForMode(int genMode) {
     switch (genMode) {
     case GEN_MODE_DIFF:
@@ -1241,7 +1263,7 @@ public String invOldMode(boolean withHeadings, int genMode) throws IOException {
         ConstraintInfo ci = constraintMap.get(key);
         for (ConstraintVariation cv : ci.getVariations()) {
           ElementDefinitionConstraintComponent inv = cv.getConstraint();
-          if (!inv.hasSource() || inv.getSource().equals(sd.getUrl()) || allInvariants || genMode!=GEN_MODE_DIFF ) {
+          if (isOwnInvariant(inv) || allInvariants) {
             tr = tbl.tr();
             tr.td().tx(inv.getKey());
             tr.td().tx(grade(inv));