fix(minimap): element at the end of a highlight makes it open ended

Author: ycnmhd

src/stores/minimap/subscriptions/effects/minimap-canvas/worker/shapes/helpers/calculate-chunk-positions.spec.ts

@@ -1420,6 +1420,46 @@ describe('calculate-chunk-position', () => {
         const actual = calculateChunkPositions(input, N_CHARS_PER_LINE, '', '');
         expect(actual).toEqual(output);
     });
+
+    test('case: bold at the end of highlight', () => {
+        const input = '==word1 **bold**== word2';
+        const output = {
+            chunks: [
+                {
+                    chunk: '==word1 ',
+                    line: 0,
+                    x_chars: 0,
+                    length_chars: 8,
+                    type: 'highlight',
+                },
+                {
+                    chunk: '**bold**',
+                    line: 0,
+                    x_chars: 8,
+                    length_chars: 8,
+                    type: 'bold_italic',
+                },
+                {
+                    chunk: '==',
+                    line: 0,
+                    x_chars: 16,
+                    length_chars: 2,
+                    type: 'highlight',
+                },
+                {
+                    chunk: 'word2',
+                    line: 0,
+                    x_chars: 19,
+                    length_chars: 5,
+                    type: null,
+                },
+            ],
+            totalLines: 1,
+            empty: false,
+        };
+        const actual = calculateChunkPositions(input, N_CHARS_PER_LINE, '', '');
+        expect(actual).toEqual(output);
+    });
 });
 
 describe('performance-test: calculate-chunk-position', () => {

src/stores/minimap/subscriptions/effects/minimap-canvas/worker/shapes/helpers/calculate-chunk-positions.ts

@@ -57,8 +57,7 @@ type ElementMeta = {
 type State = {
     element: MinimapElement;
     elementMeta: ElementMeta | null;
-    currentCharacterName: ElementName | null;
-
+    closingTagLength: number;
     x: number;
     lineNumber: number;
     // highlight/task/bullet point
@@ -126,7 +125,7 @@ export const calculateChunkPositions = (
         },
         elementMeta: null,
         parentElementMeta: null,
-        currentCharacterName: null,
+        closingTagLength: 0,
         x: 0,
         lineNumber: 0,
     };
@@ -148,13 +147,11 @@ export const calculateChunkPositions = (
             if (state.elementMeta?.noSpaces) {
                 state.elementMeta = null;
             }
-            state.currentCharacterName = null;
         } else if (
             !state.elementMeta ||
             state.elementMeta?.scope !== ElementScope.full_line
         ) {
             const elementName = charToElementName[character];
-            state.currentCharacterName = elementName;
             if (elementName) {
                 const nextCharacter = content[i + 1];
                 // heading
@@ -243,7 +240,9 @@ export const calculateChunkPositions = (
                             scope: ElementScope.character,
                         };
                     }
-                } else {
+                }
+                // double tag blocks
+                else {
                     const isHighlight = character === '=';
                     const isDoubleCharacterTag =
                         (isHighlight && nextCharacter === '=') ||
@@ -262,7 +261,9 @@ export const calculateChunkPositions = (
                         const isClosingTag =
                             state.elementMeta?.elementName === elementName;
                         if (isClosingTag) {
-                            state.elementMeta = null;
+                            state.closingTagLength = isDoubleCharacterTag
+                                ? 2
+                                : 1;
                         } else {
                             const scope = isHighlight
                                 ? ElementScope.multi_line
@@ -289,7 +290,7 @@ export const calculateChunkPositions = (
         }
         // fallback to highlight/task/bullet-point types
         else if (
-            !state.currentCharacterName &&
+            state.closingTagLength === 0 &&
             !state.elementMeta &&
             state.parentElementMeta
         ) {
@@ -372,7 +373,18 @@ export const calculateChunkPositions = (
         } else {
             state.element.chunk += character;
         }
-
+        if (state.closingTagLength > 0) {
+            state.closingTagLength--;
+            // end of the element
+            if (state.closingTagLength === 0) {
+                if (state.parentElementMeta) {
+                    state.elementMeta = state.parentElementMeta;
+                    state.parentElementMeta = null;
+                } else {
+                    state.elementMeta = null;
+                }
+            }
+        }
         state.x++;
     }
     state.element.length_chars = state.element.chunk.length;