From 0c57bd576447c4b61f67c22f81db7543ba30ff3f Mon Sep 17 00:00:00 2001 From: Randall Winkhart Date: Sat, 18 Jan 2025 21:23:48 -0500 Subject: [PATCH] Allow leaving trailing spaces (two) in note lines for manual breaks in Markdown (currently only supported in BEAN) --- go.mod | 2 +- go.sum | 4 ++-- src/cli/edit.go | 9 +++------ 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 68760ee..2ddb723 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.23.4 require ( github.com/Trojan2021/BEAN v0.0.0-20241210230804-8f294833b514 github.com/charmbracelet/glamour v0.7.0 - github.com/rwinkhart/libmutton v0.2.5-0.20250119002915-fb5449cf1f75 + github.com/rwinkhart/libmutton v0.2.5-0.20250119022039-038e386df7e0 golang.org/x/term v0.28.0 ) diff --git a/go.sum b/go.sum index 6e02c85..4459efa 100644 --- a/go.sum +++ b/go.sum @@ -58,8 +58,8 @@ github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/rwinkhart/convertroman v0.2.0 h1:otUm939eXT77q/Lr31mJtMwVWEw0RjEUB71gO65h9OM= github.com/rwinkhart/convertroman v0.2.0/go.mod h1:Af6HqvX0EIM4Y3HcnNXbbRey1dLasGB7WU0+3Cowgmw= -github.com/rwinkhart/libmutton v0.2.5-0.20250119002915-fb5449cf1f75 h1:vHUCzYT1ZWxaEGfF3Xhx2v2x/IQcmLqSp+46dgW4KPg= -github.com/rwinkhart/libmutton v0.2.5-0.20250119002915-fb5449cf1f75/go.mod h1:kn7x0901qFyX1/HBxJf287zoySZkxKRMObKigLiI5Ok= +github.com/rwinkhart/libmutton v0.2.5-0.20250119022039-038e386df7e0 h1:kt9Sdf/qma5BbPU4tou6OpS9vjY/GOt0BIvjFciNro4= +github.com/rwinkhart/libmutton v0.2.5-0.20250119022039-038e386df7e0/go.mod h1:kn7x0901qFyX1/HBxJf287zoySZkxKRMObKigLiI5Ok= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= diff --git a/src/cli/edit.go b/src/cli/edit.go index e3f4fa3..dec86c6 100644 --- a/src/cli/edit.go +++ b/src/cli/edit.go @@ -6,7 +6,6 @@ import ( "os" "os/exec" "reflect" - "strings" "github.com/rwinkhart/libmutton/core" "github.com/rwinkhart/libmutton/sync" @@ -117,15 +116,13 @@ func editNote(baseNote []string) ([]string, bool) { // remove trailing empty strings from the edited note note = core.RemoveTrailingEmptyStrings(note) - // trim trailing whitespace from each note line - for i, line := range note { - note[i] = strings.TrimRight(line, " \t\r\n") - } + // clamp trailing whitespace in each note line + core.ClampTrailingWhitespace(note) // return the edited note if it is different from baseNote if !reflect.DeepEqual(note, baseNote) { return note, true } else { - return []string{}, false + return nil, false } }