Merge pull request #2 from ktr0731/apply-239

apply c-bata/go-prompt c-bata#239

Author: ktr0731

README.md

@@ -1,125 +1 @@
-# go-prompt
-
-[![Go Report Card](https://goreportcard.com/badge/github.com/c-bata/go-prompt)](https://goreportcard.com/report/github.com/c-bata/go-prompt)
-![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)
-[![GoDoc](https://godoc.org/github.com/c-bata/go-prompt?status.svg)](https://godoc.org/github.com/c-bata/go-prompt) 
-![tests](https://github.com/c-bata/go-prompt/workflows/tests/badge.svg)
-
-A library for building powerful interactive prompts inspired by [python-prompt-toolkit](https://github.com/jonathanslenders/python-prompt-toolkit),
-making it easier to build cross-platform command line tools using Go.
-
-```go
-package main
-
-import (
-	"fmt"
-	"github.com/c-bata/go-prompt"
-)
-
-func completer(d prompt.Document) []prompt.Suggest {
-	s := []prompt.Suggest{
-		{Text: "users", Description: "Store the username and age"},
-		{Text: "articles", Description: "Store the article text posted by user"},
-		{Text: "comments", Description: "Store the text commented to articles"},
-	}
-	return prompt.FilterHasPrefix(s, d.GetWordBeforeCursor(), true)
-}
-
-func main() {
-	fmt.Println("Please select table.")
-	t := prompt.Input("> ", completer)
-	fmt.Println("You selected " + t)
-}
-```
-
-#### Projects using go-prompt
-
-* [c-bata/kube-prompt : An interactive kubernetes client featuring auto-complete written in Go.](https://github.com/c-bata/kube-prompt)
-* [rancher/cli : The Rancher Command Line Interface (CLI)is a unified tool to manage your Rancher server](https://github.com/rancher/cli)
-* [kubicorn/kubicorn : Simple, cloud native infrastructure for Kubernetes.](https://github.com/kubicorn/kubicorn)
-* [cch123/asm-cli : Interactive shell of assembly language(X86/X64) based on unicorn and rasm2](https://github.com/cch123/asm-cli)
-* [ktr0731/evans : more expressive universal gRPC client](https://github.com/ktr0731/evans)
-* [CrushedPixel/moshpit: A Command-line tool for datamoshing.](https://github.com/CrushedPixel/moshpit)
-* [last-ent/testy-go: Testy Go: A tool for easy testing!](https://github.com/last-ent/testy-go)
-* [tiagorlampert/CHAOS: a PoC that allow generate payloads and control remote operating systems.](https://github.com/tiagorlampert/CHAOS)
-* [abs-lang/abs: ABS is a scripting language that works best on terminal. It tries to combine the elegance of languages such as Python, or Ruby, to the convenience of Bash.](https://github.com/abs-lang/abs)
-* [takashabe/btcli: btcli is a CLI client for the Bigtable. Has many read options and auto-completion.](https://github.com/takashabe/btcli)
-* [ysn2233/kafka-prompt: An interactive kafka-prompt(kafka-shell) built on existing kafka command client](https://github.com/ysn2233/kafka-prompt)
-* [fishi0x01/vsh: HashiCorp Vault interactive shell](https://github.com/fishi0x01/vsh)
-* [mstrYoda/docker-shell: A simple interactive prompt for docker](https://github.com/mstrYoda/docker-shell)
-* [c-bata/gh-prompt: An interactive GitHub CLI featuring auto-complete.](https://github.com/c-bata/gh-prompt)
-* [docker-slim/docker-slim: Don't change anything in your Docker container image and minify it by up to 30x (and for compiled languages even more) making it secure too! (free and open source)](https://github.com/docker-slim/docker-slim)
-* [rueyaa332266/ezcron: Ezcron is a CLI tool, helping you deal with cron expression easier.](https://github.com/rueyaa332266/ezcron)
-* [qingstor/qsctl: Advanced command line tool for QingStor Object Storage.](https://github.com/qingstor/qsctl)
-* [segmentio/topicctl: Tool for declarative management of Kafka topics](https://github.com/segmentio/topicctl)
-* [chriswalz/bit: Bit is a modern Git CLI](https://github.com/chriswalz/bit)
-* (If you create a CLI utility using go-prompt and want your own project to be listed here, please submit a GitHub issue.)
-
-## Features
-
-### Powerful auto-completion
-
-[![demo](https://github.com/c-bata/assets/raw/master/go-prompt/kube-prompt.gif)](https://github.com/c-bata/kube-prompt)
-
-(This is a GIF animation of kube-prompt.)
-
-### Flexible options
-
-go-prompt provides many options. Please check [option section of GoDoc](https://godoc.org/github.com/c-bata/go-prompt#Option) for more details.
-
-[![options](https://github.com/c-bata/assets/raw/master/go-prompt/prompt-options.png)](#flexible-options)
-
-### Keyboard Shortcuts
-
-Emacs-like keyboard shortcuts are available by default (these also are the default shortcuts in Bash shell).
-You can customize and expand these shortcuts.
-
-[![keyboard shortcuts](https://github.com/c-bata/assets/raw/master/go-prompt/keyboard-shortcuts.gif)](#keyboard-shortcuts)
-
-Key Binding          | Description
----------------------|---------------------------------------------------------
-<kbd>Ctrl + A</kbd>  | Go to the beginning of the line (Home)
-<kbd>Ctrl + E</kbd>  | Go to the end of the line (End)
-<kbd>Ctrl + P</kbd>  | Previous command (Up arrow)
-<kbd>Ctrl + N</kbd>  | Next command (Down arrow)
-<kbd>Ctrl + F</kbd>  | Forward one character
-<kbd>Ctrl + B</kbd>  | Backward one character
-<kbd>Ctrl + D</kbd>  | Delete character under the cursor
-<kbd>Ctrl + H</kbd>  | Delete character before the cursor (Backspace)
-<kbd>Ctrl + W</kbd>  | Cut the word before the cursor to the clipboard
-<kbd>Ctrl + K</kbd>  | Cut the line after the cursor to the clipboard
-<kbd>Ctrl + U</kbd>  | Cut the line before the cursor to the clipboard
-<kbd>Ctrl + L</kbd>  | Clear the screen
-
-### History
-
-You can use <kbd>Up arrow</kbd> and <kbd>Down arrow</kbd> to walk through the history of commands executed.
-
-[![History](https://github.com/c-bata/assets/raw/master/go-prompt/history.gif)](#history)
-
-### Multiple platform support
-
-We have confirmed go-prompt works fine in the following terminals:
-
-* iTerm2 (macOS)
-* Terminal.app (macOS)
-* Command Prompt (Windows)
-* gnome-terminal (Ubuntu)
-
-## Links
-
-* [Change Log](./CHANGELOG.md)
-* [GoDoc](http://godoc.org/github.com/c-bata/go-prompt)
-* [gocover.io](https://gocover.io/github.com/c-bata/go-prompt)
-
-## Author
-
-Masashi Shibata
-
-* Twitter: [@c\_bata\_](https://twitter.com/c_bata_/)
-* Github: [@c-bata](https://github.com/c-bata/)
-
-## License
-
-This software is licensed under the MIT license, see [LICENSE](./LICENSE) for more information.
-
+This is a fork of c-bata/go-prompt optimized for ktr0731/evans. It's not recommended to use this fork for other projects!

_example/exec-command/main.go

@@ -4,7 +4,7 @@ import (
 	"os"
 	"os/exec"
 
-	prompt "github.com/c-bata/go-prompt"
+	prompt "github.com/ktr0731/go-prompt"
 )
 
 func executor(t string) {

_example/http-prompt/main.go

@@ -10,7 +10,7 @@ import (
 	"path"
 	"strings"
 
-	prompt "github.com/c-bata/go-prompt"
+	prompt "github.com/ktr0731/go-prompt"
 )
 
 type RequestContext struct {

_example/live-prefix/main.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	prompt "github.com/c-bata/go-prompt"
+	prompt "github.com/ktr0731/go-prompt"
 )
 
 var LivePrefixState struct {

_example/simple-echo/cjk-cyrillic/main.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	prompt "github.com/c-bata/go-prompt"
+	prompt "github.com/ktr0731/go-prompt"
 )
 
 func executor(in string) {

_example/simple-echo/main.go

@@ -2,8 +2,9 @@ package main
 
 import (
 	"fmt"
+	"log"
 
-	prompt "github.com/c-bata/go-prompt"
+	prompt "github.com/ktr0731/go-prompt"
 )
 
 func completer(in prompt.Document) []prompt.Suggest {
@@ -17,12 +18,15 @@ func completer(in prompt.Document) []prompt.Suggest {
 }
 
 func main() {
-	in := prompt.Input(">>> ", completer,
+	in, err := prompt.Input(">>> ", completer,
 		prompt.OptionTitle("sql-prompt"),
 		prompt.OptionHistory([]string{"SELECT * FROM users;"}),
 		prompt.OptionPrefixTextColor(prompt.Yellow),
 		prompt.OptionPreviewSuggestionTextColor(prompt.Blue),
 		prompt.OptionSelectedSuggestionBGColor(prompt.LightGray),
 		prompt.OptionSuggestionBGColor(prompt.DarkGray))
+	if err != nil {
+		log.Fatal(err)
+	}
 	fmt.Println("Your input: " + in)
 }

_tools/complete_file/main.go

@@ -5,8 +5,8 @@ import (
 	"os"
 	"strings"
 
-	prompt "github.com/c-bata/go-prompt"
-	"github.com/c-bata/go-prompt/completer"
+	prompt "github.com/ktr0731/go-prompt"
+	"github.com/ktr0731/go-prompt/completer"
 )
 
 var filePathCompleter = completer.FilePathCompleter{

_tools/vt100_debug/main.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package main
@@ -6,8 +7,8 @@ import (
 	"fmt"
 	"syscall"
 
-	prompt "github.com/c-bata/go-prompt"
-	"github.com/c-bata/go-prompt/internal/term"
+	prompt "github.com/ktr0731/go-prompt"
+	"github.com/ktr0731/go-prompt/internal/term"
 )
 
 func main() {

document_test.go

@@ -182,11 +182,11 @@ This is a`),
 func ExampleDocument_GetWordBeforeCursorUntilSeparator() {
 	d := &Document{
 		Text:           `hello,i am ktr0731`,
-		cursorPosition: len(`hello,i am c`),
+		cursorPosition: len(`hello,i am k`),
 	}
 	fmt.Println(d.GetWordBeforeCursorUntilSeparator(","))
 	// Output:
-	// i am c
+	// i am k
 }
 
 func ExampleDocument_GetWordAfterCursorUntilSeparator() {

internal/term/raw.go

@@ -25,5 +25,5 @@ func SetRaw(fd int) error {
 	n.Cc[syscall.VMIN] = 1
 	n.Cc[syscall.VTIME] = 0
 
-	return termios.Tcsetattr(uintptr(fd), termios.TCSANOW, (*unix.Termios)(n))
+	return termios.Tcsetattr(uintptr(fd), termios.TCSANOW, (*unix.Termios)(&n))
 }