Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-16 21:06:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2516 from Qaishin/multimatch_fix

Browse source 
Fix multimatch error. Resolves #2514
This commit is contained in:
Griatch 2021-09-07 23:23:04 +02:00 • committed by GitHub
commit ff2733fd93
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
evennia/commands/cmdparser.py
View file

@ -125,7 +125,7 @@ def try_num_differentiators(raw_string):
# the user might be trying to identify the command
# with a #num-command style syntax. We expect the regex to
# contain the groups "number" and "name".
mindex, new_raw_string = (num_ref_match.group("number"), num_ref_match.group("name"))
mindex, new_raw_string = (num_ref_match.group("number"), num_ref_match.group("name") + num_ref_match.group("args"))
return int(mindex), new_raw_string
else:
return None, None

2
evennia/settings_default.py
View file

@ -324,7 +324,7 @@ COMMAND_PARSER = "evennia.commands.cmdparser.cmdparser"
# parser expects this. It should also involve a number starting from 1.
# When changing this you must also update SEARCH_MULTIMATCH_TEMPLATE
# to properly describe the syntax.
SEARCH_MULTIMATCH_REGEX = r"(?P<name>.*)-(?P<number>[0-9]+)"
SEARCH_MULTIMATCH_REGEX = r"(?P<name>[^-]*)-(?P<number>[0-9]+)(?P<args>.*)"
# To display multimatch errors in various listings we must display
# the syntax in a way that matches what SEARCH_MULTIMATCH_REGEX understand.
# The template will be populated with data and expects the following markup: