Skip to content

fix highlighter bugs #4022

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
redsti-github wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −15
Open

fix highlighter bugs #4022

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 14 additions & 15 deletions pkg/highlight/highlighter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ func (h *Highlighter) highlightRegion(highlights LineMatch, start int, canMatchE
searchNesting := true
endLoc := findIndex(curRegion.end, curRegion.skip, line)
if endLoc != nil {
if start == endLoc[0] {
if endLoc[0] == 0 {
searchNesting = false
} else {
firstLoc = endLoc
Expand All @@ -142,30 +142,21 @@ func (h *Highlighter) highlightRegion(highlights LineMatch, start int, canMatchE
}
}
}
if firstRegion != nil && firstLoc[0] != lineLen {
if !statesOnly {
highlights[start+firstLoc[0]] = firstRegion.limitGroup
}
h.highlightEmptyRegion(highlights, start+firstLoc[1], canMatchEnd, lineNum, sliceStart(line, firstLoc[1]), statesOnly)
h.highlightRegion(highlights, start+firstLoc[1], canMatchEnd, lineNum, sliceStart(line, firstLoc[1]), firstRegion, statesOnly)
return highlights
}

if !statesOnly {
fullHighlights := make([]Group, lineLen)
fullHighlights := make([]Group, firstLoc[0])
for i := 0; i < len(fullHighlights); i++ {
fullHighlights[i] = curRegion.group
}

if searchNesting {
line_part := sliceEnd(line, firstLoc[0])
for _, p := range curRegion.rules.patterns {
if curRegion.group == curRegion.limitGroup || p.group == curRegion.limitGroup {
matches := findAllIndex(p.regex, line)
matches := findAllIndex(p.regex, line_part)
for _, m := range matches {
if (endLoc == nil) || (m[0] < endLoc[0]) {
for i := m[0]; i < m[1]; i++ {
fullHighlights[i] = p.group
}
for i := m[0]; i < m[1]; i++ {
fullHighlights[i] = p.group
}
}
}
Expand All @@ -178,6 +169,14 @@ func (h *Highlighter) highlightRegion(highlights LineMatch, start int, canMatchE
}
}

if firstRegion != nil && firstLoc[0] != lineLen {
if !statesOnly {
highlights[start+firstLoc[0]] = firstRegion.limitGroup
}
h.highlightRegion(highlights, start+firstLoc[1], canMatchEnd, lineNum, sliceStart(line, firstLoc[1]), firstRegion, statesOnly)
return highlights
}

loc := endLoc
if loc != nil {
if !statesOnly {
Expand Down