upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-27 17:02:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

wmllint: don't try to collect WML tags inside Lua code

Browse Source 
Fixes #5509
This commit is contained in:
Elvish_Hunter 2021-02-16 16:18:53 +01:00
parent a0ee38a49a
commit 2a83e78a3c
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
data/tools/wmllint
View File

@ -2800,6 +2800,7 @@ def translator(filename, mapxforms, textxform):
cont = False cont = False
validate = True validate = True
unbalanced = False unbalanced = False
in_lua_code = False
newdata = [] newdata = []
refname = None refname = None
while mfile: while mfile:
@ -2930,7 +2931,7 @@ def translator(filename, mapxforms, textxform):
# Now do warnings based on the state of the tag stack. # Now do warnings based on the state of the tag stack.
# the regex check for "path=" is needed due to [modify_ai] # the regex check for "path=" is needed due to [modify_ai]
# which uses square braces in its syntax # which uses square braces in its syntax
if not unbalanced and not re.match(r"\s*path\=", destringed): if not unbalanced and not in_lua_code and not re.match(r"\s*path\=", destringed):
for instance in re.finditer(r"\[\/?\+?([a-z][a-z_]*[a-z])\]", destringed): for instance in re.finditer(r"\[\/?\+?([a-z][a-z_]*[a-z])\]", destringed):
tag = instance.group(1) tag = instance.group(1)
closer = instance.group(0)[1] == '/' closer = instance.group(0)[1] == '/'
@ -2959,6 +2960,14 @@ def translator(filename, mapxforms, textxform):
unbalanced = True unbalanced = True
if "wmllint: unbalanced-off" in comment: if "wmllint: unbalanced-off" in comment:
unbalanced = False unbalanced = False
# single line of Lua code, skip
if re.match(r"\s*?code\s?=\s?<<.*>>", destringed):
continue
# multiline Lua block
if re.match(r"\s*?code\s?=\s?<<.*", destringed):
in_lua_code = True
if in_lua_code and re.match(r".*?>>\s*$", destringed):
in_lua_code = False
if "wmllint: match" in comment: if "wmllint: match" in comment:
comment = comment.strip() comment = comment.strip()
try: try: