fix(highlight): rendering all cells

Should preserve cells with hlId 0 for clearing highlights
vscode-neovim · Nov 14, 2023 · 84344a5 · 84344a5
1 parent c5178d1
commit 84344a5
Showing 1 changed file with 11 additions and 17 deletions.
diff --git a/src/highlight_provider.ts b/src/highlight_provider.ts
@@ -282,25 +282,19 @@ export class HighlightProvider implements Disposable {
                     }
                 }
             }
-            // combine eol cells that have the same hlId
+            // Combine EOL cells that have the same hlId
+            // However, preserve cells with hlId 0 for clearing highlights
             const finalEolCells: ValidCell[] = [];
-            if (eolCells.length > 1) {
-                let hlId = 0;
-                for (const [idx, cell] of eolCells.entries()) {
-                    if (idx > 0 && cell.hlId === hlId) {
-                        finalEolCells[finalEolCells.length - 1].text += cell.text;
-                    } else {
-                        finalEolCells.push(cell);
-                    }
-                    hlId = cell.hlId;
-                }
-            }
-            // Clearing cells without actual function used to fill the screen
-            if (finalEolCells.length) {
-                const last = finalEolCells[finalEolCells.length - 1];
-                if (last.text.length > 100 && last.text.trim().length === 0) {
-                    finalEolCells.pop();
+            let hlId = 0;
+            for (const cell of eolCells) {
+                if (cell.hlId === 0) {
+                    finalEolCells.push(cell);
+                } else if (cell.hlId === hlId && finalEolCells.length) {
+                    finalEolCells[finalEolCells.length - 1].text += cell.text;
+                } else {
+                    finalEolCells.push(cell);
                 }
+                hlId = cell.hlId;
             }
             validCells.push(...finalEolCells);
         }