From a3f202f3677c8b5d13f45d0fb2b408ec1175fa89 Mon Sep 17 00:00:00 2001 From: Mikhail Alabugin <137305666+1t1sCooL@users.noreply.github.com> Date: Thu, 27 Aug 2026 13:11:46 +0300 Subject: [PATCH 1/6] docs: fix dead Visual C++ Redistributable link in README --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8826d4e0..b54a227d 100644 --- a/README.md +++ b/README.md @@ -417,7 +417,7 @@ scoop install bat You can download prebuilt binaries from the [Release page](https://github.com/sharkdp/bat/releases), -You will need to install the [Visual C++ Redistributable](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads) package. +You will need to install the [Visual C++ Redistributable](https://learn.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist) package. ### From binaries @@ -794,7 +794,7 @@ Example configuration file: ### Prerequisites -You will need to install the [Visual C++ Redistributable](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads) package. +You will need to install the [Visual C++ Redistributable](https://learn.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist) package. ### Paging From ea3909bbdf7e0f574e1ab9ce4670f1583f252ed1 Mon Sep 17 00:00:00 2001 From: Mikhail Alabugin <137305666+1t1sCooL@users.noreply.github.com> Date: Wed, 2 Sep 2026 11:10:47 +0300 Subject: [PATCH 2/6] Add changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ac77a75a..bbc0a086 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## Other +- Fix dead Visual C++ Redistributable link in README, see #3895 (@1t1sCooL) - Update Cargo dependencies to resolve current RustSec advisories, see #3861 (@TyceHerrman) - Add instructions for removing fish help abbreviations to README, see #3655 (@claw-explorer). Closes #3536 - Add .NET slnx extension, see #3682 (@ltrzesniewski) From 54b1f9c6af3aab74d9055932160b72af75910448 Mon Sep 17 00:00:00 2001 From: Navpreet Sidhu Date: Tue, 20 Oct 2026 21:31:39 +0530 Subject: [PATCH 3/6] Fix hang on block comment after an expression in JavaScript --- CHANGELOG.md | 1 + assets/patches/JavaScript.sublime-syntax.patch | 10 ++++++++++ .../highlighted/Svelte/comment_after_expression.svelte | 5 +++++ .../source/Svelte/comment_after_expression.svelte | 5 +++++ 4 files changed, 21 insertions(+) create mode 100644 tests/syntax-tests/highlighted/Svelte/comment_after_expression.svelte create mode 100644 tests/syntax-tests/source/Svelte/comment_after_expression.svelte diff --git a/CHANGELOG.md b/CHANGELOG.md index d572aea1..ac687c9e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ - Syntax highlighting for Python files using uv as script runner in shebang #3689 (@janlarres) ## Bugfixes +- Fix `bat` hanging forever on JavaScript (and Svelte) code where an expression is followed by a block comment, e.g. `a /* x */`. Closes #4080, see #XXXX (@NavpreetSSidhu) - Fix the first line of UTF-16BE input swallowing the second line, which broke line numbers, `--line-range` and highlighting, see #XXXX (@cindykrafft) - Exit quietly with status 0 instead of panicking when stdout is closed early (broken pipe) on auxiliary output paths such as `--completion`, `--config-file`, `--diagnostic`, `--generate-config-file`, `--set-terminal-title` and `cache --build`/`--clear`, matching the main output path since #232, closes #4034, see #4035 (@Mathjk) - Track strikethrough (SGR 9 / 29) in the ANSI style tracker so it is re-emitted like bold, dim, italic, and underline, and is no longer dropped after the first highlighted token when displaying ANSI input with syntax highlighting, see #4015 (@mikehasa) diff --git a/assets/patches/JavaScript.sublime-syntax.patch b/assets/patches/JavaScript.sublime-syntax.patch index 9ab89d1d..8f12bac7 100644 --- a/assets/patches/JavaScript.sublime-syntax.patch +++ b/assets/patches/JavaScript.sublime-syntax.patch @@ -12,3 +12,13 @@ index 05a4fed6..78a7bf55 100644 scope: source.js variables: bin_digit: '[01_]' +@@ -93,7 +93,8 @@ variables: + (?! \+\+ | -- ) + (?= + != | +- [-+*/%><=&|^\[(;,.:?] | ++ [-+*%><=&|^\[(;,.:?] | ++ /(?!\*) | + (?:in|instanceof){{identifier_break}} + ) + )) diff --git a/tests/syntax-tests/highlighted/Svelte/comment_after_expression.svelte b/tests/syntax-tests/highlighted/Svelte/comment_after_expression.svelte new file mode 100644 index 00000000..1c5db65b --- /dev/null +++ b/tests/syntax-tests/highlighted/Svelte/comment_after_expression.svelte @@ -0,0 +1,5 @@ +{a + /* comment */ +} + +{a /* comment */} diff --git a/tests/syntax-tests/source/Svelte/comment_after_expression.svelte b/tests/syntax-tests/source/Svelte/comment_after_expression.svelte new file mode 100644 index 00000000..35be16d7 --- /dev/null +++ b/tests/syntax-tests/source/Svelte/comment_after_expression.svelte @@ -0,0 +1,5 @@ +{a + /* comment */ +} + +{a /* comment */} From 49d9ac1d6e8e8deb2770c50231c9b42c1074a871 Mon Sep 17 00:00:00 2001 From: Navpreet Sidhu Date: Tue, 20 Oct 2026 21:40:03 +0530 Subject: [PATCH 4/6] changelog: reference PR #4091 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ac687c9e..6845cb2b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,7 +26,7 @@ - Syntax highlighting for Python files using uv as script runner in shebang #3689 (@janlarres) ## Bugfixes -- Fix `bat` hanging forever on JavaScript (and Svelte) code where an expression is followed by a block comment, e.g. `a /* x */`. Closes #4080, see #XXXX (@NavpreetSSidhu) +- Fix `bat` hanging forever on JavaScript (and Svelte) code where an expression is followed by a block comment, e.g. `a /* x */`. Closes #4080, see #4091 (@NavpreetSSidhu) - Fix the first line of UTF-16BE input swallowing the second line, which broke line numbers, `--line-range` and highlighting, see #XXXX (@cindykrafft) - Exit quietly with status 0 instead of panicking when stdout is closed early (broken pipe) on auxiliary output paths such as `--completion`, `--config-file`, `--diagnostic`, `--generate-config-file`, `--set-terminal-title` and `cache --build`/`--clear`, matching the main output path since #232, closes #4034, see #4035 (@Mathjk) - Track strikethrough (SGR 9 / 29) in the ANSI style tracker so it is re-emitted like bold, dim, italic, and underline, and is no longer dropped after the first highlighted token when displaying ANSI input with syntax highlighting, see #4015 (@mikehasa) From e423744a7d1181c3435b6faf61788ed06b3d1f9b Mon Sep 17 00:00:00 2001 From: PerchAnton Date: Wed, 28 Oct 2026 13:48:22 +0200 Subject: [PATCH 5/6] ci: pin i686 GNU runner to Ubuntu 24.04 --- .github/workflows/CICD.yml | 3 ++- CHANGELOG.md | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml index 61844a84..fc807718 100644 --- a/.github/workflows/CICD.yml +++ b/.github/workflows/CICD.yml @@ -166,7 +166,8 @@ jobs: - { target: arm-unknown-linux-gnueabihf , os: ubuntu-latest , dpkg_arch: armhf, use-cross: true } - { target: arm-unknown-linux-musleabihf, os: ubuntu-latest , dpkg_arch: musl-linux-armhf, use-cross: true } - { target: i686-pc-windows-msvc , os: windows-2025 , } - - { target: i686-unknown-linux-gnu , os: ubuntu-latest , dpkg_arch: i386, use-cross: true } + # The timeout test's socketpair fails on the Ubuntu 26.04 runner. + - { target: i686-unknown-linux-gnu , os: ubuntu-24.04 , dpkg_arch: i386, use-cross: true } - { target: i686-unknown-linux-musl , os: ubuntu-latest , dpkg_arch: musl-linux-i686, use-cross: true } - { target: x86_64-apple-darwin , os: macos-15-intel, } - { target: aarch64-apple-darwin , os: macos-latest , } diff --git a/CHANGELOG.md b/CHANGELOG.md index 91d8d49a..349147ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## Other +- Pin the i686 GNU CI runner to Ubuntu 24.04 to avoid `socketpair` failures on Ubuntu 26.04, see #XXXX (@PerchAnton) - Fix dead Visual C++ Redistributable link in README, see #3895 (@1t1sCooL) - Document `StripAnsiMode` and its variants in rustdoc, see #4067 (@ump45nose) - Update Cargo dependencies to resolve current RustSec advisories, see #3861 (@TyceHerrman) From 3e2c1bdc8e026b53a6ec91c3681dba73db5408b8 Mon Sep 17 00:00:00 2001 From: PerchAnton Date: Wed, 28 Oct 2026 13:50:21 +0200 Subject: [PATCH 6/6] docs: link the i686 runner fix in changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 349147ef..04f7b5ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ ## Other -- Pin the i686 GNU CI runner to Ubuntu 24.04 to avoid `socketpair` failures on Ubuntu 26.04, see #XXXX (@PerchAnton) +- Pin the i686 GNU CI runner to Ubuntu 24.04 to avoid `socketpair` failures on Ubuntu 26.04, see #4101 (@PerchAnton) - Fix dead Visual C++ Redistributable link in README, see #3895 (@1t1sCooL) - Document `StripAnsiMode` and its variants in rustdoc, see #4067 (@ump45nose) - Update Cargo dependencies to resolve current RustSec advisories, see #3861 (@TyceHerrman)