development/gitg
development/gitg
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gitg synced 2024-10-02 14:13:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Higlight trailing whitespace

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=732233
This commit is contained in:
Jesse van den Kieboom 2014-06-25 19:20:40 +02:00
parent 842a3312b9
commit 3daef3124c
3 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libgitg/gitg-diff-view-request-diff.vala
View file

@ -172,9 +172,15 @@ namespace Gitg
builder.begin_object();
{
var content = line.get_content();
var text = line.get_text();
// Split off trailing whitespace
var chomped = text.chomp();
var ws = text.slice(chomped.length, text.length);
builder.set_member_name("type").add_int_value((int64)line.get_origin());
builder.set_member_name("content").add_string_value(line.get_text());
builder.set_member_name("content").add_string_value(chomped);
builder.set_member_name("trailing_whitespace").add_string_value(ws);
builder.set_member_name("offset").add_int_value((int64)line.get_content_offset());
builder.set_member_name("length").add_int_value((int64)content.length);
}

16
libgitg/resources/diff-view-html-builder.js
View file

@ -144,7 +144,21 @@ function diff_file(file, lnstate, data)
}
row += '<td class="gutter type">' + o + '</td>';
row += '<td class="code">' + html_escape(l.content).replace(/\t/g, tabrepl) + '</td>';
var content = html_escape(l.content);
content = content.replace(/\t/g, tabrepl);
var ws = '';
if (l.trailing_whitespace.length > 0)
{
ws = html_escape(l.trailing_whitespace);
ws = ws.replace(/\t/g, tabrepl);
ws = '<span class="trailing-whitespace">' + ws + '</span>';
}
row += '<td class="code">' + content + ws + '</td>';
row += '</tr>';

4
libgitg/resources/diff-view.css
View file

@ -76,6 +76,10 @@ span.tab {
display: inline-block;
}
span.trailing-whitespace {
background-color: #cc3333;
}
div#diff div.file table.wrapped td.code {
white-space: pre-wrap;
}