mirror of https://github.com/Hilbis/Hilbish
chore: reorder hilbish.completion functions
parent
93c0645d12
commit
7cd1170e41
16
complete.go
16
complete.go
|
@ -193,10 +193,10 @@ func escapeFilename(fname string) string {
|
||||||
// The completions interface deals with tab completions.
|
// The completions interface deals with tab completions.
|
||||||
func completionLoader(rtm *rt.Runtime) *rt.Table {
|
func completionLoader(rtm *rt.Runtime) *rt.Table {
|
||||||
exports := map[string]util.LuaExport{
|
exports := map[string]util.LuaExport{
|
||||||
"bins": {luaBinaryComplete, 3, false},
|
"bins": {hcmpBins, 3, false},
|
||||||
"call": {callLuaCompleter, 4, false},
|
"call": {hcmpCall, 4, false},
|
||||||
"files": {luaFileComplete, 3, false},
|
"files": {hcmpFiles, 3, false},
|
||||||
"handler": {completionHandler, 2, false},
|
"handler": {hcmpHandler, 2, false},
|
||||||
}
|
}
|
||||||
|
|
||||||
mod := rt.NewTable()
|
mod := rt.NewTable()
|
||||||
|
@ -231,7 +231,7 @@ hilbish.complete('command.sudo', function(query, ctx, fields)
|
||||||
end)
|
end)
|
||||||
#example
|
#example
|
||||||
*/
|
*/
|
||||||
func luaBinaryComplete(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
|
func hcmpBins(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
|
||||||
query, ctx, fds, err := getCompleteParams(t, c)
|
query, ctx, fds, err := getCompleteParams(t, c)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
@ -257,7 +257,7 @@ func luaBinaryComplete(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
|
||||||
// #param query string
|
// #param query string
|
||||||
// #param ctx string
|
// #param ctx string
|
||||||
// #param fields table
|
// #param fields table
|
||||||
func callLuaCompleter(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
|
func hcmpCall(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
|
||||||
if err := c.CheckNArgs(4); err != nil {
|
if err := c.CheckNArgs(4); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
@ -304,7 +304,7 @@ func callLuaCompleter(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
|
||||||
// #param query string
|
// #param query string
|
||||||
// #param ctx string
|
// #param ctx string
|
||||||
// #param fields table
|
// #param fields table
|
||||||
func luaFileComplete(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
|
func hcmpFiles(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
|
||||||
query, ctx, fds, err := getCompleteParams(t, c)
|
query, ctx, fds, err := getCompleteParams(t, c)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
@ -341,7 +341,7 @@ function hilbish.completion.handler(line, pos)
|
||||||
end
|
end
|
||||||
#example
|
#example
|
||||||
*/
|
*/
|
||||||
func completionHandler(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
|
func hcmpHandler(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
|
||||||
return c.Next(), nil
|
return c.Next(), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -13,10 +13,52 @@ The completions interface deals with tab completions.
|
||||||
## Functions
|
## Functions
|
||||||
|||
|
|||
|
||||||
|----|----|
|
|----|----|
|
||||||
|<a href="#completion.call">call(name, query, ctx, fields) -> completionGroups (table), prefix (string)</a>|Calls a completer function. This is mainly used to call a command completer, which will have a `name`|
|
|
||||||
|<a href="#completion.handler">handler(line, pos)</a>|This function contains the general completion handler for Hilbish. This function handles|
|
|
||||||
|<a href="#completion.bins">bins(query, ctx, fields) -> entries (table), prefix (string)</a>|Return binaries/executables based on the provided parameters.|
|
|<a href="#completion.bins">bins(query, ctx, fields) -> entries (table), prefix (string)</a>|Return binaries/executables based on the provided parameters.|
|
||||||
|
|<a href="#completion.call">call(name, query, ctx, fields) -> completionGroups (table), prefix (string)</a>|Calls a completer function. This is mainly used to call a command completer, which will have a `name`|
|
||||||
|<a href="#completion.files">files(query, ctx, fields) -> entries (table), prefix (string)</a>|Returns file matches based on the provided parameters.|
|
|<a href="#completion.files">files(query, ctx, fields) -> entries (table), prefix (string)</a>|Returns file matches based on the provided parameters.|
|
||||||
|
|<a href="#completion.handler">handler(line, pos)</a>|This function contains the general completion handler for Hilbish. This function handles|
|
||||||
|
|
||||||
|
<hr><div id='completion.bins'>
|
||||||
|
<h4 class='heading'>
|
||||||
|
hilbish.completion.bins(query, ctx, fields) -> entries (table), prefix (string)
|
||||||
|
<a href="#completion.bins" class='heading-link'>
|
||||||
|
<i class="fas fa-paperclip"></i>
|
||||||
|
</a>
|
||||||
|
</h4>
|
||||||
|
|
||||||
|
Return binaries/executables based on the provided parameters.
|
||||||
|
This function is meant to be used as a helper in a command completion handler.
|
||||||
|
|
||||||
|
|
||||||
|
#### Parameters
|
||||||
|
`string` **`query`**
|
||||||
|
|
||||||
|
|
||||||
|
`string` **`ctx`**
|
||||||
|
|
||||||
|
|
||||||
|
`table` **`fields`**
|
||||||
|
|
||||||
|
|
||||||
|
#### Example
|
||||||
|
```lua
|
||||||
|
-- an extremely simple completer for sudo.
|
||||||
|
hilbish.complete('command.sudo', function(query, ctx, fields)
|
||||||
|
table.remove(fields, 1)
|
||||||
|
if #fields[1] then
|
||||||
|
-- return commands because sudo runs a command as root..!
|
||||||
|
|
||||||
|
local entries, pfx = hilbish.completion.bins(query, ctx, fields)
|
||||||
|
return {
|
||||||
|
type = 'grid',
|
||||||
|
items = entries
|
||||||
|
}, pfx
|
||||||
|
end
|
||||||
|
|
||||||
|
-- ... else suggest files or anything else ..
|
||||||
|
end)
|
||||||
|
````
|
||||||
|
</div>
|
||||||
|
|
||||||
<hr><div id='completion.call'>
|
<hr><div id='completion.call'>
|
||||||
<h4 class='heading'>
|
<h4 class='heading'>
|
||||||
|
@ -42,6 +84,28 @@ You can check the Completions doc or `doc completions` for info on the `completi
|
||||||
`table` **`fields`**
|
`table` **`fields`**
|
||||||
|
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<hr><div id='completion.files'>
|
||||||
|
<h4 class='heading'>
|
||||||
|
hilbish.completion.files(query, ctx, fields) -> entries (table), prefix (string)
|
||||||
|
<a href="#completion.files" class='heading-link'>
|
||||||
|
<i class="fas fa-paperclip"></i>
|
||||||
|
</a>
|
||||||
|
</h4>
|
||||||
|
|
||||||
|
Returns file matches based on the provided parameters.
|
||||||
|
This function is meant to be used as a helper in a command completion handler.
|
||||||
|
#### Parameters
|
||||||
|
`string` **`query`**
|
||||||
|
|
||||||
|
|
||||||
|
`string` **`ctx`**
|
||||||
|
|
||||||
|
|
||||||
|
`table` **`fields`**
|
||||||
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<hr><div id='completion.handler'>
|
<hr><div id='completion.handler'>
|
||||||
|
@ -79,67 +143,3 @@ end
|
||||||
````
|
````
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<hr><div id='completion.bins'>
|
|
||||||
<h4 class='heading'>
|
|
||||||
hilbish.completion.bins(query, ctx, fields) -> entries (table), prefix (string)
|
|
||||||
<a href="#completion.bins" class='heading-link'>
|
|
||||||
<i class="fas fa-paperclip"></i>
|
|
||||||
</a>
|
|
||||||
</h4>
|
|
||||||
|
|
||||||
Return binaries/executables based on the provided parameters.
|
|
||||||
This function is meant to be used as a helper in a command completion handler.
|
|
||||||
|
|
||||||
|
|
||||||
#### Parameters
|
|
||||||
`string` **`query`**
|
|
||||||
|
|
||||||
|
|
||||||
`string` **`ctx`**
|
|
||||||
|
|
||||||
|
|
||||||
`table` **`fields`**
|
|
||||||
|
|
||||||
|
|
||||||
#### Example
|
|
||||||
```lua
|
|
||||||
-- an extremely simple completer for sudo.
|
|
||||||
hilbish.complete('command.sudo', function(query, ctx, fields)
|
|
||||||
table.remove(fields, 1)
|
|
||||||
if #fields[1] then
|
|
||||||
-- return commands because sudo runs a command as root..!
|
|
||||||
|
|
||||||
local entries, pfx = hilbish.completion.bins(query, ctx, fields)
|
|
||||||
return {
|
|
||||||
type = 'grid',
|
|
||||||
items = entries
|
|
||||||
}, pfx
|
|
||||||
end
|
|
||||||
|
|
||||||
-- ... else suggest files or anything else ..
|
|
||||||
end)
|
|
||||||
````
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<hr><div id='completion.files'>
|
|
||||||
<h4 class='heading'>
|
|
||||||
hilbish.completion.files(query, ctx, fields) -> entries (table), prefix (string)
|
|
||||||
<a href="#completion.files" class='heading-link'>
|
|
||||||
<i class="fas fa-paperclip"></i>
|
|
||||||
</a>
|
|
||||||
</h4>
|
|
||||||
|
|
||||||
Returns file matches based on the provided parameters.
|
|
||||||
This function is meant to be used as a helper in a command completion handler.
|
|
||||||
#### Parameters
|
|
||||||
`string` **`query`**
|
|
||||||
|
|
||||||
|
|
||||||
`string` **`ctx`**
|
|
||||||
|
|
||||||
|
|
||||||
`table` **`fields`**
|
|
||||||
|
|
||||||
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
|
@ -14,18 +14,6 @@ function hilbish.aliases.add(alias, cmd) end
|
||||||
--- @param cb function
|
--- @param cb function
|
||||||
function hilbish.runner.setMode(cb) end
|
function hilbish.runner.setMode(cb) end
|
||||||
|
|
||||||
--- Calls a completer function. This is mainly used to call a command completer, which will have a `name`
|
|
||||||
--- in the form of `command.name`, example: `command.git`.
|
|
||||||
--- You can check the Completions doc or `doc completions` for info on the `completionGroups` return value.
|
|
||||||
function hilbish.completion.call(name, query, ctx, fields) end
|
|
||||||
|
|
||||||
--- This function contains the general completion handler for Hilbish. This function handles
|
|
||||||
--- completion of everything, which includes calling other command handlers, binaries, and files.
|
|
||||||
--- This function can be overriden to supply a custom handler. Note that alias resolution is required to be done in this function.
|
|
||||||
---
|
|
||||||
---
|
|
||||||
function hilbish.completion.handler(line, pos) end
|
|
||||||
|
|
||||||
--- Returns the current input line.
|
--- Returns the current input line.
|
||||||
function hilbish.editor.getLine() end
|
function hilbish.editor.getLine() end
|
||||||
|
|
||||||
|
@ -45,6 +33,28 @@ function hilbish.editor.getChar() end
|
||||||
--- @param text string
|
--- @param text string
|
||||||
function hilbish.editor.setVimRegister(register, text) end
|
function hilbish.editor.setVimRegister(register, text) end
|
||||||
|
|
||||||
|
--- Return binaries/executables based on the provided parameters.
|
||||||
|
--- This function is meant to be used as a helper in a command completion handler.
|
||||||
|
---
|
||||||
|
---
|
||||||
|
function hilbish.completion.bins(query, ctx, fields) end
|
||||||
|
|
||||||
|
--- Calls a completer function. This is mainly used to call a command completer, which will have a `name`
|
||||||
|
--- in the form of `command.name`, example: `command.git`.
|
||||||
|
--- You can check the Completions doc or `doc completions` for info on the `completionGroups` return value.
|
||||||
|
function hilbish.completion.call(name, query, ctx, fields) end
|
||||||
|
|
||||||
|
--- Returns file matches based on the provided parameters.
|
||||||
|
--- This function is meant to be used as a helper in a command completion handler.
|
||||||
|
function hilbish.completion.files(query, ctx, fields) end
|
||||||
|
|
||||||
|
--- This function contains the general completion handler for Hilbish. This function handles
|
||||||
|
--- completion of everything, which includes calling other command handlers, binaries, and files.
|
||||||
|
--- This function can be overriden to supply a custom handler. Note that alias resolution is required to be done in this function.
|
||||||
|
---
|
||||||
|
---
|
||||||
|
function hilbish.completion.handler(line, pos) end
|
||||||
|
|
||||||
--- Sets an alias, with a name of `cmd` to another command.
|
--- Sets an alias, with a name of `cmd` to another command.
|
||||||
---
|
---
|
||||||
---
|
---
|
||||||
|
@ -168,16 +178,6 @@ function hilbish.which(name) end
|
||||||
--- Puts a job in the background. This acts the same as initially running a job.
|
--- Puts a job in the background. This acts the same as initially running a job.
|
||||||
function hilbish.jobs:background() end
|
function hilbish.jobs:background() end
|
||||||
|
|
||||||
--- Return binaries/executables based on the provided parameters.
|
|
||||||
--- This function is meant to be used as a helper in a command completion handler.
|
|
||||||
---
|
|
||||||
---
|
|
||||||
function hilbish.completion.bins(query, ctx, fields) end
|
|
||||||
|
|
||||||
--- Returns file matches based on the provided parameters.
|
|
||||||
--- This function is meant to be used as a helper in a command completion handler.
|
|
||||||
function hilbish.completion.files(query, ctx, fields) end
|
|
||||||
|
|
||||||
--- Puts a job in the foreground. This will cause it to run like it was
|
--- Puts a job in the foreground. This will cause it to run like it was
|
||||||
--- executed normally and wait for it to complete.
|
--- executed normally and wait for it to complete.
|
||||||
function hilbish.jobs:foreground() end
|
function hilbish.jobs:foreground() end
|
||||||
|
|
Loading…
Reference in New Issue