Use refactored code instead of original.

complete_helper.go

@@ -7,38 +7,51 @@ import (
 	"github.com/chzyer/readline/runes"
 )
 
+type PrefixCompleterInterface interface {
+	Print(prefix string, level int, buf *bytes.Buffer)
+	Do(line []rune, pos int) (newLine [][]rune, length int)
+	GetName() []rune
+	GetChildren() []PrefixCompleterInterface
+}
+
 type PrefixCompleter struct {
 	Name     []rune
-	Children []*PrefixCompleter
+	Children []PrefixCompleterInterface
 }
 
-func (p *PrefixCompleter) Tree(prefix string) string {
+func Print(p PrefixCompleterInterface, prefix string, level int, buf *bytes.Buffer) {
-	buf := bytes.NewBuffer(nil)
+	if strings.TrimSpace(string(p.GetName())) != "" {
-	p.Print(prefix, 0, buf)
-	return buf.String()
-}
-
-func (p *PrefixCompleter) Print(prefix string, level int, buf *bytes.Buffer) {
-	if strings.TrimSpace(string(p.Name)) != "" {
 		buf.WriteString(prefix)
 		if level > 0 {
 			buf.WriteString("├")
 			buf.WriteString(strings.Repeat("─", (level*4)-2))
 			buf.WriteString(" ")
 		}
-		buf.WriteString(string(p.Name) + "\n")
+		buf.WriteString(string(p.GetName()) + "\n")
 		level++
 	}
-	for _, ch := range p.Children {
+	for _, ch := range p.GetChildren() {
 		ch.Print(prefix, level, buf)
 	}
 }
 
-func NewPrefixCompleter(pc ...*PrefixCompleter) *PrefixCompleter {
+func (p *PrefixCompleter) Print(prefix string, level int, buf *bytes.Buffer) {
+	Print(p, prefix, level, buf)
+}
+
+func (p *PrefixCompleter) GetName() []rune {
+	return p.Name
+}
+
+func (p *PrefixCompleter) GetChildren() []PrefixCompleterInterface {
+	return p.Children
+}
+
+func NewPrefixCompleter(pc ...PrefixCompleterInterface) *PrefixCompleter {
 	return PcItem("", pc...)
 }
 
-func PcItem(name string, pc ...*PrefixCompleter) *PrefixCompleter {
+func PcItem(name string, pc ...PrefixCompleterInterface) *PrefixCompleter {
 	name += " "
 	return &PrefixCompleter{
 		Name:     []rune(name),
@@ -47,24 +60,29 @@ func PcItem(name string, pc ...*PrefixCompleter) *PrefixCompleter {
 }
 
 func (p *PrefixCompleter) Do(line []rune, pos int) (newLine [][]rune, offset int) {
+	return Do(p, line, pos)
+}
+
+func Do(p PrefixCompleterInterface, line []rune, pos int) (newLine [][]rune, offset int) {
 	line = line[:pos]
 	goNext := false
-	var lineCompleter *PrefixCompleter
+	var lineCompleter PrefixCompleterInterface
-	for _, child := range p.Children {
+	for _, child := range p.GetChildren() {
-		if len(line) >= len(child.Name) {
+		childName := child.GetName()
-			if runes.HasPrefix(line, child.Name) {
+		if len(line) >= len(childName) {
-				if len(line) == len(child.Name) {
+			if runes.HasPrefix(line, childName) {
+				if len(line) == len(childName) {
 					newLine = append(newLine, []rune{' '})
 				} else {
-					newLine = append(newLine, child.Name)
+					newLine = append(newLine, childName)
 				}
-				offset = len(child.Name)
+				offset = len(childName)
 				lineCompleter = child
 				goNext = true
 			}
 		} else {
-			if runes.HasPrefix(child.Name, line) {
+			if runes.HasPrefix(childName, line) {
-				newLine = append(newLine, child.Name[len(line):])
+				newLine = append(newLine, childName[len(line):])
 				offset = len(line)
 				lineCompleter = child
 			}

complete_helper_ext.go

@@ -1,110 +0,0 @@
-package readline
-
-import (
-	"bytes"
-	"strings"
-
-	"github.com/chzyer/readline/runes"
-)
-
-type PrefixCompleterInterface interface {
-	Print(prefix string, level int, buf *bytes.Buffer)
-	Do(line []rune, pos int) (newLine [][]rune, length int)
-	GetName() []rune
-	GetChildren() []PrefixCompleterInterface
-}
-
-type PrefixCompleterExt struct {
-	Name     []rune
-	Children []PrefixCompleterInterface
-}
-
-func Print(p PrefixCompleterInterface, prefix string, level int, buf *bytes.Buffer) {
-	if strings.TrimSpace(string(p.GetName())) != "" {
-		buf.WriteString(prefix)
-		if level > 0 {
-			buf.WriteString("├")
-			buf.WriteString(strings.Repeat("─", (level*4)-2))
-			buf.WriteString(" ")
-		}
-		buf.WriteString(string(p.GetName()) + "\n")
-		level++
-	}
-	for _, ch := range p.GetChildren() {
-		ch.Print(prefix, level, buf)
-	}
-}
-
-func (p *PrefixCompleterExt) Print(prefix string, level int, buf *bytes.Buffer) {
-	Print(p, prefix, level, buf)
-}
-
-func (p *PrefixCompleterExt) GetName() []rune {
-	return p.Name
-}
-
-func (p *PrefixCompleterExt) GetChildren() []PrefixCompleterInterface {
-	return p.Children
-}
-
-func NewPrefixCompleterExt(pc ...PrefixCompleterInterface) *PrefixCompleterExt {
-	return PceItem("", pc...)
-}
-
-func PceItem(name string, pc ...PrefixCompleterInterface) *PrefixCompleterExt {
-	name += " "
-	return &PrefixCompleterExt{
-		Name:     []rune(name),
-		Children: pc,
-	}
-}
-
-func (p *PrefixCompleterExt) Do(line []rune, pos int) (newLine [][]rune, offset int) {
-	return Do(p, line, pos)
-}
-
-func Do(p PrefixCompleterInterface, line []rune, pos int) (newLine [][]rune, offset int) {
-	line = line[:pos]
-	goNext := false
-	var lineCompleter PrefixCompleterInterface
-	for _, child := range p.GetChildren() {
-		childName := child.GetName()
-		if len(line) >= len(childName) {
-			if runes.HasPrefix(line, childName) {
-				if len(line) == len(childName) {
-					newLine = append(newLine, []rune{' '})
-				} else {
-					newLine = append(newLine, childName)
-				}
-				offset = len(childName)
-				lineCompleter = child
-				goNext = true
-			}
-		} else {
-			if runes.HasPrefix(childName, line) {
-				newLine = append(newLine, childName[len(line):])
-				offset = len(line)
-				lineCompleter = child
-			}
-		}
-	}
-
-	if len(newLine) != 1 {
-		return
-	}
-
-	tmpLine := make([]rune, 0, len(line))
-	for i := offset; i < len(line); i++ {
-		if line[i] == ' ' {
-			continue
-		}
-
-		tmpLine = append(tmpLine, line[i:]...)
-		return lineCompleter.Do(tmpLine, len(tmpLine))
-	}
-
-	if goNext {
-		return lineCompleter.Do(nil, 0)
-	}
-	return
-}