github/zyedidia.micro
2
0
Fork 0
mirror of https://github.com/zyedidia/micro.git synced 2026-03-24 01:37:15 +09:00
Code Issues Packages Projects Releases Wiki Activity

Highlight in parallel

Browse Source
This commit is contained in:
Zachary Yedidia
2020-01-28 20:54:14 -05:00
parent 477bdb3dc8
commit 953f5a0eff
3 changed files with 65 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
internal/buffer/buffer.go
View File

@@ -10,6 +10,7 @@ import (
"path/filepath"
"strconv"
"strings"
"sync"
"time"
"unicode/utf8"
@@ -117,6 +118,7 @@ type Buffer struct {
Highlighter *highlight.Highlighter
// Modifications is the list of modified regions for syntax highlighting
Modifications []Loc
HighlightLock sync.Mutex
// Hash of the original buffer -- empty if fastdirty is on
origHash [md5.Size]byte
@@ -610,7 +612,9 @@ func (b *Buffer) UpdateRules() {
}
if b.Highlighter == nil || syntaxFile != "" {
b.Settings["filetype"] = b.SyntaxDef.FileType
if b.SyntaxDef != nil {
b.Settings["filetype"] = b.SyntaxDef.FileType
}
} else {
b.SyntaxDef = &highlight.EmptyDef
}
@@ -618,8 +622,11 @@ func (b *Buffer) UpdateRules() {
if b.SyntaxDef != nil {
b.Highlighter = highlight.NewHighlighter(b.SyntaxDef)
if b.Settings["syntax"].(bool) {
b.Highlighter.HighlightStates(b)
b.Highlighter.HighlightMatches(b, 0, b.End().Y)
go func() {
b.Highlighter.HighlightStates(b)
b.Highlighter.HighlightMatches(b, 0, b.End().Y)
screen.DrawChan <- true
}()
}
}
}