From b45dc4a3b87482aa162a748ce7e835b729529071 Mon Sep 17 00:00:00 2001 From: Zachary Yedidia Date: Mon, 13 Feb 2017 16:15:08 -0500 Subject: [PATCH] Formatting improvements --- highlighter.go | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/highlighter.go b/highlighter.go index cbdd220..9a838d6 100644 --- a/highlighter.go +++ b/highlighter.go @@ -76,18 +76,23 @@ func (h *Highlighter) highlightRegion(start int, canMatchEnd bool, lineNum int, if loc != nil { if region.parent == nil { 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]:]))) - } else { - 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))) + return combineLineMatch(highlights, + combineLineMatch(h.highlightRegion(start, false, lineNum, line[:loc[0]], region), + h.highlightEmptyRegion(start+loc[1], canMatchEnd, lineNum, line[loc[1]:]))) } + 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 { loc = FindIndex(r.start, line, start == 0, canMatchEnd) if loc != nil { 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) if loc != nil { 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))) } }