newedit/cli* -> cli/cli*

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"
 )

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.

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"
 )

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"
 )

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{}

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

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"
 )
 

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.

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"
 )
 

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.

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) {

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"
 )
 

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"
 )
 

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

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

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

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"

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"
 )

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"

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"
 )
 

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"
 )
 

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"
 )
 

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"
 )

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"}}

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"
 )

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"
 )
 

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"
 )
 

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"
 )

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"

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"

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"
 )

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"