github/zyedidia.micro
2
0
Fork 0
mirror of https://github.com/zyedidia/micro.git synced 2026-03-29 22:27:13 +09:00
Code Issues Packages Projects Releases Wiki Activity

Store highlighting matches in each line

Browse Source
This commit is contained in:
Zachary Yedidia
2017-02-19 11:16:01 -05:00
parent 7bb61307e0
commit 7fe2b8ef2f
3 changed files with 33 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
cmd/micro/cellview.go
View File

@@ -1,8 +1,6 @@
package main
import (
"time"
"github.com/mattn/go-runewidth"
"github.com/zyedidia/tcell"
)
@@ -48,13 +46,18 @@ func (c *CellView) Draw(buf *Buffer, top, height, left, width int) {
indentchar := []rune(buf.Settings["indentchar"].(string))[0]
start := buf.Cursor.Y
startTime := time.Now()
matches := buf.highlighter.ReHighlight(buf, start)
elapsed := time.Since(startTime)
for i, m := range matches {
buf.matches[start+i] = m
// startTime := time.Now()
if start > 0 && buf.lines[start-1].rehighlight {
buf.highlighter.ReHighlightLine(buf, start-1)
buf.lines[start-1].rehighlight = false
}
messenger.Message("Rehighlighted ", len(matches), " lines in ", elapsed)
buf.highlighter.ReHighlight(buf, start)
// elapsed := time.Since(startTime)
// for i, m := range matches {
// buf.matches[start+i] = m
// }
// messenger.Message("Rehighlighted ", len(matches), " lines in ", elapsed)
c.lines = make([][]*Char, 0)
@@ -90,7 +93,7 @@ func (c *CellView) Draw(buf *Buffer, top, height, left, width int) {
if colN >= len(line) {
break
}
if group, ok := buf.matches[lineN][colN]; ok {
if group, ok := buf.Match(lineN)[colN]; ok {
curStyle = GetColor(group)
}
@@ -124,7 +127,7 @@ func (c *CellView) Draw(buf *Buffer, top, height, left, width int) {
}
}
if group, ok := buf.matches[lineN][len(line)]; ok {
if group, ok := buf.Match(lineN)[len(line)]; ok {
curStyle = GetColor(group)
}