From 64b3a88f2376820ae0af2efeace6d63115fb4891 Mon Sep 17 00:00:00 2001 From: Todd Leonhardt Date: Sat, 20 May 2017 00:06:22 -0700 Subject: Abbreviations are no longer accepted for multiline commands Due to the way the parsing logic works for multiline commands, abbreviations didn't function properly with mutliline commands. So to avoid confusion, this commit deals with this issue by simply disallowing abbreviations for multiline commands altogether. A warning has been added to the section on abbreviations in the documentation to hopefully make this clear for users. --- cmd2.py | 4 ++-- docs/freefeatures.rst | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/cmd2.py b/cmd2.py index 1de93ec2..14203367 100755 --- a/cmd2.py +++ b/cmd2.py @@ -600,7 +600,7 @@ class Cmd(cmd.Cmd): excludeFromHistory = '''run r list l history hi ed edit li eof'''.split() # make sure your terminators are not in legalChars! legalChars = u'!#$%.:?@_-' + pyparsing.alphanums + pyparsing.alphas8bit - multilineCommands = [] + multilineCommands = [] # NOTE: Multiline commands can never be abbreviated, even if abbrev is True noSpecialParse = 'set ed edit exit'.split() prefixParser = pyparsing.Empty() redirector = '>' # for sending output to file @@ -1089,7 +1089,7 @@ class Cmd(cmd.Cmd): result = target else: if self.abbrev: # accept shortened versions of commands - funcs = [fname for fname in self.keywords if fname.startswith(arg)] + funcs = [func for func in self.keywords if func.startswith(arg) and func not in self.multilineCommands] if len(funcs) == 1: result = 'do_' + funcs[0] return result diff --git a/docs/freefeatures.rst b/docs/freefeatures.rst index 44ade408..3c740c00 100644 --- a/docs/freefeatures.rst +++ b/docs/freefeatures.rst @@ -243,6 +243,11 @@ no other commands defined beginning with *divid*, This behavior can be turned off with ``app.abbrev`` (see :ref:`parameters`) +.. warning:: + + Due to the way the parsing logic works for multiline commands, abbreviations + will not be accepted for multiline commands. + Misc. pre-defined commands ========================== -- cgit v1.2.1