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.

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

fix filename pattern matching #127

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 format/private/format.sh
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ function ls-files {

# TODO: determine which staged changes we should format; avoid formatting unstaged changes
# TODO: try to format only modified regions of the file (where supported)
git ls-files --cached --modified --other --exclude-standard ${patterns[@]} | {
git ls-files --cached --modified --other --exclude-standard "${patterns[@]}" "${patterns[@]/#/*/}" | {
grep -vE "^$(git ls-files --deleted)$" || true;
}
else
Expand Down
7 changes: 3 additions & 4 deletions format/test/format_test.bats
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ bats_load_library "bats-assert"
assert_output --partial "Formatting TSX with Prettier..."
assert_output --partial "+ prettier --write example/src/hello.tsx"
assert_output --partial "Formatting JSON with Prettier..."
assert_output --partial "+ prettier --write renovate.json"
assert_output --partial "+ prettier --write .bcr/metadata.template.json"
assert_output --partial "Formatting CSS with Prettier..."
assert_output --partial "+ prettier --write example/src/hello.css"
assert_output --partial "Formatting HTML with Prettier..."
Expand All @@ -38,16 +38,15 @@ bats_load_library "bats-assert"

assert_output --partial "Formatting Starlark with Buildifier..."
assert_output --partial "+ buildifier -mode=fix BUILD.bazel"
# FIXME(#122): this was broken by #105
# assert_output --partial "format/private/BUILD.bazel"
assert_output --partial "format/private/BUILD.bazel"
}

@test "should run prettier on Markdown" {
run bazel run //format/test:format_markdown
assert_success

assert_output --partial "Formatting Markdown with Prettier..."
assert_output --partial "+ prettier --write CONTRIBUTING.md README.md"
assert_output --partial "+ prettier --write .bcr/README.md CONTRIBUTING.md README.md"
}

@test "should run prettier on SQL" {
Expand Down
Loading