zyedidia/micro
1
1
Fork 0
mirror of https://github.com/zyedidia/micro.git synced 2024-10-26 12:07:18 +03:00
Code Issues Projects Releases Wiki Activity

highlighter: Properly handle rehighlighting within Highlight()

Browse Source 
Co-authored-by: Dmitry Maluka <dmitrymaluka@gmail.com>
This commit is contained in:
Jöran Karl 2024-04-11 21:24:24 +02:00
parent 1a436a5b18
commit 4ab825b8ae
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/highlight/highlighter.go
View File

@ -454,8 +454,10 @@ func (h *Highlighter) HighlightString(input string) []LineMatch {
return lineMatches
}
// Highlight sets the state and matches for each line from startline to endline
// It sets all other matches in the buffer to nil to conserve memory
// Highlight sets the state and matches for each line from startline to endline,
// and also for some amount of lines after endline, until it detects a line
// whose state does not change, which means that the lines after it do not change
// their highlighting and therefore do not need to be updated.
func (h *Highlighter) Highlight(input LineStates, startline, endline int) {
var curState *region
if startline > 0 {
@ -466,7 +468,7 @@ func (h *Highlighter) Highlight(input LineStates, startline, endline int) {
input.Unlock()
}
for i := startline; i <= endline; i++ {
for i := startline; ; i++ {
input.Lock()
if i >= input.LinesNum() {
input.Unlock()
@ -479,9 +481,18 @@ func (h *Highlighter) Highlight(input LineStates, startline, endline int) {
match, newState := h.highlight(highlights, 0, i, line, curState)
curState = newState
var lastState *region
if i >= endline {
lastState = input.State(i)
}
input.SetState(i, curState)
input.SetMatch(i, match)
input.Unlock()
if i >= endline && curState == lastState {
break
}
}
}