tools: Fix screen corruption from TextWidgets containing line breaks.

2018-07-24 21:44:13 +10:00 · 2018-07-24 21:44:13 +10:00 · b41c86afac
commit b41c86afac
parent 9b47e07cf6
19 changed files with 28 additions and 41 deletions
--- a/tests/golden-files/results/html2text-hi_html
+++ b/tests/golden-files/results/html2text-hi_html
@ -1 +1 @@
-hello
+hello
--- a/tests/golden-files/results/mypy-hi_py
+++ b/tests/golden-files/results/mypy-hi_py
@ -1 +1 @@
-input/hi.py:4: error: Missing parentheses in call to 'print'. Did you mean print("hi")?
+input/hi.py:4: error: Missing parentheses in call to 'print'. Did you mean print("hi")?
--- a/tests/golden-files/results/nm-libieee_a
+++ b/tests/golden-files/results/nm-libieee_a
@ -1 +1 @@
-00000000 D _LIB_VERSION
+00000000 D _LIB_VERSION
--- a/tests/golden-files/results/nm-libpcprofile_so
+++ b/tests/golden-files/results/nm-libpcprofile_so
@ -1 +1 @@
-nm: ./input/libpcprofile.so: no symbols
+nm: ./input/libpcprofile.so: no symbols
--- a/tests/golden-files/results/perl_syntax-perl_pl
+++ b/tests/golden-files/results/perl_syntax-perl_pl
@ -1 +1 @@
-./input/perl.pl syntax OK
+./input/perl.pl syntax OK
--- a/tests/golden-files/results/perldoc-perl_pl
+++ b/tests/golden-files/results/perldoc-perl_pl
@ -1 +1 @@
-No documentation found for "./input/perl.pl".
+No documentation found for "./input/perl.pl".
--- a/tests/golden-files/results/php7_syntax-root_php
+++ b/tests/golden-files/results/php7_syntax-root_php
@ -1 +1 @@
-No syntax errors detected in ./input/root.php
+No syntax errors detected in ./input/root.php
--- a/tests/golden-files/results/pylint-hi3_py
+++ b/tests/golden-files/results/pylint-hi3_py
@ -1 +1 @@
-No config file found, using default configuration
+No config file found, using default configuration
--- a/tests/golden-files/results/pylint-hi_py
+++ b/tests/golden-files/results/pylint-hi_py
@ -1 +1 @@
-No config file found, using default configuration
+No config file found, using default configuration
--- a/tests/golden-files/results/python_gut-hi3_py
+++ b/tests/golden-files/results/python_gut-hi3_py
@ -1,2 +1 @@
-(B[m[38;2;106;184;37m[48;2;32;32;32m[1mdef(B[m[38;2;208;208;208m[48;2;32;32;32m (B[m[38;2;68;127;207m[48;2;32;32;32mhi(B[m[38;2;208;208;208m[48;2;32;32;32m():
-(B[m
+(B[m[38;2;106;184;37m[48;2;32;32;32m[1mdef(B[m[38;2;208;208;208m[48;2;32;32;32m (B[m[38;2;68;127;207m[48;2;32;32;32mhi(B[m[38;2;208;208;208m[48;2;32;32;32m():(B[m
--- a/tests/golden-files/results/python_gut-hi_py
+++ b/tests/golden-files/results/python_gut-hi_py
@ -1,2 +1 @@
-(B[m[38;2;106;184;37m[48;2;32;32;32m[1mdef(B[m[38;2;208;208;208m[48;2;32;32;32m (B[m[38;2;68;127;207m[48;2;32;32;32mhi(B[m[38;2;208;208;208m[48;2;32;32;32m():
-(B[m
+(B[m[38;2;106;184;37m[48;2;32;32;32m[1mdef(B[m[38;2;208;208;208m[48;2;32;32;32m (B[m[38;2;68;127;207m[48;2;32;32;32mhi(B[m[38;2;208;208;208m[48;2;32;32;32m():(B[m
--- a/tests/golden-files/results/python_mccabe-hi3_py
+++ b/tests/golden-files/results/python_mccabe-hi3_py
@ -1 +1 @@
-3:0: 'hi' 1
+3:0: 'hi' 1
--- a/tests/golden-files/results/python_mccabe-hi_py
+++ b/tests/golden-files/results/python_mccabe-hi_py
@ -1 +1 @@
-("3:0: 'hi'", 1)
+("3:0: 'hi'", 1)
--- a/tests/golden-files/results/tar_bz2-hi_tar_bz2
+++ b/tests/golden-files/results/tar_bz2-hi_tar_bz2
@ -1 +1 @@
-rw-rw-r-- ahamilton/ahamilton 27 2016-02-09 21:50 hi.py
+-rw-rw-r-- ahamilton/ahamilton 27 2016-02-09 21:50 hi.py
--- a/tests/golden-files/results/tar_gz-hi_tar_gz
+++ b/tests/golden-files/results/tar_gz-hi_tar_gz
@ -1 +1 @@
-rw-rw-r-- ahamilton/ahamilton 27 2016-02-09 21:50 hi.py
+-rw-rw-r-- ahamilton/ahamilton 27 2016-02-09 21:50 hi.py
--- a/tests/golden-files/results/tar_gz-hi_tgz
+++ b/tests/golden-files/results/tar_gz-hi_tgz
@ -1 +1 @@
-rw-rw-r-- ahamilton/ahamilton 27 2016-02-09 21:50 hi.py
+-rw-rw-r-- ahamilton/ahamilton 27 2016-02-09 21:50 hi.py
--- a/tests/golden-files/results/uncrustify-closure-util_java
+++ b/tests/golden-files/results/uncrustify-closure-util_java
@ -1,2 +1 @@
-(B[m[38;2;208;208;208m[48;2;32;32;32m
 (B[m
--- a/vigil/fill3.py
+++ b/vigil/fill3.py
@ -341,7 +341,7 @@ class Text:
        if len(lines) == 0:
            self.text = []
        elif len(lines) == 1:
-            self.text = [text]
+            self.text = [lines[0]]
        else:
            max_width = max(len(line) for line in lines)
            height = len(lines)
--- a/vigil/tools.py
+++ b/vigil/tools.py
@ -157,21 +157,6 @@ def _syntax_highlight_using_path(text, path):
    return _syntax_highlight(text, lexer, style)


-def pygments_(path):
-    with open(path) as file_:
-        try:
-            text = file_.read()
-        except UnicodeDecodeError:
-            return Status.not_applicable, fill3.Text("Not unicode")
-        else:
-            try:
-                source_widget = _syntax_highlight_using_path(_fix_input(text),
-                                                             path)
-            except pygments.util.ClassNotFound:
-                return Status.normal, fill3.Text(text)
-    return Status.normal, source_widget
-
-
 def linguist(path):
    # Dep: ruby?, ruby-dev, libicu-dev, cmake, "gem install github-linguist"
    return _run_command(["linguist", path], Status.normal)
@ -252,12 +237,17 @@ def metadata(path):

@deps(deps={"python3-pygments"}, url="python3-pygments")
 def contents(path):
-    root, ext = splitext(path)
-    if ext == "":
-        with open(path) as file_:
-            return Status.normal, fill3.Text(_fix_input(file_.read()))
-    else:
-        return pygments_(path)
+    with open(path) as file_:
+        try:
+            text = file_.read()
+        except UnicodeDecodeError:
+            return Status.not_applicable, fill3.Text("Not unicode")
+    text = _fix_input(text)
+    try:
+        text_widget = _syntax_highlight_using_path(text, path)
+    except pygments.util.ClassNotFound:
+        text_widget = fill3.Text(text)
+    return Status.normal, text_widget


 def _is_python_syntax_correct(path, python_version):