Compare commits

...

2 Commits

Author SHA1 Message Date
sammy 885c54ed3f feat: ctrl c to cancel input 2021-04-14 13:20:03 -04:00
sammy cd96ac86ac chore: remove old commented code 2021-04-14 13:19:41 -04:00
2 changed files with 14 additions and 14 deletions

View File

@ -18,4 +18,3 @@ bait.catch('command.exit', function(code)
doPrompt(code ~= 0)
end)
--hook("tab complete", function ())

27
main.go
View File

@ -4,10 +4,8 @@ import (
"fmt"
"os"
"os/user"
"syscall"
"os/signal"
"strings"
"bufio"
"io"
hooks "hilbish/golibs/bait"
@ -29,6 +27,7 @@ var commands = map[string]bool{}
var aliases = map[string]string{}
var bait hooks.Bait
var homedir string
var running bool
func main() {
homedir, _ = os.UserHomeDir()
@ -89,13 +88,14 @@ func main() {
}
}
HandleSignals()
go HandleSignals()
LuaInit(*configflag)
readline.Completer = readline.FilenameCompleter
readline.LoadHistory(homedir + "/.hilbish-history")
for {
running = false
input, err := readline.String(fmtPrompt())
if err == io.EOF {
// Exit if user presses ^D (ctrl + d)
@ -117,6 +117,7 @@ func main() {
if err != nil || !strings.HasSuffix(input, "\\") { break }
}
}
running = true
RunInput(input)
termwidth, _, err := term.GetSize(0)
@ -126,12 +127,7 @@ func main() {
}
func ContinuePrompt(prev string) (string, error) {
fmt.Print(multilinePrompt)
reader := bufio.NewReader(os.Stdin)
// TODO: use readline here?
cont, err := reader.ReadString('\n')
cont, err := readline.String(multilinePrompt)
if err != nil {
fmt.Println("")
return "", err
@ -170,9 +166,14 @@ func fmtPrompt() string {
// do i even have to say
func HandleSignals() {
c := make(chan os.Signal)
signal.Notify(c, os.Interrupt, syscall.SIGTERM)
go func() {
<-c
}()
signal.Notify(c, os.Interrupt)
for range c {
if !running {
fmt.Println(" // interrupt")
readline.ReplaceLine("", 0)
readline.RefreshLine()
}
}
}