From 5ca6ebc34914d0442841f5b2a9a404fda6a77ba6 Mon Sep 17 00:00:00 2001
From: Qi Xiao <xiaqqaix@gmail.com>
Date: Sun, 19 Jan 2025 16:16:19 +0000
Subject: [PATCH] Fix test and check errors.

---
 .codespellrc                          | 2 +-
 pkg/etkedit/addon_histlist.go         | 2 ++
 pkg/etkedit/addon_location.go         | 2 ++
 pkg/etkedit/transcripts_test.go       | 4 +++-
 pkg/eval/builtin_fn_styled_test.elvts | 4 ++--
 pkg/mods/etk/etk.go                   | 8 --------
 6 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/.codespellrc b/.codespellrc
index f182c5057..2d33a2995 100644
--- a/.codespellrc
+++ b/.codespellrc
@@ -1,3 +1,3 @@
 [codespell]
-ignore-words-list = ro,upto,nd,doas,fo,shouldbe,iterm,lates,testof
+ignore-words-list = ro,upto,nd,doas,fo,shouldbe,iterm,lates,testof,golab
 skip = ./.git,./vscode/node_modules,./vscode/dist,./website/_dst,./website/*.html
diff --git a/pkg/etkedit/addon_histlist.go b/pkg/etkedit/addon_histlist.go
index ec64594a7..398f4c7cb 100644
--- a/pkg/etkedit/addon_histlist.go
+++ b/pkg/etkedit/addon_histlist.go
@@ -43,6 +43,7 @@ type histlistItems struct {
 	last    map[string]int
 }
 
+/*
 func (it histlistItems) filter(p func(string) bool, dedup bool) histlistItems {
 	var filtered []storedefs.Cmd
 	for i, entry := range it.entries {
@@ -56,6 +57,7 @@ func (it histlistItems) filter(p func(string) bool, dedup bool) histlistItems {
 	}
 	return histlistItems{filtered, nil}
 }
+*/
 
 func (it histlistItems) Len() int      { return len(it.entries) }
 func (it histlistItems) Get(i int) any { return it.entries[i] }
diff --git a/pkg/etkedit/addon_location.go b/pkg/etkedit/addon_location.go
index 1792e12f9..aa79f6f89 100644
--- a/pkg/etkedit/addon_location.go
+++ b/pkg/etkedit/addon_location.go
@@ -30,6 +30,7 @@ type locationItems struct {
 	dirs []storedefs.Dir
 }
 
+/*
 func (l locationItems) filter(p func(string) bool) locationItems {
 	var filteredDirs []storedefs.Dir
 	for _, dir := range l.dirs {
@@ -39,6 +40,7 @@ func (l locationItems) filter(p func(string) bool) locationItems {
 	}
 	return locationItems{filteredDirs}
 }
+*/
 
 func (l locationItems) Len() int      { return len(l.dirs) }
 func (l locationItems) Get(i int) any { return l.dirs[i] }
diff --git a/pkg/etkedit/transcripts_test.go b/pkg/etkedit/transcripts_test.go
index 0fb285fa3..9ee02fe66 100644
--- a/pkg/etkedit/transcripts_test.go
+++ b/pkg/etkedit/transcripts_test.go
@@ -9,6 +9,7 @@ import (
 	edit "src.elv.sh/pkg/etkedit"
 	"src.elv.sh/pkg/eval"
 	"src.elv.sh/pkg/eval/evaltest"
+	"src.elv.sh/pkg/store"
 	"src.elv.sh/pkg/testutil"
 	"src.elv.sh/pkg/ui"
 )
@@ -17,6 +18,7 @@ import (
 var transcripts embed.FS
 
 func TestTranscripts(t *testing.T) {
+	st := store.MustTempStore(t)
 	evaltest.TestTranscriptsInFS(t, transcripts,
 		"edit-fixture", func(t *testing.T, ev *eval.Evaler) {
 			// The default prompt and rprompt depends on environment factors
@@ -32,7 +34,7 @@ func TestTranscripts(t *testing.T) {
 			testutil.Set(t, edit.HasCommandPtr, hasBuiltinCmd)
 			testutil.Set(t, edit.HasCommandMaxBlockPtr, func() time.Duration { return time.Hour })
 
-			ed := edit.NewEditor(ev)
+			ed := edit.NewEditor(ev, st)
 			ev.ExtendBuiltin(eval.BuildNs().AddNs("edit", ed))
 			etktest.Setup(t, ev, ed.Comp())
 		},
diff --git a/pkg/eval/builtin_fn_styled_test.elvts b/pkg/eval/builtin_fn_styled_test.elvts
index 994070cfe..b9edb2c2a 100644
--- a/pkg/eval/builtin_fn_styled_test.elvts
+++ b/pkg/eval/builtin_fn_styled_test.elvts
@@ -168,7 +168,7 @@ Exception: cannot concatenate fn and ui:text-segment
 
 ## text + unsupported ##
 ~> to-string (styled abc){ }
-Exception: cannot concatenate ui:text and fn
+Exception: cannot concatenate styled and fn
   [tty]:1:11-25: to-string (styled abc){ }
 
 ## string + text ##
@@ -183,7 +183,7 @@ Exception: cannot concatenate ui:text and fn
 
 ## unsupported + text ##
 ~> to-string { }(styled abc)
-Exception: cannot concatenate fn and ui:text
+Exception: cannot concatenate fn and styled
   [tty]:1:11-25: to-string { }(styled abc)
 
 ## introspecting concatenated text ##
diff --git a/pkg/mods/etk/etk.go b/pkg/mods/etk/etk.go
index 9baefdbf6..3dbe0fdcc 100644
--- a/pkg/mods/etk/etk.go
+++ b/pkg/mods/etk/etk.go
@@ -14,10 +14,6 @@ import (
 	"src.elv.sh/pkg/ui"
 )
 
-type textViewOpts struct{ DotBefore int }
-
-func (*textViewOpts) SetDefaultOptions() {}
-
 var Ns = eval.BuildNsNamed("etk").
 	AddVars(map[string]vars.Var{
 		// etk.Reaction values
@@ -90,10 +86,6 @@ type viewReact struct {
 	React etk.React
 }
 
-type vboxOpts struct{ Focus int }
-
-func (*vboxOpts) SetDefaultOptions() {}
-
 func scanCompFromFn(fm *eval.Frame, fn eval.Callable) etk.Comp {
 	return func(c etk.Context) (etk.View, etk.React) {
 		subcomps := map[string]viewReact{}