Skip to content
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

Jump to bottom

Expand variable highlights to support Bash parameter expansion #20

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Expand variable highlights to support Bash parameter expansion #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
38 changes: 31 additions & 7 deletions syntaxes/bats.variables.tmLanguage
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
Expand All @@ -11,18 +11,42 @@
<dict>
<key>match</key>
<string>\$(output|status|lines|stderr|stderr_lines)\b</string>
<key>name</key>
<string>support.variable.bats</string>
<key>captures</key>
<dict>
<key>1</key>
<dict>
<key>name</key>
<string>support.variable.bats</string>
</dict>
</dict>
</dict>
<dict>
<key>match</key>
<string>\$BATS_(RUN_COMMAND|TEST_(FILENAME|DIRNAME|NAMES?|DESCRIPTION)|(SUITE_)?TEST_NUMBER|((RUN|FILE|SUITE|TEST)_)?TMPDIR|FILE_EXTENSION|VERSION)\b</string>
<key>name</key>
<string>support.variable.bats</string>
<string>\${#?(output|status|lines|stderr|stderr_lines)\b[^}]*}</string>
<key>captures</key>
<dict>
<key>1</key>
<dict>
<key>name</key>
<string>support.variable.bats</string>
</dict>
</dict>
</dict>
<dict>
<key>match</key>
<string>\$(BATS_(RUN_COMMAND|TEST_(FILENAME|DIRNAME|NAMES?|DESCRIPTION)|(SUITE_)?TEST_NUMBER|((RUN|FILE|SUITE|TEST)_)?TMPDIR|FILE_EXTENSION|VERSION))\b</string>
<key>captures</key>
<dict>
<key>1</key>
<dict>
<key>name</key>
<string>support.variable.bats</string>
</dict>
</dict>
</dict>
<dict>
<key>match</key>
<string>\$\{#?(output|status|lines|stderr|stderr_lines)\b</string>
<string>\${#?(BATS_(RUN_COMMAND|TEST_(FILENAME|DIRNAME|NAMES?|DESCRIPTION)|(SUITE_)?TEST_NUMBER|((RUN|FILE|SUITE|TEST)_)?TMPDIR|FILE_EXTENSION|VERSION))\b[^}]*}</string>
<key>captures</key>
<dict>
<key>1</key>
Expand Down
63 changes: 60 additions & 3 deletions test/test.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,14 @@ bats_load_library test_helper
skip echo "${var}"
[ "$status" -eq 0 ]
[ "${lines[0]}" = "${some_var}" ]
[ "${lines[@]}" = 1 ]
[ "${#lines[@]}" = 1 ]
[ "$output" == 'some value' ]
}
# using --separate-stderr
@test 'some other test' {
run foo
[ "${stderr_lines[@]}" = 1 ]
[ "${stderr_lines[0]}" = "${other_var}" ]
[ "${#stderr_lines[@]}" = 1 ]
[ "$stderr" == 'some value' ]
}

Expand Down Expand Up @@ -179,7 +180,7 @@ bats_load_library test_helper
assert_fifo_exists
assert_fifo_not_exists
assert_sticky_bit
assert_no_sticky_bit
assert_no_sticky_bit
}
##
# bats-file
Expand Down Expand Up @@ -231,3 +232,59 @@ $BATS_SUITE_TMPDIR
$BATS_FILE_TMPDIR
$BATS_TEST_TMPDIR
$BATS_VERSION

# exercise the syntax color in various ways on a Bats variable name

$BATS_TEST_DIRNAME
${BATS_TEST_DIRNAME}
${BATS_TEST_DIRNAME##*/}
${BATS_TEST_DIRNAME%/*}
${BATS_TEST_DIRNAME:1:2}
${#BATS_TEST_DIRNAME}
$BATS_TEST_DIRNAME/file
${BATS_TEST_DIRNAME}/file
var=$BATS_TEST_DIRNAME
var=${BATS_TEST_DIRNAME}
var=$BATS_TEST_DIRNAME/file
var=${BATS_TEST_DIRNAME}/file
"$BATS_TEST_DIRNAME"
"${BATS_TEST_DIRNAME}"
"$BATS_TEST_DIRNAME/file"
"${BATS_TEST_DIRNAME}/file"
var="$BATS_TEST_DIRNAME"
var="${BATS_TEST_DIRNAME}"
var="$BATS_TEST_DIRNAME/file"
var="${BATS_TEST_DIRNAME}/file"

# exercise the syntax color in various ways on a Bats output variable name

$stderr_lines
${stderr_lines}
${stderr_lines[3]}
${stderr_lines##*/}
${stderr_lines%/*}
${stderr_lines:1:2}
${#stderr_lines[@]}
$stderr_lines-composite
${stderr_lines}composite
var=$stderr_lines
var=${stderr_lines}
var=${stderr_lines[3]}
var=${#stderr_lines[@]}
var=$stderr_lines-composite
var=${stderr_lines}composite
var=${stderr_lines[3]}composite
"$stderr_lines"
"${stderr_lines}"
"${stderr_lines[3]}"
"${#stderr_lines[@]}"
"$stderr_lines-composite"
"${stderr_lines}composite"
"${stderr_lines[3]}composite"
var="$stderr_lines"
var="${stderr_lines}"
var="${stderr_lines[3]}"
var="${#stderr_lines[@]}"
var="$stderr_lines-composite"
var="${stderr_lines}composite"
var="${stderr_lines[3]}composite"