Merge 0a225ac847 into 16b39fe157

api.go

@@ -712,5 +712,14 @@ func hlhinter(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
 // #example
 // #param line string
 func hlhighlighter(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
-	return c.Next(), nil
+	if err := c.Check1Arg(); err != nil {
+		return nil, err
+	}
+
+	line, err := c.StringArg(0)
+	if err != nil {
+		return nil, err
+	}
+
+	return c.PushingNext1(t.Runtime, rt.StringValue(line)), nil
 }

rl.go

@@ -70,11 +70,8 @@ func newLineReader(prompt string, noHist bool) *lineReader {
 		hooks.Emit("hilbish.vimAction", actionStr, args)
 	}
 	rl.HintText = func(line []rune, pos int) []rune {
-		if hinter == nil {
+		hinter := hshMod.Get(rt.StringValue("hinter"))
-			return []rune{}
+		retVal, err := rt.Call1(l.MainThread(), hinter,
-		}
-
-		retVal, err := rt.Call1(l.MainThread(), rt.FunctionValue(hinter),
 		rt.StringValue(string(line)), rt.IntValue(int64(pos)))
 		if err != nil {
 			fmt.Println(err)
@@ -89,10 +86,8 @@ func newLineReader(prompt string, noHist bool) *lineReader {
 		return []rune(hintText)
 	}
 	rl.SyntaxHighlighter = func(line []rune) string {
-		if highlighter == nil {
+		highlighter := hshMod.Get(rt.StringValue("highlighter"))
-			return string(line)
+		retVal, err := rt.Call1(l.MainThread(), highlighter,
-		}
-		retVal, err := rt.Call1(l.MainThread(), rt.FunctionValue(highlighter),
 		rt.StringValue(string(line)))
 		if err != nil {
 			fmt.Println(err)