From 48d001add7fdcfdf0747bd0cbfa2a71d0662a3b0 Mon Sep 17 00:00:00 2001 From: Andrey Bienkowski Date: Thu, 14 Jan 2021 22:40:51 +0300 Subject: [PATCH] Fix wrong comment handling in wmllint A comment containing a string [advancefrom] was causing wmllint to get confused ../../data/campaigns/Dead_Water/scenarios/06_Uncharted_Islands.cfg, line 22: [advancefrom] needs to be manually updated to [modify_unit_type] and moved into the _main.cfg file --- data/tools/wmllint | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/data/tools/wmllint b/data/tools/wmllint index 50e2c493851e..6f19e88dfe18 100755 --- a/data/tools/wmllint +++ b/data/tools/wmllint @@ -1804,13 +1804,14 @@ def global_sanity_check(filename, lines): # Because we can't be sure about what the UMC author wants to do, just warn in_campaign = False for num, line in enumerate(lines, start=1): - if "[campaign]" in line: + precomment = line.split("#")[0] + if "[campaign]" in precomment: in_campaign = True continue - if "[/campaign]" in line: + if "[/campaign]" in precomment: in_campaign = False continue - if has_opening_tag(line, "advancefrom"): + if has_opening_tag(precomment, "advancefrom"): print("{}, line {}: [advancefrom] needs to be manually updated to \ [modify_unit_type] and moved into the _main.cfg file".format(filename, num)) if in_campaign: