comments: ensure we ALWAYS display unmatched comments.

rhodecode/lib/codeblocks.py

@@ -368,19 +368,18 b' class DiffSet(object):'
     adding highlighting, side by side/unified renderings and line diffs
     """
 
-    HL_REAL = 'REAL' # highlights using original file, slow
-    HL_FAST = 'FAST' # highlights using just the line, fast but not correct
-                     # in the case of multiline code
-    HL_NONE = 'NONE' # no highlighting, fastest
+    HL_REAL = 'REAL'  # highlights using original file, slow
+    HL_FAST = 'FAST'  # highlights using just the line, fast but not correct
+                      # in the case of multiline code
+    HL_NONE = 'NONE'  # no highlighting, fastest
 
     def __init__(self, highlight_mode=HL_REAL, repo_name=None,
                  source_repo_name=None,
                  source_node_getter=lambda filename: None,
                  target_node_getter=lambda filename: None,
                  source_nodes=None, target_nodes=None,
-                 max_file_size_limit=150 * 1024, # files over this size will
-                                                 # use fast highlighting
-                 comments=None,
+                 # files over this size will use fast highlighting
+                 max_file_size_limit=150 * 1024,
                  ):
 
         self.highlight_mode = highlight_mode
@@ -391,8 +390,6 b' class DiffSet(object):'
         self.target_nodes = target_nodes or {}
         self.repo_name = repo_name
         self.source_repo_name = source_repo_name or repo_name
-        self.comments = comments or {}
-        self.comments_store = self.comments.copy()
         self.max_file_size_limit = max_file_size_limit
 
     def render_patchset(self, patchset, source_ref=None, target_ref=None):
@@ -518,20 +515,6 b' class DiffSet(object):'
             hunkbit.target_file_path = target_file_path
             filediff.hunks.append(hunkbit)
 
-        left_comments = {}
-        if source_file_path in self.comments_store:
-            for lineno, comments in self.comments_store[source_file_path].items():
-                left_comments[lineno] = comments
-
-        if target_file_path in self.comments_store:
-            for lineno, comments in self.comments_store[target_file_path].items():
-                left_comments[lineno] = comments
-
-        # left comments are one that we couldn't place in diff lines.
-        # could be outdated, or the diff changed and this line is no
-        # longer available
-        filediff.left_comments = left_comments
-
         return filediff
 
     def parse_hunk(self, hunk, source_file, target_file):

rhodecode/templates/changeset/changeset_file_comment.mako

@@ -28,7 +28,7 b''
 
       <div class="meta">
           <div class="comment-type-label">
-              <div class="comment-label ${comment.comment_type or 'note'}" id="comment-label-${comment.comment_id}">
+              <div class="comment-label ${comment.comment_type or 'note'}" id="comment-label-${comment.comment_id}" title="line: ${comment.line_no}">
               % if comment.comment_type == 'todo':
                   % if comment.resolved:
                       <div class="resolved tooltip" title="${_('Resolved by comment #{}').format(comment.resolved.comment_id)}">

rhodecode/templates/codeblocks/diffs.mako

@@ -223,37 +223,59 b' collapse_all = len(diffset.files) > coll'
             %endif
         %endfor
 
+        <% unmatched_comments = (inline_comments or {}).get(filediff.patch['filename'], {}) %>
+
         ## outdated comments that do not fit into currently displayed lines
-        % for lineno, comments in filediff.left_comments.items():
+        % for lineno, comments in unmatched_comments.items():
 
-        %if c.diffmode == 'unified':
-            <tr class="cb-line">
-                <td class="cb-data cb-context"></td>
-                <td class="cb-lineno cb-context"></td>
-                <td class="cb-lineno cb-context"></td>
-                <td class="cb-content cb-context">
-                    ${inline_comments_container(comments, inline_comments)}
-                </td>
-            </tr>
-        %elif c.diffmode == 'sideside':
-            <tr class="cb-line">
-                <td class="cb-data cb-context"></td>
-                <td class="cb-lineno cb-context"></td>
-                <td class="cb-content cb-context">
-                    % if lineno.startswith('o'):
+            %if c.diffmode == 'unified':
+                % if loop.index == 0:
+                <tr class="cb-hunk">
+                    <td colspan="3"></td>
+                    <td>
+                        <div>
+                        ${_('Unmatched inline comments below')}
+                        </div>
+                    </td>
+                </tr>
+                % endif
+                <tr class="cb-line">
+                    <td class="cb-data cb-context"></td>
+                    <td class="cb-lineno cb-context"></td>
+                    <td class="cb-lineno cb-context"></td>
+                    <td class="cb-content cb-context">
                         ${inline_comments_container(comments, inline_comments)}
-                    % endif
-                </td>
+                    </td>
+                </tr>
+            %elif c.diffmode == 'sideside':
+                % if loop.index == 0:
+                <tr class="cb-hunk">
+                    <td colspan="2"></td>
+                    <td class="cb-line" colspan="6">
+                        <div>
+                        ${_('Unmatched comments below')}
+                        </div>
+                    </td>
+                </tr>
+                % endif
+                <tr class="cb-line">
+                    <td class="cb-data cb-context"></td>
+                    <td class="cb-lineno cb-context"></td>
+                    <td class="cb-content cb-context">
+                        % if lineno.startswith('o'):
+                            ${inline_comments_container(comments, inline_comments)}
+                        % endif
+                    </td>
 
-                <td class="cb-data cb-context"></td>
-                <td class="cb-lineno cb-context"></td>
-                <td class="cb-content cb-context">
-                    % if lineno.startswith('n'):
-                        ${inline_comments_container(comments, inline_comments)}
-                    % endif
-                </td>
-            </tr>
-        %endif
+                    <td class="cb-data cb-context"></td>
+                    <td class="cb-lineno cb-context"></td>
+                    <td class="cb-content cb-context">
+                        % if lineno.startswith('n'):
+                            ${inline_comments_container(comments, inline_comments)}
+                        % endif
+                    </td>
+                </tr>
+            %endif
 
         % endfor
 
@@ -512,18 +534,20 b' from rhodecode.lib.diffs import NEW_FILE'
 </%def>
 
 <%!
-def get_comments_for(comments, filename, line_version, line_number):
+def get_comments_for(diff_type, comments, filename, line_version, line_number):
     if hasattr(filename, 'unicode_path'):
         filename = filename.unicode_path
 
     if not isinstance(filename, basestring):
         return None
 
-    line_key = '{}{}'.format(line_version, line_number)
+    line_key = '{}{}'.format(line_version, line_number) ## e.g o37, n12
+
     if comments and filename in comments:
         file_comments = comments[filename]
         if line_key in file_comments:
-            return file_comments[line_key]
+            data = file_comments.pop(line_key)
+            return data
 %>
 
 <%def name="render_hunk_lines_sideside(hunk, use_comments=False, inline_comments=None)">
@@ -542,16 +566,17 b' def get_comments_for(comments, filename,'
             data-line-no="${line.original.lineno}"
             >
             <div>
-            <% loc = None %>
+
+            <% line_old_comments = None %>
             %if line.original.get_comment_args:
-                <% loc = get_comments_for(inline_comments, *line.original.get_comment_args) %>
+                <% line_old_comments = get_comments_for('side-by-side', inline_comments, *line.original.get_comment_args) %>
             %endif
-            %if loc:
-                <% has_outdated = any([x.outdated for x in loc]) %>
+            %if line_old_comments:
+                <% has_outdated = any([x.outdated for x in line_old_comments]) %>
                 % if has_outdated:
-                    <i title="${_('comments including outdated')}:${len(loc)}" class="icon-comment_toggle" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
+                    <i title="${_('comments including outdated')}:${len(line_old_comments)}" class="icon-comment_toggle" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
                 % else:
-                    <i title="${_('comments')}: ${len(loc)}" class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
+                    <i title="${_('comments')}: ${len(line_old_comments)}" class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
                 % endif
             %endif
             </div>
@@ -574,8 +599,8 b' def get_comments_for(comments, filename,'
             %endif
             <span class="cb-code">${line.original.action} ${line.original.content or '' | n}</span>
 
-            %if use_comments and line.original.lineno and loc:
-                ${inline_comments_container(loc, inline_comments)}
+            %if use_comments and line.original.lineno and line_old_comments:
+                ${inline_comments_container(line_old_comments, inline_comments)}
             %endif
 
         </td>
@@ -585,16 +610,16 b' def get_comments_for(comments, filename,'
             <div>
 
             %if line.modified.get_comment_args:
-                <% lmc = get_comments_for(inline_comments, *line.modified.get_comment_args) %>
+                <% line_new_comments = get_comments_for('side-by-side', inline_comments, *line.modified.get_comment_args) %>
             %else:
-                <% lmc = None%>
+                <% line_new_comments = None%>
             %endif
-            %if lmc:
-                <% has_outdated = any([x.outdated for x in lmc]) %>
+            %if line_new_comments:
+                <% has_outdated = any([x.outdated for x in line_new_comments]) %>
                 % if has_outdated:
-                    <i title="${_('comments including outdated')}:${len(lmc)}" class="icon-comment_toggle" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
+                    <i title="${_('comments including outdated')}:${len(line_new_comments)}" class="icon-comment_toggle" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
                 % else:
-                    <i title="${_('comments')}: ${len(lmc)}" class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
+                    <i title="${_('comments')}: ${len(line_new_comments)}" class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
                 % endif
             %endif
             </div>
@@ -616,8 +641,8 b' def get_comments_for(comments, filename,'
             ${render_add_comment_button()}
             %endif
             <span class="cb-code">${line.modified.action} ${line.modified.content or '' | n}</span>
-            %if use_comments and line.modified.lineno and lmc:
-            ${inline_comments_container(lmc, inline_comments)}
+            %if use_comments and line.modified.lineno and line_new_comments:
+            ${inline_comments_container(line_new_comments, inline_comments)}
             %endif
         </td>
     </tr>
@@ -639,7 +664,7 b' def get_comments_for(comments, filename,'
             <div>
 
             %if comments_args:
-                <% comments = get_comments_for(inline_comments, *comments_args) %>
+                <% comments = get_comments_for('unified', inline_comments, *comments_args) %>
             %else:
                 <% comments = None%>
             %endif