newedit/core -> newedit/clicore.

newedit/clicore/config.go

@@ -1,4 +1,4 @@
-package core
+package clicore
 
 import (
 	"sync"

newedit/clicore/doc.go

@@ -1,6 +1,6 @@
-// Package core defines the core of Elvish's interactive line editor. It is
+// Package clicore defines the core of Elvish's interactive line editor. It is
 // language-agnostic and can be used to build editors for other languages.
 //
 // The center of this package is the Editor type. Most other types are either
 // states managed by the Editor or dependencies of the Editor.
-package core
+package clicore

newedit/clicore/editor.go

@@ -1,4 +1,4 @@
-package core
+package clicore
 
 import (
 	"io"

newedit/clicore/editor_test.go

@@ -1,4 +1,4 @@
-package core
+package clicore
 
 import (
 	"errors"

newedit/clicore/fake_mode.go

@@ -1,4 +1,4 @@
-package core
+package clicore
 
 import (
 	"fmt"

newedit/clicore/fake_signal_source.go

@@ -1,4 +1,4 @@
-package core
+package clicore
 
 import "os"
 

newedit/clicore/fake_tty.go

@@ -1,4 +1,4 @@
-package core
+package clicore
 
 import (
 	"reflect"

newedit/clicore/highlighter.go

@@ -1,4 +1,4 @@
-package core
+package clicore
 
 import "github.com/elves/elvish/styled"
 

newedit/clicore/loop.go

@@ -1,4 +1,4 @@
-package core
+package clicore
 
 import "sync"
 

newedit/clicore/loop_example_test.go

@@ -1,4 +1,4 @@
-package core
+package clicore
 
 import "fmt"
 

newedit/clicore/loop_test.go

@@ -1,4 +1,4 @@
-package core
+package clicore
 
 import (
 	"reflect"

newedit/clicore/prompt.go

@@ -1,4 +1,4 @@
-package core
+package clicore
 
 import "github.com/elves/elvish/styled"
 

newedit/clicore/render.go

@@ -1,4 +1,4 @@
-package core
+package clicore
 
 import (
 	"github.com/elves/elvish/edit/ui"

newedit/clicore/render_test.go

@@ -1,4 +1,4 @@
-package core
+package clicore
 
 import (
 	"errors"

newedit/clicore/signal_source.go

@@ -1,4 +1,4 @@
-package core
+package clicore
 
 import (
 	"os"

newedit/clicore/signal_source_test.go

@@ -1,6 +1,6 @@
 // +build !windows,!plan9
 
-package core
+package clicore
 
 import (
 	"testing"

newedit/clicore/tty.go

@@ -1,4 +1,4 @@
-package core
+package clicore
 
 import (
 	"fmt"

newedit/clicore/utils.go

@@ -1,4 +1,4 @@
-package core
+package clicore
 
 import (
 	"github.com/elves/elvish/newedit/editutil"

newedit/dep_interfaces.go

@@ -6,7 +6,7 @@ import "github.com/elves/elvish/newedit/types"
 // This file defines the interfaces for those dependencies as well as fake
 // implementations that are useful in tests.
 
-// Interface for the core.Editor dependency.
+// Interface for the clicore.Editor dependency.
 type editor interface {
 	notifier
 	State() *types.State

newedit/editor.go

@@ -7,7 +7,7 @@ import (
 	"github.com/elves/elvish/edit/history/histutil"
 	"github.com/elves/elvish/eval"
 	"github.com/elves/elvish/eval/vars"
-	"github.com/elves/elvish/newedit/core"
+	"github.com/elves/elvish/newedit/clicore"
 	"github.com/elves/elvish/newedit/highlight"
 	"github.com/elves/elvish/parse"
 	"github.com/elves/elvish/store/storedefs"
@@ -20,13 +20,13 @@ import (
 //
 // TODO: Rename ReadLine to ReadCode and remove Close.
 type Editor struct {
-	core *core.Editor
+	core *clicore.Editor
 	ns   eval.Ns
 }
 
 // NewEditor creates a new editor from input and output terminal files.
 func NewEditor(in, out *os.File, ev *eval.Evaler, st storedefs.Store) *Editor {
-	ed := core.NewEditor(core.NewTTY(in, out), core.NewSignalSource())
+	ed := clicore.NewEditor(clicore.NewTTY(in, out), clicore.NewSignalSource())
 
 	ed.Highlighter = highlight.NewHighlighter(
 		highlight.Dep{Check: makeCheck(ev), HasCommand: makeHasCommand(ev)})

newedit/prompt/prompt.go

@@ -1,4 +1,4 @@
-// Package prompt provides an implementation of the core.Prompt interface.
+// Package prompt provides an implementation of the clicore.Prompt interface.
 package prompt
 
 import (

newedit/prompt_api.go

@@ -10,13 +10,13 @@ import (
 	"github.com/elves/elvish/eval"
 	"github.com/elves/elvish/eval/vals"
 	"github.com/elves/elvish/eval/vars"
-	"github.com/elves/elvish/newedit/core"
+	"github.com/elves/elvish/newedit/clicore"
 	"github.com/elves/elvish/newedit/prompt"
 	"github.com/elves/elvish/styled"
 	"github.com/elves/elvish/util"
 )
 
-func makePrompt(nt notifier, ev *eval.Evaler, ns eval.Ns, computeInit eval.Callable, name string) core.Prompt {
+func makePrompt(nt notifier, ev *eval.Evaler, ns eval.Ns, computeInit eval.Callable, name string) clicore.Prompt {
 	compute := computeInit
 	ns[name] = vars.FromPtr(&compute)
 	return prompt.New(func() styled.Text {