Merge pull request #779 from noborus/trim-right

Remove extra spaces on the right in WriteQuit

Author: noborus

go.mod

@@ -15,7 +15,7 @@ require (
 	github.com/klauspost/compress v1.18.0
 	github.com/mattn/go-runewidth v0.0.16
 	github.com/noborus/guesswidth v0.4.0
-	github.com/noborus/tcellansi v0.0.0-20250320075053-376e9cb3c42b
+	github.com/noborus/tcellansi v0.1.0
 	github.com/pierrec/lz4/v4 v4.1.22
 	github.com/rivo/uniseg v0.4.7
 	github.com/spf13/cobra v1.9.1
@@ -36,10 +36,10 @@ require (
 	github.com/sagikazarmark/locafero v0.9.0 // indirect
 	github.com/sourcegraph/conc v0.3.0 // indirect
 	github.com/spf13/afero v1.14.0 // indirect
-	github.com/spf13/cast v1.7.1 // indirect
+	github.com/spf13/cast v1.8.0 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/sys v0.33.0 // indirect
-	golang.org/x/text v0.24.0 // indirect
+	golang.org/x/text v0.25.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -40,8 +40,8 @@ github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6T
 github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/noborus/guesswidth v0.4.0 h1:+PPh+Z+GM4mKmVrhYR4lpjeyBuLMSVo2arM+VErdHIc=
 github.com/noborus/guesswidth v0.4.0/go.mod h1:ghA6uh9RcK+uSmaDDmBMj/tRZ3BSpspDP6DMF5Xk3bc=
-github.com/noborus/tcellansi v0.0.0-20250320075053-376e9cb3c42b h1:5EpdRpG4A6J1vK/vwVLczm3l1hB4KwmlqHdsFgfTffc=
-github.com/noborus/tcellansi v0.0.0-20250320075053-376e9cb3c42b/go.mod h1:uZyUH8CuoepBfZgDzh8xV3z1sZFAw97hN8otIuZT5jA=
+github.com/noborus/tcellansi v0.1.0 h1:oYaYAHS0kB2gR6hBmn8KN9uZrINB4c/OsUuj5jsnOXw=
+github.com/noborus/tcellansi v0.1.0/go.mod h1:MIOzvoK75Q/5sN2ac4mG8WCZM3xoHW8HdGhRWdJXomk=
 github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=
 github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
 github.com/pierrec/lz4/v4 v4.1.22 h1:cKFw6uJDK+/gfw5BcDL0JL5aBsAFdsIT18eRtLj7VIU=
@@ -61,8 +61,8 @@ github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9yS
 github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0=
 github.com/spf13/afero v1.14.0 h1:9tH6MapGnn/j0eb0yIXiLjERO8RB6xIVZRDCX7PtqWA=
 github.com/spf13/afero v1.14.0/go.mod h1:acJQ8t0ohCGuMN3O+Pv0V0hgMxNYDlvdk+VTfyZmbYo=
-github.com/spf13/cast v1.7.1 h1:cuNEagBQEHWN1FnbGEjCXL2szYEXqfJPbP2HNUaca9Y=
-github.com/spf13/cast v1.7.1/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
+github.com/spf13/cast v1.8.0 h1:gEN9K4b8Xws4EX0+a0reLmhq8moKn7ntRlQYgjPeCDk=
+github.com/spf13/cast v1.8.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
 github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
 github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
 github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
@@ -141,8 +141,8 @@ golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
-golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
-golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
+golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
+golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=

oviewer/oviewer.go

@@ -1177,6 +1177,7 @@ func (root *Root) writeCurrentScreen(output io.Writer) {
 			return
 		}
 		strs = tcellansi.ScreenContentToStrings(root.Screen, 0, root.Doc.width, 0, height-1)
+		strs = tcellansi.TrimRightSpaces(strs)
 	}
 	for _, str := range strs {
 		if _, err := output.Write([]byte(str)); err != nil {
@@ -1228,7 +1229,9 @@ func (root *Root) ScreenContent() []string {
 	root.Screen.Sync()
 	m := root.Doc
 	height := realHeight(root.scr)
-	return tcellansi.ScreenContentToStrings(root.Screen, 0, m.width, 0, height)
+	strs := tcellansi.ScreenContentToStrings(root.Screen, 0, m.width, 0, height)
+	strs = tcellansi.TrimRightSpaces(strs)
+	return strs
 }
 
 // writeOriginal writes to the original terminal.

oviewer/oviewer_test.go

@@ -1387,7 +1387,16 @@ func TestRoot_outputOnExit(t *testing.T) {
 				IsWriteOnExit:   true,
 				IsWriteOriginal: false,
 			},
-			wantOutput: "test                                                                            \x1B[0m\n",
+			wantOutput: "test\n",
+		},
+		{
+			name: "writeCurrentScreen_test4",
+			fields: fields{
+				fileName:        filepath.Join(testdata, "test4.txt"),
+				IsWriteOnExit:   true,
+				IsWriteOriginal: false,
+			},
+			wantOutput: "\x1b[38;2;255;175;135m\x1b[1mHello\033[0m\n",
 		},
 		{
 			name: "writeOriginal",

testdata/test4.txt

@@ -0,0 +1 @@
+Hello