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

Support rule precedence just like the old format

Browse Source
This commit is contained in:
Zachary Yedidia
2017-03-21 13:15:46 -04:00
parent 59bf1a2260
commit 8a33c98bc6
5 changed files with 167 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/micro/cellview.go
View File

@@ -69,7 +69,6 @@ func (c *CellView) Draw(buf *Buffer, top, height, left, width int) {
}
buf.highlighter.HighlightMatches(buf, top, top+height)
messenger.Message(top, top+height)
c.lines = make([][]*Char, 0)

33
cmd/micro/highlight/highlighter.go
View File

@@ -77,6 +77,7 @@ func findAllIndex(regex *regexp.Regexp, str []byte, canMatchStart, canMatchEnd b
}
func (h *Highlighter) highlightRegion(start int, canMatchEnd bool, lineNum int, line []byte, region *Region) LineMatch {
fullHighlights := make([]uint8, len(line))
highlights := make(LineMatch)
if start == 0 {
@@ -126,10 +127,18 @@ func (h *Highlighter) highlightRegion(start int, canMatchEnd bool, lineNum int,
for _, p := range region.rules.patterns {
matches := findAllIndex(p.regex, line, start == 0, canMatchEnd)
for _, m := range matches {
highlights[start+m[0]] = p.group
if _, ok := highlights[start+m[1]]; !ok {
highlights[start+m[1]] = region.group
for i := m[0]; i < m[1]; i++ {
fullHighlights[i] = p.group
}
// highlights[start+m[0]] = p.group
// if _, ok := highlights[start+m[1]]; !ok {
// highlights[start+m[1]] = region.group
// }
}
}
for i, h := range fullHighlights {
if i == 0 || h != fullHighlights[i-1] {
highlights[start+i] = h
}
}
@@ -141,6 +150,7 @@ func (h *Highlighter) highlightRegion(start int, canMatchEnd bool, lineNum int,
}
func (h *Highlighter) highlightEmptyRegion(start int, canMatchEnd bool, lineNum int, line []byte) LineMatch {
fullHighlights := make([]uint8, len(line))
highlights := make(LineMatch)
if len(line) == 0 {
if canMatchEnd {
@@ -170,10 +180,18 @@ func (h *Highlighter) highlightEmptyRegion(start int, canMatchEnd bool, lineNum
for _, p := range h.def.rules.patterns {
matches := findAllIndex(p.regex, line, start == 0, canMatchEnd)
for _, m := range matches {
highlights[start+m[0]] = p.group
if _, ok := highlights[start+m[1]]; !ok {
highlights[start+m[1]] = 0
for i := m[0]; i < m[1]; i++ {
fullHighlights[i] = p.group
}
// highlights[start+m[0]] = p.group
// if _, ok := highlights[start+m[1]]; !ok {
// highlights[start+m[1]] = 0
// }
}
}
for i, h := range fullHighlights {
if i == 0 || h != fullHighlights[i-1] {
highlights[start+i] = h
}
}
@@ -269,9 +287,6 @@ func (h *Highlighter) ReHighlightStates(input LineStates, startline int) {
curState := h.lastRegion
lastState := input.State(i)
// if i < endline {
// input.SetMatch(i, match)
// }
input.SetState(i, curState)
if curState == lastState {

144
cmd/micro/runtime.go
View File

File diff suppressed because one or more lines are too long

2
runtime/syntax/go.yaml
View File

@@ -17,7 +17,7 @@ rules:
- statement: "!"
- statement: ","
- constant.number: "\\b([0-9]+|0x[0-9a-fA-F]*)\\b"
- constant.specialChar: "\\([0-7]{3|x[A-Fa-f0-9]{2}|u[A-Fa-f0-9]{4}|U[A-Fa-f0-9]{8})"
- constant.specialChar: "\\\\([0-7]{3|x[A-Fa-f0-9]{2}|u[A-Fa-f0-9]{4}|U[A-Fa-f0-9]{8})"
- comment:
start: "//"

2
runtime/syntax/syntax_checker.go
View File

@@ -14,7 +14,7 @@ func main() {
hadErr := false
for _, f := range files {
if strings.HasSuffix(f.Name(), ".yaml") {
input, _ := ioutil.ReadFile("/Users/zachary/gocode/src/github.com/zyedidia/highlight/syntax_files/" + f.Name())
input, _ := ioutil.ReadFile(f.Name())
_, err := highlight.ParseDef(input)
if err != nil {
hadErr = true