Merge branch...

Merge branch '26824-diff-unfold-link-is-still-visible-when-there-are-no-lines-to-unfold' into 'master'

Resolve "Diff unfold link is still visible when there are no lines to unfold"

Closes #26824 and #28127

See merge request !8761

app/views/projects/blob/diff.html.haml

@@ -25,6 +25,6 @@
           = link_to raw(line_new), "##{line_new}"
         = line_content
 
-  - if @form.unfold? && @form.bottom? && @form.to < @blob.loc
+  - if @form.unfold? && @form.bottom? && @form.to < @blob.lines.size
     %tr.line_holder{ id: @form.to, class: line_class }
       = diff_match_line @form.to - @form.offset, @form.to, text: @match_line, view: diff_view, bottom: true

app/views/projects/diffs/_content.html.haml

@@ -15,10 +15,13 @@
         %a.click-to-expand
           Click to expand it.
     - elsif diff_file.diff_lines.length > 0
+      - total_lines = 0
+      - if blob.lines.any?
+        - total_lines = blob.lines.last.chomp == '' ? blob.lines.size - 1 : blob.lines.size
       - if diff_view == :parallel
-        = render "projects/diffs/parallel_view", diff_file: diff_file, project: project, blob: blob
+        = render "projects/diffs/parallel_view", diff_file: diff_file, total_lines: total_lines
       - else
-        = render "projects/diffs/text_file", diff_file: diff_file
+        = render "projects/diffs/text_file", diff_file: diff_file, total_lines: total_lines
     - else
       - if diff_file.mode_changed?
         .nothing-here-block File mode changed

app/views/projects/diffs/_parallel_view.html.haml

@@ -43,7 +43,8 @@
         - discussion_left, discussion_right = parallel_diff_discussions(left, right, diff_file)
         - if discussion_left || discussion_right
           = render "discussions/parallel_diff_discussion", discussion_left: discussion_left, discussion_right: discussion_right
-    - if !diff_file.new_file && diff_file.diff_lines.any?
+    - if !diff_file.new_file && !diff_file.deleted_file && diff_file.diff_lines.any?
       - last_line = diff_file.diff_lines.last
+      - if last_line.new_pos < total_lines
         %tr.line_holder.parallel
           = diff_match_line last_line.old_pos, last_line.new_pos, bottom: true, view: :parallel

app/views/projects/diffs/_text_file.html.haml

@@ -10,7 +10,8 @@
     as: :line,
     locals: { diff_file: diff_file, discussions: discussions }
 
-  - if !diff_file.new_file && diff_file.highlighted_diff_lines.any?
+  - if !diff_file.new_file && !diff_file.deleted_file && diff_file.highlighted_diff_lines.any?
     - last_line = diff_file.highlighted_diff_lines.last
+    - if last_line.new_pos < total_lines
       %tr.line_holder
         = diff_match_line last_line.old_pos, last_line.new_pos, bottom: true

changelogs/unreleased/26824-diff-unfold-link-is-still-visible-when-there-are-no-lines-to-unfold.yml

+---
+title: prevent diff unfolding link from appearing when there are no more lines to
+  show
+merge_request: 8761
+author: