From 2a12efed089d0e5a8788474a02048bed9c806b16 Mon Sep 17 00:00:00 2001 From: Qi Xiao Date: Thu, 25 Apr 2019 21:33:17 +0100 Subject: [PATCH] newedit/cli* -> cli/cli* --- {newedit => cli}/clicore/app.go | 2 +- {newedit => cli}/clicore/app_test.go | 0 {newedit => cli}/clicore/config.go | 0 {newedit => cli}/clicore/doc.go | 0 {newedit => cli}/clicore/fake_mode.go | 2 +- {newedit => cli}/clicore/fake_signal_source.go | 0 {newedit => cli}/clicore/fake_tty.go | 0 {newedit => cli}/clicore/highlighter.go | 0 {newedit => cli}/clicore/loop.go | 0 {newedit => cli}/clicore/loop_example_test.go | 0 {newedit => cli}/clicore/loop_test.go | 0 {newedit => cli}/clicore/prompt.go | 0 {newedit => cli}/clicore/render.go | 2 +- {newedit => cli}/clicore/render_test.go | 2 +- {newedit => cli}/clicore/signal_source.go | 0 {newedit => cli}/clicore/signal_source_test.go | 0 {newedit => cli}/clicore/tty.go | 0 {newedit => cli}/clicore/utils.go | 4 ++-- {newedit => cli}/clitypes/doc.go | 0 {newedit => cli}/clitypes/mode.go | 0 {newedit => cli}/clitypes/state.go | 0 {newedit => cli}/clitypes/state_test.go | 0 {newedit => cli}/cliutil/action_error.go | 2 +- {newedit => cli}/cliutil/action_error_test.go | 2 +- {newedit => cli}/cliutil/basic_mode.go | 2 +- {newedit => cli}/cliutil/basic_mode_test.go | 2 +- {newedit => cli}/cliutil/doc.go | 0 newedit/binding.go | 4 ++-- newedit/binding_test.go | 4 ++-- newedit/builtin_fn_buffer.go | 2 +- newedit/builtin_fn_buffer_test.go | 2 +- newedit/builtin_fn_flow.go | 4 ++-- newedit/builtin_fn_misc.go | 2 +- newedit/dep_interfaces.go | 2 +- newedit/editor.go | 2 +- newedit/histlist/histlist.go | 2 +- newedit/histlist/histlist_test.go | 2 +- newedit/histlist_api_test.go | 2 +- newedit/insert/insert.go | 4 ++-- newedit/insert/insert_test.go | 2 +- newedit/insert_api.go | 4 ++-- newedit/insert_api_test.go | 2 +- newedit/lastcmd/lastcmd.go | 2 +- newedit/lastcmd_api_test.go | 2 +- newedit/listing/listing.go | 2 +- newedit/listing/listing_test.go | 2 +- newedit/location/location.go | 2 +- newedit/location/location_test.go | 2 +- newedit/location_api_test.go | 2 +- newedit/prompt_api.go | 2 +- 50 files changed, 38 insertions(+), 38 deletions(-) rename {newedit => cli}/clicore/app.go (99%) rename {newedit => cli}/clicore/app_test.go (100%) rename {newedit => cli}/clicore/config.go (100%) rename {newedit => cli}/clicore/doc.go (100%) rename {newedit => cli}/clicore/fake_mode.go (97%) rename {newedit => cli}/clicore/fake_signal_source.go (100%) rename {newedit => cli}/clicore/fake_tty.go (100%) rename {newedit => cli}/clicore/highlighter.go (100%) rename {newedit => cli}/clicore/loop.go (100%) rename {newedit => cli}/clicore/loop_example_test.go (100%) rename {newedit => cli}/clicore/loop_test.go (100%) rename {newedit => cli}/clicore/prompt.go (100%) rename {newedit => cli}/clicore/render.go (99%) rename {newedit => cli}/clicore/render_test.go (99%) rename {newedit => cli}/clicore/signal_source.go (100%) rename {newedit => cli}/clicore/signal_source_test.go (100%) rename {newedit => cli}/clicore/tty.go (100%) rename {newedit => cli}/clicore/utils.go (74%) rename {newedit => cli}/clitypes/doc.go (100%) rename {newedit => cli}/clitypes/mode.go (100%) rename {newedit => cli}/clitypes/state.go (100%) rename {newedit => cli}/clitypes/state_test.go (100%) rename {newedit => cli}/cliutil/action_error.go (94%) rename {newedit => cli}/cliutil/action_error_test.go (94%) rename {newedit => cli}/cliutil/basic_mode.go (97%) rename {newedit => cli}/cliutil/basic_mode_test.go (98%) rename {newedit => cli}/cliutil/doc.go (100%) diff --git a/newedit/clicore/app.go b/cli/clicore/app.go similarity index 99% rename from newedit/clicore/app.go rename to cli/clicore/app.go index 4445f03f..c7a58c03 100644 --- a/newedit/clicore/app.go +++ b/cli/clicore/app.go @@ -6,8 +6,8 @@ import ( "sync" "syscall" + clitypes "github.com/elves/elvish/cli/clitypes" "github.com/elves/elvish/edit/tty" - clitypes "github.com/elves/elvish/newedit/clitypes" "github.com/elves/elvish/styled" "github.com/elves/elvish/sys" ) diff --git a/newedit/clicore/app_test.go b/cli/clicore/app_test.go similarity index 100% rename from newedit/clicore/app_test.go rename to cli/clicore/app_test.go diff --git a/newedit/clicore/config.go b/cli/clicore/config.go similarity index 100% rename from newedit/clicore/config.go rename to cli/clicore/config.go diff --git a/newedit/clicore/doc.go b/cli/clicore/doc.go similarity index 100% rename from newedit/clicore/doc.go rename to cli/clicore/doc.go diff --git a/newedit/clicore/fake_mode.go b/cli/clicore/fake_mode.go similarity index 97% rename from newedit/clicore/fake_mode.go rename to cli/clicore/fake_mode.go index b3af9f1b..ed84b786 100644 --- a/newedit/clicore/fake_mode.go +++ b/cli/clicore/fake_mode.go @@ -3,9 +3,9 @@ package clicore import ( "fmt" + "github.com/elves/elvish/cli/clitypes" "github.com/elves/elvish/edit/tty" "github.com/elves/elvish/edit/ui" - "github.com/elves/elvish/newedit/clitypes" ) // A Mode implementation useful in tests. diff --git a/newedit/clicore/fake_signal_source.go b/cli/clicore/fake_signal_source.go similarity index 100% rename from newedit/clicore/fake_signal_source.go rename to cli/clicore/fake_signal_source.go diff --git a/newedit/clicore/fake_tty.go b/cli/clicore/fake_tty.go similarity index 100% rename from newedit/clicore/fake_tty.go rename to cli/clicore/fake_tty.go diff --git a/newedit/clicore/highlighter.go b/cli/clicore/highlighter.go similarity index 100% rename from newedit/clicore/highlighter.go rename to cli/clicore/highlighter.go diff --git a/newedit/clicore/loop.go b/cli/clicore/loop.go similarity index 100% rename from newedit/clicore/loop.go rename to cli/clicore/loop.go diff --git a/newedit/clicore/loop_example_test.go b/cli/clicore/loop_example_test.go similarity index 100% rename from newedit/clicore/loop_example_test.go rename to cli/clicore/loop_example_test.go diff --git a/newedit/clicore/loop_test.go b/cli/clicore/loop_test.go similarity index 100% rename from newedit/clicore/loop_test.go rename to cli/clicore/loop_test.go diff --git a/newedit/clicore/prompt.go b/cli/clicore/prompt.go similarity index 100% rename from newedit/clicore/prompt.go rename to cli/clicore/prompt.go diff --git a/newedit/clicore/render.go b/cli/clicore/render.go similarity index 99% rename from newedit/clicore/render.go rename to cli/clicore/render.go index 9c09c5af..ba568f4d 100644 --- a/newedit/clicore/render.go +++ b/cli/clicore/render.go @@ -1,8 +1,8 @@ package clicore import ( + "github.com/elves/elvish/cli/clitypes" "github.com/elves/elvish/edit/ui" - "github.com/elves/elvish/newedit/clitypes" "github.com/elves/elvish/styled" "github.com/elves/elvish/util" ) diff --git a/newedit/clicore/render_test.go b/cli/clicore/render_test.go similarity index 99% rename from newedit/clicore/render_test.go rename to cli/clicore/render_test.go index 4c97ff14..8b9d3e5c 100644 --- a/newedit/clicore/render_test.go +++ b/cli/clicore/render_test.go @@ -4,8 +4,8 @@ import ( "errors" "testing" + "github.com/elves/elvish/cli/clitypes" "github.com/elves/elvish/edit/ui" - "github.com/elves/elvish/newedit/clitypes" "github.com/elves/elvish/styled" "github.com/elves/elvish/tt" ) diff --git a/newedit/clicore/signal_source.go b/cli/clicore/signal_source.go similarity index 100% rename from newedit/clicore/signal_source.go rename to cli/clicore/signal_source.go diff --git a/newedit/clicore/signal_source_test.go b/cli/clicore/signal_source_test.go similarity index 100% rename from newedit/clicore/signal_source_test.go rename to cli/clicore/signal_source_test.go diff --git a/newedit/clicore/tty.go b/cli/clicore/tty.go similarity index 100% rename from newedit/clicore/tty.go rename to cli/clicore/tty.go diff --git a/newedit/clicore/utils.go b/cli/clicore/utils.go similarity index 74% rename from newedit/clicore/utils.go rename to cli/clicore/utils.go index e1a713f8..6f50090b 100644 --- a/newedit/clicore/utils.go +++ b/cli/clicore/utils.go @@ -1,8 +1,8 @@ package clicore import ( - "github.com/elves/elvish/newedit/clitypes" - "github.com/elves/elvish/newedit/cliutil" + "github.com/elves/elvish/cli/clitypes" + "github.com/elves/elvish/cli/cliutil" ) // Returns the first non-nil value. If all are nil, return utils.BasicMode{} diff --git a/newedit/clitypes/doc.go b/cli/clitypes/doc.go similarity index 100% rename from newedit/clitypes/doc.go rename to cli/clitypes/doc.go diff --git a/newedit/clitypes/mode.go b/cli/clitypes/mode.go similarity index 100% rename from newedit/clitypes/mode.go rename to cli/clitypes/mode.go diff --git a/newedit/clitypes/state.go b/cli/clitypes/state.go similarity index 100% rename from newedit/clitypes/state.go rename to cli/clitypes/state.go diff --git a/newedit/clitypes/state_test.go b/cli/clitypes/state_test.go similarity index 100% rename from newedit/clitypes/state_test.go rename to cli/clitypes/state_test.go diff --git a/newedit/cliutil/action_error.go b/cli/cliutil/action_error.go similarity index 94% rename from newedit/cliutil/action_error.go rename to cli/cliutil/action_error.go index 724c6970..612d8d0e 100644 --- a/newedit/cliutil/action_error.go +++ b/cli/cliutil/action_error.go @@ -3,7 +3,7 @@ package cliutil import ( "fmt" - "github.com/elves/elvish/newedit/clitypes" + "github.com/elves/elvish/cli/clitypes" ) // ActionError is like HandlerAction with an Error method. It is useful as a diff --git a/newedit/cliutil/action_error_test.go b/cli/cliutil/action_error_test.go similarity index 94% rename from newedit/cliutil/action_error_test.go rename to cli/cliutil/action_error_test.go index 46f70a6d..9c20e172 100644 --- a/newedit/cliutil/action_error_test.go +++ b/cli/cliutil/action_error_test.go @@ -3,8 +3,8 @@ package cliutil import ( "testing" + "github.com/elves/elvish/cli/clitypes" "github.com/elves/elvish/eval/vals" - "github.com/elves/elvish/newedit/clitypes" "github.com/elves/elvish/tt" ) diff --git a/newedit/cliutil/basic_mode.go b/cli/cliutil/basic_mode.go similarity index 97% rename from newedit/cliutil/basic_mode.go rename to cli/cliutil/basic_mode.go index e314084c..bd1c3c8c 100644 --- a/newedit/cliutil/basic_mode.go +++ b/cli/cliutil/basic_mode.go @@ -4,9 +4,9 @@ import ( "unicode" "unicode/utf8" + "github.com/elves/elvish/cli/clitypes" "github.com/elves/elvish/edit/tty" "github.com/elves/elvish/edit/ui" - "github.com/elves/elvish/newedit/clitypes" ) // BasicMode is a basic Mode implementation. diff --git a/newedit/cliutil/basic_mode_test.go b/cli/cliutil/basic_mode_test.go similarity index 98% rename from newedit/cliutil/basic_mode_test.go rename to cli/cliutil/basic_mode_test.go index bef029ef..a5b043c3 100644 --- a/newedit/cliutil/basic_mode_test.go +++ b/cli/cliutil/basic_mode_test.go @@ -5,9 +5,9 @@ import ( "reflect" "testing" + "github.com/elves/elvish/cli/clitypes" "github.com/elves/elvish/edit/tty" "github.com/elves/elvish/edit/ui" - "github.com/elves/elvish/newedit/clitypes" "github.com/elves/elvish/tt" ) diff --git a/newedit/cliutil/doc.go b/cli/cliutil/doc.go similarity index 100% rename from newedit/cliutil/doc.go rename to cli/cliutil/doc.go diff --git a/newedit/binding.go b/newedit/binding.go index f367964f..30c5ab1e 100644 --- a/newedit/binding.go +++ b/newedit/binding.go @@ -6,12 +6,12 @@ import ( "os" "sync" + "github.com/elves/elvish/cli/clitypes" + "github.com/elves/elvish/cli/cliutil" "github.com/elves/elvish/edit/eddefs" "github.com/elves/elvish/edit/ui" "github.com/elves/elvish/eval" "github.com/elves/elvish/eval/vals" - "github.com/elves/elvish/newedit/clitypes" - "github.com/elves/elvish/newedit/cliutil" ) // TODO(xiaq): Move the implementation into this package. diff --git a/newedit/binding_test.go b/newedit/binding_test.go index 5661b66d..e1f3d6d0 100644 --- a/newedit/binding_test.go +++ b/newedit/binding_test.go @@ -5,10 +5,10 @@ import ( "reflect" "testing" + "github.com/elves/elvish/cli/clitypes" + "github.com/elves/elvish/cli/cliutil" "github.com/elves/elvish/edit/ui" "github.com/elves/elvish/eval" - "github.com/elves/elvish/newedit/clitypes" - "github.com/elves/elvish/newedit/cliutil" ) func TestKeyHandlerFromBinding_CallsBinding(t *testing.T) { diff --git a/newedit/builtin_fn_buffer.go b/newedit/builtin_fn_buffer.go index 32e86789..3a8f8249 100644 --- a/newedit/builtin_fn_buffer.go +++ b/newedit/builtin_fn_buffer.go @@ -5,7 +5,7 @@ import ( "unicode" "unicode/utf8" - "github.com/elves/elvish/newedit/clitypes" + "github.com/elves/elvish/cli/clitypes" "github.com/elves/elvish/util" ) diff --git a/newedit/builtin_fn_buffer_test.go b/newedit/builtin_fn_buffer_test.go index b2567655..33a2ee01 100644 --- a/newedit/builtin_fn_buffer_test.go +++ b/newedit/builtin_fn_buffer_test.go @@ -3,7 +3,7 @@ package newedit import ( "testing" - "github.com/elves/elvish/newedit/clitypes" + "github.com/elves/elvish/cli/clitypes" "github.com/elves/elvish/tt" ) diff --git a/newedit/builtin_fn_flow.go b/newedit/builtin_fn_flow.go index 6fcf74e3..0115f4fc 100644 --- a/newedit/builtin_fn_flow.go +++ b/newedit/builtin_fn_flow.go @@ -1,8 +1,8 @@ package newedit import ( - "github.com/elves/elvish/newedit/clitypes" - "github.com/elves/elvish/newedit/cliutil" + "github.com/elves/elvish/cli/clitypes" + "github.com/elves/elvish/cli/cliutil" ) //elvdoc:fn exit-binding diff --git a/newedit/builtin_fn_misc.go b/newedit/builtin_fn_misc.go index 1cf332a5..bb692711 100644 --- a/newedit/builtin_fn_misc.go +++ b/newedit/builtin_fn_misc.go @@ -1,8 +1,8 @@ package newedit import ( + "github.com/elves/elvish/cli/clitypes" "github.com/elves/elvish/edit/eddefs" - "github.com/elves/elvish/newedit/clitypes" ) //elvdoc:fn binding-map diff --git a/newedit/dep_interfaces.go b/newedit/dep_interfaces.go index f3fa285e..f02e1db0 100644 --- a/newedit/dep_interfaces.go +++ b/newedit/dep_interfaces.go @@ -1,6 +1,6 @@ package newedit -import "github.com/elves/elvish/newedit/clitypes" +import "github.com/elves/elvish/cli/clitypes" // The editor's dependencies are not concrete implementations, but interfaces. // This file defines the interfaces for those dependencies as well as fake diff --git a/newedit/editor.go b/newedit/editor.go index 005a6d25..5db905cf 100644 --- a/newedit/editor.go +++ b/newedit/editor.go @@ -4,10 +4,10 @@ import ( "fmt" "os" + "github.com/elves/elvish/cli/clicore" "github.com/elves/elvish/edit/history/histutil" "github.com/elves/elvish/eval" "github.com/elves/elvish/eval/vars" - "github.com/elves/elvish/newedit/clicore" "github.com/elves/elvish/newedit/highlight" "github.com/elves/elvish/parse" "github.com/elves/elvish/store/storedefs" diff --git a/newedit/histlist/histlist.go b/newedit/histlist/histlist.go index 9c1c0f38..b76e45fb 100644 --- a/newedit/histlist/histlist.go +++ b/newedit/histlist/histlist.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" + "github.com/elves/elvish/cli/clitypes" "github.com/elves/elvish/edit/ui" - "github.com/elves/elvish/newedit/clitypes" "github.com/elves/elvish/newedit/listing" "github.com/elves/elvish/styled" ) diff --git a/newedit/histlist/histlist_test.go b/newedit/histlist/histlist_test.go index aa96f5c6..dc4792d9 100644 --- a/newedit/histlist/histlist_test.go +++ b/newedit/histlist/histlist_test.go @@ -3,7 +3,7 @@ package histlist import ( "testing" - "github.com/elves/elvish/newedit/clitypes" + "github.com/elves/elvish/cli/clitypes" "github.com/elves/elvish/newedit/listing" "github.com/elves/elvish/styled" "github.com/elves/elvish/tt" diff --git a/newedit/histlist_api_test.go b/newedit/histlist_api_test.go index b50c3670..753f4609 100644 --- a/newedit/histlist_api_test.go +++ b/newedit/histlist_api_test.go @@ -6,9 +6,9 @@ import ( "github.com/elves/elvish/edit/ui" + "github.com/elves/elvish/cli/clitypes" "github.com/elves/elvish/edit/history/histutil" "github.com/elves/elvish/eval" - "github.com/elves/elvish/newedit/clitypes" "github.com/elves/elvish/newedit/listing" ) diff --git a/newedit/insert/insert.go b/newedit/insert/insert.go index 596564b0..75e4febe 100644 --- a/newedit/insert/insert.go +++ b/newedit/insert/insert.go @@ -7,10 +7,10 @@ import ( "strings" "sync" + "github.com/elves/elvish/cli/clitypes" + "github.com/elves/elvish/cli/cliutil" "github.com/elves/elvish/edit/tty" "github.com/elves/elvish/edit/ui" - "github.com/elves/elvish/newedit/clitypes" - "github.com/elves/elvish/newedit/cliutil" "github.com/elves/elvish/parse" ) diff --git a/newedit/insert/insert_test.go b/newedit/insert/insert_test.go index d06c4955..9d956915 100644 --- a/newedit/insert/insert_test.go +++ b/newedit/insert/insert_test.go @@ -4,9 +4,9 @@ import ( "reflect" "testing" + "github.com/elves/elvish/cli/clitypes" "github.com/elves/elvish/edit/tty" "github.com/elves/elvish/edit/ui" - "github.com/elves/elvish/newedit/clitypes" "github.com/elves/elvish/parse" ) diff --git a/newedit/insert_api.go b/newedit/insert_api.go index b5efa647..905106b2 100644 --- a/newedit/insert_api.go +++ b/newedit/insert_api.go @@ -1,12 +1,12 @@ package newedit import ( + "github.com/elves/elvish/cli/clitypes" + "github.com/elves/elvish/cli/cliutil" "github.com/elves/elvish/edit/tty" "github.com/elves/elvish/eval" "github.com/elves/elvish/eval/vals" "github.com/elves/elvish/eval/vars" - "github.com/elves/elvish/newedit/clitypes" - "github.com/elves/elvish/newedit/cliutil" "github.com/elves/elvish/newedit/insert" "github.com/xiaq/persistent/hashmap" ) diff --git a/newedit/insert_api_test.go b/newedit/insert_api_test.go index d5ca58b7..40a66598 100644 --- a/newedit/insert_api_test.go +++ b/newedit/insert_api_test.go @@ -4,11 +4,11 @@ import ( "reflect" "testing" + "github.com/elves/elvish/cli/clitypes" "github.com/elves/elvish/edit/tty" "github.com/elves/elvish/edit/ui" "github.com/elves/elvish/eval" "github.com/elves/elvish/eval/vals" - "github.com/elves/elvish/newedit/clitypes" ) var abbrData = [][2]string{{"xx", "xx full"}, {"yy", "yy full"}} diff --git a/newedit/lastcmd/lastcmd.go b/newedit/lastcmd/lastcmd.go index c48072b1..3940248f 100644 --- a/newedit/lastcmd/lastcmd.go +++ b/newedit/lastcmd/lastcmd.go @@ -5,8 +5,8 @@ import ( "strconv" "strings" + "github.com/elves/elvish/cli/clitypes" "github.com/elves/elvish/edit/ui" - "github.com/elves/elvish/newedit/clitypes" "github.com/elves/elvish/newedit/listing" "github.com/elves/elvish/styled" ) diff --git a/newedit/lastcmd_api_test.go b/newedit/lastcmd_api_test.go index 3801c579..7bfe9941 100644 --- a/newedit/lastcmd_api_test.go +++ b/newedit/lastcmd_api_test.go @@ -4,9 +4,9 @@ import ( "reflect" "testing" + "github.com/elves/elvish/cli/clitypes" "github.com/elves/elvish/edit/ui" "github.com/elves/elvish/eval" - "github.com/elves/elvish/newedit/clitypes" "github.com/elves/elvish/newedit/listing" ) diff --git a/newedit/listing/listing.go b/newedit/listing/listing.go index db4ad52e..320e236a 100644 --- a/newedit/listing/listing.go +++ b/newedit/listing/listing.go @@ -18,9 +18,9 @@ import ( "unicode" "unicode/utf8" + "github.com/elves/elvish/cli/clitypes" "github.com/elves/elvish/edit/tty" "github.com/elves/elvish/edit/ui" - "github.com/elves/elvish/newedit/clitypes" "github.com/elves/elvish/styled" ) diff --git a/newedit/listing/listing_test.go b/newedit/listing/listing_test.go index 7ba945ab..54bac28e 100644 --- a/newedit/listing/listing_test.go +++ b/newedit/listing/listing_test.go @@ -5,9 +5,9 @@ import ( "strconv" "testing" + "github.com/elves/elvish/cli/clitypes" "github.com/elves/elvish/edit/tty" "github.com/elves/elvish/edit/ui" - "github.com/elves/elvish/newedit/clitypes" "github.com/elves/elvish/styled" "github.com/elves/elvish/tt" ) diff --git a/newedit/location/location.go b/newedit/location/location.go index a425f42e..6ea42743 100644 --- a/newedit/location/location.go +++ b/newedit/location/location.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" + "github.com/elves/elvish/cli/clitypes" "github.com/elves/elvish/edit/ui" - "github.com/elves/elvish/newedit/clitypes" "github.com/elves/elvish/newedit/listing" "github.com/elves/elvish/store/storedefs" "github.com/elves/elvish/styled" diff --git a/newedit/location/location_test.go b/newedit/location/location_test.go index 207b4e3e..a94262bf 100644 --- a/newedit/location/location_test.go +++ b/newedit/location/location_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/elves/elvish/newedit/clitypes" + "github.com/elves/elvish/cli/clitypes" "github.com/elves/elvish/newedit/listing" "github.com/elves/elvish/store/storedefs" "github.com/elves/elvish/styled" diff --git a/newedit/location_api_test.go b/newedit/location_api_test.go index 05e92a53..3a12c64a 100644 --- a/newedit/location_api_test.go +++ b/newedit/location_api_test.go @@ -6,8 +6,8 @@ import ( "github.com/elves/elvish/edit/ui" + "github.com/elves/elvish/cli/clitypes" "github.com/elves/elvish/eval" - "github.com/elves/elvish/newedit/clitypes" "github.com/elves/elvish/newedit/listing" "github.com/elves/elvish/store/storedefs" ) diff --git a/newedit/prompt_api.go b/newedit/prompt_api.go index 4d9f4dd2..f574eea4 100644 --- a/newedit/prompt_api.go +++ b/newedit/prompt_api.go @@ -7,10 +7,10 @@ import ( "os/user" "sync" + "github.com/elves/elvish/cli/clicore" "github.com/elves/elvish/eval" "github.com/elves/elvish/eval/vals" "github.com/elves/elvish/eval/vars" - "github.com/elves/elvish/newedit/clicore" "github.com/elves/elvish/newedit/prompt" "github.com/elves/elvish/styled" "github.com/elves/elvish/util"