midgard/mapcomplete
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't emit an error if multiple overrides add to a list

Browse source
This commit is contained in:
pietervdvn 2022-07-19 09:46:06 +02:00
parent 47b50e2b94
commit 1f5c594f34
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Models/ThemeConfig/Conversion/Validation.ts
View file

@ -246,6 +246,10 @@ class OverrideShadowingCheck extends DesugaringStep<LayoutConfigJson> {
for (const layer of withOverride) { for (const layer of withOverride) {
for (const key in overrideAll) { for (const key in overrideAll) {
if(key.endsWith("+") || key.startsWith("+")){
// This key will _add_ to the list, not overwrite it - so no warning is needed
continue
}
if (layer["override"][key] !== undefined || layer["override"]["=" + key] !== undefined) { if (layer["override"][key] !== undefined || layer["override"]["=" + key] !== undefined) {
const w = "The override of layer " + JSON.stringify(layer["builtin"]) + " has a shadowed property: " + key + " is overriden by overrideAll of the theme"; const w = "The override of layer " + JSON.stringify(layer["builtin"]) + " has a shadowed property: " + key + " is overriden by overrideAll of the theme";
errors.push(w) errors.push(w)