Add trailing-whitespace style
This commit adds trailing-whitespace style for emphasizing. In gerrit, we can find a trailing-whitespace very easily because it is emphasized in red. So this commit imitates it. Change-Id: Ie3f35c678093c51d8e39aeeaab2ea17d504e89fb
This commit is contained in:
parent
473bd972c1
commit
fa378e224d
@ -303,6 +303,20 @@ class Repo(object):
|
|||||||
ret.append(x.split('\t'))
|
ret.append(x.split('\t'))
|
||||||
return ret
|
return ret
|
||||||
|
|
||||||
|
trailing_ws_re = re.compile('\s+$')
|
||||||
|
def _emph_trail_ws(self, style, line):
|
||||||
|
result = (style, line)
|
||||||
|
re_result = self.trailing_ws_re.search(line)
|
||||||
|
if (re_result):
|
||||||
|
span = re_result.span()
|
||||||
|
if len(line[:span[0]]) == 0:
|
||||||
|
ws_line = ('trailing-ws', line)
|
||||||
|
else:
|
||||||
|
ws_line = [(style, line[:span[0]]),
|
||||||
|
('trailing-ws', line[span[0]:span[1]])]
|
||||||
|
result = ws_line
|
||||||
|
return result
|
||||||
|
|
||||||
def intralineDiff(self, old, new):
|
def intralineDiff(self, old, new):
|
||||||
# takes a list of old lines and a list of new lines
|
# takes a list of old lines and a list of new lines
|
||||||
prevline = None
|
prevline = None
|
||||||
@ -341,9 +355,11 @@ class Repo(object):
|
|||||||
accumulator += c
|
accumulator += c
|
||||||
if accumulator:
|
if accumulator:
|
||||||
if emphasis:
|
if emphasis:
|
||||||
result.append((prevstyle+'-word', accumulator))
|
result.append(self._emph_trail_ws(prevstyle+'-word',
|
||||||
|
accumulator))
|
||||||
else:
|
else:
|
||||||
result.append((prevstyle+'-line', accumulator))
|
result.append(self._emph_trail_ws(prevstyle+'-line',
|
||||||
|
accumulator))
|
||||||
if prevstyle == 'added':
|
if prevstyle == 'added':
|
||||||
output_new.append(result)
|
output_new.append(result)
|
||||||
elif prevstyle == 'removed':
|
elif prevstyle == 'removed':
|
||||||
@ -352,7 +368,8 @@ class Repo(object):
|
|||||||
continue
|
continue
|
||||||
if prevline is not None:
|
if prevline is not None:
|
||||||
if prevstyle == 'added' or prevstyle == 'context':
|
if prevstyle == 'added' or prevstyle == 'context':
|
||||||
output_new.append((prevstyle+'-line', prevline))
|
output_new.append(self._emph_trail_ws(prevstyle+'-line',
|
||||||
|
prevline))
|
||||||
if prevstyle == 'removed' or prevstyle == 'context':
|
if prevstyle == 'removed' or prevstyle == 'context':
|
||||||
output_old.append((prevstyle+'-line', prevline))
|
output_old.append((prevstyle+'-line', prevline))
|
||||||
if key == '+':
|
if key == '+':
|
||||||
@ -365,7 +382,8 @@ class Repo(object):
|
|||||||
#self.log.debug('prev'+repr(prevline))
|
#self.log.debug('prev'+repr(prevline))
|
||||||
if prevline is not None:
|
if prevline is not None:
|
||||||
if prevstyle == 'added':
|
if prevstyle == 'added':
|
||||||
output_new.append((prevstyle+'-line', prevline))
|
output_new.append(self._emph_trail_ws(prevstyle+'-line',
|
||||||
|
prevline))
|
||||||
elif prevstyle == 'removed':
|
elif prevstyle == 'removed':
|
||||||
output_old.append((prevstyle+'-line', prevline))
|
output_old.append((prevstyle+'-line', prevline))
|
||||||
#self.log.debug(repr(output_old))
|
#self.log.debug(repr(output_old))
|
||||||
|
@ -49,6 +49,7 @@ DEFAULT_PALETTE={
|
|||||||
'line-number': ['dark gray', ''],
|
'line-number': ['dark gray', ''],
|
||||||
'focused-line-number': ['dark gray,standout', ''],
|
'focused-line-number': ['dark gray,standout', ''],
|
||||||
'search-result': ['default,standout', ''],
|
'search-result': ['default,standout', ''],
|
||||||
|
'trailing-ws': ['light red,standout', ''],
|
||||||
# Change view
|
# Change view
|
||||||
'change-data': ['dark cyan', ''],
|
'change-data': ['dark cyan', ''],
|
||||||
'focused-change-data': ['light cyan', ''],
|
'focused-change-data': ['light cyan', ''],
|
||||||
|
Loading…
x
Reference in New Issue
Block a user