inventory tag: don't warn on general text input (due to notes existing)

mcmonkey4eva · mcmonkey4eva · commit 706501ad72da · 2023-12-27T17:56:23.000-08:00
diff --git a/SharpDenizenTools/ScriptAnalysis/ScriptChecker.cs b/SharpDenizenTools/ScriptAnalysis/ScriptChecker.cs
@@ -521,6 +521,9 @@ void warnPart(SingleTag.Part part, string key, string message)
             }
         }
 
+        /// <summary>Matcher for characters allowed in a simple note name.</summary>
+        public static AsciiMatcher AllowedSimpleNoteName = new(AsciiMatcher.BothCaseLetters + AsciiMatcher.Digits + "_-");
+
         /// <summary>Helper to check a single tag parameter.</summary>
         public void CheckTagParam(SingleTag.Part part, SingleTag.Part metaPart, string input, Action<SingleTag.Part, string, string> warnPart)
         {
@@ -545,7 +548,7 @@ public void CheckTagParam(SingleTag.Part part, SingleTag.Part metaPart, string i
                     }
                     break;
                 case "<inventory>":
-                    if (!ExtraData.InventoryMatchers.Contains(input) && ContextValidatedGetScriptFor(input, "inventory") is null)
+                    if (!ExtraData.InventoryMatchers.Contains(input) && ContextValidatedGetScriptFor(input, "inventory") is null && !AllowedSimpleNoteName.IsOnlyMatches(input))
                     {
                         warnPart(metaPart, "invalid_tag_inventory", $"Tag part `{part.Text}` has parameter `{part.Parameter}` which has to be a valid Inventory, but is not.");
                     }

Original file line number	Diff line number	Diff line change
`@@ -521,6 +521,9 @@ void warnPart(SingleTag.Part part, string key, string message)`
`521`	`521`	`}`
`522`	`522`	`}`
`523`	`523`
	`524`	`+ /// <summary>Matcher for characters allowed in a simple note name.</summary>`
	`525`	`+ public static AsciiMatcher AllowedSimpleNoteName = new(AsciiMatcher.BothCaseLetters + AsciiMatcher.Digits + "_-");`
	`526`	`+`
`524`	`527`	`/// <summary>Helper to check a single tag parameter.</summary>`
`525`	`528`	`public void CheckTagParam(SingleTag.Part part, SingleTag.Part metaPart, string input, Action<SingleTag.Part, string, string> warnPart)`
`526`	`529`	`{`
`@@ -545,7 +548,7 @@ public void CheckTagParam(SingleTag.Part part, SingleTag.Part metaPart, string i`
`545`	`548`	`}`
`546`	`549`	`break;`
`547`	`550`	`case "<inventory>":`
`548`		`- if (!ExtraData.InventoryMatchers.Contains(input) && ContextValidatedGetScriptFor(input, "inventory") is null)`
	`551`	`+ if (!ExtraData.InventoryMatchers.Contains(input) && ContextValidatedGetScriptFor(input, "inventory") is null && !AllowedSimpleNoteName.IsOnlyMatches(input))`
`549`	`552`	`{`
`550`	`553`	warnPart(metaPart, "invalid_tag_inventory", $"Tag part `{part.Text}` has parameter `{part.Parameter}` which has to be a valid Inventory, but is not.");
`551`	`554`	`}`