fix(codelens): Deleting line does not remove codelens (onivim#2839)

__Issue:__ When deleting a line with a codelens, the codelens persists until the file is saved

__Defect:__ There was a bug with our shift logic - if the item would be deleted, there were cases were it could be kept (in a sparse mapping, where it wouldn't be overwritten - like the code lens / inline elements)

__Fix:__ Remove elements that are deleted in `shift`, and case to cover

CHANGES_CURRENT.md

@@ -4,6 +4,7 @@
 
 - #2845 - Workspace: Opening a file should not always open a folder (fixes #1983)
 - #2842 - CLI: AppImage - fix argument parsing in `AppRun` (fixes #2803)
+- #2839 - Extensions: CodeLens - fix lens persisting when line is deleted
 
 ### Performance
 

src/Core/Kernel/IntMap.re

@@ -31,17 +31,22 @@ let shift =
     let newMap =
       map
       |> bindings
-      |> List.map(((key, v)) =>
+      |> List.filter_map(((key, v)) =>
            if (delta > 0) {
              if (key < startPos) {
-               (key, v);
+               Some((key, v));
              } else {
-               (key + delta, v);
+               Some((key + delta, v));
              };
-           } else if (key <= endPos) {
-             (key, v);
+           } else if (key < startPos) {
+             Some((key, v));
            } else {
-             (key + delta, v);
+             let newPosition = key + delta;
+             if (newPosition < startPos) {
+               None;
+             } else {
+               Some((newPosition, v));
+             };
            }
          )
       |> List.to_seq

test/Core/IntMapTests.re

@@ -81,5 +81,19 @@ describe("IntMap", ({describe, _}) => {
       expect.string(val0).toEqual("a");
       expect.string(val1).toEqual("c");
     });
+
+    test("remove line in sparse list", ({expect, _}) => {
+      let map = [(1, "b")] |> List.to_seq |> IntMap.of_seq;
+      let newMap =
+        map
+        |> IntMap.shift(~default=_ => None, ~startPos=1, ~endPos=1, ~delta=-1);
+      let val0 = IntMap.find_opt(0, newMap);
+      let val1 = IntMap.find_opt(1, newMap);
+      let val2 = IntMap.find_opt(2, newMap);
+
+      expect.equal(val0, None);
+      expect.equal(val1, None);
+      expect.equal(val2, None);
+    });
   })
 });