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

wmllint: Ignore [load_resource] for unit id validation

Browse source 
Fixes #4538.

[ci skip]
This commit is contained in:
Iris Morelle 2019-11-04 22:11:18 -03:00
parent 7c16ced6d4
commit c75b7c1681
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelog.md
View file

@ -33,6 +33,7 @@
### Miscellaneous and bug fixes
* Fix --userdata-dir deprecation warning being printed when starting wesnoth without arguments
when -DPREFERENCES_DIR="..." was defined at compile time.
* Make wmllint recognize `[load_resource]` (issue #4538).
## Version 1.15.2
### AI:
@ -342,6 +343,7 @@
* New help topic outlining common (and less commons) reasons for losing a scenario. (PR#4217)
* Add help text for some debug commands (part of Issue#2500)
* More deprecation warnings logged by default (part of PR#4449)
* Make wmllint recognize `[load_resource]` (issue #4538).
## Version 1.14.9
### AI:

8
data/tools/wmllint
View file

@ -1731,6 +1731,7 @@ def global_sanity_check(filename, lines):
in_facet = False
in_sound_source = False
in_remove_sound_source = False
in_load_resource = False
in_message = False
in_option = False
#last index is true: we're currently directly in an [event]
@ -1839,6 +1840,10 @@ def global_sanity_check(filename, lines):
in_remove_sound_source = True
elif "[/remove_sound_source]" in lines[i]:
in_remove_sound_source = False
elif "[load_resource]" in lines[i]:
in_load_resource = True
elif "[/load_resource]" in lines[i]:
in_load_resource = False
elif "[message]" in lines[i]:
in_message = True
elif "[/message]" in lines[i]:
@ -2119,7 +2124,8 @@ def global_sanity_check(filename, lines):
elif preamble_seen and subtag_depth > 0 and not ignore_id \
and not in_object and not in_cfg and not in_aspect \
and not in_facet and not in_sound_source \
and not in_remove_sound_source and not in_stage \
and not in_remove_sound_source and not in_load_resource \
and not in_stage \
and not in_goal and not in_set_menu_item \
and not in_clear_menu_item and not directly_in_event[-1] \
and not in_time_area and not in_trait and not in_checkbox \