more clean up

Author: Jason3S

packages/cspell-lib/src/lib/Transform/SourceMap.ts

@@ -482,35 +482,37 @@ function advanceCursors(cursor1: SourceMapMergeCursor, cursor2: SourceMapMergeCu
 export function sliceSourceMapToSourceRange(map: SourceMap | undefined, range: Range): SourceMap | undefined {
     if (!map?.length) return map;
 
+    const cursor = createSourceMapCursor(map);
     const [start, end] = range;
 
-    let idx = 0;
-    let p = 0;
-    for (; idx < map.length && p + map[idx] < start; idx += 2) {
-        p += map[idx];
-    }
+    const startDst = cursor.mapOffsetToDest(start);
+    if (cursor.done) return [];
 
-    if (idx >= map.length) {
-        return [];
-    }
+    const startIdx = cursor.idx;
+    const startOffsetSrc = cursor.begin0;
+    const startOffsetDst = cursor.begin1;
+    const startLinear = cursor.linear;
 
-    const startIdx = idx;
-    const startOffset = start - p;
+    cursor.mapOffsetToDest(end);
 
-    for (; idx < map.length && p + map[idx] <= end; idx += 2) {
-        p += map[idx];
+    let endIdx = cursor.idx;
+    if (startIdx === endIdx && startLinear) {
+        return [];
     }
 
-    const endIdx = idx;
-    if (startIdx === endIdx) {
-        return undefined;
+    if (!cursor.linear || cursor.begin0 < end) {
+        endIdx += 2;
     }
 
     const newMap = map.slice(startIdx, endIdx);
 
-    if (startOffset !== 0) {
-        newMap[0] -= startOffset;
-        newMap[1] -= Math.min(startOffset, newMap[1]);
+    // Only adjust the first pair of offsets, the rest are relative to the first pair.
+    newMap[0] -= start - startOffsetSrc;
+    newMap[1] -= startDst - startOffsetDst;
+
+    if (newMap[0] === newMap[1] && !startLinear) {
+        // Force a non-linear map when the deltas are the same but the segment is non-linear.
+        newMap.unshift(0, 0);
     }
 
     return newMap;

packages/cspell-lib/src/lib/Transform/TextMap.test.ts

@@ -15,17 +15,37 @@ describe('TextMap', () => {
         ${'fine café'}        | ${[200, 209]} | ${undefined}          | ${[205, 209]} | ${tm('café', [205, 209])}
         ${'fine café coffee'} | ${[200, 219]} | ${[8, 8, 4, 1, 7, 7]} | ${[205, 212]} | ${tm('café', [205, 212], [3, 3, 4, 1])}
         ${'fine café coffee'} | ${[200, 219]} | ${[8, 8, 4, 1, 7, 7]} | ${[200, 212]} | ${tm('fine café', [200, 212], [8, 8, 4, 1])}
-        ${'fine café coffee'} | ${[200, 219]} | ${[8, 8, 4, 1, 7, 7]} | ${[200, 213]} | ${tm('fine café ', [200, 213], [8, 8, 4, 1])}
+        ${'fine café coffee'} | ${[200, 219]} | ${[8, 8, 4, 1, 7, 7]} | ${[200, 213]} | ${tm('fine café ', [200, 213], [8, 8, 4, 1, 7, 7])}
         ${'fine café coffee'} | ${[200, 219]} | ${[8, 8, 4, 1, 7, 7]} | ${[200, 219]} | ${tm('fine café coffee', [200, 219], [8, 8, 4, 1, 7, 7])}
         ${'fine café coffee'} | ${[200, 219]} | ${[8, 8, 4, 1]}       | ${[200, 219]} | ${tm('fine café coffee', [200, 219], [8, 8, 4, 1])}
         ${'fine café coffee'} | ${[200, 219]} | ${[8, 8, 4, 1]}       | ${[205, 212]} | ${tm('café', [205, 212], [3, 3, 4, 1])}
         ${'fine café coffee'} | ${[200, 219]} | ${[8, 8, 4, 1]}       | ${[205, 219]} | ${tm('café coffee', [205, 219], [3, 3, 4, 1])}
+        ${'fine café coffee'} | ${[200, 219]} | ${[8, 8, 4, 1]}       | ${[201, 202]} | ${tm('i', [201, 202])}
+        ${'fine café coffee'} | ${[200, 219]} | ${[8, 8, 4, 1]}       | ${[201, 202]} | ${tm('i', [201, 202])}
     `('extractTextMap $text $range $map $extRange', ({ text, range, map, extRange, expected }) => {
         const tm = { text, range, map };
         const r = extractTextMapRangeOrigin(tm, extRange);
         expect(r).toEqual(expected);
     });
 
+    test.each`
+        text                  | range         | map                   | extRange      | expected
+        ${'fine café coffee'} | ${[200, 219]} | ${[8, 8, 4, 1]}       | ${[208, 208]} | ${tm('', [208, 208], [4, 1])}
+        ${'fine café coffee'} | ${[200, 219]} | ${[8, 8, 4, 1]}       | ${[208, 209]} | ${tm('', [208, 209], [4, 1])}
+        ${'fine café coffee'} | ${[200, 219]} | ${[8, 8, 4, 1, 7, 7]} | ${[208, 210]} | ${tm('', [208, 210], [4, 1])}
+        ${'fine café coffee'} | ${[200, 219]} | ${[8, 8, 4, 1, 7, 7]} | ${[208, 211]} | ${tm('', [208, 211], [4, 1])}
+        ${'fine café coffee'} | ${[200, 219]} | ${[8, 8, 4, 1, 7, 7]} | ${[208, 212]} | ${tm('é', [208, 212], [4, 1])}
+        ${'fine café coffee'} | ${[200, 219]} | ${[8, 8, 4, 1, 7, 7]} | ${[208, 213]} | ${tm('é ', [208, 213], [4, 1, 7, 7])}
+        ${'fine café coffee'} | ${[200, 219]} | ${[8, 8, 4, 1, 7, 7]} | ${[209, 212]} | ${tm('é', [209, 212], [3, 1])}
+        ${'fine café coffee'} | ${[200, 219]} | ${[8, 8, 4, 1, 7, 7]} | ${[210, 212]} | ${tm('é', [210, 212], [2, 1])}
+        ${'fine café coffee'} | ${[200, 219]} | ${[8, 8, 4, 1, 7, 7]} | ${[211, 212]} | ${tm('é', [211, 212], [0, 0, 1, 1])}
+        ${'fine café coffee'} | ${[200, 219]} | ${[8, 8, 4, 1, 7, 7]} | ${[212, 212]} | ${tm('', [212, 212])}
+    `('extractTextMap edge cases $text $range $map $extRange', ({ text, range, map, extRange, expected }) => {
+        const tm = { text, range, map };
+        const r = extractTextMapRangeOrigin(tm, extRange);
+        expect(r).toEqual(expected);
+    });
+
     test.each`
         range         | intersectRange | expected
         ${[0, 100]}   | ${[50, 200]}   | ${true}