kallithea Changeset - 73ba6abe60db

Changeset - 73ba6abe60db

Parent rev.

Child rev.

[Not reviewed]

stable

0 2 0

Thomas De Schampheleire - 5 years ago 2020-10-19 12:47:50
thomas.de_schampheleire@nokia.com

lib/diffs: make sure that trailing tabs are indicated

Backport of 53142fd5af4e - the problem also existed before f79c40759d6f.

Eat trailing newline after trailing tab as we already do for trailing spaces.

The change diff mainly shows re group numbers shifting.

2 files changed with 8 insertions and 6 deletions:

kallithea/lib/diffs.py

kallithea/tests/models/test_diff_parsers.py

0 comments (0 inline, 0 general)

kallithea/lib/diffs.py

➞

Show inline comments

@@ @@ -450,13 +450,13 @@ class DiffProcessor(object): @@
         """
         Returns tuple of added, and removed lines for this instance
         """
         return self.adds, self.removes
 _escape_re = re.compile(r'(&)|(<)|(>)|(\t)|(\r)|(?<=.)( \n| $)')
+_escape_re = re.compile(r'(&)|(<)|(>)|(\t)(\n|$)?|(\r)|(?<=.)( \n| $)')
 def _escaper(string):
     """
     Do HTML escaping/markup
     """
@@ @@ -467,16 +467,18 @@ def _escaper(string): @@
             return '&amp;'
         if groups[1]:
             return '&lt;'
         if groups[2]:
             return '&gt;'
         if groups[3]:
             if groups[4] is not None:  # end of line
                 return '<u>\t</u><i></i>'
             return '<u>\t</u>'
-        if groups[4]:
+        if groups[5]:
             return '<u class="cr"></u>'
-        if groups[5]:
+        if groups[6]:
             return ' <i></i>'
         assert False
     return _escape_re.sub(substitute, safe_str(string))

kallithea/tests/models/test_diff_parsers.py

➞

Show inline comments

@@ @@ -294,19 +294,19 @@ class TestDiffLib(base.TestController): @@
         for d in chunks[1]:
             l.append('%(action)-7s %(new_lineno)3s %(old_lineno)3s %(line)r\n' % d)
         s = ''.join(l)
         assert s == r'''
 context ... ... '@@ -51,6 +51,13 @@\n'
 unmod    51  51 '<u>\t</u>begin();\n'
-unmod    52  52 '<u>\t</u>\n'
+unmod    52  52 '<u>\t</u><i></i>'
 add      53     '<u>\t</u>int foo;<u class="cr"></u>\n'
 add      54     '<u>\t</u>int bar; <u class="cr"></u>\n'
 add      55     '<u>\t</u>int baz;<u>\t</u><u class="cr"></u>\n'
 add      56     '<u>\t</u>int space; <i></i>'
 add      57     '<u>\t</u>int tab;<u>\t</u>\n'
 add      58     '<u>\t</u>\n'
 add      57     '<u>\t</u>int tab;<u>\t</u><i></i>'
 add      58     '<u>\t</u><i></i>'
 unmod    59  53 ' <i></i>'
 del          54 '<u>\t</u>#define MAX_STEPS (48)\n'
 add      60     '<u>\t</u><u class="cr"></u>\n'
 add      61     '<u>\t</u>#define MAX_STEPS (64)<u class="cr"></u>\n'
 unmod    62  55 '\n'
 del          56 '<u>\t</u>#define MIN_STEPS (<del>48</del>)\n'

0 comments (0 inline, 0 general)