luke/qedit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TextEdit: account for tab offsets when highlighting

Browse Source
This commit is contained in:
Luke I. Wilson 2021-03-30 22:21:56 -05:00
parent de921419ce
commit aaf377ccd5
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ui/textedit.go
View File

@ -382,6 +382,8 @@ func (t *TextEdit) Draw(s tcell.Screen) {
var size int = 1 // Size of the rune (in bytes) var size int = 1 // Size of the rune (in bytes)
var selected bool // Whether this rune should be styled as selected var selected bool // Whether this rune should be styled as selected
tabOffsetAtRuneIdx := t.getTabCountInLineAtCol(line, runeIdx) * (t.TabSize-1)
if byteIdx < len(lineBytes) { // If we are drawing part of the line contents... if byteIdx < len(lineBytes) { // If we are drawing part of the line contents...
r, size = utf8.DecodeRune(lineBytes[byteIdx:]) r, size = utf8.DecodeRune(lineBytes[byteIdx:])
@ -392,9 +394,6 @@ func (t *TextEdit) Draw(s tcell.Screen) {
// Determine whether we select the current rune. Also only select runes within // Determine whether we select the current rune. Also only select runes within
// the line bytes range. // the line bytes range.
if t.selectMode && line >= t.selection.StartLine && line <= t.selection.EndLine { // If we're part of a selection... if t.selectMode && line >= t.selection.StartLine && line <= t.selection.EndLine { // If we're part of a selection...
tabOffsetAtRuneIdx := t.getTabCountInLineAtCol(line, runeIdx) * (t.TabSize-1)
if line == t.selection.StartLine { // If selection starts at this line... if line == t.selection.StartLine { // If selection starts at this line...
if runeIdx-tabOffsetAtRuneIdx >= t.selection.StartCol { // And we're at or past the start col... if runeIdx-tabOffsetAtRuneIdx >= t.selection.StartCol { // And we're at or past the start col...
// If the start line is also the end line... // If the start line is also the end line...
@ -425,8 +424,8 @@ func (t *TextEdit) Draw(s tcell.Screen) {
if lineHighlightDataIdx < len(lineHighlightData) { // Works for single-line highlights if lineHighlightDataIdx < len(lineHighlightData) { // Works for single-line highlights
data := lineHighlightData[lineHighlightDataIdx] data := lineHighlightData[lineHighlightDataIdx]
if runeIdx >= data.Col { if runeIdx-tabOffsetAtRuneIdx >= data.Col {
if runeIdx > data.EndCol { // Passed that highlight data if runeIdx-tabOffsetAtRuneIdx > data.EndCol { // Passed that highlight data
currentStyle = defaultStyle currentStyle = defaultStyle
lineHighlightDataIdx++ // Go to next one lineHighlightDataIdx++ // Go to next one
} else { // Start coloring as this syntax style } else { // Start coloring as this syntax style