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

Proper unicode support

Browse Source
This commit is contained in:
Zachary Yedidia
2017-03-26 17:20:53 -04:00
parent b23c507af5
commit 89d1f1c202
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,7 +49,7 @@ func NewHighlighter(def *Def) *Highlighter {
// color's group (represented as one byte) // color's group (represented as one byte)
type LineMatch map[int]uint8 type LineMatch map[int]uint8
func findIndex(regex *regexp2.Regexp, str []byte, canMatchStart, canMatchEnd bool) []int { func findIndex(regex *regexp2.Regexp, str []rune, canMatchStart, canMatchEnd bool) []int {
regexStr := regex.String() regexStr := regex.String()
if strings.Contains(regexStr, "^") { if strings.Contains(regexStr, "^") {
if !canMatchStart { if !canMatchStart {
@@ -68,7 +68,7 @@ func findIndex(regex *regexp2.Regexp, str []byte, canMatchStart, canMatchEnd boo
return []int{match.Index, match.Index + match.Length} return []int{match.Index, match.Index + match.Length}
} }
func findAllIndex(regex *regexp.Regexp, str []byte, canMatchStart, canMatchEnd bool) [][]int { func findAllIndex(regex *regexp.Regexp, str []rune, canMatchStart, canMatchEnd bool) [][]int {
regexStr := regex.String() regexStr := regex.String()
if strings.Contains(regexStr, "^") { if strings.Contains(regexStr, "^") {
if !canMatchStart { if !canMatchStart {
@@ -80,10 +80,10 @@ func findAllIndex(regex *regexp.Regexp, str []byte, canMatchStart, canMatchEnd b
return nil return nil
} }
} }
return regex.FindAllIndex(str, -1) return regex.FindAllIndex([]byte(string(str)), -1)
} }
func (h *Highlighter) highlightRegion(highlights LineMatch, start int, canMatchEnd bool, lineNum int, line []byte, region *Region, statesOnly bool) LineMatch { func (h *Highlighter) highlightRegion(highlights LineMatch, start int, canMatchEnd bool, lineNum int, line []rune, region *Region, statesOnly bool) LineMatch {
// highlights := make(LineMatch) // highlights := make(LineMatch)
if start == 0 { if start == 0 {
@@ -167,7 +167,7 @@ func (h *Highlighter) highlightRegion(highlights LineMatch, start int, canMatchE
return highlights return highlights
} }
func (h *Highlighter) highlightEmptyRegion(highlights LineMatch, start int, canMatchEnd bool, lineNum int, line []byte, statesOnly bool) LineMatch { func (h *Highlighter) highlightEmptyRegion(highlights LineMatch, start int, canMatchEnd bool, lineNum int, line []rune, statesOnly bool) LineMatch {
if len(line) == 0 { if len(line) == 0 {
if canMatchEnd { if canMatchEnd {
h.lastRegion = nil h.lastRegion = nil
@@ -236,7 +236,7 @@ func (h *Highlighter) HighlightString(input string) []LineMatch {
var lineMatches []LineMatch var lineMatches []LineMatch
for i := 0; i < len(lines); i++ { for i := 0; i < len(lines); i++ {
line := []byte(lines[i]) line := []rune(lines[i])
highlights := make(LineMatch) highlights := make(LineMatch)
if i == 0 || h.lastRegion == nil { if i == 0 || h.lastRegion == nil {
@@ -252,7 +252,7 @@ func (h *Highlighter) HighlightString(input string) []LineMatch {
// HighlightStates correctly sets all states for the buffer // HighlightStates correctly sets all states for the buffer
func (h *Highlighter) HighlightStates(input LineStates) { func (h *Highlighter) HighlightStates(input LineStates) {
for i := 0; i < input.LinesNum(); i++ { for i := 0; i < input.LinesNum(); i++ {
line := []byte(input.Line(i)) line := []rune(input.Line(i))
// highlights := make(LineMatch) // highlights := make(LineMatch)
if i == 0 || h.lastRegion == nil { if i == 0 || h.lastRegion == nil {
@@ -276,7 +276,7 @@ func (h *Highlighter) HighlightMatches(input LineStates, startline, endline int)
break break
} }
line := []byte(input.Line(i)) line := []rune(input.Line(i))
highlights := make(LineMatch) highlights := make(LineMatch)
var match LineMatch var match LineMatch
@@ -300,7 +300,7 @@ func (h *Highlighter) ReHighlightStates(input LineStates, startline int) {
h.lastRegion = input.State(startline - 1) h.lastRegion = input.State(startline - 1)
} }
for i := startline; i < input.LinesNum(); i++ { for i := startline; i < input.LinesNum(); i++ {
line := []byte(input.Line(i)) line := []rune(input.Line(i))
// highlights := make(LineMatch) // highlights := make(LineMatch)
// var match LineMatch // var match LineMatch
@@ -322,7 +322,7 @@ func (h *Highlighter) ReHighlightStates(input LineStates, startline int) {
// ReHighlightLine will rehighlight the state and match for a single line // ReHighlightLine will rehighlight the state and match for a single line
func (h *Highlighter) ReHighlightLine(input LineStates, lineN int) { func (h *Highlighter) ReHighlightLine(input LineStates, lineN int) {
line := []byte(input.Line(lineN)) line := []rune(input.Line(lineN))
highlights := make(LineMatch) highlights := make(LineMatch)
h.lastRegion = nil h.lastRegion = nil