Skip to content

Make solveByType use the catchall ("*") last. #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
InsanityGod wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make solveByType use the catchall ("*") last. #44

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion Loading/RegistryObjectType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,16 +320,22 @@ protected static void solveByType(JToken json, string codePath, API.Datastructur
{
throw new FormatException("Invalid value at key: " + entry.Key);
}
var catchAll = jobj["*"];
foreach (var byTypeProperty in jobj)
{
if (WildcardUtil.Match(byTypeProperty.Key, codePath))
if(byTypeProperty.Key != "*" && WildcardUtil.Match(byTypeProperty.Key, codePath))
{
JToken typedToken = byTypeProperty.Value; // Unnecessary to solveByType specifically on this new token's contents as we will be doing a solveByType on all the tokens in the jsonObj anyhow, after adding the propertiesToAdd
if (propertiesToAdd == null) propertiesToAdd = new Dictionary<string, JToken>();
propertiesToAdd.Add(trueKey, typedToken);
break; // Replaces for first matched key only
}
}
if(catchAll is not null && (propertiesToAdd is null || !propertiesToAdd.ContainsKey(trueKey)))
{
propertiesToAdd ??= new Dictionary<string, JToken>();
propertiesToAdd.Add(trueKey, catchAll);
}
if (propertiesToRemove == null) propertiesToRemove = new List<string>();
propertiesToRemove.Add(entry.Key);
}
Expand Down