Add strings that cause wcwidth to return -1 to assertion message

sebastinas · sebastinas · commit 6e402e2cb996 · 2021-05-12T21:46:56.000+02:00
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -1579,13 +1579,13 @@ def move_screen_up(current_line_start_row):
             assert cursor_row >= 0 and cursor_column >= 0, (
                 cursor_row,
                 cursor_column,
+                self.current_stdouterr_line,
+                self.stdin.current_line,
             )
         elif self.coderunner.running:  # TODO does this ever happen?
             cursor_row, cursor_column = divmod(
-                (
-                    len(self.current_cursor_line_without_suggestion)
-                    + self.cursor_offset
-                ),
+                len(self.current_cursor_line_without_suggestion)
+                + self.cursor_offset,
                 width,
             )
             assert cursor_row >= 0 and cursor_column >= 0, (
@@ -1597,19 +1597,17 @@ def move_screen_up(current_line_start_row):
             )
         else:  # Common case for determining cursor position
             cursor_row, cursor_column = divmod(
-                (
-                    wcswidth(self.current_cursor_line_without_suggestion.s)
-                    - wcswidth(self.current_line)
-                    + wcswidth(self.current_line, max(0, self.cursor_offset))
-                )
+                wcswidth(self.current_cursor_line_without_suggestion.s)
+                - wcswidth(self.current_line)
+                + wcswidth(self.current_line, max(0, self.cursor_offset))
                 + self.number_of_padding_chars_on_current_cursor_line(),
                 width,
             )
             assert cursor_row >= 0 and cursor_column >= 0, (
                 cursor_row,
                 cursor_column,
-                len(self.current_cursor_line),
-                len(self.current_line),
+                self.current_cursor_line_without_suggestion.s,
+                self.current_line,
                 self.cursor_offset,
             )
         cursor_row += current_line_start_row
