From e811cb6fec3928722061f448afa03899beb6c020 Mon Sep 17 00:00:00 2001 From: kbkpbot Date: Wed, 12 Jun 2024 11:19:19 +0800 Subject: [PATCH 1/3] fix find_between, when not found return '' --- vlib/builtin/string.v | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vlib/builtin/string.v b/vlib/builtin/string.v index 28019b8a579841..b2fa1823011714 100644 --- a/vlib/builtin/string.v +++ b/vlib/builtin/string.v @@ -1653,7 +1653,7 @@ pub fn (s string) find_between(start string, end string) string { val := s[start_pos + start.len..] end_pos := val.index_(end) if end_pos == -1 { - return val + return '' } return val[..end_pos] } From e1ee2268fc73653c1f89895c8147b4731ec30a38 Mon Sep 17 00:00:00 2001 From: kbkpbot Date: Wed, 12 Jun 2024 18:49:53 +0800 Subject: [PATCH 2/3] add test --- vlib/builtin/string_test.v | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vlib/builtin/string_test.v b/vlib/builtin/string_test.v index bb556cc565cf21..c8c37bf6274da4 100644 --- a/vlib/builtin/string_test.v +++ b/vlib/builtin/string_test.v @@ -44,6 +44,8 @@ fn test_ends_with() { fn test_between() { s := 'hello [man] how you doing' assert s.find_between('[', ']') == 'man' + assert s.find_between('[','A') == '' + assert s.find_between('',']') == '' } fn test_compare() { From bcf4c6fbe5a4b0e60e81602072329f61b480d679 Mon Sep 17 00:00:00 2001 From: kbkpbot Date: Wed, 12 Jun 2024 18:56:09 +0800 Subject: [PATCH 3/3] fix format --- vlib/builtin/string_test.v | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vlib/builtin/string_test.v b/vlib/builtin/string_test.v index c8c37bf6274da4..50ec55fa8eec08 100644 --- a/vlib/builtin/string_test.v +++ b/vlib/builtin/string_test.v @@ -44,8 +44,8 @@ fn test_ends_with() { fn test_between() { s := 'hello [man] how you doing' assert s.find_between('[', ']') == 'man' - assert s.find_between('[','A') == '' - assert s.find_between('',']') == '' + assert s.find_between('[', 'A') == '' + assert s.find_between('A', ']') == '' } fn test_compare() {