kallithea Changeset - 9038c1a443a0

Changeset - 9038c1a443a0

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich (mads) - 6 years ago 2020-06-11 22:48:50
mads@kiilerich.com

Grafted from: 9722cab840cc

diff: refactor as_html with separate code paths for diff lines with and without line number

Just inlining and factoring and moving things around.

1 file changed with 41 insertions and 53 deletions:

kallithea/lib/diffs.py

0 comments (0 inline, 0 general)

kallithea/lib/diffs.py

➞

Show inline comments

@@ @@ -67,25 +67,12 @@ def as_html(table_class='code-difftable' @@
             old_lineno_class='lineno old', new_lineno_class='lineno new',
             no_lineno_class='lineno',
             code_class='code', enable_comments=False, parsed_lines=None):
     """
     Return given diff as html table with customized css classes
     """
     def _link_to_if(condition, label, url):
         """
         Generates a link if condition is meet or just the label if not.
         """
         if condition:
             return '''<a href="%(url)s" data-pseudo-content="%(label)s"></a>''' % {
                 'url': url,
                 'label': label
+            }
         else:
             return label
     _html_empty = True
     _html = []
     _html.append('''<table class="%(table_class)s">\n''' % {
         'table_class': table_class
     })
@@ @@ -94,56 +81,57 @@ def as_html(table_class='code-difftable' @@
             _html_empty = False
             for change in chunk:
                 _html.append('''<tr class="%(lc)s %(action)s">\n''' % {
                     'lc': line_class,
                     'action': change['action']
                 })
                 anchor_old_id = ''
                 anchor_new_id = ''
                 anchor_old = "%(filename)s_o%(oldline_no)s" % {
                     'filename': _safe_id(file_info['filename']),
                     'oldline_no': change['old_lineno']
+                }
                 anchor_new = "%(filename)s_n%(newline_no)s" % {
                     'filename': _safe_id(file_info['filename']),
                     'newline_no': change['new_lineno']
+                }
                 cond_old = change['old_lineno']
                 cond_new = change['new_lineno']
                 no_lineno = not change['old_lineno'] and not change['new_lineno']
                 if cond_old:
                     anchor_old_id = 'id="%s"' % anchor_old
                 if cond_new:
                     anchor_new_id = 'id="%s"' % anchor_new
                 ###########################################################
                 # OLD LINE NUMBER
                 ###########################################################
                 _html.append('''\t<td %(a_id)s class="%(olc)s" %(colspan)s>''' % {
                     'a_id': anchor_old_id,
                     'olc': no_lineno_class if no_lineno else old_lineno_class,
                     'colspan': 'colspan="2"' if no_lineno else ''
                 })
                 _html.append('''%(link)s''' % {
                     'link': _link_to_if(not no_lineno, change['old_lineno'],
                                         '#%s' % anchor_old)
                 })
                 _html.append('''</td>\n''')
                 ###########################################################
                 # NEW LINE NUMBER
                 ###########################################################
                 if not no_lineno:
                 if change['old_lineno'] or change['new_lineno']:
                     ###########################################################
                     # OLD LINE NUMBER
                     ###########################################################
                     anchor_old = "%(filename)s_o%(oldline_no)s" % {
                         'filename': _safe_id(file_info['filename']),
                         'oldline_no': change['old_lineno']
+                    }
                     anchor_old_id = ''
                     if change['old_lineno']:
                         anchor_old_id = 'id="%s"' % anchor_old
                     _html.append('''\t<td %(a_id)s class="%(olc)s">''' % {
                         'a_id': anchor_old_id,
                         'olc': old_lineno_class,
                     })
                     _html.append('''<a href="%(url)s" data-pseudo-content="%(label)s"></a>''' % {
                         'label': change['old_lineno'],
                         'url': '#%s' % anchor_old,
                     })
                     _html.append('''</td>\n''')
                     ###########################################################
                     # NEW LINE NUMBER
                     ###########################################################
                     anchor_new = "%(filename)s_n%(newline_no)s" % {
                         'filename': _safe_id(file_info['filename']),
                         'newline_no': change['new_lineno']
+                    }
                     anchor_new_id = ''
                     if change['new_lineno']:
                         anchor_new_id = 'id="%s"' % anchor_new
                     _html.append('''\t<td %(a_id)s class="%(nlc)s">''' % {
                         'a_id': anchor_new_id,
                         'nlc': new_lineno_class
                     })
                     _html.append('''%(link)s''' % {
                         'link': _link_to_if(True, change['new_lineno'],
                                             '#%s' % anchor_new)
                     _html.append('''<a href="%(url)s" data-pseudo-content="%(label)s"></a>''' % {
                         'label': change['new_lineno'],
                         'url': '#%s' % anchor_new,
                     })
                     _html.append('''</td>\n''')
                 else:
                     ###########################################################
                     # NO LINE NUMBER
                     ###########################################################
                     _html.append('''\t<td class="%(olc)s" colspan="2">''' % {
                         'olc': no_lineno_class,
                     })
                     _html.append('''</td>\n''')
                 ###########################################################
                 # CODE
                 ###########################################################
                 comments = '' if enable_comments else 'no-comment'

0 comments (0 inline, 0 general)