#3008 Don't append location/position information to the error message…

… if none is present
FirelyTeam · Jan 14, 2025 · fa4bd61 · fa4bd61
1 parent c32024b
commit fa4bd61
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/src/Hl7.Fhir.Base/Utility/ExtendedCodedException.cs b/src/Hl7.Fhir.Base/Utility/ExtendedCodedException.cs
@@ -43,10 +43,20 @@ public ExtendedCodedException(
 
         private static string formatLocationMessage(string baseMessage, string? instancePath, long? lineNumber, long? position)
         {
-            string location = $"At line {lineNumber}, position {position}";
+            // If there is no location data, just return the base message
+            if (string.IsNullOrEmpty(instancePath) && !lineNumber.HasValue && !position.HasValue)
+                return baseMessage;
+
+            string? location = null;
             if (!string.IsNullOrEmpty(instancePath))
-                location = $"At {instancePath}, line {lineNumber}, position {position}";
-            var messageWithLocation = $"{baseMessage} {location}";
+                location += instancePath;
+            if (lineNumber.HasValue && position.HasValue)
+            {
+                if (!string.IsNullOrEmpty(location))
+                    location += ", ";
+                location += $"line {lineNumber}, position {position}";
+            }
+            var messageWithLocation = $"{baseMessage} At {location}";
             return messageWithLocation;
         }