Merge pull request #598 from python-cmd2/rename_display_width

Renamed display_width to ansi_safe_wcswidth

Author: kmvanbrunt

cmd2/cmd2.py

@@ -1301,7 +1301,7 @@ def _display_matches_gnu_readline(self, substitution: str, matches: List[str],
                 longest_match_length = 0
 
                 for cur_match in matches_to_display:
-                    cur_length = utils.display_width(cur_match)
+                    cur_length = utils.ansi_safe_wcswidth(cur_match)
                     if cur_length > longest_match_length:
                         longest_match_length = cur_length
             else:
@@ -2661,7 +2661,7 @@ def _print_topics(self, header: str, cmds: List[str], verbose: bool) -> None:
                 widest = 0
                 # measure the commands
                 for command in cmds:
-                    width = utils.display_width(command)
+                    width = utils.ansi_safe_wcswidth(command)
                     if width > widest:
                         widest = width
                 # add a 4-space pad
@@ -3478,13 +3478,13 @@ def async_alert(self, alert_msg: str, new_prompt: Optional[str] = None) -> None:
 
             if update_terminal:
                 # Get the display width of the prompt
-                prompt_width = utils.display_width(current_prompt)
+                prompt_width = utils.ansi_safe_wcswidth(current_prompt)
 
                 # Get the size of the terminal
                 terminal_size = shutil.get_terminal_size()
 
                 # Figure out how many lines the prompt and user input take up
-                total_str_size = prompt_width + utils.display_width(readline.get_line_buffer())
+                total_str_size = prompt_width + utils.ansi_safe_wcswidth(readline.get_line_buffer())
                 num_input_lines = int(total_str_size / terminal_size.columns) + 1
 
                 # Get the cursor's offset from the beginning of the first input line

cmd2/utils.py

@@ -22,9 +22,10 @@ def strip_ansi(text: str) -> str:
     return constants.ANSI_ESCAPE_RE.sub('', text)
 
 
-def display_width(text: str) -> int:
+def ansi_safe_wcswidth(text: str) -> int:
     """
-    Return the printable length of a string. This can be different than character count in unicode strings.
+    Wraps wcswidth to make it compatible with colored strings
+
     :param text: the string being measured
     """
     # Strip ANSI escape codes since they cause wcswidth to return -1

tests/test_utils.py

@@ -21,10 +21,10 @@ def test_strip_ansi():
     assert base_str != ansi_str
     assert base_str == cu.strip_ansi(ansi_str)
 
-def test_display_width():
+def test_ansi_safe_wcswidth():
     base_str = HELLO_WORLD
     ansi_str = Fore.GREEN + base_str + Fore.RESET
-    assert cu.display_width(ansi_str) != len(ansi_str)
+    assert cu.ansi_safe_wcswidth(ansi_str) != len(ansi_str)
 
 def test_strip_quotes_no_quotes():
     base_str = HELLO_WORLD