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

Fix multiline highlight issue

Browse Source
This commit is contained in:
Zachary Yedidia
2016-03-25 20:23:23 -04:00
parent ff039df5d0
commit 0882af3450
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/highlighter.go
View File

@@ -240,7 +240,6 @@ func Match(v *View) SyntaxMatches {
str := strings.Join(buf.lines[totalStart:totalEnd], "\n") str := strings.Join(buf.lines[totalStart:totalEnd], "\n")
startNum := v.cursor.loc + v.cursor.Distance(0, totalStart) startNum := v.cursor.loc + v.cursor.Distance(0, totalStart)
toplineNum := v.cursor.loc + v.cursor.Distance(0, v.topline)
for _, rule := range rules { for _, rule := range rules {
if rule.startend { if rule.startend {
@@ -251,11 +250,17 @@ func Match(v *View) SyntaxMatches {
value[1] += startNum value[1] += startNum
for i := value[0]; i < value[1]; i++ { for i := value[0]; i < value[1]; i++ {
colNum, lineNum := GetPos(i, buf) colNum, lineNum := GetPos(i, buf)
v.m.Message(strconv.Itoa(lineNum) + ", " + strconv.Itoa(colNum)) if lineNum == -1 || colNum == -1 {
if i >= toplineNum { continue
if lineNum != -1 && colNum != -1 { }
matches[lineNum][colNum] = rule.style lineNum -= viewStart
if lineNum >= 0 && lineNum < v.height {
if lineNum >= len(matches) {
v.m.Error("Line " + strconv.Itoa(lineNum))
} else if colNum >= len(matches[lineNum]) {
v.m.Error("Line " + strconv.Itoa(lineNum) + " Col " + strconv.Itoa(colNum) + " " + strconv.Itoa(len(matches[lineNum])))
} }
matches[lineNum][colNum] = rule.style
} }
} }
} }