re
/
readline
forked from mirror/readline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix data race in PromptLen (#80)

This commit is contained in:
chzyer 2016-09-10 16:03:59 +08:00 committed by GitHub
parent 31ab3eee0c
commit 820d6f2766
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
runebuf.go
View File

@ -75,6 +75,13 @@ func (r *RuneBuffer) CurrentWidth(x int) int {
} }
func (r *RuneBuffer) PromptLen() int { func (r *RuneBuffer) PromptLen() int {
r.Lock()
width := r.promptLen()
r.Unlock()
return width
}
func (r *RuneBuffer) promptLen() int {
return runes.WidthAll(runes.ColorFilter(r.prompt)) return runes.WidthAll(runes.ColorFilter(r.prompt))
} }
@ -371,7 +378,7 @@ func (r *RuneBuffer) isInLineEdge() bool {
} }
func (r *RuneBuffer) getSplitByLine(rs []rune) []string { func (r *RuneBuffer) getSplitByLine(rs []rune) []string {
return SplitByLine(r.PromptLen(), r.width, rs) return SplitByLine(r.promptLen(), r.width, rs)
} }
func (r *RuneBuffer) IdxLine(width int) int { func (r *RuneBuffer) IdxLine(width int) int {
@ -492,14 +499,16 @@ func (r *RuneBuffer) Set(buf []rune) {
} }
func (r *RuneBuffer) SetPrompt(prompt string) { func (r *RuneBuffer) SetPrompt(prompt string) {
r.Lock()
r.prompt = []rune(prompt) r.prompt = []rune(prompt)
r.Unlock()
} }
func (r *RuneBuffer) cleanOutput(w io.Writer, idxLine int) { func (r *RuneBuffer) cleanOutput(w io.Writer, idxLine int) {
buf := bufio.NewWriter(w) buf := bufio.NewWriter(w)
if r.width == 0 { if r.width == 0 {
buf.WriteString(strings.Repeat("\r\b", len(r.buf)+r.PromptLen())) buf.WriteString(strings.Repeat("\r\b", len(r.buf)+r.promptLen()))
buf.Write([]byte("\033[J")) buf.Write([]byte("\033[J"))
} else { } else {
buf.Write([]byte("\033[J")) // just like ^k :) buf.Write([]byte("\033[J")) // just like ^k :)