prettier completion box (but still needs work)

thomasballinger · thomasballinger · commit fea5cbd661bd · 2013-08-23T01:28:36.000-04:00
--HG--
branch : scroll-frontend
extra : rebase_source : bc666f09492ab499a8edaa357b0976f36ffd4d94
diff --git a/bpython/scrollfrontend/replpainter.py b/bpython/scrollfrontend/replpainter.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*- 
 
 from fmtstr.fmtfuncs import *
 from fmtstr.fsarray import fsarray
@@ -32,13 +33,14 @@ def paint_current_line(rows, columns, current_display_line):
     lines = display_linize(current_display_line, columns)
     return fsarray([(line+' '*columns)[:columns] for line in lines])
 
-def matches_lines(rows, columns, matches, current):
+def matches_lines(rows, columns, matches, current, config):
     highlight_color = lambda x: red(on_blue(x))
     if not matches:
         return []
+    color = func_for_letter(config.color_scheme['main'])
     max_match_width = max(len(m) for m in matches)
     words_wide = max(1, (columns - 1) / (max_match_width + 1))
-    matches_lines = [fmtstr(' ').join(m.ljust(max_match_width)
+    matches_lines = [fmtstr(' ').join(color(m.ljust(max_match_width))
                                         if m != current
                                         else highlight_color(m) + ' '*(max_match_width - len(m))
                                       for m in matches[i:i+words_wide])
@@ -54,19 +56,21 @@ def paint_infobox(rows, columns, matches, argspec, match, docstring, config):
     """Returns painted completions, argspec, match, docstring etc."""
     if not (rows and columns):
         return fsarray(0, 0)
+    color = func_for_letter(config.color_scheme['main'])
     lines = ((display_linize(blue(formatted_argspec(argspec)), columns-2) if argspec else []) +
-             (display_linize(str(argspec), columns-2) if argspec else []) +
-             sum((display_linize(line, columns-2) for line in docstring.split('\n')) if docstring else [], []) +
-             (matches_lines(rows, columns, matches, match) if matches else [])
+             ([fmtstr('')] if docstring else []) +
+             sum(([color(x) for x in display_linize(line, columns-2)]
+                 for line in docstring.split('\n')) if docstring else [], []) +
+             (matches_lines(rows, columns, matches, match, config) if matches else [])
              )
 
     # add borders
     width = min(columns - 2, max([len(line) for line in lines]))
     output_lines = []
-    output_lines.append('+'+'-'*width+'+')
+    output_lines.append('┌'+'─'*width+'┐')
     for line in lines:
         output_lines.append('|'+((line+' '*(width - len(line)))[:width])+'|')
-    output_lines.append('+'+'-'*width+'+')
+    output_lines.append('└'+'─'*width+'┘')
     r = fsarray(output_lines[:rows])
     assert len(r.shape) == 2
     #return r
