From 6785dc19abc60aa75f1d3c93d032e2dd3b94843b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Breitbart?= Date: Sat, 22 Jul 2023 16:32:01 +0200 Subject: [PATCH] exclude combined from merge, fix linter --- src/browser/renderer/dom/DomRendererRowFactory.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/browser/renderer/dom/DomRendererRowFactory.ts b/src/browser/renderer/dom/DomRendererRowFactory.ts index c9602596..cc65f53d 100644 --- a/src/browser/renderer/dom/DomRendererRowFactory.ts +++ b/src/browser/renderer/dom/DomRendererRowFactory.ts @@ -125,6 +125,7 @@ export class DomRendererRowFactory { const isInSelection = this._isCellInSelection(x, row); const isCursorCell = isCursorRow && x === cursorX; const cc = cell.getCode(); + const isCombined = cell.isCombined(); if (!charElement) { charElement = this._document.createElement('span'); @@ -139,8 +140,8 @@ export class DomRendererRowFactory { */ // FIMXE: add combined check, fix \xa0 text handling as below if ( - cellAmount && width === 1 - && cell.bg === oldBg && cell.fg === oldFg && cell.extended.ext == oldExt + cellAmount && width === 1 && !isCombined + && cell.bg === oldBg && cell.fg === oldFg && cell.extended.ext === oldExt && cc < 1424 && !metrics[cc] && !isInSelection && !isCursorCell @@ -370,7 +371,7 @@ export class DomRendererRowFactory { // account first char for later merge if it meets the start conditions - if (width === 1 && cc < 1424 && !metrics[cc] && !isInSelection && !isCursorCell) { + if (width === 1 && !isCombined && cc < 1424 && !metrics[cc] && !isInSelection && !isCursorCell) { cellAmount++; } else { // every non-mergeable char gets directly written to its own span