Fix some issues with unicode handling

[micro.git] / cmd / micro / highlighter.go

diff --git a/cmd/micro/highlighter.go b/cmd/micro/highlighter.go
index 32fe656324b4f54739f2c724f10a61ea709f1bd4..f636d87a8e2a4ce92ff1e44dbacabbe69b723bfa 100644 (file)
--- a/cmd/micro/highlighter.go
+++ b/cmd/micro/highlighter.go
@@ -59,6 +59,7 @@ var preInstalledSynFiles = []string{
        "git-rebase-todo",
        "glsl",
        "go",
+       "golo",
        "groff",
        "haml",
        "haskell",
@@ -71,6 +72,7 @@ var preInstalledSynFiles = []string{
        "keymap",
        "kickstart",
        "ledger",
+       "lilypond",
        "lisp",
        "lua",
        "makefile",
@@ -441,20 +443,19 @@ func Match(v *View) SyntaxMatches {
        str := strings.Join(buf.Lines(totalStart, totalEnd), "\n")
        startNum := ToCharPos(Loc{0, totalStart}, v.Buf)
 
-       toplineNum := ToCharPos(Loc{0, v.Topline}, v.Buf)
-
        for _, rule := range rules {
                if rule.startend {
                        if indicies := rule.regex.FindAllStringIndex(str, -1); indicies != nil {
                                for _, value := range indicies {
                                        value[0] = runePos(value[0], str) + startNum
                                        value[1] = runePos(value[1], str) + startNum
-                                       for i := value[0]; i < value[1]; i++ {
-                                               if i < toplineNum {
+                                       startLoc := FromCharPos(value[0], buf)
+                                       endLoc := FromCharPos(value[1], buf)
+                                       for curLoc := startLoc; curLoc.LessThan(endLoc); curLoc = curLoc.Move(1, buf) {
+                                               if curLoc.Y < v.Topline {
                                                        continue
                                                }
-                                               loc := FromCharPos(i, buf)
-                                               colNum, lineNum := loc.X, loc.Y
+                                               colNum, lineNum := curLoc.X, curLoc.Y
                                                if lineNum == -1 || colNum == -1 {
                                                        continue
                                                }
@@ -471,6 +472,7 @@ func Match(v *View) SyntaxMatches {
                                        for _, value := range indicies {
                                                start := runePos(value[0], line)
                                                end := runePos(value[1], line)
+                                               // messenger.Message(start, " ", end)
                                                for i := start; i < end; i++ {
                                                        matches[lineN][i] = rule.style
                                                }