github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-06 20:55:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Never create empty spans at the beginning of a row

Browse Source 
This was happening when a text decoration overlapped a row, but the next
boundary was located exactly at the beginning of it.
This commit is contained in:
Antonio Scandurra
2017-05-04 11:53:20 +02:00
parent ac8a908385
commit c2b854123b
2 changed files with 59 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/text-editor-component.js
View File

@@ -1135,6 +1135,7 @@ class TextEditorComponent {
}
const renderedStartRow = this.getRenderedStartRow()
const renderedEndRow = this.getRenderedEndRow()
const containingMarkers = []
// Iterate over boundaries to build up text decorations.
@@ -1186,10 +1187,18 @@ class TextEditorComponent {
// Add decoration start with className/style for current position's column,
// and also for the start of every row up until the next decoration boundary
this.addTextDecorationStart(boundary.position.row, boundary.position.column, className, style)
if (boundary.position.row >= renderedStartRow) {
this.addTextDecorationStart(boundary.position.row, boundary.position.column, className, style)
}
const nextBoundary = this.textDecorationBoundaries[i + 1]
if (nextBoundary) {
for (let row = boundary.position.row + 1; row <= nextBoundary.position.row; row++) {
let row = Math.max(boundary.position.row + 1, renderedStartRow)
const endRow = Math.min(nextBoundary.position.row, renderedEndRow)
for (; row < endRow; row++) {
this.addTextDecorationStart(row, 0, className, style)
}
if (row === nextBoundary.position.row && nextBoundary.position.column !== 0) {
this.addTextDecorationStart(row, 0, className, style)
}
}
@@ -3584,7 +3593,9 @@ class LineComponent {
let activeStyle = null
let nextDecoration = textDecorations ? textDecorations[decorationIndex] : null
if (nextDecoration && nextDecoration.column === 0) {
({className: activeClassName, style: activeStyle} = nextDecoration)
column = nextDecoration.column
activeClassName = nextDecoration.className
activeStyle = nextDecoration.style
nextDecoration = textDecorations[++decorationIndex]
}
@@ -3603,7 +3614,9 @@ class LineComponent {
while (nextDecoration && nextDecoration.column <= nextTokenColumn) {
const text = lineText.substring(column, nextDecoration.column)
this.appendTextNode(textNodes, openScopeNode, text, activeClassName, activeStyle)
,({column, className: activeClassName, style: activeStyle} = nextDecoration)
column = nextDecoration.column
activeClassName = nextDecoration.className
activeStyle = nextDecoration.style
nextDecoration = textDecorations[++decorationIndex]
}