mirror of https://github.com/Hilbis/Hilbish
feat: accept a function in complete
the `complete` function will now also accept a nested function in the table for you to have more fine control over what is suggested and easily filter specific thingsdev
parent
6bff669abe
commit
11aaa0cd36
56
rl.go
56
rl.go
|
@ -1,3 +1,4 @@
|
||||||
|
//go:build !hilbiline && !goreadline
|
||||||
// +build !hilbiline,!goreadline
|
// +build !hilbiline,!goreadline
|
||||||
|
|
||||||
package main
|
package main
|
||||||
|
@ -126,18 +127,53 @@ func newLineReader(prompt string) *lineReader {
|
||||||
if key.String() == fields[1] {
|
if key.String() == fields[1] {
|
||||||
// if value is a table, we need to iterate over it
|
// if value is a table, we need to iterate over it
|
||||||
// and add each value to completions
|
// and add each value to completions
|
||||||
valueTbl := value.(*lua.LTable)
|
// check if value is either a table or function
|
||||||
valueTbl.ForEach(func(key lua.LValue, value lua.LValue) {
|
if value.Type() == lua.LTTable {
|
||||||
val := value.String()
|
valueTbl := value.(*lua.LTable)
|
||||||
if val == "<file>" {
|
valueTbl.ForEach(func(key lua.LValue, value lua.LValue) {
|
||||||
// complete files
|
val := value.String()
|
||||||
completions = append(completions, readline.FilenameCompleter(query, ctx)...)
|
if val == "<file>" {
|
||||||
} else {
|
// complete files
|
||||||
if strings.HasPrefix(val, query) {
|
completions = append(completions, readline.FilenameCompleter(query, ctx)...)
|
||||||
completions = append(completions, val)
|
} else {
|
||||||
|
if strings.HasPrefix(val, query) {
|
||||||
|
completions = append(completions, val)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
})
|
||||||
|
} else if value.Type() == lua.LTFunction {
|
||||||
|
// if value is a function, we need to call it
|
||||||
|
// and add each value to completions
|
||||||
|
// completionsCtx is the context we pass to the function,
|
||||||
|
// removing 2 fields from the fields array
|
||||||
|
completionsCtx := strings.Join(fields[2:], " ")
|
||||||
|
err := l.CallByParam(lua.P{
|
||||||
|
Fn: value,
|
||||||
|
NRet: 1,
|
||||||
|
Protect: true,
|
||||||
|
}, lua.LString(query), lua.LString(completionsCtx))
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
}
|
}
|
||||||
})
|
|
||||||
|
luacompleteTable := l.Get(-1)
|
||||||
|
l.Pop(1)
|
||||||
|
|
||||||
|
// just check if its actually a table and add it to the completions
|
||||||
|
if cmpTbl, ok := luacompleteTable.(*lua.LTable); ok {
|
||||||
|
cmpTbl.ForEach(func(key lua.LValue, value lua.LValue) {
|
||||||
|
val := value.String()
|
||||||
|
if strings.HasPrefix(val, query) {
|
||||||
|
completions = append(completions, val)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// throw lua error
|
||||||
|
// complete.cmdname: error message...
|
||||||
|
l.RaiseError("complete." + fields[0] + ": completion value is not a table or function")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue