0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5431 from hexagonrecursion/wmllint-fix-comment-parsing

Browse source 
Fix comment parsing in wmllint
This commit is contained in:
Charles Dang 2021-01-15 09:24:10 +11:00 • committed by GitHub
commit f0d51ac57f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
data/tools/wmllint
View file

@ -1696,40 +1696,41 @@ def global_sanity_check(filename, lines):
if line.startswith("#endif"):
ifdef_stack.pop()
continue
if "[generator]" in line:
precomment = line.split("#")[0]
if "[generator]" in precomment:
in_generator = True
continue
elif "[/generator]" in line:
elif "[/generator]" in precomment:
in_generator = False
continue
# do not use has_opening_tag() here, otherwise a [+side] tag
# will make the sidecount variable incorrect
elif "[side]" in line:
elif "[side]" in precomment:
in_side = True
sidecount += 1
continue
elif "[/side]" in line:
elif "[/side]" in precomment:
if recruit or recruitment_pattern:
sides.append((filename, recruit, recruitment_pattern))
in_side = False
recruit = {}
recruitment_pattern = {}
continue
elif in_side and has_opening_tag(line, "ai"):
elif in_side and has_opening_tag(precomment, "ai"):
in_ai = True
continue
elif in_side and has_opening_tag(line, "unit"):
elif in_side and has_opening_tag(precomment, "unit"):
in_subunit = True
continue
elif in_side and "[/ai]" in line:
elif in_side and "[/ai]" in precomment:
in_ai = False
continue
elif in_side and "[/unit]" in line:
elif in_side and "[/unit]" in precomment:
in_subunit = False
continue
if "wmllint: skip-side" in line:
sidecount += 1
if not in_side or in_subunit or '=' not in line:
if not in_side or in_subunit or '=' not in precomment:
continue
try:
(key, prefix, value, comment) = parse_attribute(line)