chore: merge from upstream

fix(hilbish.completions): return prefix on the `call` function (from #263 )
2023-09-30 19:53:38 -04:00 · 2023-09-30 19:52:33 -04:00
2 changed files with 8 additions and 4 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -16,6 +16,9 @@ completed.
  - Example: `hilbish.alias('hello', 'echo %1 says hello')` allows the user to run `hello hilbish`
  which will output `hilbish says hello`.

+### Fixed
+- Return the prefix when calling `hilbish.completions.call`
+
 [#219]: https://github.com/Rosettea/Hilbish/issues/219
 ### Fixed
 - Replaced `sed` in-place editing with `grep` and `mv` for compatibility with BSD utils
--- a/complete.go
+++ b/complete.go
@ -253,15 +253,16 @@ func callLuaCompleter(t *rt.Thread, c *rt.GoCont) (rt.Cont, error) {
 	}

 	// we must keep the holy 80 cols
-	completerReturn, err := rt.Call1(l.MainThread(),
-	rt.FunctionValue(completecb), rt.StringValue(query),
-	rt.StringValue(ctx), rt.TableValue(fields))
+	cont := c.Next()
+	err = rt.Call(l.MainThread(), rt.FunctionValue(completecb),
+	[]rt.Value{rt.StringValue(query), rt.StringValue(ctx), rt.TableValue(fields)},
+	cont)

 	if err != nil {
 		return nil, err
 	}

-	return c.PushingNext1(t.Runtime, completerReturn), nil
+	return cont, nil
 }

 // #interface completions
Author	SHA1	Message	Date
sammyette	6d07d8db53	chore: merge from upstream	2023-09-30 19:53:38 -04:00
sammyette	483e5f6dbe	fix(hilbish.completions): return prefix on the `call` function (from #263 )	2023-09-30 19:52:33 -04:00