GitHubMirror/go-highlite
1
0
Fork 0
mirror of https://github.com/rwinkhart/go-highlite.git synced 2026-09-05 16:37:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Formatting improvements

Browse Source
This commit is contained in:
Zachary Yedidia
2017-02-13 16:15:08 -05:00
parent 2d6c6001b0
commit b45dc4a3b8
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
highlighter.go
+13 -6
View File
@@ -76,18 +76,23 @@ func (h *Highlighter) highlightRegion(start int, canMatchEnd bool, lineNum int,
if loc != nil { if loc != nil {
if region.parent == nil { if region.parent == nil {
highlights[start+loc[1]] = "" highlights[start+loc[1]] = ""
return combineLineMatch(highlights, combineLineMatch(h.highlightRegion(start, false, lineNum, line[:loc[0]], region), h.highlightEmptyRegion(start+loc[1], canMatchEnd, lineNum, line[loc[1]:]))) return combineLineMatch(highlights,
} else { combineLineMatch(h.highlightRegion(start, false, lineNum, line[:loc[0]], region),
highlights[start+loc[1]] = region.parent.group h.highlightEmptyRegion(start+loc[1], canMatchEnd, lineNum, line[loc[1]:])))
return combineLineMatch(highlights, combineLineMatch(h.highlightRegion(start, false, lineNum, line[:loc[0]], region), h.highlightRegion(start+loc[1], canMatchEnd, lineNum, line[loc[1]:], region.parent)))
} }
highlights[start+loc[1]] = region.parent.group
return combineLineMatch(highlights,
combineLineMatch(h.highlightRegion(start, false, lineNum, line[:loc[0]], region),
h.highlightRegion(start+loc[1], canMatchEnd, lineNum, line[loc[1]:], region.parent)))
} }
for _, r := range region.rules.regions { for _, r := range region.rules.regions {
loc = FindIndex(r.start, line, start == 0, canMatchEnd) loc = FindIndex(r.start, line, start == 0, canMatchEnd)
if loc != nil { if loc != nil {
highlights[start+loc[0]] = r.group highlights[start+loc[0]] = r.group
return combineLineMatch(highlights, combineLineMatch(h.highlightRegion(start, false, lineNum, line[:loc[0]], region), h.highlightRegion(start+loc[1], canMatchEnd, lineNum, line[loc[1]:], r))) return combineLineMatch(highlights,
combineLineMatch(h.highlightRegion(start, false, lineNum, line[:loc[0]], region),
h.highlightRegion(start+loc[1], canMatchEnd, lineNum, line[loc[1]:], r)))
} }
} }
@@ -121,7 +126,9 @@ func (h *Highlighter) highlightEmptyRegion(start int, canMatchEnd bool, lineNum
loc := FindIndex(r.start, line, start == 0, canMatchEnd) loc := FindIndex(r.start, line, start == 0, canMatchEnd)
if loc != nil { if loc != nil {
highlights[start+loc[0]] = r.group highlights[start+loc[0]] = r.group
return combineLineMatch(highlights, combineLineMatch(h.highlightEmptyRegion(start, false, lineNum, line[:loc[0]]), h.highlightRegion(start+loc[1], canMatchEnd, lineNum, line[loc[1]:], r))) return combineLineMatch(highlights,
combineLineMatch(h.highlightEmptyRegion(start, false, lineNum, line[:loc[0]]),
h.highlightRegion(start+loc[1], canMatchEnd, lineNum, line[loc[1]:], r)))
} }
} }