From 8e708c9aa73f0efaca114a6389d1d787c1a4bc97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= Date: Tue, 25 Jun 2024 22:07:56 +0000 Subject: [PATCH] Fix typos --- CHANGELOG.md | 6 +++--- assets/patches/Lisp.sublime-syntax.patch | 2 +- src/config.rs | 4 ++-- src/vscreen.rs | 2 +- .../highlighting-speed-src/grep-output-ansi-sequences.txt | 2 +- tests/integration_tests.rs | 4 ++-- tests/scripts/license-checks.sh | 6 +++--- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e361ddb91..5af6ae4222 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 @@ -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) @@ -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 diff --git a/assets/patches/Lisp.sublime-syntax.patch b/assets/patches/Lisp.sublime-syntax.patch index 09a84a386c..59ff73fa27 100644 --- a/assets/patches/Lisp.sublime-syntax.patch +++ b/assets/patches/Lisp.sublime-syntax.patch @@ -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:]_]+-)+\\?) + diff --git a/src/config.rs b/src/config.rs index eb7df8ee9f..6466df6155 100644 --- a/src/config.rs +++ b/src/config.rs @@ -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, - // 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, } diff --git a/src/vscreen.rs b/src/vscreen.rs index 9e29f9cc36..0a2f63814f 100644 --- a/src/vscreen.rs +++ b/src/vscreen.rs @@ -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 /// diff --git a/tests/benchmarks/highlighting-speed-src/grep-output-ansi-sequences.txt b/tests/benchmarks/highlighting-speed-src/grep-output-ansi-sequences.txt index 22bfdcbc3e..ff0b50e3a2 100644 --- a/tests/benchmarks/highlighting-speed-src/grep-output-ansi-sequences.txt +++ b/tests/benchmarks/highlighting-speed-src/grep-output-ansi-sequences.txt @@ -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() diff --git a/tests/integration_tests.rs b/tests/integration_tests.rs index d60093616c..5664795725 100644 --- a/tests/integration_tests.rs +++ b/tests/integration_tests.rs @@ -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] @@ -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") diff --git a/tests/scripts/license-checks.sh b/tests/scripts/license-checks.sh index 21365084d5..12d3fc3d1e 100755 --- a/tests/scripts/license-checks.sh +++ b/tests/scripts/license-checks.sh @@ -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