contrapunctus/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Merge branch 'develop' into waste-theme

Browse source
This commit is contained in:
Pieter Vander Vennet 2022-02-18 00:12:37 +01:00
commit 8a40dc4ffd
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -226,7 +226,7 @@ export class DetectShadowedMappings extends DesugaringStep<TagRenderingConfigJso
}
const parsedConditions = json.mappings.map(m => TagUtils.Tag(m.if))
for (let i = 0; i < json.mappings.length; i++) {
if (!parsedConditions[i].isUsableAsAnswer()) {
if(json.mappings[i].hideInAnswer === true){
continue
}
const keyValues = parsedConditions[i].asChange({});
@ -241,7 +241,7 @@ export class DetectShadowedMappings extends DesugaringStep<TagRenderingConfigJso
const doesMatch = parsedConditions[j].matchesProperties(properties)
if (doesMatch) {
// The current mapping is shadowed!
warnings.push(`At ${context}: Mapping ${i} is shadowed by mapping ${j} and will thus never be shown:
errors.push(`At ${context}: Mapping ${i} is shadowed by mapping ${j} and will thus never be shown:
The mapping ${parsedConditions[i].asHumanString(false, false, {})} is fully matched by a previous mapping, which matches:
${parsedConditions[j].asHumanString(false, false, {})}.

4
test/LegacyThemeLoader.spec.ts
View file

@ -423,7 +423,7 @@ export default class LegacyThemeLoaderSpec extends T {
}
]
}, "test");
T.isTrue(r.errors.length > 0, "Failing case is not detected")
T.isTrue(r.errors.length > 0, "Failing case 0 is not detected")
const r0 = new DetectShadowedMappings().convert( {
mappings: [
@ -437,7 +437,7 @@ export default class LegacyThemeLoaderSpec extends T {
}
]
}, "test");
T.isTrue(r0.errors.length > 0, "Failing case is not detected")
T.isTrue(r0.errors.length > 0, "Failing case 1 is not detected")
}
],
["Images are rewritten", () => {