diff --git a/CHANGELOG.md b/CHANGELOG.md index b9e21f1e..083a53b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,79 +1,171 @@ -# Change Log +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + + +## [1.0.0] + +This release contains a major refactoring of the codebase. +It's the first release of the [elk-language/go-prompt](https://github.com/elk-language/go-prompt) fork. + +The original library has been abandoned for at least 2 years now (although serious development has stopped 5 years ago). + +This release aims to make the code a bit cleaner, fix a couple of bugs and provide new, essential functionality such as syntax highlighting, dynamic Enter and multiline edit support. + +### Added + +- `prompt.New` constructor options: + - `prompt.WithLexer` let's you set a custom lexer for providing syntax highlighting + - `prompt.WithCompleter` for setting a custom `Completer` (completer is no longer a required argument in `prompt.New`) + - `prompt.WithIndentSize` let's you customise how many spaces should constitute a single indentation level + - `prompt.WithExecuteOnEnterCallback` + +- `prompt.Position` -- represents the cursor's position in 2D +- `prompt.Lexer`, `prompt.Token`, `prompt.SimpleToken`, `prompt.EagerLexer`, `prompt.LexerFunc` -- new syntax highlighting functionality +- `prompt.ExecuteOnEnterCallback` -- new dynamic Enter functionality (decide whether to insert a newline and indent or execute the input) + +- `_example/bang-executor` -- a sample program which uses the new `ExecuteOnEnterCallback`. Pressing Enter will insert a newline unless the input ends with an exclamation point `!` (then it gets executed). +- `_example/even-lexer` -- a sample program which shows how to use the new lexer feature. It implements a simple lexer which colours every character with an even index green. + +### Changed + +- Update Go from 1.16 to 1.19 +- The cursor can move in 2D. +- The Up arrow key will jump to the line above if the cursor is beyond the first line, but it will replace the input with the previous history entry if it's on the first line (like in Ruby's irb) +- The Down arrow key will jump to the line below if the cursor is before the last line, but it will replace the input with the next history entry if it's on the last line (like in Ruby's irb) +- Make `Completer` optional when creating a new `prompt.Prompt`. Change the signature of `prompt.New` from `func New(Executor, Completer, ...Option) *Prompt` to `func New(Executor, ...Option) *Prompt` +- Rename `prompt.ConsoleParser` to `prompt.Reader` and make it embed `io.ReadCloser` +- Rename `prompt.ConsoleWriter` to `prompt.Writer` and make it embed `io.Writer` and `io.StringWriter` +- Rename `prompt.OptionTitle` to `prompt.WithTitle` +- Rename `prompt.OptionPrefix` to `prompt.WithPrefix` +- Rename `prompt.OptionInitialBufferText` to `prompt.WithInitialText` +- Rename `prompt.OptionCompletionWordSeparator` to `prompt.WithCompletionWordSeparator` +- Replace `prompt.OptionLivePrefix` with `prompt.WithPrefixCallback` -- `func() string`. The prefix is always determined by a callback function which should always return a `string`. +- Rename `prompt.OptionPrefixTextColor` to `prompt.WithPrefixTextColor` +- Rename `prompt.OptionPrefixBackgroundColor` to `prompt.WithPrefixBackgroundColor` +- Rename `prompt.OptionInputTextColor` to `prompt.WithInputTextColor` +- Rename `prompt.OptionInputBGColor` to `prompt.WithInputBGColor` +- Rename `prompt.OptionPreviewSuggestionTextColor` to `prompt.WithPreviewSuggestionTextColor` +- Rename `prompt.OptionSuggestionTextColor` to `prompt.WithSuggestionTextColor` +- Rename `prompt.OptionSuggestionBGColor` to `prompt.WithSuggestionBGColor` +- Rename `prompt.OptionSelectedSuggestionTextColor` to `prompt.WithSelectedSuggestionTextColor` +- Rename `prompt.OptionSelectedSuggestionBGColor` to `prompt.WithSelectedSuggestionBGColor` +- Rename `prompt.OptionDescriptionTextColor` to `prompt.WithDescriptionTextColor` +- Rename `prompt.OptionDescriptionBGColor` to `prompt.WithDescriptionBGColor` +- Rename `prompt.OptionSelectedDescriptionTextColor` to `prompt.WithSelectedDescriptionTextColor` +- Rename `prompt.OptionSelectedDescriptionBGColor` to `prompt.WithSelectedDescriptionBGColor` +- Rename `prompt.OptionScrollbarThumbColor` to `prompt.WithScrollbarThumbColor` +- Rename `prompt.OptionScrollbarBGColor` to `prompt.WithScrollbarBGColor` +- Rename `prompt.OptionMaxSuggestion` to `prompt.WithMaxSuggestion` +- Rename `prompt.OptionHistory` to `prompt.WithHistory` +- Rename `prompt.OptionSwitchKeyBindMode` to `prompt.WithKeyBindMode` +- Rename `prompt.OptionCompletionOnDown` to `prompt.WithCompletionOnDown` +- Rename `prompt.OptionAddKeyBind` to `prompt.WithKeyBind` +- Rename `prompt.OptionAddASCIICodeBind` to `prompt.WithASCIICodeBind` +- Rename `prompt.OptionShowCompletionAtStart` to `prompt.WithShowCompletionAtStart` +- Rename `prompt.OptionBreakLineCallback` to `prompt.WithBreakLineCallback` +- Rename `prompt.OptionExitChecker` to `prompt.WithExitChecker` -## v0.3.0 (2018/??/??) +### Fixed -next release. +- Make pasting multiline text work properly +- Make pasting text with tabs work properly (tabs get replaced with spaces) +- Introduce `strings.ByteNumber`, `strings.RuneNumber`, `strings.StringWidth` to reduce the ambiguity of when to use which of the three main units used by this library to measure string length and index parts of strings. Several subtle bugs (using the wrong unit) causing panics have been fixed this way. +- Remove a `/dev/tty` leak in `PosixReader` (old `PosixParser`) -## v0.2.3 (2018/10/25) +### Removed -### What's new? +- `prompt.SwitchKeyBindMode` -* Add `prompt.FuzzyFilter` for fuzzy matching at [#92](https://github.com/c-bata/go-prompt/pull/92). -* Add `OptionShowCompletionAtStart` to show completion at start at [#100](https://github.com/c-bata/go-prompt/pull/100). -* Add `prompt.NewStderrWriter` at [#102](https://github.com/c-bata/go-prompt/pull/102). +## [0.2.6] - 2021-03-03 -### Fixed +### Changed -* Fix resetting display attributes (please see [pull #104](https://github.com/c-bata/go-prompt/pull/104) for more details). -* Fix error handling of Flush function in ConsoleWriter (please see [pull #97](https://github.com/c-bata/go-prompt/pull/97) for more details). -* Fix panic problem when reading from stdin before starting the prompt (please see [issue #88](https://github.com/c-bata/go-prompt/issues/88) for more details). +- Update pkg/term to 1.2.0 -### Removed or Deprecated -* `prompt.NewStandardOutputWriter` is deprecated. Please use `prompt.NewStdoutWriter`. +## [0.2.5] - 2020-09-19 -## v0.2.2 (2018/06/28) +### Changed -### What's new? +- Upgrade all dependencies to latest -* Support CJK(Chinese, Japanese and Korean) and Cyrillic characters. -* Add OptionCompletionWordSeparator(x string) to customize insertion points for completions. - * To support this, text query functions by arbitrary word separator are added in Document (please see [here](https://github.com/c-bata/go-prompt/pull/79) for more details). -* Add FilePathCompleter to complete file path on your system. -* Add option to customize ascii code key bindings. -* Add GetWordAfterCursor method in Document. -### Removed or Deprecated +## [0.2.4] - 2020-09-18 -* prompt.Choose shortcut function is deprecated. +### Changed -## v0.2.1 (2018/02/14) +- Update pkg/term module to latest and use unix.Termios -### What's New? -* ~~It seems that windows support is almost perfect.~~ - * A critical bug is found :( When you change a terminal window size, the layout will be broken because current implementation cannot catch signal for updating window size on Windows. +## [0.2.3] - 2018-10-25 + +### Added + +* `prompt.FuzzyFilter` for fuzzy matching at [#92](https://github.com/c-bata/go-prompt/pull/92). +* `OptionShowCompletionAtStart` to show completion at start at [#100](https://github.com/c-bata/go-prompt/pull/100). +* `prompt.NewStderrWriter` at [#102](https://github.com/c-bata/go-prompt/pull/102). ### Fixed -* Fix a Shift+Tab handling on Windows. -* Fix 4-dimension arrow keys handling on Windows. +* reset display attributes (please see [pull #104](https://github.com/c-bata/go-prompt/pull/104) for more details). +* handle errors of Flush function in ConsoleWriter (please see [pull #97](https://github.com/c-bata/go-prompt/pull/97) for more details). +* don't panic problem when reading from stdin before starting the prompt (please see [issue #88](https://github.com/c-bata/go-prompt/issues/88) for more details). + +### Deprecated + +* `prompt.NewStandardOutputWriter` -- please use `prompt.NewStdoutWriter`. + + +## [0.2.2] - 2018-06-28 + +### Added -## v0.2.0 (2018/02/13) +* Support CJK (Chinese, Japanese and Korean) and Cyrillic characters. +* `OptionCompletionWordSeparator(x string)` to customize insertion points for completions. + * To support this, text query functions by arbitrary word separator are added in `Document` (please see [here](https://github.com/c-bata/go-prompt/pull/79) for more details). +* `FilePathCompleter` to complete file path on your system. +* `option` to customize ascii code key bindings. +* `GetWordAfterCursor` method in `Document`. -### What's New? +### Deprecated -* Supports scrollbar when there are too many matched suggestions -* Windows support (but please caution because this is still not perfect). -* Add OptionLivePrefix to update the prefix dynamically -* Implement clear screen by `Ctrl+L`. +* `prompt.Choose` shortcut function is deprecated. + + +## [0.2.1] - 2018-02-14 + +### Added + +* ~~It seems that windows support is almost perfect.~~ + * A critical bug is found :( When you change a terminal window size, the layout will be broken because current implementation cannot catch signal for updating window size on Windows. ### Fixed -* Fix the behavior of `Ctrl+W` keybind. -* Fix the panic because when running on a docker container (please see [here](https://github.com/c-bata/go-prompt/pull/32) for details). -* Fix panic when making terminal window small size after input 2 lines of texts. See [here](https://github.com/c-bata/go-prompt/issues/37) for details). -* And also fixed many bugs that layout is broken when using Terminal.app, GNU Terminal and a Goland(IntelliJ). +* Shift + Tab handling on Windows. +* 4-dimension arrow keys handling on Windows. + + +## [0.2.0] - 2018-02-13 -### News +### Added -New core developers are joined (alphabetical order). +* Support scrollbar when there are too many matched suggestions +* Support Windows (but please caution because this is still not perfect). +* `OptionLivePrefix` to update the prefix dynamically +* Clear screen by Ctrl + L. + +### Fixed -* Nao Yonashiro (Github @orisano) -* Ryoma Abe (Github @Allajah) -* Yusuke Nakamura (Github @unasuke) +* Improve the Ctrl + W keybind. +* Don't panic because when running in a docker container (please see [here](https://github.com/c-bata/go-prompt/pull/32) for details). +* Don't panic when making terminal window small size after input 2 lines of texts. See [here](https://github.com/c-bata/go-prompt/issues/37) for details). +* Get rid of many bugs that layout is broken when using Terminal.app, GNU Terminal and a Goland(IntelliJ). -## v0.1.0 (2017/08/15) +## [0.1.0] - 2017-08-15 Initial Release diff --git a/_example/README.md b/_example/README.md index 759b0e3f..02fe6057 100644 --- a/_example/README.md +++ b/_example/README.md @@ -3,6 +3,18 @@ This directory includes some examples using go-prompt. These examples are useful to know the usage of go-prompt and check behavior for development. +## even-lexer + +Uses a custom lexer that colours every character with an even index green. + +Shows you how to hook up a custom lexer for syntax highlighting. + +## bang-executor + +Inserts a newline when the Enter key is pressed unless the input ends with an exclamation point `!` (then it gets printed). + +Shows you how to define a custom callback which determines whether the input is complete and should be executed or a newline should be inserted (after Enter has been pressed). + ## simple-echo ![simple-input](https://github.com/c-bata/assets/raw/master/go-prompt/examples/input.gif) @@ -19,7 +31,7 @@ A simple [http-prompt](https://github.com/eliangcs/http-prompt) implementation u ![live-prefix](https://github.com/c-bata/assets/raw/master/go-prompt/examples/live-prefix.gif) -A example application which changes a prefix string dynamically. +A example application which changes the prefix string dynamically. This feature is used like [ktr0731/evans](https://github.com/ktr0731/evans) which is interactive gRPC client using go-prompt. ## exec-command diff --git a/_example/build.sh b/_example/build.sh index 7b71a4f5..8c561684 100755 --- a/_example/build.sh +++ b/_example/build.sh @@ -11,3 +11,4 @@ go build -o ${BIN_DIR}/live-prefix ${DIR}/live-prefix/main.go go build -o ${BIN_DIR}/simple-echo ${DIR}/simple-echo/main.go go build -o ${BIN_DIR}/simple-echo-cjk-cyrillic ${DIR}/simple-echo/cjk-cyrillic/main.go go build -o ${BIN_DIR}/even-lexer ${DIR}/even-lexer/main.go +go build -o ${BIN_DIR}/bang-executor ${DIR}/bang-executor/main.go diff --git a/constructor.go b/constructor.go index 1727dffa..ecb18a43 100644 --- a/constructor.go +++ b/constructor.go @@ -18,6 +18,24 @@ func WithIndentSize(i int) Option { } } +// WithLexer set lexer function and enable it. +func WithLexer(lex Lexer) Option { + return func(p *Prompt) error { + p.lexer = lex + return nil + } +} + +// WithExecuteOnEnterCallback can be used to set +// a custom callback function that determines whether an Enter key +// should trigger the Executor or add a newline to the user input buffer. +func WithExecuteOnEnterCallback(fn ExecuteOnEnterCallback) Option { + return func(p *Prompt) error { + p.executeOnEnterCallback = fn + return nil + } +} + // WithCompleter is an option that sets a custom Completer object. func WithCompleter(c Completer) Option { return func(p *Prompt) error { @@ -228,8 +246,8 @@ func WithHistory(x []string) Option { } } -// WithSwitchKeyBindMode set a key bind mode. -func WithSwitchKeyBindMode(m KeyBindMode) Option { +// WithKeyBindMode set a key bind mode. +func WithKeyBindMode(m KeyBindMode) Option { return func(p *Prompt) error { p.keyBindMode = m return nil @@ -244,20 +262,16 @@ func WithCompletionOnDown() Option { } } -// SwitchKeyBindMode to set a key bind mode. -// Deprecated: Please use WithSwitchKeyBindMode. -var SwitchKeyBindMode = WithSwitchKeyBindMode - -// WithAddKeyBind to set a custom key bind. -func WithAddKeyBind(b ...KeyBind) Option { +// WithKeyBind to set a custom key bind. +func WithKeyBind(b ...KeyBind) Option { return func(p *Prompt) error { p.keyBindings = append(p.keyBindings, b...) return nil } } -// WithAddASCIICodeBind to set a custom key bind. -func WithAddASCIICodeBind(b ...ASCIICodeBind) Option { +// WithASCIICodeBind to set a custom key bind. +func WithASCIICodeBind(b ...ASCIICodeBind) Option { return func(p *Prompt) error { p.ASCIICodeBindings = append(p.ASCIICodeBindings, b...) return nil @@ -288,24 +302,6 @@ func WithExitChecker(fn ExitChecker) Option { } } -// WithLexer set lexer function and enable it. -func WithLexer(lex Lexer) Option { - return func(p *Prompt) error { - p.lexer = lex - return nil - } -} - -// WithExecuteOnEnterCallback can be used to set -// a custom callback function that determines whether an Enter key -// should trigger the Executor or add a newline to the user input buffer. -func WithExecuteOnEnterCallback(fn ExecuteOnEnterCallback) Option { - return func(p *Prompt) error { - p.executeOnEnterCallback = fn - return nil - } -} - func DefaultExecuteOnEnterCallback(input string, indentSize int) (int, bool) { return 0, true }