expanded history searches with string or regex for #545

history -v with a string or regex search now searches both the entered command as well as the expanded command

Author: kotfu

cmd2/history.py

@@ -154,13 +154,14 @@ def isin(hi):
                     :param hi: HistoryItem
                     :return: bool - True if search matches
                     """
-                    return finder.search(hi)
+                    return finder.search(hi) or finder.search(hi.expanded)
             else:
                 def isin(hi):
                     """Listcomp filter function for doing a case-insensitive string search of History.
 
                     :param hi: HistoryItem
                     :return: bool - True if search matches
                     """
-                    return utils.norm_fold(getme) in utils.norm_fold(hi)
+                    srch = utils.norm_fold(getme)
+                    return srch in utils.norm_fold(hi) or srch in utils.norm_fold(hi.expanded)
             return [itm for itm in self if isin(itm)]

tests/test_history.py

@@ -123,6 +123,31 @@ def test_history_with_string_argument(base_app):
 """)
     assert out == expected
 
+def test_history_expanded_with_string_argument(base_app):
+    run_cmd(base_app, 'alias create sc shortcuts')
+    run_cmd(base_app, 'help')
+    run_cmd(base_app, 'help history')
+    run_cmd(base_app, 'sc')
+    out = run_cmd(base_app, 'history -v shortcuts')
+    expected = normalize("""
+    1  alias create sc shortcuts
+    4  sc
+    4x shortcuts
+""")
+    assert out == expected
+
+def test_history_expanded_with_regex_argument(base_app):
+    run_cmd(base_app, 'alias create sc shortcuts')
+    run_cmd(base_app, 'help')
+    run_cmd(base_app, 'help history')
+    run_cmd(base_app, 'sc')
+    out = run_cmd(base_app, 'history -v /sh.*cuts/')
+    expected = normalize("""
+    1  alias create sc shortcuts
+    4  sc
+    4x shortcuts
+""")
+    assert out == expected
 
 def test_history_with_integer_argument(base_app):
     run_cmd(base_app, 'help')