Account for change hunks with additions. #129

dstein64 · Mar 20, 2024 · 46021d6 · 46021d6
1 parent 1d80f72
commit 46021d6
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/lua/scrollview/contrib/gitsigns.lua b/lua/scrollview/contrib/gitsigns.lua
@@ -163,14 +163,26 @@ function M.setup(config)
                 end
               end
             elseif hunk.type == 'change' then
-              local first = hunk.added.start
-              local last = hunk.added.start
+              -- WARN: A change hunk can be comprised of a change (the removed
+              -- lines) and an add (lines added after the removed lines). #129
+              local first = hunk.removed.start
+              local last = first
               if not config.only_first_line then
-                last = last + hunk.added.count - 1
+                last = last + hunk.removed.count - 1
               end
               for line = first, last do
                 table.insert(lines_change, line)
               end
+              if hunk.added.count > hunk.removed.count then
+                first = hunk.removed.start + hunk.removed.count
+                last = first
+                if not config.only_first_line then
+                  last = last + hunk.added.count - hunk.removed.count - 1
+                end
+                for line = first, last do
+                  table.insert(lines_add, line)
+                end
+              end
             elseif hunk.type == 'delete' then
               table.insert(lines_delete, hunk.added.start)
             end