diff --git a/addons/addon-webgl/src/WebglRenderer.ts b/addons/addon-webgl/src/WebglRenderer.ts index 6c270d12..aa9587aa 100644 --- a/addons/addon-webgl/src/WebglRenderer.ts +++ b/addons/addon-webgl/src/WebglRenderer.ts @@ -377,6 +377,8 @@ export class WebglRenderer extends Disposable implements IRenderer { let line: IBufferLine; let joinedRanges: [number, number][]; let isJoined: boolean; + let skipJoinedCheckUntilX: number = 0; + let isValidJoinRange: boolean = true; let lastCharX: number; let range: [number, number]; let chars: string; @@ -405,6 +407,7 @@ export class WebglRenderer extends Disposable implements IRenderer { row = y + terminal.buffer.ydisp; line = terminal.buffer.lines.get(row)!; this._model.lineLengths[y] = 0; + skipJoinedCheckUntilX = 0; joinedRanges = this._characterJoinerService.getJoinedCharacters(row); for (x = 0; x < terminal.cols; x++) { lastBg = this._cellColorResolver.result.bg; @@ -416,25 +419,41 @@ export class WebglRenderer extends Disposable implements IRenderer { // If true, indicates that the current character(s) to draw were joined. isJoined = false; + + // Indicates whether this cell is part of a joined range that should be ignored as it cannot + // be rendered entirely, like the selection state differs across the range. + isValidJoinRange = (x >= skipJoinedCheckUntilX); + lastCharX = x; // Process any joined character ranges as needed. Because of how the // ranges are produced, we know that they are valid for the characters // and attributes of our input. - if (joinedRanges.length > 0 && x === joinedRanges[0][0]) { - isJoined = true; + if (joinedRanges.length > 0 && x === joinedRanges[0][0] && isValidJoinRange) { range = joinedRanges.shift()!; - // We already know the exact start and end column of the joined range, - // so we get the string and width representing it directly. - cell = new JoinedCellData( - cell, - line!.translateToString(true, range[0], range[1]), - range[1] - range[0] - ); + // If the ligature's selection state is not consistent, don't join it. This helps the + // selection render correctly regardless whether they should be joined. + const firstSelectionState = this._model.selection.isCellSelected(this._terminal, range[0], row); + for (i = range[0] + 1; i < range[1]; i++) { + isValidJoinRange &&= (firstSelectionState === this._model.selection.isCellSelected(this._terminal, i, row)); + } + if (!isValidJoinRange) { + skipJoinedCheckUntilX = range[1]; + } else { + isJoined = true; - // Skip over the cells occupied by this range in the loop - lastCharX = range[1] - 1; + // We already know the exact start and end column of the joined range, + // so we get the string and width representing it directly. + cell = new JoinedCellData( + cell, + line!.translateToString(true, range[0], range[1]), + range[1] - range[0] + ); + + // Skip over the cells occupied by this range in the loop + lastCharX = range[1] - 1; + } } chars = cell.getChars(); diff --git a/src/browser/renderer/dom/DomRendererRowFactory.ts b/src/browser/renderer/dom/DomRendererRowFactory.ts index d71edeb9..d5750112 100644 --- a/src/browser/renderer/dom/DomRendererRowFactory.ts +++ b/src/browser/renderer/dom/DomRendererRowFactory.ts @@ -84,6 +84,7 @@ export class DomRendererRowFactory { let charElement: HTMLSpanElement | undefined; let cellAmount = 0; let text = ''; + let i = 0; let oldBg = 0; let oldFg = 0; let oldExt = 0; @@ -91,6 +92,7 @@ export class DomRendererRowFactory { let oldSpacing = 0; let oldIsInSelection: boolean = false; let spacing = 0; + let skipJoinedCheckUntilX = 0; const classes: string[] = []; const hasHover = linkStart !== -1 && linkEnd !== -1; @@ -106,29 +108,44 @@ export class DomRendererRowFactory { // If true, indicates that the current character(s) to draw were joined. let isJoined = false; + + // Indicates whether this cell is part of a joined range that should be ignored as it cannot + // be rendered entirely, like the selection state differs across the range. + let isValidJoinRange = (x >= skipJoinedCheckUntilX); + let lastCharX = x; // Process any joined character ranges as needed. Because of how the // ranges are produced, we know that they are valid for the characters // and attributes of our input. let cell = this._workCell; - if (joinedRanges.length > 0 && x === joinedRanges[0][0]) { - isJoined = true; + if (joinedRanges.length > 0 && x === joinedRanges[0][0] && isValidJoinRange) { const range = joinedRanges.shift()!; + // If the ligature's selection state is not consistent, don't join it. This helps the + // selection render correctly regardless whether they should be joined. + const firstSelectionState = this._isCellInSelection(range[0], row); + for (i = range[0] + 1; i < range[1]; i++) { + isValidJoinRange &&= (firstSelectionState === this._isCellInSelection(i, row)); + } + if (!isValidJoinRange) { + skipJoinedCheckUntilX = range[1]; + } else { + isJoined = true; - // We already know the exact start and end column of the joined range, - // so we get the string and width representing it directly - cell = new JoinedCellData( - this._workCell, - lineData.translateToString(true, range[0], range[1]), - range[1] - range[0] - ); + // We already know the exact start and end column of the joined range, + // so we get the string and width representing it directly + cell = new JoinedCellData( + this._workCell, + lineData.translateToString(true, range[0], range[1]), + range[1] - range[0] + ); - // Skip over the cells occupied by this range in the loop - lastCharX = range[1] - 1; + // Skip over the cells occupied by this range in the loop + lastCharX = range[1] - 1; - // Recalculate width - width = cell.getWidth(); + // Recalculate width + width = cell.getWidth(); + } } const isInSelection = this._isCellInSelection(x, row); @@ -178,6 +195,7 @@ export class DomRendererRowFactory { && !isCursorCell && !isJoined && !isDecorated + && isValidJoinRange ) { // no span alterations, thus only account chars skipping all code below if (cell.isInvisible()) { @@ -435,7 +453,7 @@ export class DomRendererRowFactory { } // exclude conditions for cell merging - never merge these - if (!isCursorCell && !isJoined && !isDecorated) { + if (!isCursorCell && !isJoined && !isDecorated && isValidJoinRange) { cellAmount++; } else { charElement.textContent = text;