From 6036fbf0500795109b1c5dcf53162cb55834d35a Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Tue, 6 Aug 2019 05:14:02 -0400
Subject: make 'then' blocks transparent by default (#654)

---
 src/SMAPI.Web/Controllers/JsonValidatorController.cs | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'src/SMAPI.Web/Controllers')

diff --git a/src/SMAPI.Web/Controllers/JsonValidatorController.cs b/src/SMAPI.Web/Controllers/JsonValidatorController.cs
index 4f234449..d82765e7 100644
--- a/src/SMAPI.Web/Controllers/JsonValidatorController.cs
+++ b/src/SMAPI.Web/Controllers/JsonValidatorController.cs
@@ -213,7 +213,7 @@ namespace StardewModdingAPI.Web.Controllers
         private IEnumerable<JsonValidatorErrorModel> GetErrorModels(ValidationError error)
         {
             // skip through transparent errors
-            if (this.GetOverrideError(error) == this.TransparentToken && error.ChildErrors.Any())
+            if (this.IsTransparentError(error))
             {
                 foreach (var model in error.ChildErrors.SelectMany(this.GetErrorModels))
                     yield return model;
@@ -240,7 +240,7 @@ namespace StardewModdingAPI.Web.Controllers
                 return message;
 
             // skip through transparent errors
-            while (this.GetOverrideError(error) == this.TransparentToken && error.ChildErrors.Count == 1)
+            if (this.IsTransparentError(error))
                 error = error.ChildErrors[0];
 
             // get friendly representation of main error
@@ -266,6 +266,19 @@ namespace StardewModdingAPI.Web.Controllers
             return message;
         }
 
+        /// <summary>Get whether a validation error should be omitted in favor of its child errors in user-facing error messages.</summary>
+        /// <param name="error">The error to check.</param>
+        private bool IsTransparentError(ValidationError error)
+        {
+            if (!error.ChildErrors.Any())
+                return false;
+
+            string @override = this.GetOverrideError(error);
+            return
+                @override == this.TransparentToken
+                || (error.ErrorType == ErrorType.Then && @override == null);
+        }
+
         /// <summary>Get an override error from the JSON schema, if any.</summary>
         /// <param name="error">The schema validation error.</param>
         private string GetOverrideError(ValidationError error)
-- 
cgit