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 typos #3008

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
6 changes: 3 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@

- Various bash completion improvements, see #2310 (@scop)
- Disable completion of `cache` subcommand, see #2399 (@cyqsimon)
- Signifigantly improve startup performance on macOS, see #2442 (@BlackHoleFox)
- Significantly improve startup performance on macOS, see #2442 (@BlackHoleFox)
- Bump MSRV to 1.62, see #2496 (@Enselic)

## Syntaxes
Expand Down Expand Up @@ -685,7 +685,7 @@ You can see the API documentation here: https://docs.rs/bat/
- Enabled LTO, making `bat` about 10% faster, see #719 (@bolinfest, @sharkdp)
- Suggestions non how to configure `bat` for MacOS dark mode, see README (@jerguslejko)
- Extended ["Integration with other tools"](https://github.com/sharkdp/bat#integration-with-other-tools) section (@eth-p)
- Updated [instrutions on how to use `bat` as a `man`-pager](https://github.com/sharkdp/bat#man), see #652, see #667 (@sharkdp)
- Updated [instructions on how to use `bat` as a `man`-pager](https://github.com/sharkdp/bat#man), see #652, see #667 (@sharkdp)
- Add section concerning file encodings, see #688 and #568 (@sharkdp)
- Updated sort order of command-line options in `--help` text and manpage, see #653 and #700 (@hrlmartins)
- Updates to the man page syntax, see #718 (@sharkdp)
Expand All @@ -703,7 +703,7 @@ You can see the API documentation here: https://docs.rs/bat/
- `/proc/cpuinfo` and `/proc/meminfo`, see #593 (@sharkdp)
- Nim, see #542 (@sharkdp)
- Vue, see #826 (@chaaaaarlotte)
- CoffeScript, see #833 (@sharkdp)
- CoffeeScript, see #833 (@sharkdp)

## New themes

Expand Down
2 changes: 1 addition & 1 deletion assets/patches/Lisp.sublime-syntax.patch
Original file line number Diff line number Diff line change
Expand Up @@ -1434,7 +1434,7 @@ index 50e5dad3..44a9795d 100644
+ break: (?={{break_char}}|$)
+ break_char: '[\s()"'',:;|]'
+
+ # caracters
+ # characters
+ standard_char: '[0-9A-Za-z!"#$%&''()*+,\-./:;<=>?@\\\[\]^_`{|}~]'
+ char_attributes: (?:(?:[[:alnum:]_]+-)+\\?)
+
Expand Down
4 changes: 2 additions & 2 deletions src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,13 @@ pub struct Config<'a> {
#[cfg(feature = "lessopen")]
pub use_lessopen: bool,

// Weather or not to set terminal title when using a pager
// Whether or not to set terminal title when using a pager
pub set_terminal_title: bool,

/// The maximum number of consecutive empty lines to display
pub squeeze_lines: Option<usize>,

// Weather or not to set terminal title when using a pager
// Whether or not to set terminal title when using a pager
pub strip_ansi: StripAnsiMode,
}

Expand Down
2 changes: 1 addition & 1 deletion src/vscreen.rs
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ impl EscapeSequenceOffsets {
}
}

/// An iterator over the offests of ANSI/VT escape sequences within a string.
/// An iterator over the offsets of ANSI/VT escape sequences within a string.
///
/// ## Example
///
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1860,7 +1860,7 @@
tests/integration_tests.rs:789: bat_with_config()
tests/integration_tests.rs:799: bat_with_config()
tests/integration_tests.rs:810: bat_with_config()
tests/integration_tests.rs:820: bat_with_config().arg("cach").assert().failure();
tests/integration_tests.rs:820: bat_with_config().arg("cache").assert().failure();
tests/integration_tests.rs:827: bat()
tests/integration_tests.rs:836: bat_with_config()
tests/integration_tests.rs:878: bat()
Expand Down
4 changes: 2 additions & 2 deletions tests/integration_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1321,7 +1321,7 @@ fn can_print_file_starting_with_cache() {

#[test]
fn does_not_print_unwanted_file_named_cache() {
bat_with_config().arg("cach").assert().failure();
bat_with_config().arg("cache").assert().failure();
}

#[test]
Expand Down Expand Up @@ -2647,7 +2647,7 @@ fn lessopen_validity() {
// Syntax highlighting should be the same regardless of
// --map-syntax' case or file extension's case
#[test]
fn highlighting_independant_from_map_syntax_case() {
fn highlighting_independent_from_map_syntax_case() {
let expected = bat()
.arg("-f")
.arg("--map-syntax=*.config:JSON")
Expand Down
6 changes: 3 additions & 3 deletions tests/scripts/license-checks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ gpl_excludes=(
# Contains a reference to GPL, but is not under GPL
":(exclude)tests/syntax-tests/source/Java Server Page (JSP)/LICENSE.md"
)
gpl_occurances=$(git grep --recurse-submodules "${gpl_term}" -- "${gpl_excludes[@]}" || true)
gpl_occurrences=$(git grep --recurse-submodules "${gpl_term}" -- "${gpl_excludes[@]}" || true)

if [ -z "${gpl_occurances}" ]; then
if [ -z "${gpl_occurrences}" ]; then
echo "PASS: No files under GPL were found"
else
echo "FAIL: GPL:ed code is not compatible with bat, but occurrences of '${gpl_term}' were found:"
echo "${gpl_occurances}"
echo "${gpl_occurrences}"
exit 1
fi
Loading