Skip to content

fix: Fix for issue #4 caused by wrong replacement in the original string on level!=1 #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
far4599 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix: Fix for issue #4 caused by wrong replacement in the original string on level!=1 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf89db0
test: added test that shows the problem caused by replacement on line…
far4599 May 12, 2021
aabfeed
fix: this is a fix for issue #4 caused by wrong replacement in the or…
far4599 May 12, 2021
2a8de5f
test: updated test expected value
far4599 May 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gospin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ func (s *Spinner) walk(seq *string, step *int, str *string, start int, level int
} else {
// replace parameter string e.g. {hello|what} with selectedOpt
stepDiff := len([]rune(*str)[*step:start+1]) - len([]rune(selected))
*str = strings.Replace(*str, string([]rune(*str)[*step:start+1]), selected, 1)
*str = string([]rune(*str)[:*step]) + selected + string([]rune(*str)[start+1:])
*step = *step - stepDiff
start = start - stepDiff
}
Expand Down
16 changes: 16 additions & 0 deletions gospin_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,14 @@ func TestSpinner_Spin(t *testing.T) {
assert.Error(t, err)
}
assert.Equal(t, expected, got, "should be equal")

nested := "The {slow|quick} {brown|blue and {red|yellow}} {fox|deer} {gracefully |}jumps over the {{slow|quick} {fox|deer}}"
expected = "The slow blue and yellow fox jumps over the quick fox"
got, err = spinner.Spin(nested)
if err != nil {
assert.Error(t, err)
}
assert.Equal(t, expected, got, "should be equal")
}

func TestSpinner_Spin_UTF8(t *testing.T) {
Expand Down Expand Up @@ -62,6 +70,14 @@ func TestSpinner_Spin_UTF8(t *testing.T) {
assert.Error(t, err)
}
assert.Equal(t, expected, got, "should be equal")

nested := "{Медленный|Быстрый} {бурый|серый с {рыжими пятнами|золотистыми пятнами}} {лис|олень} {с легкостью |}перепрыгнул через {{сонного|ленивого} {волка|оленя}}"
expected = "Медленный бурый олень перепрыгнул через сонного оленя"
got, err = spinner.Spin(nested)
if err != nil {
assert.Error(t, err)
}
assert.Equal(t, expected, got, "should be equal")
}

func TestSpinner_Spin_EndCharFirstChar(t *testing.T) {
Expand Down