github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-24 04:42:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
6fcb6f77be
fish-shell/tests/checks/string.fish

800 lines
18 KiB
Fish
Raw Normal View History

Port string tests to littlecheck `wc -l tests/string.*` 329 tests/string.err 422 tests/string.in 520 tests/string.out 1271 total `wc -l tests/checks/string.fish` 555 tests/checks/string.fish and it looks nicer. 'nuff said.
2019-06-25 23:21:11 +08:00
#RUN: %fish %s
# Tests for string builtin. Mostly taken from man page examples.
string match -r -v "c.*" dog can cat diz; and echo "exit 0"
# CHECK: dog
# CHECK: diz
# CHECK: exit 0
string match -q -r -v "c.*" dog can cat diz; and echo "exit 0"
# CHECK: exit 0
string match -v "c*" dog can cat diz; and echo "exit 0"
# CHECK: dog
# CHECK: diz
# CHECK: exit 0
string match -q -v "c*" dog can cat diz; and echo "exit 0"
# CHECK: exit 0
string match -v "d*" dog dan dat diz; or echo "exit 1"
# CHECK: exit 1
string match -q -v "d*" dog dan dat diz; or echo "exit 1"
# CHECK: exit 1
string match -r -v x y; and echo "exit 0"
# CHECK: y
# CHECK: exit 0
string match -r -v x x; or echo "exit 1"
# CHECK: exit 1
string match -q -r -v x y; and echo "exit 0"
# CHECK: exit 0
string match -q -r -v x x; or echo "exit 1"
# CHECK: exit 1
string length "hello, world"
# CHECK: 12
string length -q ""; and echo not zero length; or echo zero length
# CHECK: zero length
New command "string pad" to pad text to a given width (#7340) Pads text to a given width, or the maximum width of all inputs.
2020-09-28 01:12:42 +08:00
string pad foo
# CHECK: foo
string pad: handle padding characters of width > 1 If the padding is not divisible by the char's width without remainder, we pad the remainder with spaces, so the total width of the output is correct. Also add completions, changelog entry, adjust documentation, add examples with emoji and some tests. Apply some minor style nitpicks and avoid extra allocations of the input strings.
2020-09-28 03:51:20 +08:00
string pad -r -w 7 -c - foo
New command "string pad" to pad text to a given width (#7340) Pads text to a given width, or the maximum width of all inputs.
2020-09-28 01:12:42 +08:00
# CHECK: foo----
string pad --width 7 -c '=' foo
# CHECK: ====foo
echo \|(string pad --width 10 --right foo)\|
# CHECK: |foo |
Set fish_emoji_width in test to guard against older wcwidth See #7340
2020-09-28 23:53:27 +08:00
begin
set -l fish_emoji_width 2
# Pad string with multi-width emoji.
string pad -w 4 -c . 🐟
# CHECK: ..🐟
# Pad with multi-width character.
string pad -w 3 -c 🐟 .
# CHECK: 🐟.
# Multi-width pad with remainder, complemented with a space.
string pad -w 4 -c 🐟 . ..
# CHECK: 🐟 .
# CHECK: 🐟..
end
string pad: handle padding characters of width > 1 If the padding is not divisible by the char's width without remainder, we pad the remainder with spaces, so the total width of the output is correct. Also add completions, changelog entry, adjust documentation, add examples with emoji and some tests. Apply some minor style nitpicks and avoid extra allocations of the input strings.
2020-09-28 03:51:20 +08:00
# Pad to the maximum length.
New command "string pad" to pad text to a given width (#7340) Pads text to a given width, or the maximum width of all inputs.
2020-09-28 01:12:42 +08:00
string pad -c . long longer longest
# CHECK: ...long
# CHECK: .longer
# CHECK: longest
string pad: handle padding characters of width > 1 If the padding is not divisible by the char's width without remainder, we pad the remainder with spaces, so the total width of the output is correct. Also add completions, changelog entry, adjust documentation, add examples with emoji and some tests. Apply some minor style nitpicks and avoid extra allocations of the input strings.
2020-09-28 03:51:20 +08:00
# This tests current behavior where the max width of an argument overrules
# the width parameter. This could be changed if needed.
string pad -c_ --width 5 longer-than-width-param x
# CHECK: longer-than-width-param
# CHECK: ______________________x
# Current behavior is that only a single padding character is supported.
# We can support longer strings in future without breaking compatibilty.
string pad -c ab -w4 .
# CHECKERR: string pad: Padding should be a character 'ab'
Let visible length work with CR and LF Because we are, ultimately, interested in how many cells a string occupies, we *have* to handle carriage return (`\r`) and line feed (`\n`). A carriage return sets the current tally to 0, and only the longest tally is kept. The idea here is that the last position is the same as the last position of the longest string. So: abcdef\r123 ends up looking like 123def which is the same width as abcdef, 6. A line feed meanwhile means we flush the current tally and start a new one. Every line is printed separately, even if it's given as one. That's because, well, counting the width over multiple lines doesn't *help*. As a sidenote: This is necessarily imperfect, because, while we may know the width of the terminal ($COLUMNS), we don't know the current cursor position. So we can only give the width, and the user can then figure something out on their own. But for the common case of figuring out how wide the prompt is, this should do.
2021-07-30 02:49:14 +08:00
# Visible length. Let's start off simple, colors are ignored:
string length --visible (set_color red)abc
# CHECK: 3
begin
set -l fish_emoji_width 2
# This should print the emoji width
Change our test emoji The emoji we used wasn't actually widened-in-9, so we now switch to one that does.
2022-02-15 05:31:30 +08:00
string length --visible . \U2693
Let visible length work with CR and LF Because we are, ultimately, interested in how many cells a string occupies, we *have* to handle carriage return (`\r`) and line feed (`\n`). A carriage return sets the current tally to 0, and only the longest tally is kept. The idea here is that the last position is the same as the last position of the longest string. So: abcdef\r123 ends up looking like 123def which is the same width as abcdef, 6. A line feed meanwhile means we flush the current tally and start a new one. Every line is printed separately, even if it's given as one. That's because, well, counting the width over multiple lines doesn't *help*. As a sidenote: This is necessarily imperfect, because, while we may know the width of the terminal ($COLUMNS), we don't know the current cursor position. So we can only give the width, and the user can then figure something out on their own. But for the common case of figuring out how wide the prompt is, this should do.
2021-07-30 02:49:14 +08:00
# CHECK: 1
# CHECK: 2
set -l fish_emoji_width 1
Change our test emoji The emoji we used wasn't actually widened-in-9, so we now switch to one that does.
2022-02-15 05:31:30 +08:00
string length --visible . \U2693
Let visible length work with CR and LF Because we are, ultimately, interested in how many cells a string occupies, we *have* to handle carriage return (`\r`) and line feed (`\n`). A carriage return sets the current tally to 0, and only the longest tally is kept. The idea here is that the last position is the same as the last position of the longest string. So: abcdef\r123 ends up looking like 123def which is the same width as abcdef, 6. A line feed meanwhile means we flush the current tally and start a new one. Every line is printed separately, even if it's given as one. That's because, well, counting the width over multiple lines doesn't *help*. As a sidenote: This is necessarily imperfect, because, while we may know the width of the terminal ($COLUMNS), we don't know the current cursor position. So we can only give the width, and the user can then figure something out on their own. But for the common case of figuring out how wide the prompt is, this should do.
2021-07-30 02:49:14 +08:00
# CHECK: 1
# CHECK: 1
end
# Only the longest run between carriage returns is kept because the rest is overwritten.
string length --visible (set_color normal)abcdef\rfooba(set_color red)raaa
# (foobaraaa)
# CHECK: 9
# Visible length is *always* split by line
string length --visible a(set_color blue)b\ncde
# CHECK: 2
# CHECK: 3
Handle backspaces for visible width This makes it so we treat backspaces as width -1, but never go below a 0 total width when talking about *lines*, like in screen or string length --visible. Fixes #8277.
2021-09-23 18:57:44 +08:00
# Backslashes and visible length:
# It can't move us before the start of the line.
string length --visible \b
# CHECK: 0
# It can't move us before the start of the line.
string length --visible \bf
# CHECK: 1
# But it does erase chars before.
string length --visible \bf\b
# CHECK: 0
# Never move past 0.
string length --visible \bf\b\b\b\b\b
# CHECK: 0
Port string tests to littlecheck `wc -l tests/string.*` 329 tests/string.err 422 tests/string.in 520 tests/string.out 1271 total `wc -l tests/checks/string.fish` 555 tests/checks/string.fish and it looks nicer. 'nuff said.
2019-06-25 23:21:11 +08:00
string sub --length 2 abcde
# CHECK: ab
string sub -s 2 -l 2 abcde
# CHECK: bc
string sub --start=-2 abcde
# CHECK: de
Add `string sub --end` (#6765)
2020-03-22 22:53:09 +08:00
string sub --end=3 abcde
# CHECK: abc
string sub --end=-4 abcde
# CHECK: a
string sub --start=2 --end=-2 abcde
# CHECK: bc
string sub -s -5 -e -2 abcdefgh
# CHECK: def
string sub -s -100 -e -2 abcde
# CHECK: abc
string sub -s -5 -e 2 abcde
# CHECK: ab
string sub -s -50 -e -100 abcde
# CHECK:
string sub -s 2 -e -5 abcde
# CHECK:
Port string tests to littlecheck `wc -l tests/string.*` 329 tests/string.err 422 tests/string.in 520 tests/string.out 1271 total `wc -l tests/checks/string.fish` 555 tests/checks/string.fish and it looks nicer. 'nuff said.
2019-06-25 23:21:11 +08:00
string split . example.com
# CHECK: example
# CHECK: com
string split -r -m1 / /usr/local/bin/fish
# CHECK: /usr/local/bin
# CHECK: fish
string split "" abc
# CHECK: a
# CHECK: b
# CHECK: c
Add `string split --fields`
2020-03-21 00:31:23 +08:00
string split --fields=2 "" abc
# CHECK: b
Allow simple ranges to be specified for `--fields`
2020-03-22 00:30:00 +08:00
string split --fields=3,2 "" abc
Add `string split --fields`
2020-03-21 00:31:23 +08:00
# CHECK: c
Allow simple ranges to be specified for `--fields`
2020-03-22 00:30:00 +08:00
# CHECK: b
Add `string split --fields`
2020-03-21 00:31:23 +08:00
Return 1 if non-existent field is given
2020-03-24 22:25:37 +08:00
string split --fields=2,9 "" abc; or echo "exit 1"
# CHECK: exit 1
Add `string split --fields`
2020-03-21 00:31:23 +08:00
Allow simple ranges to be specified for `--fields`
2020-03-22 00:30:00 +08:00
string split --fields=1-3,5,9-7 "" 123456789
# CHECK: 1
# CHECK: 2
# CHECK: 3
# CHECK: 5
# CHECK: 9
# CHECK: 8
# CHECK: 7
string split --fields: handle multi-line/arg input
2020-04-18 12:03:54 +08:00
string split -f1 ' ' 'a b' 'c d'
# CHECK: a
# CHECK: c
string split: add `--allow-empty` flag to be used with `--fields`
2020-04-18 14:25:08 +08:00
string split --allow-empty --fields=2,9 "" abc
# CHECK: b
Port string tests to littlecheck `wc -l tests/string.*` 329 tests/string.err 422 tests/string.in 520 tests/string.out 1271 total `wc -l tests/checks/string.fish` 555 tests/checks/string.fish and it looks nicer. 'nuff said.
2019-06-25 23:21:11 +08:00
seq 3 | string join ...
# CHECK: 1...2...3
string trim " abc "
# CHECK: abc
string trim --right --chars=yz xyzzy zany
# CHECK: x
# CHECK: zan
echo \x07 | string escape
# CHECK: \cg
string escape --style=script 'a b#c"\'d'
# CHECK: a\ b\#c\"\'d
string escape --style=url 'a b#c"\'d'
# CHECK: a%20b%23c%22%27d
string escape --style=url \na\nb%c~d\n
# CHECK: %0Aa%0Ab%25c~d%0A
string escape --style=var 'a b#c"\'d'
# CHECK: a_20_b_23_c_22_27_d
string escape --style=var a\nghi_
# CHECK: a_0A_ghi__
Reindent functions to remove useless quotes This does not include checks/function.fish because that currently includes a "; end" in a message that indent would remove, breaking the test.
2020-03-10 02:36:12 +08:00
string escape --style=var abc
Port string tests to littlecheck `wc -l tests/string.*` 329 tests/string.err 422 tests/string.in 520 tests/string.out 1271 total `wc -l tests/checks/string.fish` 555 tests/checks/string.fish and it looks nicer. 'nuff said.
2019-06-25 23:21:11 +08:00
# CHECK: abc
Reindent functions to remove useless quotes This does not include checks/function.fish because that currently includes a "; end" in a message that indent would remove, breaking the test.
2020-03-10 02:36:12 +08:00
string escape --style=var _a_b_c_
Port string tests to littlecheck `wc -l tests/string.*` 329 tests/string.err 422 tests/string.in 520 tests/string.out 1271 total `wc -l tests/checks/string.fish` 555 tests/checks/string.fish and it looks nicer. 'nuff said.
2019-06-25 23:21:11 +08:00
# CHECK: __a__b__c__
string escape --style=var -- -
# CHECK: _2D_
# string escape with multibyte chars
string escape --style=url aöb
string escape --style=url 中
string escape --style=url aöb | string unescape --style=url
string escape --style=url 中 | string unescape --style=url
string escape --style=var aöb
string escape --style=var 中
string escape --style=var aöb | string unescape --style=var
string escape --style=var 中 | string unescape --style=var
# CHECK: a%C3%B6b
# CHECK: %E4%B8%AD
# CHECK: aöb
# CHECK: 中
# CHECK: a_C3_B6_b
# CHECK: _E4_B8_AD_
# CHECK: aöb
# CHECK: 中
# test regex escaping
string escape --style=regex ".ext"
string escape --style=regex "bonjour, amigo"
string escape --style=regex "^this is a literal string"
# CHECK: \.ext
# CHECK: bonjour, amigo
# CHECK: \^this is a literal string
### Verify that we can correctly unescape the same strings
# we tested escaping above.
set x (string unescape (echo \x07 | string escape))
test $x = \x07
and echo success
# CHECK: success
string unescape --style=script (string escape --style=script 'a b#c"\'d')
# CHECK: a b#c"'d
string unescape --style=url (string escape --style=url 'a b#c"\'d')
# CHECK: a b#c"'d
string unescape --style=url (string escape --style=url \na\nb%c~d\n)
New command "string pad" to pad text to a given width (#7340) Pads text to a given width, or the maximum width of all inputs.
2020-09-28 01:12:42 +08:00
# CHECK:
Port string tests to littlecheck `wc -l tests/string.*` 329 tests/string.err 422 tests/string.in 520 tests/string.out 1271 total `wc -l tests/checks/string.fish` 555 tests/checks/string.fish and it looks nicer. 'nuff said.
2019-06-25 23:21:11 +08:00
# CHECK: a
# CHECK: b%c~d
string unescape --style=var (string escape --style=var 'a b#c"\'d')
# CHECK: a b#c"'d
string unescape --style=var (string escape --style=var a\nghi_)
# CHECK: a
# CHECK: ghi_
string unescape --style=var (string escape --style=var 'abc')
# CHECK: abc
string unescape --style=var (string escape --style=var '_a_b_c_')
# CHECK: _a_b_c_
string unescape --style=var -- (string escape --style=var -- -)
# CHECK: -
### Verify that we can correctly match strings.
string match "*" a
# CHECK: a
string match "a*b" axxb
# CHECK: axxb
string match -i "a**B" Axxb
# CHECK: Axxb
echo "ok?" | string match "*?"
# CHECK: ok?
string match -r "cat|dog|fish" "nice dog"
# CHECK: dog
string match -r "(\d\d?):(\d\d):(\d\d)" 2:34:56
# CHECK: 2:34:56
# CHECK: 2
# CHECK: 34
# CHECK: 56
string match -r "^(\w{2,4})\g1\$" papa mud murmur
# CHECK: papa
# CHECK: pa
# CHECK: murmur
# CHECK: mur
string match -r -a -n at ratatat
# CHECK: 2 2
# CHECK: 4 2
# CHECK: 6 2
string match -r -i "0x[0-9a-f]{1,8}" "int magic = 0xBadC0de;"
# CHECK: 0xBadC0de
string replace is was "blue is my favorite"
# CHECK: blue was my favorite
string replace 3rd last 1st 2nd 3rd
# CHECK: 1st
# CHECK: 2nd
# CHECK: last
string replace -a " " _ "spaces to underscores"
# CHECK: spaces_to_underscores
string replace -r -a "[^\d.]+" " " "0 one two 3.14 four 5x"
New command "string pad" to pad text to a given width (#7340) Pads text to a given width, or the maximum width of all inputs.
2020-09-28 01:12:42 +08:00
# CHECK: 0 3.14 5
Port string tests to littlecheck `wc -l tests/string.*` 329 tests/string.err 422 tests/string.in 520 tests/string.out 1271 total `wc -l tests/checks/string.fish` 555 tests/checks/string.fish and it looks nicer. 'nuff said.
2019-06-25 23:21:11 +08:00
string replace -r "(\w+)\s+(\w+)" "\$2 \$1 \$\$" "left right"
# CHECK: right left $
string replace -r "\s*newline\s*" "\n" "put a newline here"
# CHECK: put a
# CHECK: here
string replace -r -a "(\w)" "\$1\$1" ab
# CHECK: aabb
string replace --filter x X abc axc x def jkx
or echo Unexpected exit status at line (status --current-line-number)
# CHECK: aXc
# CHECK: X
# CHECK: jkX
string replace --filter y Y abc axc x def jkx
and echo Unexpected exit status at line (status --current-line-number)
string replace --regex -f "\d" X 1bc axc 2 d3f jk4 xyz
or echo Unexpected exit status at line (status --current-line-number)
# CHECK: Xbc
# CHECK: X
# CHECK: dXf
# CHECK: jkX
Reindent functions to remove useless quotes This does not include checks/function.fish because that currently includes a "; end" in a message that indent would remove, breaking the test.
2020-03-10 02:36:12 +08:00
string replace --regex -f Z X 1bc axc 2 d3f jk4 xyz
Port string tests to littlecheck `wc -l tests/string.*` 329 tests/string.err 422 tests/string.in 520 tests/string.out 1271 total `wc -l tests/checks/string.fish` 555 tests/checks/string.fish and it looks nicer. 'nuff said.
2019-06-25 23:21:11 +08:00
and echo Unexpected exit status at line (status --current-line-number)
# From https://github.com/fish-shell/fish-shell/issues/5201
# 'string match -r with empty capture groups'
string match -r '^([ugoa]*)([=+-]?)([rwx]*)$' '=r'
#CHECK: =r
New command "string pad" to pad text to a given width (#7340) Pads text to a given width, or the maximum width of all inputs.
2020-09-28 01:12:42 +08:00
#CHECK:
Port string tests to littlecheck `wc -l tests/string.*` 329 tests/string.err 422 tests/string.in 520 tests/string.out 1271 total `wc -l tests/checks/string.fish` 555 tests/checks/string.fish and it looks nicer. 'nuff said.
2019-06-25 23:21:11 +08:00
#CHECK: =
#CHECK: r
### Test some failure cases
string match -r "[" "a[sd"; and echo "unexpected exit 0"
# CHECKERR: string match: Regular expression compile error: missing terminating ] for character class
# CHECKERR: string match: [
# CHECKERR: string match: ^
# FIXME: This prints usage summary?
#string invalidarg; and echo "unexpected exit 0"
# DONTCHECKERR: string: Subcommand 'invalidarg' is not valid
string length; or echo "missing argument returns 1"
# CHECK: missing argument returns 1
string match -r -v "[dcantg].*" dog can cat diz; or echo "no regexp invert match"
# CHECK: no regexp invert match
string match -v "*" dog can cat diz; or echo "no glob invert match"
# CHECK: no glob invert match
string match -rvn a bbb; or echo "exit 1"
# CHECK: 1 3
### Test repeat subcommand
Reindent functions to remove useless quotes This does not include checks/function.fish because that currently includes a "; end" in a message that indent would remove, breaking the test.
2020-03-10 02:36:12 +08:00
string repeat -n 2 foo
Port string tests to littlecheck `wc -l tests/string.*` 329 tests/string.err 422 tests/string.in 520 tests/string.out 1271 total `wc -l tests/checks/string.fish` 555 tests/checks/string.fish and it looks nicer. 'nuff said.
2019-06-25 23:21:11 +08:00
# CHECK: foofoo
Reindent functions to remove useless quotes This does not include checks/function.fish because that currently includes a "; end" in a message that indent would remove, breaking the test.
2020-03-10 02:36:12 +08:00
string repeat --count 2 foo
Port string tests to littlecheck `wc -l tests/string.*` 329 tests/string.err 422 tests/string.in 520 tests/string.out 1271 total `wc -l tests/checks/string.fish` 555 tests/checks/string.fish and it looks nicer. 'nuff said.
2019-06-25 23:21:11 +08:00
# CHECK: foofoo
echo foo | string repeat -n 2
# CHECK: foofoo
Reindent functions to remove useless quotes This does not include checks/function.fish because that currently includes a "; end" in a message that indent would remove, breaking the test.
2020-03-10 02:36:12 +08:00
string repeat -n2 -q foo; and echo "exit 0"
Port string tests to littlecheck `wc -l tests/string.*` 329 tests/string.err 422 tests/string.in 520 tests/string.out 1271 total `wc -l tests/checks/string.fish` 555 tests/checks/string.fish and it looks nicer. 'nuff said.
2019-06-25 23:21:11 +08:00
# CHECK: exit 0
Reindent functions to remove useless quotes This does not include checks/function.fish because that currently includes a "; end" in a message that indent would remove, breaking the test.
2020-03-10 02:36:12 +08:00
string repeat -n2 --quiet foo; and echo "exit 0"
Port string tests to littlecheck `wc -l tests/string.*` 329 tests/string.err 422 tests/string.in 520 tests/string.out 1271 total `wc -l tests/checks/string.fish` 555 tests/checks/string.fish and it looks nicer. 'nuff said.
2019-06-25 23:21:11 +08:00
# CHECK: exit 0
Reindent functions to remove useless quotes This does not include checks/function.fish because that currently includes a "; end" in a message that indent would remove, breaking the test.
2020-03-10 02:36:12 +08:00
string repeat -n0 foo; or echo "exit 1"
Port string tests to littlecheck `wc -l tests/string.*` 329 tests/string.err 422 tests/string.in 520 tests/string.out 1271 total `wc -l tests/checks/string.fish` 555 tests/checks/string.fish and it looks nicer. 'nuff said.
2019-06-25 23:21:11 +08:00
# CHECK: exit 1
string repeat -n0; or echo "exit 1"
# CHECK: exit 1
string repeat -m0; or echo "exit 1"
# CHECK: exit 1
Run fish_indent on all our fish scripts It's now good enough to do so. We don't allow grid-alignment: ```fish complete -c foo -s b -l barnanana -a '(something)' complete -c foo -s z -a '(something)' ``` becomes ```fish complete -c foo -s b -l barnanana -a '(something)' complete -c foo -s z -a '(something)' ``` It's just more trouble than it is worth. The one part I'd change: We align and/or'd parts of an if-condition with the in-block code: ```fish if true and false dosomething end ``` becomes ```fish if true and false dosomething end ``` but it's not used terribly much and if we ever fix it we can just reindent.
2020-01-14 03:34:22 +08:00
string repeat -n1 -N "there is "
echo "no newline"
Port string tests to littlecheck `wc -l tests/string.*` 329 tests/string.err 422 tests/string.in 520 tests/string.out 1271 total `wc -l tests/checks/string.fish` 555 tests/checks/string.fish and it looks nicer. 'nuff said.
2019-06-25 23:21:11 +08:00
# CHECK: there is no newline
Run fish_indent on all our fish scripts It's now good enough to do so. We don't allow grid-alignment: ```fish complete -c foo -s b -l barnanana -a '(something)' complete -c foo -s z -a '(something)' ``` becomes ```fish complete -c foo -s b -l barnanana -a '(something)' complete -c foo -s z -a '(something)' ``` It's just more trouble than it is worth. The one part I'd change: We align and/or'd parts of an if-condition with the in-block code: ```fish if true and false dosomething end ``` becomes ```fish if true and false dosomething end ``` but it's not used terribly much and if we ever fix it we can just reindent.
2020-01-14 03:34:22 +08:00
string repeat -n1 --no-newline "there is "
echo "no newline"
Port string tests to littlecheck `wc -l tests/string.*` 329 tests/string.err 422 tests/string.in 520 tests/string.out 1271 total `wc -l tests/checks/string.fish` 555 tests/checks/string.fish and it looks nicer. 'nuff said.
2019-06-25 23:21:11 +08:00
# CHECK: there is no newline
Reindent functions to remove useless quotes This does not include checks/function.fish because that currently includes a "; end" in a message that indent would remove, breaking the test.
2020-03-10 02:36:12 +08:00
string repeat -n10 -m4 foo
Port string tests to littlecheck `wc -l tests/string.*` 329 tests/string.err 422 tests/string.in 520 tests/string.out 1271 total `wc -l tests/checks/string.fish` 555 tests/checks/string.fish and it looks nicer. 'nuff said.
2019-06-25 23:21:11 +08:00
# CHECK: foof
Reindent functions to remove useless quotes This does not include checks/function.fish because that currently includes a "; end" in a message that indent would remove, breaking the test.
2020-03-10 02:36:12 +08:00
string repeat -n10 --max 5 foo
Port string tests to littlecheck `wc -l tests/string.*` 329 tests/string.err 422 tests/string.in 520 tests/string.out 1271 total `wc -l tests/checks/string.fish` 555 tests/checks/string.fish and it looks nicer. 'nuff said.
2019-06-25 23:21:11 +08:00
# CHECK: foofo
Reindent functions to remove useless quotes This does not include checks/function.fish because that currently includes a "; end" in a message that indent would remove, breaking the test.
2020-03-10 02:36:12 +08:00
string repeat -n3 -m20 foo
Port string tests to littlecheck `wc -l tests/string.*` 329 tests/string.err 422 tests/string.in 520 tests/string.out 1271 total `wc -l tests/checks/string.fish` 555 tests/checks/string.fish and it looks nicer. 'nuff said.
2019-06-25 23:21:11 +08:00
# CHECK: foofoofoo
Reindent functions to remove useless quotes This does not include checks/function.fish because that currently includes a "; end" in a message that indent would remove, breaking the test.
2020-03-10 02:36:12 +08:00
string repeat -m4 foo
Port string tests to littlecheck `wc -l tests/string.*` 329 tests/string.err 422 tests/string.in 520 tests/string.out 1271 total `wc -l tests/checks/string.fish` 555 tests/checks/string.fish and it looks nicer. 'nuff said.
2019-06-25 23:21:11 +08:00
# CHECK: foof
Teach string repeat to handle multiple arguments Each argument in string repeat is handled independently, except that the --no-newline option applies only to the last newline. Fixes #5988
2021-01-12 08:30:33 +08:00
string repeat -n 5 a b c
# CHECK: aaaaa
# CHECK: bbbbb
# CHECK: ccccc
string repeat -n 5 --max 4 123 456 789
# CHECK: 1231
# CHECK: 4564
# CHECK: 7897
string repeat -n 5 --max 4 123 '' 789
# CHECK: 1231
# CHECK:
# CHECK: 7897
# Historical string repeat behavior is no newline if no output.
echo -n before
string repeat -n 5 ''
echo after
# CHECK: beforeafter
Reindent functions to remove useless quotes This does not include checks/function.fish because that currently includes a "; end" in a message that indent would remove, breaking the test.
2020-03-10 02:36:12 +08:00
string repeat -n-1 foo; and echo "exit 0"
Port string tests to littlecheck `wc -l tests/string.*` 329 tests/string.err 422 tests/string.in 520 tests/string.out 1271 total `wc -l tests/checks/string.fish` 555 tests/checks/string.fish and it looks nicer. 'nuff said.
2019-06-25 23:21:11 +08:00
# CHECKERR: string repeat: Invalid count value '-1'
Reindent functions to remove useless quotes This does not include checks/function.fish because that currently includes a "; end" in a message that indent would remove, breaking the test.
2020-03-10 02:36:12 +08:00
string repeat -m-1 foo; and echo "exit 0"
Port string tests to littlecheck `wc -l tests/string.*` 329 tests/string.err 422 tests/string.in 520 tests/string.out 1271 total `wc -l tests/checks/string.fish` 555 tests/checks/string.fish and it looks nicer. 'nuff said.
2019-06-25 23:21:11 +08:00
# CHECKERR: string repeat: Invalid max value '-1'
Reindent functions to remove useless quotes This does not include checks/function.fish because that currently includes a "; end" in a message that indent would remove, breaking the test.
2020-03-10 02:36:12 +08:00
string repeat -n notanumber foo; and echo "exit 0"
Update tests for changed error output
2021-11-04 13:52:17 +08:00
# CHECKERR: string repeat: notanumber: invalid integer
Port string tests to littlecheck `wc -l tests/string.*` 329 tests/string.err 422 tests/string.in 520 tests/string.out 1271 total `wc -l tests/checks/string.fish` 555 tests/checks/string.fish and it looks nicer. 'nuff said.
2019-06-25 23:21:11 +08:00
Reindent functions to remove useless quotes This does not include checks/function.fish because that currently includes a "; end" in a message that indent would remove, breaking the test.
2020-03-10 02:36:12 +08:00
string repeat -m notanumber foo; and echo "exit 0"
Update tests for changed error output
2021-11-04 13:52:17 +08:00
# CHECKERR: string repeat: notanumber: invalid integer
Port string tests to littlecheck `wc -l tests/string.*` 329 tests/string.err 422 tests/string.in 520 tests/string.out 1271 total `wc -l tests/checks/string.fish` 555 tests/checks/string.fish and it looks nicer. 'nuff said.
2019-06-25 23:21:11 +08:00
Reindent functions to remove useless quotes This does not include checks/function.fish because that currently includes a "; end" in a message that indent would remove, breaking the test.
2020-03-10 02:36:12 +08:00
echo stdin | string repeat -n1 "and arg"; and echo "exit 0"
Update tests for changed error output
2021-11-04 13:52:17 +08:00
# CHECKERR: string repeat: too many arguments
Port string tests to littlecheck `wc -l tests/string.*` 329 tests/string.err 422 tests/string.in 520 tests/string.out 1271 total `wc -l tests/checks/string.fish` 555 tests/checks/string.fish and it looks nicer. 'nuff said.
2019-06-25 23:21:11 +08:00
string repeat -n; and echo "exit 0"
Update tests for changed error output
2021-11-04 13:52:17 +08:00
# CHECKERR: string repeat: -n: option requires an argument
Port string tests to littlecheck `wc -l tests/string.*` 329 tests/string.err 422 tests/string.in 520 tests/string.out 1271 total `wc -l tests/checks/string.fish` 555 tests/checks/string.fish and it looks nicer. 'nuff said.
2019-06-25 23:21:11 +08:00
# FIXME: Also triggers usage
# string repeat -l fakearg
# DONTCHECKERR: string repeat: Unknown option '-l'
string repeat ""
or echo string repeat empty string failed
# CHECK: string repeat empty string failed
string repeat -n3 ""
or echo string repeat empty string failed
# CHECK: string repeat empty string failed
# Test equivalent matches with/without the --entire, --regex, and --invert flags.
string match -e x abc dxf xyz jkx x z
or echo exit 1
# CHECK: dxf
# CHECK: xyz
# CHECK: jkx
# CHECK: x
string match x abc dxf xyz jkx x z
# CHECK: x
string match --entire -r "a*b[xy]+" abc abxc bye aaabyz kaabxz abbxy abcx caabxyxz
or echo exit 1
# CHECK: abxc
# CHECK: bye
# CHECK: aaabyz
# CHECK: kaabxz
# CHECK: abbxy
# CHECK: caabxyxz
# 'string match --entire "" -- banana'
string match --entire "" -- banana
or echo exit 1
# CHECK: banana
# 'string match -r "a*b[xy]+" abc abxc bye aaabyz kaabxz abbxy abcx caabxyxz'
string match -r "a*b[xy]+" abc abxc bye aaabyz kaabxz abbxy abcx caabxyxz
or echo exit 1
# CHECK: abx
# CHECK: by
# CHECK: aaaby
# CHECK: aabx
# CHECK: bxy
# CHECK: aabxyx
# Make sure that groups are handled correct with/without --entire.
# 'string match --entire -r "a*b([xy]+)" abc abxc bye aaabyz kaabxz abbxy abcx caabxyxz'
string match --entire -r "a*b([xy]+)" abc abxc bye aaabyz kaabxz abbxy abcx caabxyxz
or echo exit 1
# CHECK: abxc
# CHECK: x
# CHECK: bye
# CHECK: y
# CHECK: aaabyz
# CHECK: y
# CHECK: kaabxz
# CHECK: x
# CHECK: abbxy
# CHECK: xy
# CHECK: caabxyxz
# CHECK: xyx
# 'string match -r "a*b([xy]+)" abc abxc bye aaabyz kaabxz abbxy abcx caabxyxz'
string match -r "a*b([xy]+)" abc abxc bye aaabyz kaabxz abbxy abcx caabxyxz
or echo exit 1
# CHECK: abx
# CHECK: x
# CHECK: by
# CHECK: y
# CHECK: aaaby
# CHECK: y
# CHECK: aabx
# CHECK: x
# CHECK: bxy
# CHECK: xy
# CHECK: aabxyx
# CHECK: xyx
# Test `string lower` and `string upper`.
set x (string lower abc DEF gHi)
or echo string lower exit 1
Reindent functions to remove useless quotes This does not include checks/function.fish because that currently includes a "; end" in a message that indent would remove, breaking the test.
2020-03-10 02:36:12 +08:00
test $x[1] = abc -a $x[2] = def -a $x[3] = ghi
Port string tests to littlecheck `wc -l tests/string.*` 329 tests/string.err 422 tests/string.in 520 tests/string.out 1271 total `wc -l tests/checks/string.fish` 555 tests/checks/string.fish and it looks nicer. 'nuff said.
2019-06-25 23:21:11 +08:00
or echo strings not converted to lowercase
set x (echo abc DEF gHi | string lower)
or echo string lower exit 1
test $x[1] = 'abc def ghi'
or echo strings not converted to lowercase
string lower -q abc
and echo lowercasing a lowercase string did not fail as expected
set x (string upper abc DEF gHi)
or echo string upper exit 1
Reindent functions to remove useless quotes This does not include checks/function.fish because that currently includes a "; end" in a message that indent would remove, breaking the test.
2020-03-10 02:36:12 +08:00
test $x[1] = ABC -a $x[2] = DEF -a $x[3] = GHI
Port string tests to littlecheck `wc -l tests/string.*` 329 tests/string.err 422 tests/string.in 520 tests/string.out 1271 total `wc -l tests/checks/string.fish` 555 tests/checks/string.fish and it looks nicer. 'nuff said.
2019-06-25 23:21:11 +08:00
or echo strings not converted to uppercase
set x (echo abc DEF gHi | string upper)
or echo string upper exit 1
test $x[1] = 'ABC DEF GHI'
or echo strings not converted to uppercase
string upper -q ABC DEF
and echo uppercasing a uppercase string did not fail as expected
# 'Check NUL'
# Note: We do `string escape` at the end to make a `\0` literal visible.
printf 'a\0b' | string escape
Reindent functions to remove useless quotes This does not include checks/function.fish because that currently includes a "; end" in a message that indent would remove, breaking the test.
2020-03-10 02:36:12 +08:00
printf 'a\0c' | string match -e a | string escape
Port string tests to littlecheck `wc -l tests/string.*` 329 tests/string.err 422 tests/string.in 520 tests/string.out 1271 total `wc -l tests/checks/string.fish` 555 tests/checks/string.fish and it looks nicer. 'nuff said.
2019-06-25 23:21:11 +08:00
printf 'a\0d' | string split '' | string escape
printf 'a\0b' | string match -r '.*b$' | string escape
printf 'a\0b' | string replace b g | string escape
printf 'a\0b' | string replace -r b g | string escape
# TODO: These do not yet work!
# printf 'a\0b' | string match '*b' | string escape
# CHECK: a\x00b
# CHECK: a\x00c
# CHECK: a
# CHECK: \x00
# CHECK: d
# CHECK: a\x00b
# CHECK: a\x00g
# CHECK: a\x00g
# string split0
count (echo -ne 'abcdefghi' | string split0)
# CHECK: 1
count (echo -ne 'abc\x00def\x00ghi\x00' | string split0)
# CHECK: 3
count (echo -ne 'abc\x00def\x00ghi\x00\x00' | string split0)
# CHECK: 4
count (echo -ne 'abc\x00def\x00ghi' | string split0)
# CHECK: 3
count (echo -ne 'abc\ndef\x00ghi\x00' | string split0)
# CHECK: 2
count (echo -ne 'abc\ndef\nghi' | string split0)
# CHECK: 1
# #5701 - split0 always returned 1
echo -ne 'a\x00b' | string split0
and echo Split something
# CHECK: a
# CHECK: b
# CHECK: Split something
# string join0
set tmp beta alpha\ngamma
count (string join \n $tmp)
# CHECK: 3
count (string join0 $tmp)
# CHECK: 2
count (string join0 $tmp | string split0)
# CHECK: 2
# string split0 in functions
# This function outputs some newline-separated content, and some
# explicitly separated content.
function dualsplit
Run fish_indent on all our fish scripts It's now good enough to do so. We don't allow grid-alignment: ```fish complete -c foo -s b -l barnanana -a '(something)' complete -c foo -s z -a '(something)' ``` becomes ```fish complete -c foo -s b -l barnanana -a '(something)' complete -c foo -s z -a '(something)' ``` It's just more trouble than it is worth. The one part I'd change: We align and/or'd parts of an if-condition with the in-block code: ```fish if true and false dosomething end ``` becomes ```fish if true and false dosomething end ``` but it's not used terribly much and if we ever fix it we can just reindent.
2020-01-14 03:34:22 +08:00
echo alpha
echo beta
echo -ne 'gamma\x00delta' | string split0
Port string tests to littlecheck `wc -l tests/string.*` 329 tests/string.err 422 tests/string.in 520 tests/string.out 1271 total `wc -l tests/checks/string.fish` 555 tests/checks/string.fish and it looks nicer. 'nuff said.
2019-06-25 23:21:11 +08:00
end
count (dualsplit)
# CHECK: 4
Correct handling of explicitly separated output when all elements are empty Previously when propagating explicitly separated output, we would early-out if the buffer was empty, where empty meant contains no characters. However it may contain one or more empty strings, in which case we should propagate those strings. Remove this footgun "empty" function and handle this properly. Fixes #5987
2019-07-22 04:53:05 +08:00
# Ensure we handle empty outputs correctly (#5987)
count (string split / /)
# CHECK: 2
count (echo -ne '\x00\x00\x00' | string split0)
# CHECK: 3
Port string tests to littlecheck `wc -l tests/string.*` 329 tests/string.err 422 tests/string.in 520 tests/string.out 1271 total `wc -l tests/checks/string.fish` 555 tests/checks/string.fish and it looks nicer. 'nuff said.
2019-06-25 23:21:11 +08:00
# string collect
count (echo one\ntwo\nthree\nfour | string collect)
count (echo one | string collect)
# CHECK: 1
# CHECK: 1
echo [(echo one\ntwo\nthree | string collect)]
# CHECK: [one
# CHECK: two
# CHECK: three]
echo [(echo one\ntwo\nthree | string collect -N)]
# CHECK: [one
# CHECK: two
# CHECK: three
# CHECK: ]
printf '[%s]\n' (string collect one\n\n two\n)
# CHECK: [one]
# CHECK: [two]
printf '[%s]\n' (string collect -N one\n\n two\n)
# CHECK: [one
New command "string pad" to pad text to a given width (#7340) Pads text to a given width, or the maximum width of all inputs.
2020-09-28 01:12:42 +08:00
# CHECK:
Port string tests to littlecheck `wc -l tests/string.*` 329 tests/string.err 422 tests/string.in 520 tests/string.out 1271 total `wc -l tests/checks/string.fish` 555 tests/checks/string.fish and it looks nicer. 'nuff said.
2019-06-25 23:21:11 +08:00
# CHECK: ]
# CHECK: [two
# CHECK: ]
printf '[%s]\n' (string collect --no-trim-newlines one\n\n two\n)
# CHECK: [one
New command "string pad" to pad text to a given width (#7340) Pads text to a given width, or the maximum width of all inputs.
2020-09-28 01:12:42 +08:00
# CHECK:
Port string tests to littlecheck `wc -l tests/string.*` 329 tests/string.err 422 tests/string.in 520 tests/string.out 1271 total `wc -l tests/checks/string.fish` 555 tests/checks/string.fish and it looks nicer. 'nuff said.
2019-06-25 23:21:11 +08:00
# CHECK: ]
# CHECK: [two
# CHECK: ]
# string collect returns 0 when it has any output, otherwise 1
string collect >/dev/null; and echo unexpected success; or echo expected failure
# CHECK: expected failure
echo -n | string collect >/dev/null; and echo unexpected success; or echo expected failure
# CHECK: expected failure
echo | string collect -N >/dev/null; and echo expected success; or echo unexpected failure
# CHECK: expected success
echo | string collect >/dev/null; and echo unexpected success; or echo expected failure
# CHECK: expected failure
string collect a >/dev/null; and echo expected success; or echo unexpected failure
# CHECK: expected success
string collect -N '' >/dev/null; and echo unexpected success; or echo expected failure
# CHECK: expected failure
string collect \n\n >/dev/null; and echo unexpected success; or echo expected failure
# CHECK: expected failure
string: Allow `collect --allow-empty` to avoid empty ellision (#8054) * string: Allow `collect --no-empty` to avoid empty ellision Currently we still have that issue where test -n (thing | string collect) can return true if `thing` doesn't print anything, because the collected argument will still be removed. So, what we do is allow `--no-empty` to be used, in which case we print one empty argument. This means test -n (thing | string collect -n) can now be safely used. "no-empty" isn't the best name for this flag, but string's design really incentivizes reusing names, and it's not *terrible*. * Switch to `--allow-empty` `--no-empty` does the exact opposite for `string split` and split0. Since `-a`/`--allow-empty` already exists, use it.
2021-07-10 03:20:58 +08:00
echo "foo"(true | string collect --allow-empty)"bar"
# CHECK: foobar
test -z (string collect)
and echo Nothing
# CHECK: Nothing
test -n (string collect)
and echo Something
# CHECK: Something
test -n (string collect -a)
or echo No, actually nothing
# CHECK: No, actually nothing
Port string tests to littlecheck `wc -l tests/string.*` 329 tests/string.err 422 tests/string.in 520 tests/string.out 1271 total `wc -l tests/checks/string.fish` 555 tests/checks/string.fish and it looks nicer. 'nuff said.
2019-06-25 23:21:11 +08:00
# string collect in functions
# This function outputs some newline-separated content, and some
# explicitly un-separated content.
function dualcollect
Run fish_indent on all our fish scripts It's now good enough to do so. We don't allow grid-alignment: ```fish complete -c foo -s b -l barnanana -a '(something)' complete -c foo -s z -a '(something)' ``` becomes ```fish complete -c foo -s b -l barnanana -a '(something)' complete -c foo -s z -a '(something)' ``` It's just more trouble than it is worth. The one part I'd change: We align and/or'd parts of an if-condition with the in-block code: ```fish if true and false dosomething end ``` becomes ```fish if true and false dosomething end ``` but it's not used terribly much and if we ever fix it we can just reindent.
2020-01-14 03:34:22 +08:00
echo alpha
echo beta
echo gamma\ndelta\nomega | string collect
Port string tests to littlecheck `wc -l tests/string.*` 329 tests/string.err 422 tests/string.in 520 tests/string.out 1271 total `wc -l tests/checks/string.fish` 555 tests/checks/string.fish and it looks nicer. 'nuff said.
2019-06-25 23:21:11 +08:00
end
count (dualcollect)
# CHECK: 3
string: Error out on `match -eq` The `--entire` would enable output even though the `--quiet` should have silenced it. These two don't make any sense together so print an error, because the user could have just left off the `-q`.
2019-10-23 03:56:44 +08:00
string match -qer asd asd
string: Allow `-eq` again Instead of forbidding it for both modes, allow it for both and make it quiet for string. Fixes #6282
2019-11-05 00:33:37 +08:00
echo $status
# CHECK: 0
string match -eq asd asd
echo $status
# CHECK: 0
string: Handle unmatched capturing groups as empty Instead of erroring out. Fixes #7343.
2020-09-20 16:33:04 +08:00
# Unmatched capturing groups are treated as empty
string pad: handle padding characters of width > 1 If the padding is not divisible by the char's width without remainder, we pad the remainder with spaces, so the total width of the output is correct. Also add completions, changelog entry, adjust documentation, add examples with emoji and some tests. Apply some minor style nitpicks and avoid extra allocations of the input strings.
2020-09-28 03:51:20 +08:00
echo az | string replace -r -- 'a(b.+)?z' 'a:$1z'
string: Handle unmatched capturing groups as empty Instead of erroring out. Fixes #7343.
2020-09-20 16:33:04 +08:00
# CHECK: a:z
string: Quit early if --quiet is satisfied E.g. if we do `string match -q`, and we find a match, nothing about the input can change anything, so we quit early. This is mainly useful for performance, but it also allows `string` with `-q` to be used with infinite input (e.g. `yes`). Alternative to #7495.
2020-11-29 19:06:48 +08:00
# --quiet should quit early
echo "Checking that --quiet quits early - if this is broken it hangs"
# CHECK: Checking that --quiet quits early - if this is broken it hangs
yes | string match -q y
echo $status
# CHECK: 0
yes | string length -q
echo $status
# CHECK: 0
yes | string replace -q y n
echo $status
# CHECK: 0
Add `string` to reserved keywords Since `string match` now creates variables, wrapping `string` necessarily breaks things, so we need to disallow it. See #7459, #7509.
2020-12-06 22:31:04 +08:00
# `string` can't be wrapped properly anymore, since `string match` creates variables:
function string
builtin string $argv
end
Update tests for changed error output
2021-11-04 13:52:17 +08:00
# CHECKERR: checks/string.fish (line {{\d+}}): function: string: cannot use reserved keyword as function name
Add `string` to reserved keywords Since `string match` now creates variables, wrapping `string` necessarily breaks things, so we need to disallow it. See #7459, #7509.
2020-12-06 22:31:04 +08:00
# CHECKERR: function string
# CHECKERR: ^
escape_string_script: Escape DEL as \x7f This used to print a literal DEL character in the output for `bind`, which wouldn't actually show up and made it hard to figure out what the key was. So we just escape it back to how we actually used it - `\x7f`. Fixes #7631.
2021-01-16 19:49:49 +08:00
string escape \x7F
# CHECK: \x7f
Fix crash in string pad Try: string pad -w 8 he \eh
2021-03-10 01:32:15 +08:00
# This used to crash.
string pad -w 8 he \eh
# CHECK: he
# CHECK: {{\x1bh}}
string: Add "--groups-only" to match This adds a simple way of picking bits from a string that might be a bit nicer than having to resort to a full `replace`. Fixes #6056
2019-06-11 22:05:24 +08:00
string match -rg '(.*)fish' catfish
# CHECK: cat
string match -rg '(.*)fish' shellfish
# CHECK: shell
# An empty match
string match -rg '(.*)fish' fish
# No match at all
string match -rg '(.*)fish' banana
# Make sure it doesn't start matching something
string match -r --groups-only '(.+)fish' fish
echo $status
# CHECK: 1
# Multiple groups
string match -r --groups-only '(.+)fish(.*)' catfishcolor
# CHECK: cat
# CHECK: color
# Examples specifically called out in #6056.
echo "foo bar baz" | string match -rg 'foo (bar) baz'
# CHECK: bar
echo "foo1x foo2x foo3x" | string match -arg 'foo(\d)x'
# CHECK: 1
# CHECK: 2
# CHECK: 3
Reference in New Issue Copy Permalink