feat(prompt): 完善提示库

完善提示库

Signed-off-by: mritd <[email protected]>

Author: mritd

glide.lock

@@ -1,7 +1,7 @@
 package: github.com/mritd/gitflow-toolkit
 import:
-- package: github.com/chzyer/readline
-  version: f6d7a1f6fbf35bbf9beb80dc63c56a29dcfb759f
+- package: github.com/mritd/readline
+  version: 90db0eb8bda49af6c0c871a98e7f2c54544b09df
 - package: github.com/cpuguy83/go-md2man
   version: 48d8747a2ca13185e7cc8efe6e9fc196a83f71a5
   subpackages:

glide.yaml

@@ -102,6 +102,8 @@ func InputSubject() string {
 	p := gitprompt.NewDefaultPrompt(func(line []rune) error {
 		if strings.TrimSpace(string(line)) == "" {
 			return errors.New("Input is empty!")
+		} else if len(line) > 25 {
+			return errors.New("Input length must < 25!")
 		} else {
 			return nil
 		}

pkg/commit/ci.go

@@ -53,8 +53,9 @@ const (
 	showCursor    = esc + "?25h"
 	clearLine     = esc + "2K"
 	moveUp        = esc + "1A"
+	move2Up       = esc + "2A"
 	moveDown      = esc + "1B"
-	cleanTerminal = "\033c"
+	clearTerminal = "\033c"
 )
 
 // FuncMap defines template helpers for the output. It can be extended as a

pkg/prompt/codes.go

@@ -56,11 +56,10 @@ func NewDefaultTpl(check func(line []rune) error) *Tpl {
 
 func NewDefaultPrompt(check func(line []rune) error, ask string) *Prompt {
 	return &Prompt{
-		isFirstRun: true,
-		Ask:        ask,
-		Prompt:     DefaultPrompt,
-		PromptTpl:  NewDefaultTpl(check),
-		FuncMap:    FuncMap,
+		Ask:       ask,
+		Prompt:    DefaultPrompt,
+		PromptTpl: NewDefaultTpl(check),
+		FuncMap:   FuncMap,
 	}
 }
 
@@ -94,12 +93,18 @@ func filterInput(r rune) (rune, bool) {
 	// block CtrlZ feature
 	case readline.CharCtrlZ:
 		return r, false
+	// clear line
+	case readline.CharInterrupt:
+		fmt.Print(moveDown)
+		fmt.Print(clearLine)
+		fmt.Print(moveUp)
+		return r, true
 	}
 	return r, true
 }
 
 func (p *Prompt) Run() string {
-
+	p.isFirstRun = true
 	p.prepareTemplates()
 
 	displayPrompt := append(render(p.prompt, p.Prompt), render(p.ask, p.Ask)...)
@@ -115,32 +120,29 @@ func (p *Prompt) Run() string {
 	util.CheckAndExit(err)
 
 	l.Config.SetListener(func(line []rune, pos int, key rune) (newLine []rune, newPos int, ok bool) {
+		// dynamic verification
 		if err = p.PromptTpl.CheckListener(line); err != nil {
 			l.SetPrompt(string(invalidPrompt))
 			l.Refresh()
-
 		} else {
 			l.SetPrompt(string(validPrompt))
 			l.Refresh()
-
 		}
 		return nil, 0, false
-
 	})
 	defer l.Close()
+
+	// read line
 	for {
+		if !p.isFirstRun {
+			fmt.Print(move2Up)
+		}
 		s, err := l.Readline()
 		util.CheckAndExit(err)
 		if err = p.PromptTpl.CheckListener([]rune(s)); err != nil {
-			if p.isFirstRun {
-				fmt.Print(moveUp)
-				p.isFirstRun = false
-			} else {
-				fmt.Print(moveUp)
-				fmt.Print(moveUp)
-			}
 			fmt.Print(clearLine)
 			fmt.Println(string(render(p.errorMsg, DefaultErrorMsgPrefix+err.Error())))
+			p.isFirstRun = false
 		} else {
 			return s
 		}