ahamilton/eris
1
0
Fork 0
Code Releases Activity

tools: Fix screen corruption from TextWidgets containing line breaks.

Browse source
This commit is contained in:
Andrew Hamilton 2018-07-24 21:44:13 +10:00
parent 9b47e07cf6
commit b41c86afac
19 changed files with 28 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tests/golden-files/results/python_gut-hi3_py
View file

@ -1,2 +1 @@
(Bdef(B (Bhi(B(): (Bdef(B (Bhi(B():(B
(B

3
tests/golden-files/results/python_gut-hi_py
View file

@ -1,2 +1 @@
(Bdef(B (Bhi(B(): (Bdef(B (Bhi(B():(B
(B

1
tests/golden-files/results/uncrustify-closure-util_java
View file

@ -1,2 +1 @@
(B
(B (B

2
vigil/fill3.py
View file

@ -341,7 +341,7 @@ class Text:
if len(lines) == 0: if len(lines) == 0:
self.text = [] self.text = []
elif len(lines) == 1: elif len(lines) == 1:
self.text = [text] self.text = [lines[0]]
else: else:
max_width = max(len(line) for line in lines) max_width = max(len(line) for line in lines)
height = len(lines) height = len(lines)

30
vigil/tools.py
View file

@ -157,21 +157,6 @@ def _syntax_highlight_using_path(text, path):
return _syntax_highlight(text, lexer, style) 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): def linguist(path):
# Dep: ruby?, ruby-dev, libicu-dev, cmake, "gem install github-linguist" # Dep: ruby?, ruby-dev, libicu-dev, cmake, "gem install github-linguist"
return _run_command(["linguist", path], Status.normal) return _run_command(["linguist", path], Status.normal)
@ -252,12 +237,17 @@ def metadata(path):
@deps(deps={"python3-pygments"}, url="python3-pygments") @deps(deps={"python3-pygments"}, url="python3-pygments")
def contents(path): def contents(path):
root, ext = splitext(path)
if ext == "":
with open(path) as file_: with open(path) as file_:
return Status.normal, fill3.Text(_fix_input(file_.read())) try:
else: text = file_.read()
return pygments_(path) 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): def _is_python_syntax_correct(path, python_version):