From d9185c9e9f32eb4e2176638d71589a1caa2160ca Mon Sep 17 00:00:00 2001 From: Jeffrey Faer Date: Wed, 27 Nov 2024 13:38:06 -0700 Subject: [PATCH 1/2] fix: Ignore leading whitespace after applying ignore_prefixes. See the history of this PR to see how ignore_prefixes.out has changed. Fix #54 --- goldens/ignore_prefixes.in | 2 +- goldens/ignore_prefixes.out | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/goldens/ignore_prefixes.in b/goldens/ignore_prefixes.in index 58a388d..7df0ca1 100644 --- a/goldens/ignore_prefixes.in +++ b/goldens/ignore_prefixes.in @@ -56,7 +56,7 @@ Combine with numerical: # keep-sorted-test end Prefixes with spaces: - # keep-sorted-test start ignore_prefixes=['* ', '* ['] + # keep-sorted-test start ignore_prefixes=['*', '* ['] * foo * bar * [baz](path/to/baz) diff --git a/goldens/ignore_prefixes.out b/goldens/ignore_prefixes.out index 559f653..a97383c 100644 --- a/goldens/ignore_prefixes.out +++ b/goldens/ignore_prefixes.out @@ -56,8 +56,8 @@ Combine with numerical: # keep-sorted-test end Prefixes with spaces: - # keep-sorted-test start ignore_prefixes=['* ', '* ['] + # keep-sorted-test start ignore_prefixes=['*', '* ['] * bar - * [baz](path/to/baz) * foo + * [baz](path/to/baz) # keep-sorted-test end From b76eb535c3e7db03adffc06cc8334a375fc61288 Mon Sep 17 00:00:00 2001 From: Jeffrey Faer Date: Wed, 27 Nov 2024 13:39:16 -0700 Subject: [PATCH 2/2] Actual change --- goldens/ignore_prefixes.out | 2 +- keepsorted/options.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/goldens/ignore_prefixes.out b/goldens/ignore_prefixes.out index a97383c..71fb5c2 100644 --- a/goldens/ignore_prefixes.out +++ b/goldens/ignore_prefixes.out @@ -58,6 +58,6 @@ Combine with numerical: Prefixes with spaces: # keep-sorted-test start ignore_prefixes=['*', '* ['] * bar - * foo * [baz](path/to/baz) + * foo # keep-sorted-test end diff --git a/keepsorted/options.go b/keepsorted/options.go index 4529f1b..223504f 100644 --- a/keepsorted/options.go +++ b/keepsorted/options.go @@ -324,7 +324,7 @@ func (opts blockOptions) removeIgnorePrefix(s string) (string, bool) { t := strings.TrimLeftFunc(s, unicode.IsSpace) for _, p := range opts.IgnorePrefixes { if strings.HasPrefix(t, p) { - return strings.Replace(s, p, "", 1), true + return strings.TrimLeftFunc(strings.Replace(s, p, "", 1), unicode.IsSpace), true } } return "", false