mirror of
https://github.com/sharkdp/bat.git
synced 2024-09-30 06:31:30 +02:00
Compare commits
No commits in common. "master" and "v0.20.0" have entirely different histories.
21
.github/ISSUE_TEMPLATE/bug_report.md
vendored
21
.github/ISSUE_TEMPLATE/bug_report.md
vendored
@ -7,26 +7,9 @@ assignees: ''
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
<!--
|
<!-- Hey there, thank you for creating an issue! -->
|
||||||
|
|
||||||
Hey there, thank you for reporting a bug!
|
**Describe the bug you encountered:**
|
||||||
|
|
||||||
Please note that the following bugs have already been reported:
|
|
||||||
|
|
||||||
* dpkg: error processing archive /some/path/some-program.deb (--unpack):
|
|
||||||
trying to overwrite '/usr/.crates2.json'
|
|
||||||
|
|
||||||
See https://github.com/sharkdp/bat/issues/938
|
|
||||||
|
|
||||||
-->
|
|
||||||
|
|
||||||
**What steps will reproduce the bug?**
|
|
||||||
|
|
||||||
1. step 1
|
|
||||||
2. step 2
|
|
||||||
3. ...
|
|
||||||
|
|
||||||
**What happens?**
|
|
||||||
|
|
||||||
...
|
...
|
||||||
|
|
||||||
|
2
.github/ISSUE_TEMPLATE/question.md
vendored
2
.github/ISSUE_TEMPLATE/question.md
vendored
@ -7,5 +7,3 @@ assignees: ''
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
<!-- Using a normal ticket is still fine, but feel free to ask your
|
|
||||||
questions about bat on https://github.com/sharkdp/bat/discussions instead. -->
|
|
||||||
|
2
.github/ISSUE_TEMPLATE/syntax_request.md
vendored
2
.github/ISSUE_TEMPLATE/syntax_request.md
vendored
@ -26,4 +26,4 @@ guidelines for adding new syntaxes:
|
|||||||
[Name or description of the syntax/language here]
|
[Name or description of the syntax/language here]
|
||||||
|
|
||||||
**Guideline Criteria:**
|
**Guideline Criteria:**
|
||||||
[packagecontrol.io link here]
|
[packagecontro.io link here]
|
||||||
|
6
.github/dependabot.yml
vendored
6
.github/dependabot.yml
vendored
@ -16,9 +16,3 @@ updates:
|
|||||||
interval: monthly
|
interval: monthly
|
||||||
time: "04:00"
|
time: "04:00"
|
||||||
timezone: Europe/Berlin
|
timezone: Europe/Berlin
|
||||||
- package-ecosystem: "github-actions"
|
|
||||||
directory: "/"
|
|
||||||
schedule:
|
|
||||||
interval: monthly
|
|
||||||
time: "04:00"
|
|
||||||
timezone: Europe/Berlin
|
|
||||||
|
23
.github/workflows/Auto-merge-dependabot-PRs.yml
vendored
23
.github/workflows/Auto-merge-dependabot-PRs.yml
vendored
@ -1,23 +0,0 @@
|
|||||||
# This workflow triggers auto-merge of any PR that dependabot creates so that
|
|
||||||
# PRs will be merged automatically without maintainer intervention if CI passes
|
|
||||||
name: Auto-merge dependabot PRs
|
|
||||||
|
|
||||||
on:
|
|
||||||
pull_request_target:
|
|
||||||
types: [opened]
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
auto-merge:
|
|
||||||
if: github.repository == 'sharkdp/bat' && startsWith(github.head_ref, 'dependabot/')
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
environment:
|
|
||||||
name: auto-merge
|
|
||||||
url: https://github.com/sharkdp/bat/blob/main/.github/workflows/Auto-merge-dependabot-PRs.yml
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ secrets.AUTO_MERGE_GITHUB_TOKEN }}
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
- run: |
|
|
||||||
gh pr review ${{ github.event.pull_request.number }} --comment --body "If CI passes, this dependabot PR will be [auto-merged](https://github.com/sharkdp/bat/blob/main/.github/workflows/Auto-merge-dependabot-PRs.yml) 🚀"
|
|
||||||
- run: |
|
|
||||||
gh pr merge --auto --squash ${{ github.event.pull_request.number }}
|
|
408
.github/workflows/CICD.yml
vendored
408
.github/workflows/CICD.yml
vendored
@ -1,8 +1,8 @@
|
|||||||
name: CICD
|
name: CICD
|
||||||
|
|
||||||
env:
|
env:
|
||||||
|
MIN_SUPPORTED_RUST_VERSION: "1.51.0"
|
||||||
CICD_INTERMEDIATES_DIR: "_cicd-intermediates"
|
CICD_INTERMEDIATES_DIR: "_cicd-intermediates"
|
||||||
MSRV_FEATURES: --no-default-features --features minimal-application,bugreport,build-assets
|
|
||||||
|
|
||||||
on:
|
on:
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
@ -14,100 +14,89 @@ on:
|
|||||||
- '*'
|
- '*'
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
all-jobs:
|
|
||||||
if: always() # Otherwise this job is skipped if the matrix job fails
|
|
||||||
name: all-jobs
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
needs:
|
|
||||||
- crate_metadata
|
|
||||||
- ensure_cargo_fmt
|
|
||||||
- min_version
|
|
||||||
- license_checks
|
|
||||||
- test_with_new_syntaxes_and_themes
|
|
||||||
- test_with_system_config
|
|
||||||
- documentation
|
|
||||||
- cargo-audit
|
|
||||||
- build
|
|
||||||
steps:
|
|
||||||
- run: jq --exit-status 'all(.result == "success")' <<< '${{ toJson(needs) }}'
|
|
||||||
|
|
||||||
crate_metadata:
|
|
||||||
name: Extract crate metadata
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
- name: Extract crate information
|
|
||||||
id: crate_metadata
|
|
||||||
run: |
|
|
||||||
cargo metadata --no-deps --format-version 1 | jq -r '"name=" + .packages[0].name' | tee -a $GITHUB_OUTPUT
|
|
||||||
cargo metadata --no-deps --format-version 1 | jq -r '"version=" + .packages[0].version' | tee -a $GITHUB_OUTPUT
|
|
||||||
cargo metadata --no-deps --format-version 1 | jq -r '"maintainer=" + .packages[0].authors[0]' | tee -a $GITHUB_OUTPUT
|
|
||||||
cargo metadata --no-deps --format-version 1 | jq -r '"homepage=" + .packages[0].homepage' | tee -a $GITHUB_OUTPUT
|
|
||||||
cargo metadata --no-deps --format-version 1 | jq -r '"msrv=" + .packages[0].rust_version' | tee -a $GITHUB_OUTPUT
|
|
||||||
outputs:
|
|
||||||
name: ${{ steps.crate_metadata.outputs.name }}
|
|
||||||
version: ${{ steps.crate_metadata.outputs.version }}
|
|
||||||
maintainer: ${{ steps.crate_metadata.outputs.maintainer }}
|
|
||||||
homepage: ${{ steps.crate_metadata.outputs.homepage }}
|
|
||||||
msrv: ${{ steps.crate_metadata.outputs.msrv }}
|
|
||||||
|
|
||||||
ensure_cargo_fmt:
|
ensure_cargo_fmt:
|
||||||
name: Ensure 'cargo fmt' has been run
|
name: Ensure 'cargo fmt' has been run
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-20.04
|
||||||
steps:
|
steps:
|
||||||
- uses: dtolnay/rust-toolchain@stable
|
- uses: actions-rs/toolchain@v1
|
||||||
with:
|
with:
|
||||||
|
toolchain: stable
|
||||||
|
default: true
|
||||||
|
profile: minimal
|
||||||
components: rustfmt
|
components: rustfmt
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v2
|
||||||
- run: cargo fmt -- --check
|
- run: cargo fmt -- --check
|
||||||
|
|
||||||
min_version:
|
|
||||||
name: Minimum supported rust version
|
|
||||||
runs-on: ubuntu-20.04
|
|
||||||
needs: crate_metadata
|
|
||||||
steps:
|
|
||||||
- name: Checkout source code
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Install rust toolchain (v${{ needs.crate_metadata.outputs.msrv }})
|
|
||||||
uses: dtolnay/rust-toolchain@master
|
|
||||||
with:
|
|
||||||
toolchain: ${{ needs.crate_metadata.outputs.msrv }}
|
|
||||||
components: clippy
|
|
||||||
- name: Run clippy (on minimum supported rust version to prevent warnings we can't fix)
|
|
||||||
run: cargo clippy --locked --all-targets ${{ env.MSRV_FEATURES }}
|
|
||||||
- name: Run tests
|
|
||||||
run: cargo test --locked ${{ env.MSRV_FEATURES }}
|
|
||||||
|
|
||||||
license_checks:
|
license_checks:
|
||||||
name: License checks
|
name: License checks
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-20.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v2
|
||||||
with:
|
with:
|
||||||
submodules: true # we especially want to perform license checks on submodules
|
submodules: true # we especially want to perform license checks on submodules
|
||||||
- run: tests/scripts/license-checks.sh
|
- run: tests/scripts/license-checks.sh
|
||||||
|
|
||||||
|
min_version:
|
||||||
|
name: Minimum supported rust version
|
||||||
|
runs-on: ubuntu-20.04
|
||||||
|
steps:
|
||||||
|
- name: Checkout source code
|
||||||
|
uses: actions/checkout@v2
|
||||||
|
|
||||||
|
- name: Install rust toolchain (v${{ env.MIN_SUPPORTED_RUST_VERSION }})
|
||||||
|
uses: actions-rs/toolchain@v1
|
||||||
|
with:
|
||||||
|
toolchain: ${{ env.MIN_SUPPORTED_RUST_VERSION }}
|
||||||
|
default: true
|
||||||
|
profile: minimal # minimal component installation (ie, no documentation)
|
||||||
|
components: clippy
|
||||||
|
- name: Run clippy (on minimum supported rust version to prevent warnings we can't fix)
|
||||||
|
uses: actions-rs/cargo@v1
|
||||||
|
with:
|
||||||
|
command: clippy
|
||||||
|
args: --locked --all-targets --all-features
|
||||||
|
- name: Run tests
|
||||||
|
uses: actions-rs/cargo@v1
|
||||||
|
with:
|
||||||
|
command: test
|
||||||
|
args: --locked
|
||||||
|
|
||||||
test_with_new_syntaxes_and_themes:
|
test_with_new_syntaxes_and_themes:
|
||||||
name: Run tests with updated syntaxes and themes
|
name: Run tests with updated syntaxes and themes
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-20.04
|
||||||
steps:
|
steps:
|
||||||
- name: Git checkout
|
- name: Git checkout
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v2
|
||||||
with:
|
with:
|
||||||
submodules: true # we need all syntax and theme submodules
|
submodules: true # we need all syntax and theme submodules
|
||||||
- name: Install Rust toolchain
|
- name: Install Rust toolchain
|
||||||
uses: dtolnay/rust-toolchain@stable
|
uses: actions-rs/toolchain@v1
|
||||||
|
with:
|
||||||
|
toolchain: stable
|
||||||
|
default: true
|
||||||
|
profile: minimal
|
||||||
- name: Build and install bat
|
- name: Build and install bat
|
||||||
run: cargo install --locked --path .
|
uses: actions-rs/cargo@v1
|
||||||
|
with:
|
||||||
|
command: install
|
||||||
|
args: --locked --path .
|
||||||
- name: Rebuild binary assets (syntaxes and themes)
|
- name: Rebuild binary assets (syntaxes and themes)
|
||||||
run: bash assets/create.sh
|
run: bash assets/create.sh
|
||||||
- name: Build and install bat with updated assets
|
- name: Build and install bat with updated assets
|
||||||
run: cargo install --locked --path .
|
uses: actions-rs/cargo@v1
|
||||||
|
with:
|
||||||
|
command: install
|
||||||
|
args: --locked --path .
|
||||||
- name: Run unit tests with new syntaxes and themes
|
- name: Run unit tests with new syntaxes and themes
|
||||||
run: cargo test --locked --release
|
uses: actions-rs/cargo@v1
|
||||||
|
with:
|
||||||
|
command: test
|
||||||
|
args: --locked --release
|
||||||
- name: Run ignored-by-default unit tests with new syntaxes and themes
|
- name: Run ignored-by-default unit tests with new syntaxes and themes
|
||||||
run: cargo test --locked --release --test assets -- --ignored
|
uses: actions-rs/cargo@v1
|
||||||
|
with:
|
||||||
|
command: test
|
||||||
|
args: --locked --release -- --ignored
|
||||||
- name: Syntax highlighting regression test
|
- name: Syntax highlighting regression test
|
||||||
run: tests/syntax-tests/regression_test.sh
|
run: tests/syntax-tests/regression_test.sh
|
||||||
- name: List of languages
|
- name: List of languages
|
||||||
@ -117,70 +106,47 @@ jobs:
|
|||||||
- name: Test custom assets
|
- name: Test custom assets
|
||||||
run: tests/syntax-tests/test_custom_assets.sh
|
run: tests/syntax-tests/test_custom_assets.sh
|
||||||
|
|
||||||
test_with_system_config:
|
|
||||||
name: Run tests with system wide configuration
|
|
||||||
runs-on: ubuntu-20.04
|
|
||||||
steps:
|
|
||||||
- name: Git checkout
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
- name: Prepare environment variables
|
|
||||||
run: |
|
|
||||||
echo "BAT_SYSTEM_CONFIG_PREFIX=$GITHUB_WORKSPACE/tests/examples/system_config" >> $GITHUB_ENV
|
|
||||||
- name: Install Rust toolchain
|
|
||||||
uses: dtolnay/rust-toolchain@stable
|
|
||||||
- name: Build and install bat
|
|
||||||
run: cargo install --locked --path .
|
|
||||||
- name: Run unit tests
|
|
||||||
run: cargo test --locked --test system_wide_config -- --ignored
|
|
||||||
|
|
||||||
documentation:
|
documentation:
|
||||||
name: Documentation
|
name: Documentation
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-20.04
|
||||||
steps:
|
steps:
|
||||||
- name: Git checkout
|
- name: Git checkout
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v2
|
||||||
- name: Install Rust toolchain
|
- name: Install Rust toolchain
|
||||||
uses: dtolnay/rust-toolchain@stable
|
uses: actions-rs/toolchain@v1
|
||||||
|
with:
|
||||||
|
toolchain: stable
|
||||||
|
default: true
|
||||||
|
profile: minimal
|
||||||
- name: Check documentation
|
- name: Check documentation
|
||||||
env:
|
env:
|
||||||
RUSTDOCFLAGS: -D warnings
|
RUSTDOCFLAGS: -D warnings
|
||||||
run: cargo doc --locked --no-deps --document-private-items --all-features
|
uses: actions-rs/cargo@v1
|
||||||
- name: Show man page
|
with:
|
||||||
run: man $(find . -name bat.1)
|
command: doc
|
||||||
|
args: --locked --no-deps --document-private-items --all-features
|
||||||
cargo-audit:
|
|
||||||
name: cargo audit
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
- run: cargo audit
|
|
||||||
|
|
||||||
build:
|
build:
|
||||||
name: ${{ matrix.job.target }} (${{ matrix.job.os }})
|
name: ${{ matrix.job.target }} (${{ matrix.job.os }})
|
||||||
runs-on: ${{ matrix.job.os }}
|
runs-on: ${{ matrix.job.os }}
|
||||||
needs: crate_metadata
|
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
job:
|
job:
|
||||||
- { target: aarch64-unknown-linux-musl , os: ubuntu-20.04, dpkg_arch: arm64, use-cross: true }
|
- { target: aarch64-unknown-linux-gnu , os: ubuntu-20.04, use-cross: true }
|
||||||
- { target: aarch64-unknown-linux-gnu , os: ubuntu-20.04, dpkg_arch: arm64, use-cross: true }
|
- { target: arm-unknown-linux-gnueabihf , os: ubuntu-20.04, use-cross: true }
|
||||||
- { target: arm-unknown-linux-gnueabihf , os: ubuntu-20.04, dpkg_arch: armhf, use-cross: true }
|
- { target: arm-unknown-linux-musleabihf, os: ubuntu-20.04, use-cross: true }
|
||||||
- { target: arm-unknown-linux-musleabihf, os: ubuntu-20.04, dpkg_arch: musl-linux-armhf, use-cross: true }
|
- { target: i686-pc-windows-msvc , os: windows-2019 }
|
||||||
- { target: i686-pc-windows-msvc , os: windows-2019, }
|
- { target: i686-unknown-linux-gnu , os: ubuntu-20.04, use-cross: true }
|
||||||
- { target: i686-unknown-linux-gnu , os: ubuntu-20.04, dpkg_arch: i686, use-cross: true }
|
- { target: i686-unknown-linux-musl , os: ubuntu-20.04, use-cross: true }
|
||||||
- { target: i686-unknown-linux-musl , os: ubuntu-20.04, dpkg_arch: musl-linux-i686, use-cross: true }
|
- { target: x86_64-apple-darwin , os: macos-10.15 }
|
||||||
- { target: x86_64-apple-darwin , os: macos-12, }
|
- { target: x86_64-pc-windows-gnu , os: windows-2019 }
|
||||||
- { target: aarch64-apple-darwin , os: macos-14, }
|
- { target: x86_64-pc-windows-msvc , os: windows-2019 }
|
||||||
- { target: x86_64-pc-windows-gnu , os: windows-2019, }
|
- { target: x86_64-unknown-linux-gnu , os: ubuntu-20.04 }
|
||||||
- { target: x86_64-pc-windows-msvc , os: windows-2019, }
|
- { target: x86_64-unknown-linux-musl , os: ubuntu-20.04, use-cross: true }
|
||||||
- { target: x86_64-unknown-linux-gnu , os: ubuntu-20.04, dpkg_arch: amd64, use-cross: true }
|
|
||||||
- { target: x86_64-unknown-linux-musl , os: ubuntu-20.04, dpkg_arch: musl-linux-amd64, use-cross: true }
|
|
||||||
env:
|
|
||||||
BUILD_CMD: cargo
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout source code
|
- name: Checkout source code
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v2
|
||||||
|
|
||||||
- name: Install prerequisites
|
- name: Install prerequisites
|
||||||
shell: bash
|
shell: bash
|
||||||
@ -190,21 +156,21 @@ jobs:
|
|||||||
aarch64-unknown-linux-gnu) sudo apt-get -y update ; sudo apt-get -y install gcc-aarch64-linux-gnu ;;
|
aarch64-unknown-linux-gnu) sudo apt-get -y update ; sudo apt-get -y install gcc-aarch64-linux-gnu ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
- name: Install Rust toolchain
|
- name: Extract crate information
|
||||||
uses: dtolnay/rust-toolchain@stable
|
|
||||||
with:
|
|
||||||
targets: ${{ matrix.job.target }}
|
|
||||||
|
|
||||||
- name: Install cross
|
|
||||||
if: matrix.job.use-cross
|
|
||||||
uses: taiki-e/install-action@v2
|
|
||||||
with:
|
|
||||||
tool: cross
|
|
||||||
|
|
||||||
- name: Overwrite build command env variable
|
|
||||||
if: matrix.job.use-cross
|
|
||||||
shell: bash
|
shell: bash
|
||||||
run: echo "BUILD_CMD=cross" >> $GITHUB_ENV
|
run: |
|
||||||
|
echo "PROJECT_NAME=$(sed -n 's/^name = "\(.*\)"/\1/p' Cargo.toml | head -n1)" >> $GITHUB_ENV
|
||||||
|
echo "PROJECT_VERSION=$(sed -n 's/^version = "\(.*\)"/\1/p' Cargo.toml | head -n1)" >> $GITHUB_ENV
|
||||||
|
echo "PROJECT_MAINTAINER=$(sed -n 's/^authors = \["\(.*\)"\]/\1/p' Cargo.toml)" >> $GITHUB_ENV
|
||||||
|
echo "PROJECT_HOMEPAGE=$(sed -n 's/^homepage = "\(.*\)"/\1/p' Cargo.toml)" >> $GITHUB_ENV
|
||||||
|
|
||||||
|
- name: Install Rust toolchain
|
||||||
|
uses: actions-rs/toolchain@v1
|
||||||
|
with:
|
||||||
|
toolchain: stable
|
||||||
|
target: ${{ matrix.job.target }}
|
||||||
|
override: true
|
||||||
|
profile: minimal # minimal component installation (ie, no documentation)
|
||||||
|
|
||||||
- name: Show version information (Rust, cargo, GCC)
|
- name: Show version information (Rust, cargo, GCC)
|
||||||
shell: bash
|
shell: bash
|
||||||
@ -217,11 +183,14 @@ jobs:
|
|||||||
rustc -V
|
rustc -V
|
||||||
|
|
||||||
- name: Build
|
- name: Build
|
||||||
shell: bash
|
uses: actions-rs/cargo@v1
|
||||||
run: $BUILD_CMD build --locked --release --target=${{ matrix.job.target }}
|
with:
|
||||||
|
use-cross: ${{ matrix.job.use-cross }}
|
||||||
|
command: build
|
||||||
|
args: --locked --release --target=${{ matrix.job.target }}
|
||||||
|
|
||||||
- name: Set binary name & path
|
- name: Strip debug information from executable
|
||||||
id: bin
|
id: strip
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
# Figure out suffix of binary
|
# Figure out suffix of binary
|
||||||
@ -230,13 +199,31 @@ jobs:
|
|||||||
*-pc-windows-*) EXE_suffix=".exe" ;;
|
*-pc-windows-*) EXE_suffix=".exe" ;;
|
||||||
esac;
|
esac;
|
||||||
|
|
||||||
# Setup paths
|
# Figure out what strip tool to use if any
|
||||||
BIN_NAME="${{ needs.crate_metadata.outputs.name }}${EXE_suffix}"
|
STRIP="strip"
|
||||||
BIN_PATH="target/${{ matrix.job.target }}/release/${BIN_NAME}"
|
case ${{ matrix.job.target }} in
|
||||||
|
arm-unknown-linux-*) STRIP="arm-linux-gnueabihf-strip" ;;
|
||||||
|
aarch64-unknown-linux-gnu) STRIP="aarch64-linux-gnu-strip" ;;
|
||||||
|
*-pc-windows-msvc) STRIP="" ;;
|
||||||
|
esac;
|
||||||
|
|
||||||
# Let subsequent steps know where to find the binary
|
# Setup paths
|
||||||
echo "BIN_PATH=${BIN_PATH}" >> $GITHUB_OUTPUT
|
BIN_DIR="${{ env.CICD_INTERMEDIATES_DIR }}/stripped-release-bin/"
|
||||||
echo "BIN_NAME=${BIN_NAME}" >> $GITHUB_OUTPUT
|
mkdir -p "${BIN_DIR}"
|
||||||
|
BIN_NAME="${{ env.PROJECT_NAME }}${EXE_suffix}"
|
||||||
|
BIN_PATH="${BIN_DIR}/${BIN_NAME}"
|
||||||
|
|
||||||
|
# Copy the release build binary to the result location
|
||||||
|
cp "target/${{ matrix.job.target }}/release/${BIN_NAME}" "${BIN_DIR}"
|
||||||
|
|
||||||
|
# Also strip if possible
|
||||||
|
if [ -n "${STRIP}" ]; then
|
||||||
|
"${STRIP}" "${BIN_PATH}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Let subsequent steps know where to find the (stripped) bin
|
||||||
|
echo ::set-output name=BIN_PATH::${BIN_PATH}
|
||||||
|
echo ::set-output name=BIN_NAME::${BIN_NAME}
|
||||||
|
|
||||||
- name: Set testing options
|
- name: Set testing options
|
||||||
id: test-options
|
id: test-options
|
||||||
@ -244,55 +231,73 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
# test only library unit tests and binary for arm-type targets
|
# test only library unit tests and binary for arm-type targets
|
||||||
unset CARGO_TEST_OPTIONS
|
unset CARGO_TEST_OPTIONS
|
||||||
unset CARGO_TEST_OPTIONS ; case ${{ matrix.job.target }} in arm-* | aarch64-*) CARGO_TEST_OPTIONS="--lib --bin ${{ needs.crate_metadata.outputs.name }}" ;; esac;
|
unset CARGO_TEST_OPTIONS ; case ${{ matrix.job.target }} in arm-* | aarch64-*) CARGO_TEST_OPTIONS="--lib --bin ${PROJECT_NAME}" ;; esac;
|
||||||
echo "CARGO_TEST_OPTIONS=${CARGO_TEST_OPTIONS}" >> $GITHUB_OUTPUT
|
echo ::set-output name=CARGO_TEST_OPTIONS::${CARGO_TEST_OPTIONS}
|
||||||
|
|
||||||
- name: Run tests
|
- name: Run tests
|
||||||
shell: bash
|
uses: actions-rs/cargo@v1
|
||||||
run: |
|
with:
|
||||||
if [[ ${{ matrix.job.os }} = windows-* ]]
|
use-cross: ${{ matrix.job.use-cross }}
|
||||||
then
|
command: test
|
||||||
powershell.exe -command "$BUILD_CMD test --locked --target=${{ matrix.job.target }} ${{ steps.test-options.outputs.CARGO_TEST_OPTIONS}}"
|
args: --locked --target=${{ matrix.job.target }} ${{ steps.test-options.outputs.CARGO_TEST_OPTIONS}}
|
||||||
else
|
|
||||||
$BUILD_CMD test --locked --target=${{ matrix.job.target }} ${{ steps.test-options.outputs.CARGO_TEST_OPTIONS}}
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: Run bat
|
- name: Run bat
|
||||||
shell: bash
|
uses: actions-rs/cargo@v1
|
||||||
run: $BUILD_CMD run --locked --target=${{ matrix.job.target }} -- --paging=never --color=always --theme=ansi Cargo.toml src/config.rs
|
with:
|
||||||
|
use-cross: ${{ matrix.job.use-cross }}
|
||||||
|
command: run
|
||||||
|
args: --locked --target=${{ matrix.job.target }} -- --paging=never --color=always --theme=ansi Cargo.toml src/config.rs
|
||||||
|
|
||||||
- name: Show diagnostics (bat --diagnostic)
|
- name: Show diagnostics (bat --diagnostic)
|
||||||
shell: bash
|
uses: actions-rs/cargo@v1
|
||||||
run: $BUILD_CMD run --locked --target=${{ matrix.job.target }} -- --paging=never --color=always --theme=ansi Cargo.toml src/config.rs --diagnostic
|
with:
|
||||||
|
use-cross: ${{ matrix.job.use-cross }}
|
||||||
|
command: run
|
||||||
|
args: --locked --target=${{ matrix.job.target }} -- --paging=never --color=always --theme=ansi Cargo.toml src/config.rs --diagnostic
|
||||||
|
|
||||||
- name: "Feature check: regex-onig"
|
- name: "Feature check: regex-onig"
|
||||||
shell: bash
|
uses: actions-rs/cargo@v1
|
||||||
run: $BUILD_CMD check --locked --target=${{ matrix.job.target }} --verbose --lib --no-default-features --features regex-onig
|
with:
|
||||||
|
use-cross: ${{ matrix.job.use-cross }}
|
||||||
|
command: check
|
||||||
|
args: --locked --target=${{ matrix.job.target }} --verbose --lib --no-default-features --features regex-onig
|
||||||
|
|
||||||
- name: "Feature check: regex-onig,git"
|
- name: "Feature check: regex-onig,git"
|
||||||
shell: bash
|
uses: actions-rs/cargo@v1
|
||||||
run: $BUILD_CMD check --locked --target=${{ matrix.job.target }} --verbose --lib --no-default-features --features regex-onig,git
|
with:
|
||||||
|
use-cross: ${{ matrix.job.use-cross }}
|
||||||
|
command: check
|
||||||
|
args: --locked --target=${{ matrix.job.target }} --verbose --lib --no-default-features --features regex-onig,git
|
||||||
|
|
||||||
- name: "Feature check: regex-onig,paging"
|
- name: "Feature check: regex-onig,paging"
|
||||||
shell: bash
|
uses: actions-rs/cargo@v1
|
||||||
run: $BUILD_CMD check --locked --target=${{ matrix.job.target }} --verbose --lib --no-default-features --features regex-onig,paging
|
with:
|
||||||
|
use-cross: ${{ matrix.job.use-cross }}
|
||||||
|
command: check
|
||||||
|
args: --locked --target=${{ matrix.job.target }} --verbose --lib --no-default-features --features regex-onig,paging
|
||||||
|
|
||||||
- name: "Feature check: regex-onig,git,paging"
|
- name: "Feature check: regex-onig,git,paging"
|
||||||
shell: bash
|
uses: actions-rs/cargo@v1
|
||||||
run: $BUILD_CMD check --locked --target=${{ matrix.job.target }} --verbose --lib --no-default-features --features regex-onig,git,paging
|
with:
|
||||||
|
use-cross: ${{ matrix.job.use-cross }}
|
||||||
|
command: check
|
||||||
|
args: --locked --target=${{ matrix.job.target }} --verbose --lib --no-default-features --features regex-onig,git,paging
|
||||||
|
|
||||||
- name: "Feature check: minimal-application"
|
- name: "Feature check: minimal-application"
|
||||||
shell: bash
|
uses: actions-rs/cargo@v1
|
||||||
run: $BUILD_CMD check --locked --target=${{ matrix.job.target }} --verbose --no-default-features --features minimal-application
|
with:
|
||||||
|
use-cross: ${{ matrix.job.use-cross }}
|
||||||
|
command: check
|
||||||
|
args: --locked --target=${{ matrix.job.target }} --verbose --no-default-features --features minimal-application
|
||||||
|
|
||||||
- name: Create tarball
|
- name: Create tarball
|
||||||
id: package
|
id: package
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
PKG_suffix=".tar.gz" ; case ${{ matrix.job.target }} in *-pc-windows-*) PKG_suffix=".zip" ;; esac;
|
PKG_suffix=".tar.gz" ; case ${{ matrix.job.target }} in *-pc-windows-*) PKG_suffix=".zip" ;; esac;
|
||||||
PKG_BASENAME=${{ needs.crate_metadata.outputs.name }}-v${{ needs.crate_metadata.outputs.version }}-${{ matrix.job.target }}
|
PKG_BASENAME=${PROJECT_NAME}-v${PROJECT_VERSION}-${{ matrix.job.target }}
|
||||||
PKG_NAME=${PKG_BASENAME}${PKG_suffix}
|
PKG_NAME=${PKG_BASENAME}${PKG_suffix}
|
||||||
echo "PKG_NAME=${PKG_NAME}" >> $GITHUB_OUTPUT
|
echo ::set-output name=PKG_NAME::${PKG_NAME}
|
||||||
|
|
||||||
PKG_STAGING="${{ env.CICD_INTERMEDIATES_DIR }}/package"
|
PKG_STAGING="${{ env.CICD_INTERMEDIATES_DIR }}/package"
|
||||||
ARCHIVE_DIR="${PKG_STAGING}/${PKG_BASENAME}/"
|
ARCHIVE_DIR="${PKG_STAGING}/${PKG_BASENAME}/"
|
||||||
@ -300,19 +305,19 @@ jobs:
|
|||||||
mkdir -p "${ARCHIVE_DIR}/autocomplete"
|
mkdir -p "${ARCHIVE_DIR}/autocomplete"
|
||||||
|
|
||||||
# Binary
|
# Binary
|
||||||
cp "${{ steps.bin.outputs.BIN_PATH }}" "$ARCHIVE_DIR"
|
cp "${{ steps.strip.outputs.BIN_PATH }}" "$ARCHIVE_DIR"
|
||||||
|
|
||||||
|
# Man page
|
||||||
|
cp 'target/${{ matrix.job.target }}/release/build/${{ env.PROJECT_NAME }}'-*/out/assets/manual/bat.1 "$ARCHIVE_DIR"
|
||||||
|
|
||||||
# README, LICENSE and CHANGELOG files
|
# README, LICENSE and CHANGELOG files
|
||||||
cp "README.md" "LICENSE-MIT" "LICENSE-APACHE" "CHANGELOG.md" "$ARCHIVE_DIR"
|
cp "README.md" "LICENSE-MIT" "LICENSE-APACHE" "CHANGELOG.md" "$ARCHIVE_DIR"
|
||||||
|
|
||||||
# Man page
|
|
||||||
cp 'target/${{ matrix.job.target }}/release/build/${{ needs.crate_metadata.outputs.name }}'-*/out/assets/manual/bat.1 "$ARCHIVE_DIR"
|
|
||||||
|
|
||||||
# Autocompletion files
|
# Autocompletion files
|
||||||
cp 'target/${{ matrix.job.target }}/release/build/${{ needs.crate_metadata.outputs.name }}'-*/out/assets/completions/bat.bash "$ARCHIVE_DIR/autocomplete/${{ needs.crate_metadata.outputs.name }}.bash"
|
cp 'target/${{ matrix.job.target }}/release/build/${{ env.PROJECT_NAME }}'-*/out/assets/completions/bat.bash "$ARCHIVE_DIR/autocomplete/${{ env.PROJECT_NAME }}.bash"
|
||||||
cp 'target/${{ matrix.job.target }}/release/build/${{ needs.crate_metadata.outputs.name }}'-*/out/assets/completions/bat.fish "$ARCHIVE_DIR/autocomplete/${{ needs.crate_metadata.outputs.name }}.fish"
|
cp 'target/${{ matrix.job.target }}/release/build/${{ env.PROJECT_NAME }}'-*/out/assets/completions/bat.fish "$ARCHIVE_DIR/autocomplete/${{ env.PROJECT_NAME }}.fish"
|
||||||
cp 'target/${{ matrix.job.target }}/release/build/${{ needs.crate_metadata.outputs.name }}'-*/out/assets/completions/_bat.ps1 "$ARCHIVE_DIR/autocomplete/_${{ needs.crate_metadata.outputs.name }}.ps1"
|
cp 'target/${{ matrix.job.target }}/release/build/${{ env.PROJECT_NAME }}'-*/out/assets/completions/_bat.ps1 "$ARCHIVE_DIR/autocomplete/_${{ env.PROJECT_NAME }}.ps1"
|
||||||
cp 'target/${{ matrix.job.target }}/release/build/${{ needs.crate_metadata.outputs.name }}'-*/out/assets/completions/bat.zsh "$ARCHIVE_DIR/autocomplete/${{ needs.crate_metadata.outputs.name }}.zsh"
|
cp 'target/${{ matrix.job.target }}/release/build/${{ env.PROJECT_NAME }}'-*/out/assets/completions/bat.zsh "$ARCHIVE_DIR/autocomplete/${{ env.PROJECT_NAME }}.zsh"
|
||||||
|
|
||||||
# base compressed package
|
# base compressed package
|
||||||
pushd "${PKG_STAGING}/" >/dev/null
|
pushd "${PKG_STAGING}/" >/dev/null
|
||||||
@ -323,7 +328,7 @@ jobs:
|
|||||||
popd >/dev/null
|
popd >/dev/null
|
||||||
|
|
||||||
# Let subsequent steps know where to find the compressed package
|
# Let subsequent steps know where to find the compressed package
|
||||||
echo "PKG_PATH=${PKG_STAGING}/${PKG_NAME}" >> $GITHUB_OUTPUT
|
echo ::set-output name=PKG_PATH::"${PKG_STAGING}/${PKG_NAME}"
|
||||||
|
|
||||||
- name: Create Debian package
|
- name: Create Debian package
|
||||||
id: debian-package
|
id: debian-package
|
||||||
@ -335,25 +340,34 @@ jobs:
|
|||||||
DPKG_DIR="${DPKG_STAGING}/dpkg"
|
DPKG_DIR="${DPKG_STAGING}/dpkg"
|
||||||
mkdir -p "${DPKG_DIR}"
|
mkdir -p "${DPKG_DIR}"
|
||||||
|
|
||||||
DPKG_BASENAME=${{ needs.crate_metadata.outputs.name }}
|
DPKG_BASENAME=${PROJECT_NAME}
|
||||||
DPKG_CONFLICTS=${{ needs.crate_metadata.outputs.name }}-musl
|
DPKG_CONFLICTS=${PROJECT_NAME}-musl
|
||||||
case ${{ matrix.job.target }} in *-musl) DPKG_BASENAME=${{ needs.crate_metadata.outputs.name }}-musl ; DPKG_CONFLICTS=${{ needs.crate_metadata.outputs.name }} ;; esac;
|
case ${{ matrix.job.target }} in *-musl) DPKG_BASENAME=${PROJECT_NAME}-musl ; DPKG_CONFLICTS=${PROJECT_NAME} ;; esac;
|
||||||
DPKG_VERSION=${{ needs.crate_metadata.outputs.version }}
|
DPKG_VERSION=${PROJECT_VERSION}
|
||||||
DPKG_ARCH="${{ matrix.job.dpkg_arch }}"
|
|
||||||
|
unset DPKG_ARCH
|
||||||
|
case ${{ matrix.job.target }} in
|
||||||
|
aarch64-*-linux-*) DPKG_ARCH=arm64 ;;
|
||||||
|
arm-*-linux-*hf) DPKG_ARCH=armhf ;;
|
||||||
|
i686-*-linux-*) DPKG_ARCH=i686 ;;
|
||||||
|
x86_64-*-linux-*) DPKG_ARCH=amd64 ;;
|
||||||
|
*) DPKG_ARCH=notset ;;
|
||||||
|
esac;
|
||||||
|
|
||||||
DPKG_NAME="${DPKG_BASENAME}_${DPKG_VERSION}_${DPKG_ARCH}.deb"
|
DPKG_NAME="${DPKG_BASENAME}_${DPKG_VERSION}_${DPKG_ARCH}.deb"
|
||||||
echo "DPKG_NAME=${DPKG_NAME}" >> $GITHUB_OUTPUT
|
echo ::set-output name=DPKG_NAME::${DPKG_NAME}
|
||||||
|
|
||||||
# Binary
|
# Binary
|
||||||
install -Dm755 "${{ steps.bin.outputs.BIN_PATH }}" "${DPKG_DIR}/usr/bin/${{ steps.bin.outputs.BIN_NAME }}"
|
install -Dm755 "${{ steps.strip.outputs.BIN_PATH }}" "${DPKG_DIR}/usr/bin/${{ steps.strip.outputs.BIN_NAME }}"
|
||||||
|
|
||||||
# Man page
|
# Man page
|
||||||
install -Dm644 'target/${{ matrix.job.target }}/release/build/${{ needs.crate_metadata.outputs.name }}'-*/out/assets/manual/bat.1 "${DPKG_DIR}/usr/share/man/man1/${{ needs.crate_metadata.outputs.name }}.1"
|
install -Dm644 'target/${{ matrix.job.target }}/release/build/${{ env.PROJECT_NAME }}'-*/out/assets/manual/bat.1 "${DPKG_DIR}/usr/share/man/man1/${{ env.PROJECT_NAME }}.1"
|
||||||
gzip -n --best "${DPKG_DIR}/usr/share/man/man1/${{ needs.crate_metadata.outputs.name }}.1"
|
gzip -n --best "${DPKG_DIR}/usr/share/man/man1/${{ env.PROJECT_NAME }}.1"
|
||||||
|
|
||||||
# Autocompletion files
|
# Autocompletion files
|
||||||
install -Dm644 'target/${{ matrix.job.target }}/release/build/${{ needs.crate_metadata.outputs.name }}'-*/out/assets/completions/bat.bash "${DPKG_DIR}/usr/share/bash-completion/completions/${{ needs.crate_metadata.outputs.name }}"
|
install -Dm644 'target/${{ matrix.job.target }}/release/build/${{ env.PROJECT_NAME }}'-*/out/assets/completions/bat.bash "${DPKG_DIR}/usr/share/bash-completion/completions/${{ env.PROJECT_NAME }}"
|
||||||
install -Dm644 'target/${{ matrix.job.target }}/release/build/${{ needs.crate_metadata.outputs.name }}'-*/out/assets/completions/bat.fish "${DPKG_DIR}/usr/share/fish/vendor_completions.d/${{ needs.crate_metadata.outputs.name }}.fish"
|
install -Dm644 'target/${{ matrix.job.target }}/release/build/${{ env.PROJECT_NAME }}'-*/out/assets/completions/bat.fish "${DPKG_DIR}/usr/share/fish/vendor_completions.d/${{ env.PROJECT_NAME }}.fish"
|
||||||
install -Dm644 'target/${{ matrix.job.target }}/release/build/${{ needs.crate_metadata.outputs.name }}'-*/out/assets/completions/bat.zsh "${DPKG_DIR}/usr/share/zsh/vendor-completions/_${{ needs.crate_metadata.outputs.name }}"
|
install -Dm644 'target/${{ matrix.job.target }}/release/build/${{ env.PROJECT_NAME }}'-*/out/assets/completions/bat.zsh "${DPKG_DIR}/usr/share/zsh/vendor-completions/_${{ env.PROJECT_NAME }}"
|
||||||
|
|
||||||
# README and LICENSE
|
# README and LICENSE
|
||||||
install -Dm644 "README.md" "${DPKG_DIR}/usr/share/doc/${DPKG_BASENAME}/README.md"
|
install -Dm644 "README.md" "${DPKG_DIR}/usr/share/doc/${DPKG_BASENAME}/README.md"
|
||||||
@ -364,12 +378,12 @@ jobs:
|
|||||||
|
|
||||||
cat > "${DPKG_DIR}/usr/share/doc/${DPKG_BASENAME}/copyright" <<EOF
|
cat > "${DPKG_DIR}/usr/share/doc/${DPKG_BASENAME}/copyright" <<EOF
|
||||||
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
|
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
|
||||||
Upstream-Name: ${{ needs.crate_metadata.outputs.name }}
|
Upstream-Name: ${{ env.PROJECT_NAME }}
|
||||||
Source: ${{ needs.crate_metadata.outputs.homepage }}
|
Source: ${{ env.PROJECT_HOMEPAGE }}
|
||||||
|
|
||||||
Files: *
|
Files: *
|
||||||
Copyright: ${{ needs.crate_metadata.outputs.maintainer }}
|
Copyright: ${{ env.PROJECT_MAINTAINER }}
|
||||||
Copyright: $COPYRIGHT_YEARS ${{ needs.crate_metadata.outputs.maintainer }}
|
Copyright: $COPYRIGHT_YEARS ${{ env.PROJECT_MAINTAINER }}
|
||||||
License: Apache-2.0 or MIT
|
License: Apache-2.0 or MIT
|
||||||
|
|
||||||
License: Apache-2.0
|
License: Apache-2.0
|
||||||
@ -410,17 +424,17 @@ jobs:
|
|||||||
Version: ${DPKG_VERSION}
|
Version: ${DPKG_VERSION}
|
||||||
Section: utils
|
Section: utils
|
||||||
Priority: optional
|
Priority: optional
|
||||||
Maintainer: ${{ needs.crate_metadata.outputs.maintainer }}
|
Maintainer: ${{ env.PROJECT_MAINTAINER }}
|
||||||
Homepage: ${{ needs.crate_metadata.outputs.homepage }}
|
Homepage: ${{ env.PROJECT_HOMEPAGE }}
|
||||||
Architecture: ${DPKG_ARCH}
|
Architecture: ${DPKG_ARCH}
|
||||||
Provides: ${{ needs.crate_metadata.outputs.name }}
|
Provides: ${{ env.PROJECT_NAME }}
|
||||||
Conflicts: ${DPKG_CONFLICTS}
|
Conflicts: ${DPKG_CONFLICTS}
|
||||||
Description: cat(1) clone with wings.
|
Description: cat(1) clone with wings.
|
||||||
A cat(1) clone with syntax highlighting and Git integration.
|
A cat(1) clone with syntax highlighting and Git integration.
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
DPKG_PATH="${DPKG_STAGING}/${DPKG_NAME}"
|
DPKG_PATH="${DPKG_STAGING}/${DPKG_NAME}"
|
||||||
echo "DPKG_PATH=${DPKG_PATH}" >> $GITHUB_OUTPUT
|
echo ::set-output name=DPKG_PATH::${DPKG_PATH}
|
||||||
|
|
||||||
# build dpkg
|
# build dpkg
|
||||||
fakeroot dpkg-deb --build "${DPKG_DIR}" "${DPKG_PATH}"
|
fakeroot dpkg-deb --build "${DPKG_DIR}" "${DPKG_PATH}"
|
||||||
@ -443,10 +457,10 @@ jobs:
|
|||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
unset IS_RELEASE ; if [[ $GITHUB_REF =~ ^refs/tags/v[0-9].* ]]; then IS_RELEASE='true' ; fi
|
unset IS_RELEASE ; if [[ $GITHUB_REF =~ ^refs/tags/v[0-9].* ]]; then IS_RELEASE='true' ; fi
|
||||||
echo "IS_RELEASE=${IS_RELEASE}" >> $GITHUB_OUTPUT
|
echo ::set-output name=IS_RELEASE::${IS_RELEASE}
|
||||||
|
|
||||||
- name: Publish archives and packages
|
- name: Publish archives and packages
|
||||||
uses: softprops/action-gh-release@v2
|
uses: softprops/action-gh-release@v1
|
||||||
if: steps.is-release.outputs.IS_RELEASE
|
if: steps.is-release.outputs.IS_RELEASE
|
||||||
with:
|
with:
|
||||||
files: |
|
files: |
|
||||||
@ -454,15 +468,3 @@ jobs:
|
|||||||
${{ steps.debian-package.outputs.DPKG_PATH }}
|
${{ steps.debian-package.outputs.DPKG_PATH }}
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
winget:
|
|
||||||
name: Publish to Winget
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
needs: build
|
|
||||||
if: startsWith(github.ref, 'refs/tags/v')
|
|
||||||
steps:
|
|
||||||
- uses: vedantmgoyal2009/winget-releaser@v2
|
|
||||||
with:
|
|
||||||
identifier: sharkdp.bat
|
|
||||||
installers-regex: '-pc-windows-msvc\.zip$'
|
|
||||||
token: ${{ secrets.WINGET_TOKEN }}
|
|
||||||
|
33
.github/workflows/require-changelog-for-PRs.yml
vendored
33
.github/workflows/require-changelog-for-PRs.yml
vendored
@ -1,33 +0,0 @@
|
|||||||
name: Changelog
|
|
||||||
|
|
||||||
on:
|
|
||||||
pull_request:
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
check-changelog:
|
|
||||||
name: Check for changelog entry
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
# dependabot PRs are automerged if CI passes; we shouldn't block these
|
|
||||||
if: github.actor != 'dependabot[bot]'
|
|
||||||
env:
|
|
||||||
PR_NUMBER: ${{ github.event.number }}
|
|
||||||
PR_BASE: ${{ github.base_ref }}
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
- name: Fetch PR base
|
|
||||||
run: git fetch --no-tags --prune --depth=1 origin
|
|
||||||
|
|
||||||
# cannot use `github.actor`: the triggering commit may be authored by a maintainer
|
|
||||||
- name: Get PR submitter
|
|
||||||
id: get-submitter
|
|
||||||
run: curl -sSfL https://api.github.com/repos/sharkdp/bat/pulls/${PR_NUMBER} | jq -r '"submitter=" + .user.login' | tee -a $GITHUB_OUTPUT
|
|
||||||
|
|
||||||
- name: Search for added line in changelog
|
|
||||||
env:
|
|
||||||
PR_SUBMITTER: ${{ steps.get-submitter.outputs.submitter }}
|
|
||||||
run: |
|
|
||||||
ADDED=$(git diff -U0 "origin/${PR_BASE}" HEAD -- CHANGELOG.md | grep -P '^\+[^\+].+$')
|
|
||||||
echo "Added lines in CHANGELOG.md:"
|
|
||||||
echo "$ADDED"
|
|
||||||
echo "Grepping for PR info (see CONTRIBUTING.md):"
|
|
||||||
grep "#${PR_NUMBER}\\b.*@${PR_SUBMITTER}\\b" <<< "$ADDED"
|
|
24
.gitmodules
vendored
24
.gitmodules
vendored
@ -239,27 +239,3 @@
|
|||||||
[submodule "assets/syntaxes/02_Extra/SublimeJQ"]
|
[submodule "assets/syntaxes/02_Extra/SublimeJQ"]
|
||||||
path = assets/syntaxes/02_Extra/SublimeJQ
|
path = assets/syntaxes/02_Extra/SublimeJQ
|
||||||
url = https://github.com/zogwarg/SublimeJQ.git
|
url = https://github.com/zogwarg/SublimeJQ.git
|
||||||
[submodule "assets/syntaxes/02_Extra/cmd-help"]
|
|
||||||
path = assets/syntaxes/02_Extra/cmd-help
|
|
||||||
url = https://github.com/victor-gp/cmd-help-sublime-syntax.git
|
|
||||||
branch = main
|
|
||||||
shallow = true
|
|
||||||
[submodule "assets/syntaxes/02_Extra/TodoTxt"]
|
|
||||||
path = assets/syntaxes/02_Extra/TodoTxt
|
|
||||||
url = https://github.com/dertuxmalwieder/SublimeTodoTxt
|
|
||||||
[submodule "assets/syntaxes/02_Extra/Ada"]
|
|
||||||
path = assets/syntaxes/02_Extra/Ada
|
|
||||||
url = https://github.com/wiremoons/ada-sublime-syntax
|
|
||||||
|
|
||||||
[submodule "assets/syntaxes/02_Extra/Crontab"]
|
|
||||||
path = assets/syntaxes/02_Extra/Crontab
|
|
||||||
url = https://github.com/michaelblyons/SublimeSyntax-Crontab
|
|
||||||
[submodule "assets/syntaxes/02_Extra/NSIS"]
|
|
||||||
path = assets/syntaxes/02_Extra/NSIS
|
|
||||||
url = https://github.com/SublimeText/NSIS
|
|
||||||
[submodule "assets/syntaxes/02_Extra/vscode-wgsl"]
|
|
||||||
path = assets/syntaxes/02_Extra/vscode-wgsl
|
|
||||||
url = https://github.com/PolyMeilex/vscode-wgsl.git
|
|
||||||
[submodule "assets/syntaxes/02_Extra/CFML"]
|
|
||||||
path = assets/syntaxes/02_Extra/CFML
|
|
||||||
url = https://github.com/jcberquist/sublimetext-cfml.git
|
|
||||||
|
238
CHANGELOG.md
238
CHANGELOG.md
@ -1,241 +1,3 @@
|
|||||||
# unreleased
|
|
||||||
|
|
||||||
## Features
|
|
||||||
|
|
||||||
- Set terminal title to file names when Paging is not Paging::Never #2807 (@Oliver-Looney)
|
|
||||||
- `bat --squeeze-blank`/`bat -s` will now squeeze consecutive empty lines, see #1441 (@eth-p) and #2665 (@einfachIrgendwer0815)
|
|
||||||
- `bat --squeeze-limit` to set the maximum number of empty consecutive when using `--squeeze-blank`, see #1441 (@eth-p) and #2665 (@einfachIrgendwer0815)
|
|
||||||
- `PrettyPrinter::squeeze_empty_lines` to support line squeezing for bat as a library, see #1441 (@eth-p) and #2665 (@einfachIrgendwer0815)
|
|
||||||
- Syntax highlighting for JavaScript files that start with `#!/usr/bin/env bun` #2913 (@sharunkumar)
|
|
||||||
- `bat --strip-ansi={never,always,auto}` to remove ANSI escape sequences from bat's input, see #2999 (@eth-p)
|
|
||||||
- Add or remove individual style components without replacing all styles #2929 (@eth-p)
|
|
||||||
|
|
||||||
## Bugfixes
|
|
||||||
|
|
||||||
- Fix long file name wrapping in header, see #2835 (@FilipRazek)
|
|
||||||
- Fix `NO_COLOR` support, see #2767 (@acuteenvy)
|
|
||||||
- Fix handling of inputs with OSC ANSI escape sequences, see #2541 and #2544 (@eth-p)
|
|
||||||
- Fix handling of inputs with combined ANSI color and attribute sequences, see #2185 and #2856 (@eth-p)
|
|
||||||
- Fix panel width when line 10000 wraps, see #2854 (@eth-p)
|
|
||||||
- Fix compile issue of `time` dependency caused by standard library regression #3045 (@cyqsimon)
|
|
||||||
|
|
||||||
## Other
|
|
||||||
|
|
||||||
- Upgrade to Rust 2021 edition #2748 (@cyqsimon)
|
|
||||||
- Refactor and cleanup build script #2756 (@cyqsimon)
|
|
||||||
- Checks changelog has been written to for PRs in CI #2766 (@cyqsimon)
|
|
||||||
- Use GitHub API to get correct PR submitter #2791 (@cyqsimon)
|
|
||||||
- Minor benchmark script improvements #2768 (@cyqsimon)
|
|
||||||
- Update Arch Linux package URL in README files #2779 (@brunobell)
|
|
||||||
- Update and improve `zsh` completion, see #2772 (@okapia)
|
|
||||||
- More extensible syntax mapping mechanism #2755 (@cyqsimon)
|
|
||||||
- Use proper Architecture for Debian packages built for musl, see #2811 (@Enselic)
|
|
||||||
- Pull in fix for unsafe-libyaml security advisory, see #2812 (@dtolnay)
|
|
||||||
- Update git-version dependency to use Syn v2, see #2816 (@dtolnay)
|
|
||||||
- Update git2 dependency to v0.18.2, see #2852 (@eth-p)
|
|
||||||
- Improve performance when color output disabled, see #2397 and #2857 (@eth-p)
|
|
||||||
- Relax syntax mapping rule restrictions to allow brace expansion #2865 (@cyqsimon)
|
|
||||||
- Apply clippy fixes #2864 (@cyqsimon)
|
|
||||||
- Faster startup by offloading glob matcher building to a worker thread #2868 (@cyqsimon)
|
|
||||||
- Display which theme is the default one in basic output (no colors), see #2937 (@sblondon)
|
|
||||||
- Display which theme is the default one in colored output, see #2838 (@sblondon)
|
|
||||||
- Add aarch64-apple-darwin ("Apple Silicon") binary tarballs to releases, see #2967 (@someposer)
|
|
||||||
- Update the Lisp syntax, see #2970 (@ccqpein)
|
|
||||||
- Use bat's ANSI iterator during tab expansion, see #2998 (@eth-p)
|
|
||||||
- Support 'statically linked binary' for aarch64 in 'Release' page, see #2992 (@tzq0301)
|
|
||||||
- Update options in shell completions and the man page of `bat`, see #2995 (@akinomyoga)
|
|
||||||
|
|
||||||
## Syntaxes
|
|
||||||
|
|
||||||
- `cmd-help`: scope subcommands followed by other terms, and other misc improvements, see #2819 (@victor-gp)
|
|
||||||
- Upgrade JQ syntax, see #2820 (@dependabot[bot])
|
|
||||||
- Add syntax mapping for quadman quadlets #2866 (@cyqsimon)
|
|
||||||
- Map containers .conf files to TOML syntax #2867 (@cyqsimon)
|
|
||||||
- Associate `.xsh` files with `xonsh` syntax that is Python, see #2840 (@anki-code)
|
|
||||||
- Associate JSON with Comments `.jsonc` with `json` syntax, see #2795 (@mxaddict)
|
|
||||||
- Associate JSON-LD `.jsonld` files with `json` syntax, see #3037 (@vorburger)
|
|
||||||
- Associate `.textproto` files with `ProtoBuf` syntax, see #3038 (@vorburger)
|
|
||||||
- Associate GeoJSON `.geojson` files with `json` syntax, see #3084 (@mvaaltola)
|
|
||||||
- Associate `.aws/{config,credentials}`, see #2795 (@mxaddict)
|
|
||||||
- Associate Wireguard config `/etc/wireguard/*.conf`, see #2874 (@cyqsimon)
|
|
||||||
- Add support for [CFML](https://www.adobe.com/products/coldfusion-family.html), see #3031 (@brenton-at-pieces)
|
|
||||||
- Map `*.mkd` files to `Markdown` syntax, see issue #3060 and PR #3061 (@einfachIrgendwer0815)
|
|
||||||
|
|
||||||
## Themes
|
|
||||||
|
|
||||||
## `bat` as a library
|
|
||||||
|
|
||||||
- Changes to `syntax_mapping::SyntaxMapping` #2755 (@cyqsimon)
|
|
||||||
- `SyntaxMapping::get_syntax_for` is now correctly public
|
|
||||||
- [BREAKING] `SyntaxMapping::{empty,builtin}` are removed; use `SyntaxMapping::new` instead
|
|
||||||
- [BREAKING] `SyntaxMapping::mappings` is replaced by `SyntaxMapping::{builtin,custom,all}_mappings`
|
|
||||||
- Make `Controller::run_with_error_handler`'s error handler `FnMut`, see #2831 (@rhysd)
|
|
||||||
- Improve compile time by 20%, see #2815 (@dtolnay)
|
|
||||||
|
|
||||||
# v0.24.0
|
|
||||||
|
|
||||||
## Features
|
|
||||||
|
|
||||||
- Add environment variable `BAT_PAGING`, see #2629 (@einfachIrgendwer0815)
|
|
||||||
- Add opt-in (`--features lessopen`) support for `LESSOPEN` and `LESSCLOSE`. See #1597, #1739, #2444, #2602, and #2662 (@Anomalocaridid)
|
|
||||||
|
|
||||||
## Bugfixes
|
|
||||||
|
|
||||||
- Fix `more` not being found on Windows when provided via `BAT_PAGER`, see #2570, #2580, and #2651 (@mataha)
|
|
||||||
- Switched default behavior of `--map-syntax` to be case insensitive #2520
|
|
||||||
- Updated version of `serde_yaml` to `0.9`. See #2627 (@Raghav-Bell)
|
|
||||||
- Fix arithmetic overflow in `LineRange::from` and `LineRange::parse_range`, see #2674, #2698 (@skoriop)
|
|
||||||
- Fix paging not happening when stdout is interactive but stdin is not, see #2574 (@Nigecat)
|
|
||||||
- Make `-pp` override `--paging` and vice versa when passed as a later argument, see #2660 (@J-Kappes)
|
|
||||||
|
|
||||||
## Other
|
|
||||||
|
|
||||||
- Output directory for generated assets (completion, manual) can be customized, see #2515 (@tranzystorek-io)
|
|
||||||
- Use the `is-terminal` crate instead of `atty`, see #2530 (@nickelc)
|
|
||||||
- Add Winget Releaser workflow, see #2519 (@sitiom)
|
|
||||||
- Bump MSRV to 1.70, see #2651 (@mataha)
|
|
||||||
|
|
||||||
## Syntaxes
|
|
||||||
|
|
||||||
- Associate `os-release` with `bash` syntax, see #2587 (@cyqsimon)
|
|
||||||
- Associate `Containerfile` with `Dockerfile` syntax, see #2606 (@einfachIrgendwer0815)
|
|
||||||
- Replaced quotes with double quotes so fzf integration example script works on windows and linux. see #2095 (@johnmatthiggins)
|
|
||||||
- Associate `ksh` files with `bash` syntax, see #2633 (@johnmatthiggins)
|
|
||||||
- Associate `sarif` files with `JSON` syntax, see #2695 (@rhysd)
|
|
||||||
- Associate `ron` files with `rust` syntax, see #2427 (@YeungOnion)
|
|
||||||
- Add support for [WebGPU Shader Language](https://www.w3.org/TR/WGSL/), see #2692 (@rhysd)
|
|
||||||
- Add `.dpkg-new` and `.dpkg-tmp` to ignored suffixe, see #2595 (@scop)
|
|
||||||
- fix: Add syntax mapping `*.jsonl` => `json`, see #2539 (@WinterCore)
|
|
||||||
- Update `Julia` syntax, see #2553 (@dependabot)
|
|
||||||
- add `NSIS` support, see #2577 (@idleberg)
|
|
||||||
- Update `ssh-config`, see #2697 (@mrmeszaros)
|
|
||||||
|
|
||||||
## `bat` as a library
|
|
||||||
|
|
||||||
- Add optional output_buffer arg to `Controller::run()` and `Controller::run_with_error_handler()`, see #2618 (@Piturnah)
|
|
||||||
|
|
||||||
|
|
||||||
# v0.23.0
|
|
||||||
|
|
||||||
## Features
|
|
||||||
|
|
||||||
- Implemented `-S` and `--chop-long-lines` flags as aliases for `--wrap=never`. See #2309 (@johnmatthiggins)
|
|
||||||
- Breaking change: Environment variables can now override config file settings (but command-line arguments still have the highest precedence), see #1152, #1281, and #2381 (@aaronkollasch)
|
|
||||||
- Implemented `--nonprintable-notation=caret` to support showing non-printable characters using caret notation. See #2429 (@einfachIrgendwer0815)
|
|
||||||
|
|
||||||
## Bugfixes
|
|
||||||
|
|
||||||
- Fix `bat cache --clear` not clearing the `--target` dir if specified. See #2393 (@miles170)
|
|
||||||
|
|
||||||
## Other
|
|
||||||
|
|
||||||
- Various bash completion improvements, see #2310 (@scop)
|
|
||||||
- Disable completion of `cache` subcommand, see #2399 (@cyqsimon)
|
|
||||||
- Signifigantly improve startup performance on macOS, see #2442 (@BlackHoleFox)
|
|
||||||
- Bump MSRV to 1.62, see #2496 (@Enselic)
|
|
||||||
|
|
||||||
## Syntaxes
|
|
||||||
|
|
||||||
- Added support for Ada, see #1300 and #2316 (@dkm)
|
|
||||||
- Added `todo.txt` syntax, see #2375 (@BANOnotIT)
|
|
||||||
- Improve Manpage.sublime-syntax. See #2364 (@Freed-Wu) and #2461 (@keith-hall)
|
|
||||||
- Added a new `requirements.txt` syntax, see #2361 (@Freed-Wu)
|
|
||||||
- Added a new VimHelp syntax, see #2366 (@Freed-Wu)
|
|
||||||
- Associate `pdm.lock` with `TOML` syntax, see #2410
|
|
||||||
- `Todo.txt`: Fix highlighting of contexts and projects at beginning of done.txt, see #2411
|
|
||||||
- `cmd-help`: overhaul scope names (colors) to improve theme support; misc syntax improvements. See #2419 (@victor-gp)
|
|
||||||
- Added support for Crontab, see #2509 (@keith-hall)
|
|
||||||
|
|
||||||
## Themes
|
|
||||||
|
|
||||||
## `bat` as a library
|
|
||||||
|
|
||||||
- `PrettyPrinter::header` correctly displays a header with the filename, see #2378 and #2406 (@cstyles)
|
|
||||||
|
|
||||||
|
|
||||||
# v0.22.1
|
|
||||||
|
|
||||||
## Bugfixes
|
|
||||||
|
|
||||||
- Bring back pre-processing of ANSI escape characters to so that some common `bat` use cases starts working again. See #2308 (@Enselic)
|
|
||||||
|
|
||||||
# v0.22.0
|
|
||||||
|
|
||||||
## Features
|
|
||||||
|
|
||||||
- Make the default macOS theme depend on Dark Mode. See #2197, #1746 (@Enselic)
|
|
||||||
- Support for separate system and user config files. See #668 (@patrickpichler)
|
|
||||||
|
|
||||||
## Bugfixes
|
|
||||||
|
|
||||||
- Prevent fork nightmare with `PAGER=batcat`. See #2235 (@johnmatthiggins)
|
|
||||||
- Make `--no-paging`/`-P` override `--paging=...` if passed as a later arg, see #2201 (@themkat)
|
|
||||||
- `--map-syntax` and `--ignored-suffix` now works together, see #2093 (@czzrr)
|
|
||||||
- Strips byte order mark from output when in non-loop-through mode. See #1922 (@dag-h)
|
|
||||||
|
|
||||||
## Other
|
|
||||||
|
|
||||||
- Relaxed glibc requirements on amd64, see #2106 and #2194 (@sharkdp)
|
|
||||||
- Improved fish completions. See #2275 (@zgracem)
|
|
||||||
- Stop pre-processing ANSI escape characters. Syntax highlighting on ANSI escaped input is not supported. See #2185 and #2189 (@Enselic)
|
|
||||||
|
|
||||||
## Syntaxes
|
|
||||||
|
|
||||||
- NSE (Nmap Scripting Engine) is mapped to Lua, see #2151 (@Cre3per)
|
|
||||||
- Correctly color `fstab` dump and pass fields, see #2246 (@yuvalmo)
|
|
||||||
- Update `Command Help` syntax, see #2255
|
|
||||||
- `Julia`: Fix syntax highlighting for function name starting with `struct`, see #2230
|
|
||||||
- Minor update to `LiveScript`, see #2291
|
|
||||||
- Associate `.mts` and `.cts` files with the `TypeScript` syntax. See #2236 (@kidonng)
|
|
||||||
- Fish history is mapped to YAML. See #2237 (@kidonng)
|
|
||||||
|
|
||||||
## `bat` as a library
|
|
||||||
|
|
||||||
- Make `bat::PrettyPrinter::syntaxes()` iterate over new `bat::Syntax` struct instead of `&syntect::parsing::SyntaxReference`. See #2222 (@Enselic)
|
|
||||||
- Clear highlights after printing, see #1919 and #1920 (@rhysd)
|
|
||||||
|
|
||||||
|
|
||||||
# v0.21.0
|
|
||||||
|
|
||||||
## Features
|
|
||||||
|
|
||||||
- Correctly render tab stops in `--show-all`, see #2038 (@Synthetica9)
|
|
||||||
- Add a `--style=default` option and make it the default. It is less verbose than `full`, see #2061 (@IsaacHorvath)
|
|
||||||
- Enable BusyBox `less` as pager, see #2162 (@nfisher1226)
|
|
||||||
- File extensions are now matched case-insensitively. See #1854, #2181 (@Enselic)
|
|
||||||
|
|
||||||
## Bugfixes
|
|
||||||
|
|
||||||
- Bump `regex` dependency from 1.5.4 to 1.5.5 to fix [CVE-2022-24713](https://blog.rust-lang.org/2022/03/08/cve-2022-24713.html), see #2145, #2139 (@Enselic)
|
|
||||||
- `bat` no longer crashes when encountering files that references missing syntaxes. See #915, #2181 (@Enselic)
|
|
||||||
|
|
||||||
## Performance
|
|
||||||
|
|
||||||
- Skip syntax highlighting on long lines (> 16384 chars) to help improve performance. See #2165 (@keith-hall)
|
|
||||||
- Vastly improve startup time by lazy-loading syntaxes via syntect 5.0.0. This makes bat display small files ~75% faster than before. See #951, #2181 (@Enselic)
|
|
||||||
|
|
||||||
## Other
|
|
||||||
|
|
||||||
- Include info about custom assets in `--diagnostics` if used. See #2107, #2144 (@Enselic)
|
|
||||||
|
|
||||||
## Syntaxes
|
|
||||||
|
|
||||||
- Mapped clang-format config file (.clang-format) to YAML syntax (@TruncatedDinosour)
|
|
||||||
- log syntax: improved handling of escape characters in double quoted strings. See #2123 (@keith-hall)
|
|
||||||
- Associate `/var/spool/mail/*` and `/var/mail/*` with the `Email` syntax. See #2156 (@cyqsimon)
|
|
||||||
- Added cmd-help syntax to scope --help messages. See #2148 (@victor-gp)
|
|
||||||
- Slightly adjust Zig syntax. See #2136 (@Enselic)
|
|
||||||
- Associate `.inf` files with the `INI` syntax. See #2190 (@Enselic)
|
|
||||||
|
|
||||||
## `bat` as a library
|
|
||||||
|
|
||||||
- Allow configuration of `show_nonprintable` with `PrettyPrinter`, see #2142
|
|
||||||
- The binary format of syntaxes.bin has been changed due to syntaxes now being lazy-loaded via syntect 5.0.0. See #2181 (@Enselic)
|
|
||||||
- Mark `bat::error::Error` enum as `#[non_exhaustive]` to allow adding new variants without future semver breakage. See #2181 (@Enselic)
|
|
||||||
- Change `Error::SyntectError(syntect::LoadingError)` to `Error::SyntectError(syntect::Error)`. See #2181 (@Enselic)
|
|
||||||
- Add `Error::SyntectLoadingError(syntect::LoadingError)` enum variant. See #2181 (@Enselic)
|
|
||||||
|
|
||||||
|
|
||||||
# v0.20.0
|
# v0.20.0
|
||||||
|
|
||||||
## Features
|
## Features
|
||||||
|
@ -6,42 +6,21 @@ Thank you for considering to contribute to `bat`!
|
|||||||
|
|
||||||
## Add an entry to the changelog
|
## Add an entry to the changelog
|
||||||
|
|
||||||
Keeping the [`CHANGELOG.md`](CHANGELOG.md) file up-to-date makes the release
|
If your contribution changes the behavior of `bat` (as opposed to a typo-fix
|
||||||
process much easier and therefore helps to get your changes into a new `bat`
|
in the documentation), please update the [`CHANGELOG.md`](CHANGELOG.md) file
|
||||||
release faster. However, not every change to the repository requires a
|
and describe your changes. This makes the release process much easier and
|
||||||
changelog entry. Below are a few examples of that.
|
therefore helps to get your changes into a new `bat` release faster.
|
||||||
|
|
||||||
Please update the changelog if your contribution contains changes regarding
|
|
||||||
any of the following:
|
|
||||||
- the behavior of `bat`
|
|
||||||
- syntax mappings
|
|
||||||
- syntax definitions
|
|
||||||
- themes
|
|
||||||
- the build system, linting, or CI workflows
|
|
||||||
|
|
||||||
A changelog entry is not necessary when:
|
|
||||||
- updating documentation
|
|
||||||
- fixing typos
|
|
||||||
|
|
||||||
>[!NOTE]
|
|
||||||
> For PRs, a CI workflow verifies that a suitable changelog entry is
|
|
||||||
> added. If such an entry is missing, the workflow will fail. If your
|
|
||||||
> changes do not need an entry to the changelog (see above), that
|
|
||||||
> workflow failure can be disregarded.
|
|
||||||
|
|
||||||
|
|
||||||
### Changelog entry format
|
|
||||||
|
|
||||||
The top of the `CHANGELOG` contains a *"unreleased"* section with a few
|
The top of the `CHANGELOG` contains a *"unreleased"* section with a few
|
||||||
subsections (Features, Bugfixes, …). Please add your entry to the subsection
|
subsections (Features, Bugfixes, …). Please add your entry to the subsection
|
||||||
that best describes your change.
|
that best describes your change.
|
||||||
|
|
||||||
Entries must follow this format:
|
Entries follow this format:
|
||||||
```
|
```
|
||||||
- Short description of what has been changed, see #123 (@user)
|
- Short description of what has been changed, see #123 (@user)
|
||||||
```
|
```
|
||||||
Please replace `#123` with the number of your pull request (not issue) and
|
Here, `#123` is the number of the original issue and/or your pull request.
|
||||||
`@user` by your GitHub username.
|
Please replace `@user` by your GitHub username.
|
||||||
|
|
||||||
|
|
||||||
## Development
|
## Development
|
||||||
@ -54,7 +33,7 @@ section in the README.
|
|||||||
|
|
||||||
Please consider opening a
|
Please consider opening a
|
||||||
[feature request ticket](https://github.com/sharkdp/bat/issues/new?assignees=&labels=feature-request&template=feature_request.md)
|
[feature request ticket](https://github.com/sharkdp/bat/issues/new?assignees=&labels=feature-request&template=feature_request.md)
|
||||||
first in order to give us a chance to discuss the details and specifics of the potential new feature before you go and build it.
|
first in order to give us a chance to discuss the feature first.
|
||||||
|
|
||||||
|
|
||||||
## Adding new syntaxes/languages or themes
|
## Adding new syntaxes/languages or themes
|
||||||
@ -71,12 +50,12 @@ first.
|
|||||||
|
|
||||||
## Regression tests
|
## Regression tests
|
||||||
|
|
||||||
You are **strongly encouraged** to add regression tests. Regression tests are great,
|
You are strongly encouraged to add regression tests. Regression tests are great,
|
||||||
not least because they:
|
not least because they:
|
||||||
|
|
||||||
* ensure that your contribution will never completely stop working.
|
* ensure that your contribution will never completely stop working,
|
||||||
|
|
||||||
* makes code reviews easier, because it becomes very clear what the code is
|
* makes code review easier, because it becomes very clear what the code is
|
||||||
supposed to do.
|
supposed to do.
|
||||||
|
|
||||||
For functional changes, you most likely want to add a test to
|
For functional changes, you most likely want to add a test to
|
||||||
|
1281
Cargo.lock
generated
1281
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
96
Cargo.toml
96
Cargo.toml
@ -3,14 +3,13 @@ authors = ["David Peter <mail@david-peter.de>"]
|
|||||||
categories = ["command-line-utilities"]
|
categories = ["command-line-utilities"]
|
||||||
description = "A cat(1) clone with wings."
|
description = "A cat(1) clone with wings."
|
||||||
homepage = "https://github.com/sharkdp/bat"
|
homepage = "https://github.com/sharkdp/bat"
|
||||||
license = "MIT OR Apache-2.0"
|
license = "MIT/Apache-2.0"
|
||||||
name = "bat"
|
name = "bat"
|
||||||
repository = "https://github.com/sharkdp/bat"
|
repository = "https://github.com/sharkdp/bat"
|
||||||
version = "0.24.0"
|
version = "0.20.0"
|
||||||
exclude = ["assets/syntaxes/*", "assets/themes/*"]
|
exclude = ["assets/syntaxes/*", "assets/themes/*"]
|
||||||
build = "build/main.rs"
|
build = "build.rs"
|
||||||
edition = '2021'
|
edition = '2018'
|
||||||
rust-version = "1.70"
|
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
default = ["application"]
|
default = ["application"]
|
||||||
@ -25,99 +24,78 @@ application = [
|
|||||||
# Mainly for developers that want to iterate quickly
|
# Mainly for developers that want to iterate quickly
|
||||||
# Be aware that the included features might change in the future
|
# Be aware that the included features might change in the future
|
||||||
minimal-application = [
|
minimal-application = [
|
||||||
|
"atty",
|
||||||
"clap",
|
"clap",
|
||||||
"etcetera",
|
"dirs-next",
|
||||||
"paging",
|
"paging",
|
||||||
"regex-onig",
|
"regex-onig",
|
||||||
"wild",
|
"wild",
|
||||||
]
|
]
|
||||||
git = ["git2"] # Support indicating git modifications
|
git = ["git2"] # Support indicating git modifications
|
||||||
paging = ["shell-words", "grep-cli"] # Support applying a pager on the output
|
paging = ["shell-words", "grep-cli"] # Support applying a pager on the output
|
||||||
lessopen = ["run_script", "os_str_bytes"] # Support $LESSOPEN preprocessor
|
# Add "syntect/plist-load" when https://github.com/trishume/syntect/pull/345 reaches us
|
||||||
build-assets = ["syntect/yaml-load", "syntect/plist-load", "regex", "walkdir"]
|
build-assets = ["syntect/yaml-load", "syntect/dump-create", "regex", "walkdir"]
|
||||||
|
|
||||||
# You need to use one of these if you depend on bat as a library:
|
# You need to use one of these if you depend on bat as a library:
|
||||||
regex-onig = ["syntect/regex-onig"] # Use the "oniguruma" regex engine
|
regex-onig = ["syntect/regex-onig"] # Use the "oniguruma" regex engine
|
||||||
regex-fancy = ["syntect/regex-fancy"] # Use the rust-only "fancy-regex" engine
|
regex-fancy = ["syntect/regex-fancy"] # Use the rust-only "fancy-regex" engine
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
nu-ansi-term = "0.50.0"
|
atty = { version = "0.2.14", optional = true }
|
||||||
ansi_colours = "^1.2"
|
ansi_term = "^0.12.1"
|
||||||
|
ansi_colours = "^1.1"
|
||||||
bincode = "1.0"
|
bincode = "1.0"
|
||||||
console = "0.15.8"
|
console = "0.15.0"
|
||||||
flate2 = "1.0"
|
flate2 = "1.0"
|
||||||
once_cell = "1.19"
|
once_cell = "1.9"
|
||||||
thiserror = "1.0"
|
thiserror = "1.0"
|
||||||
wild = { version = "2.2", optional = true }
|
wild = { version = "2.0", optional = true }
|
||||||
content_inspector = "0.2.4"
|
content_inspector = "0.2.4"
|
||||||
shell-words = { version = "1.1.0", optional = true }
|
encoding = "0.2"
|
||||||
unicode-width = "0.1.13"
|
shell-words = { version = "1.0.0", optional = true }
|
||||||
|
unicode-width = "0.1.9"
|
||||||
globset = "0.4"
|
globset = "0.4"
|
||||||
serde = "1.0"
|
serde = { version = "1.0", features = ["derive"] }
|
||||||
serde_derive = "1.0"
|
serde_yaml = "0.8"
|
||||||
serde_yaml = "0.9.28"
|
|
||||||
semver = "1.0"
|
semver = "1.0"
|
||||||
path_abs = { version = "0.5", default-features = false }
|
path_abs = { version = "0.5", default-features = false }
|
||||||
clircle = "0.5"
|
clircle = "0.3"
|
||||||
bugreport = { version = "0.5.0", optional = true }
|
bugreport = { version = "0.4", optional = true }
|
||||||
etcetera = { version = "0.8.0", optional = true }
|
dirs-next = { version = "2.0.0", optional = true }
|
||||||
grep-cli = { version = "0.1.10", optional = true }
|
grep-cli = { version = "0.1.6", optional = true }
|
||||||
regex = { version = "1.10.2", optional = true }
|
regex = { version = "1.0", optional = true }
|
||||||
walkdir = { version = "2.5", optional = true }
|
walkdir = { version = "2.0", optional = true }
|
||||||
bytesize = { version = "1.3.0" }
|
bytesize = { version = "1.1.0" }
|
||||||
encoding_rs = "0.8.34"
|
|
||||||
os_str_bytes = { version = "~7.0", optional = true }
|
|
||||||
run_script = { version = "^0.10.1", optional = true}
|
|
||||||
|
|
||||||
[dependencies.git2]
|
[dependencies.git2]
|
||||||
version = "0.18"
|
version = "0.13"
|
||||||
optional = true
|
optional = true
|
||||||
default-features = false
|
default-features = false
|
||||||
|
|
||||||
[dependencies.syntect]
|
[dependencies.syntect]
|
||||||
version = "5.2.0"
|
version = "4.6.0"
|
||||||
default-features = false
|
default-features = false
|
||||||
features = ["parsing"]
|
features = ["parsing"]
|
||||||
|
|
||||||
[dependencies.clap]
|
[dependencies.clap]
|
||||||
version = "4.4.12"
|
version = "2.34"
|
||||||
optional = true
|
optional = true
|
||||||
features = ["wrap_help", "cargo"]
|
default-features = false
|
||||||
|
features = ["suggestions", "color", "wrap_help"]
|
||||||
[target.'cfg(target_os = "macos")'.dependencies]
|
|
||||||
home = "0.5.9"
|
|
||||||
plist = "1.7.0"
|
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
assert_cmd = "2.0.12"
|
assert_cmd = "2.0.4"
|
||||||
expect-test = "1.5.0"
|
serial_test = "0.5.1"
|
||||||
serial_test = { version = "2.0.0", default-features = false }
|
predicates = "2.1.0"
|
||||||
predicates = "3.1.0"
|
|
||||||
wait-timeout = "0.2.0"
|
wait-timeout = "0.2.0"
|
||||||
tempfile = "3.8.1"
|
tempfile = "3.3.0"
|
||||||
serde = { version = "1.0", features = ["derive"] }
|
|
||||||
|
|
||||||
[target.'cfg(unix)'.dev-dependencies]
|
[target.'cfg(unix)'.dev-dependencies]
|
||||||
nix = { version = "0.26.4", default-features = false, features = ["term"] }
|
nix = "0.23.1"
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
anyhow = "1.0.86"
|
clap = { version = "2.34", optional = true }
|
||||||
indexmap = { version = "2.3.0", features = ["serde"] }
|
|
||||||
itertools = "0.13.0"
|
|
||||||
once_cell = "1.18"
|
|
||||||
regex = "1.10.2"
|
|
||||||
serde = "1.0"
|
|
||||||
serde_derive = "1.0"
|
|
||||||
serde_with = { version = "3.8.1", default-features = false, features = ["macros"] }
|
|
||||||
toml = { version = "0.8.9", features = ["preserve_order"] }
|
|
||||||
walkdir = "2.5"
|
|
||||||
|
|
||||||
[build-dependencies.clap]
|
|
||||||
version = "4.4.12"
|
|
||||||
optional = true
|
|
||||||
features = ["wrap_help", "cargo"]
|
|
||||||
|
|
||||||
[profile.release]
|
[profile.release]
|
||||||
lto = true
|
lto = true
|
||||||
strip = true
|
|
||||||
codegen-units = 1
|
codegen-units = 1
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
Copyright (c) 2018-2023 bat-developers (https://github.com/sharkdp/bat).
|
Copyright (c) 2018-2021 bat-developers (https://github.com/sharkdp/bat).
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
140
README.md
140
README.md
@ -32,16 +32,6 @@ A special *thank you* goes to our biggest <a href="doc/sponsors.md">sponsors</a>
|
|||||||
<sup>Add Single Sign-On (and more) in minutes instead of months.</sup>
|
<sup>Add Single Sign-On (and more) in minutes instead of months.</sup>
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
<a href="https://www.warp.dev/?utm_source=github&utm_medium=referral&utm_campaign=bat_20231001">
|
|
||||||
<img src="doc/sponsors/warp-logo.png" width="200" alt="Warp">
|
|
||||||
<br>
|
|
||||||
<strong>Warp is a modern, Rust-based terminal with AI built in<br>so you and your team can build great software, faster.</strong>
|
|
||||||
<br>
|
|
||||||
<sub>Feel more productive on the command line with parameterized commands,</sub>
|
|
||||||
<br>
|
|
||||||
<sup>autosuggestions, and an IDE-like text editor.</sup>
|
|
||||||
</a>
|
|
||||||
|
|
||||||
### Syntax highlighting
|
### Syntax highlighting
|
||||||
|
|
||||||
`bat` supports syntax highlighting for a large number of programming and markup
|
`bat` supports syntax highlighting for a large number of programming and markup
|
||||||
@ -128,7 +118,7 @@ use `bat`s `--color=always` option to force colorized output. You can also use `
|
|||||||
option to restrict the load times for long files:
|
option to restrict the load times for long files:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
fzf --preview "bat --color=always --style=numbers --line-range=:500 {}"
|
fzf --preview 'bat --color=always --style=numbers --line-range=:500 {}'
|
||||||
```
|
```
|
||||||
|
|
||||||
For more information, see [`fzf`'s `README`](https://github.com/junegunn/fzf#preview-window).
|
For more information, see [`fzf`'s `README`](https://github.com/junegunn/fzf#preview-window).
|
||||||
@ -181,7 +171,7 @@ You can combine `bat` with `git diff` to view lines around code changes with pro
|
|||||||
highlighting:
|
highlighting:
|
||||||
```bash
|
```bash
|
||||||
batdiff() {
|
batdiff() {
|
||||||
git diff --name-only --relative --diff-filter=d | xargs bat --diff
|
git diff --name-only --diff-filter=d | xargs bat --diff
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
If you prefer to use this as a separate tool, check out `batdiff` in [`bat-extras`](https://github.com/eth-p/bat-extras).
|
If you prefer to use this as a separate tool, check out `batdiff` in [`bat-extras`](https://github.com/eth-p/bat-extras).
|
||||||
@ -222,39 +212,10 @@ Also, note that this will [not work](https://github.com/sharkdp/bat/issues/1145)
|
|||||||
|
|
||||||
The [`prettybat`](https://github.com/eth-p/bat-extras/blob/master/doc/prettybat.md) script is a wrapper that will format code and print it with `bat`.
|
The [`prettybat`](https://github.com/eth-p/bat-extras/blob/master/doc/prettybat.md) script is a wrapper that will format code and print it with `bat`.
|
||||||
|
|
||||||
#### Highlighting `--help` messages
|
|
||||||
|
|
||||||
You can use `bat` to colorize help text: `$ cp --help | bat -plhelp`
|
|
||||||
|
|
||||||
You can also use a wrapper around this:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# in your .bashrc/.zshrc/*rc
|
|
||||||
alias bathelp='bat --plain --language=help'
|
|
||||||
help() {
|
|
||||||
"$@" --help 2>&1 | bathelp
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Then you can do `$ help cp` or `$ help git commit`.
|
|
||||||
|
|
||||||
When you are using `zsh`, you can also use global aliases to override `-h` and `--help` entirely:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
alias -g -- -h='-h 2>&1 | bat --language=help --style=plain'
|
|
||||||
alias -g -- --help='--help 2>&1 | bat --language=help --style=plain'
|
|
||||||
```
|
|
||||||
|
|
||||||
This way, you can keep on using `cp --help`, but get colorized help pages.
|
|
||||||
|
|
||||||
Be aware that in some cases, `-h` may not be a shorthand of `--help` (for example with `ls`).
|
|
||||||
|
|
||||||
Please report any issues with the help syntax in [this repository](https://github.com/victor-gp/cmd-help-sublime-syntax).
|
|
||||||
|
|
||||||
|
|
||||||
## Installation
|
## Installation
|
||||||
|
|
||||||
[![Packaging status](https://repology.org/badge/vertical-allrepos/bat-cat.svg?columns=3&exclude_unsupported=1)](https://repology.org/project/bat-cat/versions)
|
[![Packaging status](https://repology.org/badge/vertical-allrepos/bat-cat.svg)](https://repology.org/project/bat-cat/versions)
|
||||||
|
|
||||||
### On Ubuntu (using `apt`)
|
### On Ubuntu (using `apt`)
|
||||||
*... and other Debian-based Linux distributions.*
|
*... and other Debian-based Linux distributions.*
|
||||||
@ -296,7 +257,7 @@ apk add bat
|
|||||||
|
|
||||||
### On Arch Linux
|
### On Arch Linux
|
||||||
|
|
||||||
You can install [the `bat` package](https://www.archlinux.org/packages/extra/x86_64/bat/)
|
You can install [the `bat` package](https://www.archlinux.org/packages/community/x86_64/bat/)
|
||||||
from the official sources:
|
from the official sources:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
@ -373,14 +334,6 @@ You can install `bat` using the [nix package manager](https://nixos.org/nix):
|
|||||||
nix-env -i bat
|
nix-env -i bat
|
||||||
```
|
```
|
||||||
|
|
||||||
### Via flox
|
|
||||||
|
|
||||||
You can install `bat` using [Flox](https://flox.dev)
|
|
||||||
|
|
||||||
```bash
|
|
||||||
flox install bat
|
|
||||||
```
|
|
||||||
|
|
||||||
### On openSUSE
|
### On openSUSE
|
||||||
|
|
||||||
You can install `bat` with zypper:
|
You can install `bat` with zypper:
|
||||||
@ -396,7 +349,7 @@ Existing packages may be available, but are not officially supported and may con
|
|||||||
|
|
||||||
### On macOS (or Linux) via Homebrew
|
### On macOS (or Linux) via Homebrew
|
||||||
|
|
||||||
You can install `bat` with [Homebrew](https://formulae.brew.sh/formula/bat):
|
You can install `bat` with [Homebrew on MacOS](https://formulae.brew.sh/formula/bat) or [Homebrew on Linux](https://formulae.brew.sh/formula-linux/bat):
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
brew install bat
|
brew install bat
|
||||||
@ -419,14 +372,6 @@ take a look at the ["Using `bat` on Windows"](#using-bat-on-windows) section.
|
|||||||
|
|
||||||
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://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads) package.
|
||||||
|
|
||||||
#### With WinGet
|
|
||||||
|
|
||||||
You can install `bat` via [WinGet](https://learn.microsoft.com/en-us/windows/package-manager/winget):
|
|
||||||
|
|
||||||
```bash
|
|
||||||
winget install sharkdp.bat
|
|
||||||
```
|
|
||||||
|
|
||||||
#### With Chocolatey
|
#### With Chocolatey
|
||||||
|
|
||||||
You can install `bat` via [Chocolatey](https://chocolatey.org/packages/Bat):
|
You can install `bat` via [Chocolatey](https://chocolatey.org/packages/Bat):
|
||||||
@ -455,7 +400,7 @@ binaries are also available: look for archives with `musl` in the file name.
|
|||||||
|
|
||||||
### From source
|
### From source
|
||||||
|
|
||||||
If you want to build `bat` from source, you need Rust 1.70.0 or
|
If you want to build `bat` from source, you need Rust 1.51 or
|
||||||
higher. You can then use `cargo` to build everything:
|
higher. You can then use `cargo` to build everything:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
@ -515,16 +460,6 @@ and line numbers but no grid and no file header. Set the `BAT_STYLE` environment
|
|||||||
variable to make these changes permanent or use `bat`s
|
variable to make these changes permanent or use `bat`s
|
||||||
[configuration file](https://github.com/sharkdp/bat#configuration-file).
|
[configuration file](https://github.com/sharkdp/bat#configuration-file).
|
||||||
|
|
||||||
>[!tip]
|
|
||||||
> If you specify a default style in `bat`'s config file, you can change which components
|
|
||||||
> are displayed during a single run of `bat` using the `--style` command-line argument.
|
|
||||||
> By prefixing a component with `+` or `-`, it can be added or removed from the current style.
|
|
||||||
>
|
|
||||||
> For example, if your config contains `--style=full,-snip`, you can run bat with
|
|
||||||
> `--style=-grid,+snip` to remove the grid and add back the `snip` component.
|
|
||||||
> Or, if you want to override the styles completely, you use `--style=numbers` to
|
|
||||||
> only show the line numbers.
|
|
||||||
|
|
||||||
### Adding new syntaxes / language definitions
|
### Adding new syntaxes / language definitions
|
||||||
|
|
||||||
Should you find that a particular syntax is not available within `bat`, you can follow these
|
Should you find that a particular syntax is not available within `bat`, you can follow these
|
||||||
@ -620,8 +555,7 @@ set, `less` is used by default. If you want to use a different pager, you can ei
|
|||||||
`PAGER` variable or set the `BAT_PAGER` environment variable to override what is specified in
|
`PAGER` variable or set the `BAT_PAGER` environment variable to override what is specified in
|
||||||
`PAGER`.
|
`PAGER`.
|
||||||
|
|
||||||
>[!NOTE]
|
**Note**: If `PAGER` is `more` or `most`, `bat` will silently use `less` instead to ensure support for colors.
|
||||||
> If `PAGER` is `more` or `most`, `bat` will silently use `less` instead to ensure support for colors.
|
|
||||||
|
|
||||||
If you want to pass command-line arguments to the pager, you can also set them via the
|
If you want to pass command-line arguments to the pager, you can also set them via the
|
||||||
`PAGER`/`BAT_PAGER` variables:
|
`PAGER`/`BAT_PAGER` variables:
|
||||||
@ -632,37 +566,20 @@ export BAT_PAGER="less -RF"
|
|||||||
|
|
||||||
Instead of using environment variables, you can also use `bat`s [configuration file](https://github.com/sharkdp/bat#configuration-file) to configure the pager (`--pager` option).
|
Instead of using environment variables, you can also use `bat`s [configuration file](https://github.com/sharkdp/bat#configuration-file) to configure the pager (`--pager` option).
|
||||||
|
|
||||||
|
**Note**: By default, if the pager is set to `less` (and no command-line options are specified),
|
||||||
|
`bat` will pass the following command line options to the pager: `-R`/`--RAW-CONTROL-CHARS`,
|
||||||
|
`-F`/`--quit-if-one-screen` and `-X`/`--no-init`. The last option (`-X`) is only used for `less`
|
||||||
|
versions older than 530.
|
||||||
|
|
||||||
### Using `less` as a pager
|
The `-R` option is needed to interpret ANSI colors correctly. The second option (`-F`) instructs
|
||||||
|
less to exit immediately if the output size is smaller than the vertical size of the terminal.
|
||||||
|
This is convenient for small files because you do not have to press `q` to quit the pager. The
|
||||||
|
third option (`-X`) is needed to fix a bug with the `--quit-if-one-screen` feature in old versions
|
||||||
|
of `less`. Unfortunately, it also breaks mouse-wheel support in `less`.
|
||||||
|
|
||||||
When using `less` as a pager, `bat` will automatically pass extra options along to `less`
|
If you want to enable mouse-wheel scrolling on older versions of `less`, you can pass just `-R` (as
|
||||||
to improve the experience. Specifically, `-R`/`--RAW-CONTROL-CHARS`, `-F`/`--quit-if-one-screen`,
|
in the example above, this will disable the quit-if-one-screen feature). For less 530 or newer,
|
||||||
and under certain conditions, `-X`/`--no-init` and/or `-S`/`--chop-long-lines`.
|
it should work out of the box.
|
||||||
|
|
||||||
>[!IMPORTANT]
|
|
||||||
> These options will not be added if:
|
|
||||||
> - The pager is not named `less`.
|
|
||||||
> - The `--pager` argument contains any command-line arguments (e.g. `--pager="less -R"`).
|
|
||||||
> - The `BAT_PAGER` environment variable contains any command-line arguments (e.g. `export BAT_PAGER="less -R"`)
|
|
||||||
>
|
|
||||||
> The `--quit-if-one-screen` option will not be added when:
|
|
||||||
> - The `--paging=always` argument is used.
|
|
||||||
> - The `BAT_PAGING` environment is set to `always`.
|
|
||||||
|
|
||||||
The `-R` option is needed to interpret ANSI colors correctly.
|
|
||||||
|
|
||||||
The `-F` option instructs `less` to exit immediately if the output size is smaller than
|
|
||||||
the vertical size of the terminal. This is convenient for small files because you do not
|
|
||||||
have to press `q` to quit the pager.
|
|
||||||
|
|
||||||
The `-X` option is needed to fix a bug with the `--quit-if-one-screen` feature in versions
|
|
||||||
of `less` older than version 530. Unfortunately, it also breaks mouse-wheel support in `less`.
|
|
||||||
If you want to enable mouse-wheel scrolling on older versions of `less` and do not mind losing
|
|
||||||
the quit-if-one-screen feature, you can set the pager (via `--pager` or `BAT_PAGER`) to `less -R`.
|
|
||||||
For `less` 530 or newer, it should work out of the box.
|
|
||||||
|
|
||||||
The `-S` option is added when `bat`'s `-S`/`--chop-long-lines` option is used. This tells `less`
|
|
||||||
to truncate any lines larger than the terminal width.
|
|
||||||
|
|
||||||
### Indentation
|
### Indentation
|
||||||
|
|
||||||
@ -704,10 +621,6 @@ A default configuration file can be created with the `--generate-config-file` op
|
|||||||
bat --generate-config-file
|
bat --generate-config-file
|
||||||
```
|
```
|
||||||
|
|
||||||
There is also now a systemwide configuration file, which is located under `/etc/bat/config` on
|
|
||||||
Linux and Mac OS and `C:\ProgramData\bat\config` on windows. If the system wide configuration
|
|
||||||
file is present, the content of the user configuration will simply be appended to it.
|
|
||||||
|
|
||||||
### Format
|
### Format
|
||||||
|
|
||||||
The configuration file is a simple list of command line arguments. Use `bat --help` to see a full list of possible options and values. In addition, you can add comments by prepending a line with the `#` character.
|
The configuration file is a simple list of command line arguments. Use `bat --help` to see a full list of possible options and values. In addition, you can add comments by prepending a line with the `#` character.
|
||||||
@ -747,9 +660,11 @@ your `PATH` or [define an environment variable](#using-a-different-pager). The [
|
|||||||
Windows 10 natively supports colors in both `conhost.exe` (Command Prompt) and PowerShell since
|
Windows 10 natively supports colors in both `conhost.exe` (Command Prompt) and PowerShell since
|
||||||
[v1511](https://en.wikipedia.org/wiki/Windows_10_version_history#Version_1511_(November_Update)), as
|
[v1511](https://en.wikipedia.org/wiki/Windows_10_version_history#Version_1511_(November_Update)), as
|
||||||
well as in newer versions of bash. On earlier versions of Windows, you can use
|
well as in newer versions of bash. On earlier versions of Windows, you can use
|
||||||
[Cmder](http://cmder.app/), which includes [ConEmu](https://conemu.github.io/).
|
[Cmder](http://cmder.net/), which includes [ConEmu](https://conemu.github.io/).
|
||||||
|
|
||||||
**Note:** Old versions of `less` do not correctly interpret colors on Windows. To fix this, you can add the optional Unix tools to your PATH when installing Git. If you don’t have any other pagers installed, you can disable paging entirely by passing `--paging=never` or by setting `BAT_PAGER` to an empty string.
|
**Note:** The Git and MSYS versions of `less` do not correctly interpret colors on Windows. If you
|
||||||
|
don’t have any other pagers installed, you can disable paging entirely by passing `--paging=never`
|
||||||
|
or by setting `BAT_PAGER` to an empty string.
|
||||||
|
|
||||||
### Cygwin
|
### Cygwin
|
||||||
|
|
||||||
@ -777,14 +692,9 @@ bat() {
|
|||||||
|
|
||||||
If an input file contains color codes or other ANSI escape sequences or control characters, `bat` will have problems
|
If an input file contains color codes or other ANSI escape sequences or control characters, `bat` will have problems
|
||||||
performing syntax highlighting and text wrapping, and thus the output can become garbled.
|
performing syntax highlighting and text wrapping, and thus the output can become garbled.
|
||||||
|
When displaying such files it is recommended to disable both syntax highlighting and wrapping by
|
||||||
If your version of `bat` supports the `--strip-ansi=auto` option, it can be used to remove such sequences
|
|
||||||
before syntax highlighting. Alternatively, you may disable both syntax highlighting and wrapping by
|
|
||||||
passing the `--color=never --wrap=never` options to `bat`.
|
passing the `--color=never --wrap=never` options to `bat`.
|
||||||
|
|
||||||
> [!NOTE]
|
|
||||||
> The `auto` option of `--strip-ansi` avoids removing escape sequences when the syntax is plain text.
|
|
||||||
|
|
||||||
### Terminals & colors
|
### Terminals & colors
|
||||||
|
|
||||||
`bat` handles terminals *with* and *without* truecolor support. However, the colors in most syntax
|
`bat` handles terminals *with* and *without* truecolor support. However, the colors in most syntax
|
||||||
@ -869,7 +779,7 @@ There are a lot of alternatives, if you are looking for similar programs. See
|
|||||||
[this document](doc/alternatives.md) for a comparison.
|
[this document](doc/alternatives.md) for a comparison.
|
||||||
|
|
||||||
## License
|
## License
|
||||||
Copyright (c) 2018-2023 [bat-developers](https://github.com/sharkdp/bat).
|
Copyright (c) 2018-2021 [bat-developers](https://github.com/sharkdp/bat).
|
||||||
|
|
||||||
`bat` is made available under the terms of either the MIT License or the Apache License 2.0, at your option.
|
`bat` is made available under the terms of either the MIT License or the Apache License 2.0, at your option.
|
||||||
|
|
||||||
|
BIN
assets/acknowledgements.bin
vendored
BIN
assets/acknowledgements.bin
vendored
Binary file not shown.
7
assets/completions/_bat.ps1.in
vendored
7
assets/completions/_bat.ps1.in
vendored
@ -37,7 +37,7 @@ Register-ArgumentCompleter -Native -CommandName '{{PROJECT_EXECUTABLE}}' -Script
|
|||||||
[CompletionResult]::new('-m', 'm', [CompletionResultType]::ParameterName, 'Use the specified syntax for files matching the glob pattern (''*.cpp:C++'').')
|
[CompletionResult]::new('-m', 'm', [CompletionResultType]::ParameterName, 'Use the specified syntax for files matching the glob pattern (''*.cpp:C++'').')
|
||||||
[CompletionResult]::new('--map-syntax', 'map-syntax', [CompletionResultType]::ParameterName, 'Use the specified syntax for files matching the glob pattern (''*.cpp:C++'').')
|
[CompletionResult]::new('--map-syntax', 'map-syntax', [CompletionResultType]::ParameterName, 'Use the specified syntax for files matching the glob pattern (''*.cpp:C++'').')
|
||||||
[CompletionResult]::new('--theme', 'theme', [CompletionResultType]::ParameterName, 'Set the color theme for syntax highlighting.')
|
[CompletionResult]::new('--theme', 'theme', [CompletionResultType]::ParameterName, 'Set the color theme for syntax highlighting.')
|
||||||
[CompletionResult]::new('--style', 'style', [CompletionResultType]::ParameterName, 'Comma-separated list of style elements to display (*default*, auto, full, plain, changes, header, header-filename, header-filesize, grid, rule, numbers, snip).')
|
[CompletionResult]::new('--style', 'style', [CompletionResultType]::ParameterName, 'Comma-separated list of style elements to display (*auto*, full, plain, changes, header, header-filename, header-filesize, grid, rule, numbers, snip).')
|
||||||
[CompletionResult]::new('-r', 'r', [CompletionResultType]::ParameterName, 'Only print the lines from N to M.')
|
[CompletionResult]::new('-r', 'r', [CompletionResultType]::ParameterName, 'Only print the lines from N to M.')
|
||||||
[CompletionResult]::new('--line-range', 'line-range', [CompletionResultType]::ParameterName, 'Only print the lines from N to M.')
|
[CompletionResult]::new('--line-range', 'line-range', [CompletionResultType]::ParameterName, 'Only print the lines from N to M.')
|
||||||
[CompletionResult]::new('-A', 'A', [CompletionResultType]::ParameterName, 'Show non-printable characters (space, tab, newline, ..).')
|
[CompletionResult]::new('-A', 'A', [CompletionResultType]::ParameterName, 'Show non-printable characters (space, tab, newline, ..).')
|
||||||
@ -59,8 +59,6 @@ Register-ArgumentCompleter -Native -CommandName '{{PROJECT_EXECUTABLE}}' -Script
|
|||||||
[CompletionResult]::new('--unbuffered', 'unbuffered', [CompletionResultType]::ParameterName, 'unbuffered')
|
[CompletionResult]::new('--unbuffered', 'unbuffered', [CompletionResultType]::ParameterName, 'unbuffered')
|
||||||
[CompletionResult]::new('--no-config', 'no-config', [CompletionResultType]::ParameterName, 'Do not use the configuration file')
|
[CompletionResult]::new('--no-config', 'no-config', [CompletionResultType]::ParameterName, 'Do not use the configuration file')
|
||||||
[CompletionResult]::new('--no-custom-assets', 'no-custom-assets', [CompletionResultType]::ParameterName, 'Do not load custom assets')
|
[CompletionResult]::new('--no-custom-assets', 'no-custom-assets', [CompletionResultType]::ParameterName, 'Do not load custom assets')
|
||||||
[CompletionResult]::new('--lessopen', 'lessopen', [CompletionResultType]::ParameterName, 'Enable the $LESSOPEN preprocessor')
|
|
||||||
[CompletionResult]::new('--no-lessopen', 'no-lessopen', [CompletionResultType]::ParameterName, 'Disable the $LESSOPEN preprocessor if enabled (overrides --lessopen)')
|
|
||||||
[CompletionResult]::new('--config-file', 'config-file', [CompletionResultType]::ParameterName, 'Show path to the configuration file.')
|
[CompletionResult]::new('--config-file', 'config-file', [CompletionResultType]::ParameterName, 'Show path to the configuration file.')
|
||||||
[CompletionResult]::new('--generate-config-file', 'generate-config-file', [CompletionResultType]::ParameterName, 'Generates a default configuration file.')
|
[CompletionResult]::new('--generate-config-file', 'generate-config-file', [CompletionResultType]::ParameterName, 'Generates a default configuration file.')
|
||||||
[CompletionResult]::new('--config-dir', 'config-dir', [CompletionResultType]::ParameterName, 'Show bat''s configuration directory.')
|
[CompletionResult]::new('--config-dir', 'config-dir', [CompletionResultType]::ParameterName, 'Show bat''s configuration directory.')
|
||||||
@ -70,8 +68,7 @@ Register-ArgumentCompleter -Native -CommandName '{{PROJECT_EXECUTABLE}}' -Script
|
|||||||
[CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Print this help message.')
|
[CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Print this help message.')
|
||||||
[CompletionResult]::new('-V', 'V', [CompletionResultType]::ParameterName, 'Show version information.')
|
[CompletionResult]::new('-V', 'V', [CompletionResultType]::ParameterName, 'Show version information.')
|
||||||
[CompletionResult]::new('--version', 'version', [CompletionResultType]::ParameterName, 'Show version information.')
|
[CompletionResult]::new('--version', 'version', [CompletionResultType]::ParameterName, 'Show version information.')
|
||||||
## Completion of the 'cache' command itself is removed for better UX
|
[CompletionResult]::new('cache', 'cache', [CompletionResultType]::ParameterValue, 'Modify the syntax-definition and theme cache')
|
||||||
## See https://github.com/sharkdp/bat/issues/2085#issuecomment-1271646802
|
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
'{{PROJECT_EXECUTABLE}};cache' {
|
'{{PROJECT_EXECUTABLE}};cache' {
|
||||||
|
131
assets/completions/bat.bash.in
vendored
131
assets/completions/bat.bash.in
vendored
@ -10,29 +10,8 @@ __bat_init_completion()
|
|||||||
_get_comp_words_by_ref "$@" cur prev words cword
|
_get_comp_words_by_ref "$@" cur prev words cword
|
||||||
}
|
}
|
||||||
|
|
||||||
__bat_escape_completions()
|
|
||||||
{
|
|
||||||
# Do not escape if completing a quoted value.
|
|
||||||
[[ $cur == [\"\']* ]] && return 0
|
|
||||||
# printf -v to an array index is available in bash >= 4.1.
|
|
||||||
# Use it if available, as -o filenames is semantically incorrect if
|
|
||||||
# we are not actually completing filenames, and it has side effects
|
|
||||||
# (e.g. adds trailing slash to candidates matching present dirs).
|
|
||||||
if ((
|
|
||||||
BASH_VERSINFO[0] > 4 || \
|
|
||||||
BASH_VERSINFO[0] == 4 && BASH_VERSINFO[1] > 0
|
|
||||||
)); then
|
|
||||||
local i
|
|
||||||
for i in ${!COMPREPLY[*]}; do
|
|
||||||
printf -v "COMPREPLY[i]" %q "${COMPREPLY[i]}"
|
|
||||||
done
|
|
||||||
else
|
|
||||||
compopt -o filenames
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
_bat() {
|
_bat() {
|
||||||
local cur prev words split=false
|
local cur prev words cword split=false
|
||||||
if declare -F _init_completion >/dev/null 2>&1; then
|
if declare -F _init_completion >/dev/null 2>&1; then
|
||||||
_init_completion -s || return 0
|
_init_completion -s || return 0
|
||||||
else
|
else
|
||||||
@ -48,12 +27,7 @@ _bat() {
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
COMPREPLY=($(compgen -W "
|
COMPREPLY=($(compgen -W "
|
||||||
--build
|
--build --clear --source --target --blank --help
|
||||||
--clear
|
|
||||||
--source
|
|
||||||
--target
|
|
||||||
--blank
|
|
||||||
--help
|
|
||||||
" -- "$cur"))
|
" -- "$cur"))
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
@ -66,28 +40,13 @@ _bat() {
|
|||||||
printf "%s\n" "$lang"
|
printf "%s\n" "$lang"
|
||||||
done
|
done
|
||||||
)" -- "$cur"))
|
)" -- "$cur"))
|
||||||
__bat_escape_completions
|
compopt -o filenames # for escaping
|
||||||
return 0
|
return 0
|
||||||
;;
|
;;
|
||||||
-H | --highlight-line | \
|
-H | --highlight-line | --diff-context | --tabs | --terminal-width | \
|
||||||
--diff-context | \
|
-m | --map-syntax | --style | --line-range | -h | --help | -V | \
|
||||||
--tabs | \
|
--version | --diagnostic | --config-file | --config-dir | \
|
||||||
--terminal-width | \
|
--cache-dir | --generate-config-file)
|
||||||
-m | --map-syntax | \
|
|
||||||
--ignored-suffix | \
|
|
||||||
--list-themes | \
|
|
||||||
--squeeze-limit | \
|
|
||||||
--line-range | \
|
|
||||||
-L | --list-languages | \
|
|
||||||
--lessopen | \
|
|
||||||
--diagnostic | \
|
|
||||||
--acknowledgements | \
|
|
||||||
-h | --help | \
|
|
||||||
-V | --version | \
|
|
||||||
--cache-dir | \
|
|
||||||
--config-dir | \
|
|
||||||
--config-file | \
|
|
||||||
--generate-config-file)
|
|
||||||
# argument required but no completion available, or option
|
# argument required but no completion available, or option
|
||||||
# causes an exit
|
# causes an exit
|
||||||
return 0
|
return 0
|
||||||
@ -115,86 +74,28 @@ _bat() {
|
|||||||
--theme)
|
--theme)
|
||||||
local IFS=$'\n'
|
local IFS=$'\n'
|
||||||
COMPREPLY=($(compgen -W "$("$1" --list-themes)" -- "$cur"))
|
COMPREPLY=($(compgen -W "$("$1" --list-themes)" -- "$cur"))
|
||||||
__bat_escape_completions
|
compopt -o filenames # for escaping
|
||||||
return 0
|
return 0
|
||||||
;;
|
;;
|
||||||
--style)
|
|
||||||
# shellcheck disable=SC2034
|
|
||||||
local -a styles=(
|
|
||||||
default
|
|
||||||
full
|
|
||||||
auto
|
|
||||||
plain
|
|
||||||
changes
|
|
||||||
header
|
|
||||||
header-filename
|
|
||||||
header-filesize
|
|
||||||
grid
|
|
||||||
rule
|
|
||||||
numbers
|
|
||||||
snip
|
|
||||||
)
|
|
||||||
# shellcheck disable=SC2016
|
|
||||||
if declare -F _comp_delimited >/dev/null 2>&1; then
|
|
||||||
# bash-completion > 2.11
|
|
||||||
_comp_delimited , -W '"${styles[@]}"'
|
|
||||||
else
|
|
||||||
COMPREPLY=($(compgen -W '${styles[@]}' -- "$cur"))
|
|
||||||
fi
|
|
||||||
return 0
|
|
||||||
esac
|
esac
|
||||||
|
|
||||||
$split && return 0
|
$split && return 0
|
||||||
|
|
||||||
if [[ $cur == -* ]]; then
|
if [[ $cur == -* ]]; then
|
||||||
# --unbuffered excluded intentionally (no-op)
|
|
||||||
COMPREPLY=($(compgen -W "
|
COMPREPLY=($(compgen -W "
|
||||||
--show-all
|
--show-all --plain --language --highlight-line
|
||||||
--plain
|
--file-name --diff --diff-context --tabs --wrap
|
||||||
--language
|
--terminal-width --number --color --italic-text
|
||||||
--highlight-line
|
--decorations --paging --pager --map-syntax --theme
|
||||||
--file-name
|
--list-themes --style --line-range --list-languages
|
||||||
--diff
|
--help --version --force-colorization --unbuffered
|
||||||
--diff-context
|
--diagnostic --config-file --config-dir --cache-dir
|
||||||
--tabs
|
|
||||||
--wrap
|
|
||||||
--chop-long-lines
|
|
||||||
--terminal-width
|
|
||||||
--number
|
|
||||||
--color
|
|
||||||
--italic-text
|
|
||||||
--decorations
|
|
||||||
--force-colorization
|
|
||||||
--paging
|
|
||||||
--pager
|
|
||||||
--map-syntax
|
|
||||||
--ignored-suffix
|
|
||||||
--theme
|
|
||||||
--list-themes
|
|
||||||
--squeeze-blank
|
|
||||||
--squeeze-limit
|
|
||||||
--style
|
|
||||||
--line-range
|
|
||||||
--list-languages
|
|
||||||
--lessopen
|
|
||||||
--diagnostic
|
|
||||||
--acknowledgements
|
|
||||||
--set-terminal-title
|
|
||||||
--help
|
|
||||||
--version
|
|
||||||
--cache-dir
|
|
||||||
--config-dir
|
|
||||||
--config-file
|
|
||||||
--generate-config-file
|
--generate-config-file
|
||||||
--no-config
|
|
||||||
--no-custom-assets
|
|
||||||
--no-lessopen
|
|
||||||
" -- "$cur"))
|
" -- "$cur"))
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
_filedir
|
_filedir
|
||||||
|
((cword == 1)) && COMPREPLY+=($(compgen -W cache -- "$cur"))
|
||||||
|
|
||||||
## Completion of the 'cache' command itself is removed for better UX
|
|
||||||
## See https://github.com/sharkdp/bat/issues/2085#issuecomment-1271646802
|
|
||||||
} && complete -F _bat {{PROJECT_EXECUTABLE}}
|
} && complete -F _bat {{PROJECT_EXECUTABLE}}
|
||||||
|
240
assets/completions/bat.fish.in
vendored
240
assets/completions/bat.fish.in
vendored
@ -1,232 +1,78 @@
|
|||||||
# Fish Shell Completions
|
# Fish Shell Completions
|
||||||
# Copy or symlink to $XDG_CONFIG_HOME/fish/completions/{{PROJECT_EXECUTABLE}}.fish
|
# Place or symlink to $XDG_CONFIG_HOME/fish/completions/{{PROJECT_EXECUTABLE}}.fish ($XDG_CONFIG_HOME is usually set to ~/.config)
|
||||||
# ($XDG_CONFIG_HOME is usually set to ~/.config)
|
|
||||||
|
|
||||||
# `bat` is `batcat` on Debian and Ubuntu
|
# Helper function:
|
||||||
set bat {{PROJECT_EXECUTABLE}}
|
function __{{PROJECT_EXECUTABLE}}_autocomplete_languages --description "A helper function used by "(status filename)
|
||||||
|
{{PROJECT_EXECUTABLE}} --list-languages | awk -F':' '
|
||||||
|
{
|
||||||
|
lang=$1
|
||||||
|
split($2, exts, ",")
|
||||||
|
|
||||||
# Helper functions:
|
for (i in exts) {
|
||||||
|
ext=exts[i]
|
||||||
function __bat_complete_files -a token
|
if (ext !~ /[A-Z].*/ && ext !~ /^\..*rc$/) {
|
||||||
# Cheat to complete files by calling `complete -C` on a fake command name,
|
print ext"\t"lang
|
||||||
# like `__fish_complete_directories` does.
|
}
|
||||||
set -l fake_command aaabccccdeeeeefffffffffgghhhhhhiiiii
|
}
|
||||||
complete -C"$fake_command $token"
|
}
|
||||||
|
' | sort
|
||||||
end
|
end
|
||||||
|
|
||||||
function __bat_complete_one_language -a comp
|
|
||||||
command $bat --list-languages | string split -f1 : | string match -e "$comp"
|
|
||||||
end
|
|
||||||
|
|
||||||
function __bat_complete_list_languages
|
|
||||||
for spec in (command $bat --list-languages)
|
|
||||||
set -l name (string split -f1 : $spec)
|
|
||||||
for ext in (string split -f2 : $spec | string split ,)
|
|
||||||
test -n "$ext"; or continue
|
|
||||||
string match -rq '[/*]' $ext; and continue
|
|
||||||
printf "%s\t%s\n" $ext $name
|
|
||||||
end
|
|
||||||
printf "%s\t\n" $name
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
function __bat_complete_map_syntax
|
|
||||||
set -l token (commandline -ct)
|
|
||||||
|
|
||||||
if string match -qr '(?<glob>.+):(?<syntax>.*)' -- $token
|
|
||||||
# If token ends with a colon, complete with the list of language names.
|
|
||||||
set -f comps $glob:(__bat_complete_one_language $syntax)
|
|
||||||
else if string match -qr '\*' -- $token
|
|
||||||
# If token contains a globbing character (`*`), complete only possible
|
|
||||||
# globs in the current directory
|
|
||||||
set -f comps (__bat_complete_files $token | string match -er '[*]'):
|
|
||||||
else
|
|
||||||
# Complete files (and globs).
|
|
||||||
set -f comps (__bat_complete_files $token | string match -erv '/$'):
|
|
||||||
end
|
|
||||||
|
|
||||||
if set -q comps[1]
|
|
||||||
printf "%s\t\n" $comps
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
function __bat_cache_subcommand
|
|
||||||
__fish_seen_subcommand_from cache
|
|
||||||
end
|
|
||||||
|
|
||||||
# Returns true if no exclusive arguments seen.
|
|
||||||
function __bat_no_excl_args
|
|
||||||
not __bat_cache_subcommand; and not __fish_seen_argument \
|
|
||||||
-s h -l help \
|
|
||||||
-s V -l version \
|
|
||||||
-l acknowledgements \
|
|
||||||
-l config-dir -l config-file \
|
|
||||||
-l diagnostic \
|
|
||||||
-l list-languages -l list-themes
|
|
||||||
end
|
|
||||||
|
|
||||||
# Returns true if the 'cache' subcommand is seen without any exclusive arguments.
|
|
||||||
function __bat_cache_no_excl
|
|
||||||
__bat_cache_subcommand; and not __fish_seen_argument \
|
|
||||||
-s h -l help \
|
|
||||||
-l acknowledgements -l build -l clear
|
|
||||||
end
|
|
||||||
|
|
||||||
function __bat_style_opts
|
|
||||||
set -l style_opts \
|
|
||||||
"default,recommended components" \
|
|
||||||
"auto,same as 'default' unless piped" \
|
|
||||||
"full,all components" \
|
|
||||||
"plain,no components" \
|
|
||||||
"changes,Git change markers" \
|
|
||||||
"header,alias for header-filename" \
|
|
||||||
"header-filename,filename above content" \
|
|
||||||
"header-filesize,filesize above content" \
|
|
||||||
"grid,lines b/w sidebar/header/content" \
|
|
||||||
"numbers,line numbers in sidebar" \
|
|
||||||
"rule,separate files" \
|
|
||||||
"snip,separate ranges"
|
|
||||||
|
|
||||||
string replace , \t $style_opts
|
|
||||||
end
|
|
||||||
|
|
||||||
# Use option argument descriptions to indicate which is the default, saving
|
|
||||||
# horizontal space and making sure the option description isn't truncated.
|
|
||||||
set -l color_opts '
|
|
||||||
auto\tdefault
|
|
||||||
never\t
|
|
||||||
always\t
|
|
||||||
'
|
|
||||||
set -l decorations_opts $color_opts
|
|
||||||
set -l paging_opts $color_opts
|
|
||||||
|
|
||||||
# Include some examples so we can indicate the default.
|
|
||||||
set -l pager_opts '
|
|
||||||
less\tdefault
|
|
||||||
less\ -FR\t
|
|
||||||
more\t
|
|
||||||
vimpager\t
|
|
||||||
'
|
|
||||||
|
|
||||||
set -l italic_text_opts '
|
|
||||||
always\t
|
|
||||||
never\tdefault
|
|
||||||
'
|
|
||||||
|
|
||||||
set -l wrap_opts '
|
|
||||||
auto\tdefault
|
|
||||||
never\t
|
|
||||||
character\t
|
|
||||||
'
|
|
||||||
|
|
||||||
# While --tabs theoretically takes any number, most people should be OK with these.
|
|
||||||
# Specifying a list lets us explain what 0 does.
|
|
||||||
set -l tabs_opts '
|
|
||||||
0\tpass\ tabs\ through\ directly
|
|
||||||
1\t
|
|
||||||
2\t
|
|
||||||
4\t
|
|
||||||
8\t
|
|
||||||
'
|
|
||||||
|
|
||||||
# Completions:
|
# Completions:
|
||||||
|
|
||||||
complete -c $bat -l acknowledgements -d "Print acknowledgements" -n __fish_is_first_arg
|
complete -c {{PROJECT_EXECUTABLE}} -l color -xka "auto never always" -d "Specify when to use colored output (default: auto)" -n "not __fish_seen_subcommand_from cache"
|
||||||
|
|
||||||
complete -c $bat -l cache-dir -f -d "Show bat's cache directory" -n __fish_is_first_arg
|
complete -c {{PROJECT_EXECUTABLE}} -l config-dir -d "Display location of '{{PROJECT_EXECUTABLE}}' configuration directory" -n "not __fish_seen_subcommand_from cache"
|
||||||
|
|
||||||
complete -c $bat -l color -x -a "$color_opts" -d "When to use colored output" -n __bat_no_excl_args
|
complete -c {{PROJECT_EXECUTABLE}} -l config-file -d "Display location of '{{PROJECT_EXECUTABLE}}' configuration file" -n "not __fish_seen_subcommand_from cache"
|
||||||
|
|
||||||
complete -c $bat -l config-dir -f -d "Display location of configuration directory" -n __fish_is_first_arg
|
complete -c {{PROJECT_EXECUTABLE}} -l decorations -xka "auto never always" -d "Specify when to use the decorations specified with '--style' (default: auto)" -n "not __fish_seen_subcommand_from cache"
|
||||||
|
|
||||||
complete -c $bat -l config-file -f -d "Display location of configuration file" -n __fish_is_first_arg
|
complete -c {{PROJECT_EXECUTABLE}} -s h -l help -d "Print help message" -n "not __fish_seen_subcommand_from cache"
|
||||||
|
|
||||||
complete -c $bat -l decorations -x -a "$decorations_opts" -d "When to use --style decorations" -n __bat_no_excl_args
|
complete -c {{PROJECT_EXECUTABLE}} -s H -l highlight-line -x -d "<N> Highlight the N-th line with a different background color" -n "not __fish_seen_subcommand_from cache"
|
||||||
|
|
||||||
complete -c $bat -l diagnostic -d "Print diagnostic info for bug reports" -n __fish_is_first_arg
|
complete -c {{PROJECT_EXECUTABLE}} -l italic-text -xka "always never" -d "Specify when to use ANSI sequences for italic text (default: never)" -n "not __fish_seen_subcommand_from cache"
|
||||||
|
|
||||||
complete -c $bat -s d -l diff -d "Only show lines with Git changes" -n __bat_no_excl_args
|
complete -c {{PROJECT_EXECUTABLE}} -s l -l language -d "Set the language for syntax highlighting" -n "not __fish_seen_subcommand_from cache" -xa "(__{{PROJECT_EXECUTABLE}}_autocomplete_languages)"
|
||||||
|
|
||||||
complete -c $bat -l diff-context -x -d "Show N context lines around Git changes" -n "__fish_seen_argument -s d -l diff"
|
complete -c {{PROJECT_EXECUTABLE}} -s r -l line-range -x -d "<N:M> Only print the specified range of lines for each file" -n "not __fish_seen_subcommand_from cache"
|
||||||
|
|
||||||
complete -c $bat -l generate-config-file -f -d "Generates a default configuration file" -n __fish_is_first_arg
|
complete -c {{PROJECT_EXECUTABLE}} -l list-languages -d "Display list of supported languages for syntax highlighting" -n "not __fish_seen_subcommand_from cache"
|
||||||
|
|
||||||
complete -c $bat -l file-name -x -d "Specify the display name" -n __bat_no_excl_args
|
complete -c {{PROJECT_EXECUTABLE}} -l list-themes -d "Display a list of supported themes for syntax highlighting" -n "not __fish_seen_subcommand_from cache"
|
||||||
|
|
||||||
complete -c $bat -s f -l force-colorization -d "Force color and decorations" -n __bat_no_excl_args
|
complete -c {{PROJECT_EXECUTABLE}} -s m -l map-syntax -x -d "<from:to> Map a file extension or file name to an existing syntax" -n "not __fish_seen_subcommand_from cache"
|
||||||
|
|
||||||
complete -c $bat -s h -d "Print a concise overview" -n __fish_is_first_arg
|
complete -c {{PROJECT_EXECUTABLE}} -s n -l number -d "Only show line numbers, no other decorations. Alias for '--style=numbers'" -n "not __fish_seen_subcommand_from cache"
|
||||||
|
|
||||||
complete -c $bat -l help -f -d "Print all help information" -n __fish_is_first_arg
|
complete -c {{PROJECT_EXECUTABLE}} -l pager -x -d "<command> Specify which pager program to use (default: less)" -n "not __fish_seen_subcommand_from cache"
|
||||||
|
|
||||||
complete -c $bat -s H -l highlight-line -x -d "Highlight line(s) N[:M]" -n __bat_no_excl_args
|
complete -c {{PROJECT_EXECUTABLE}} -l paging -xka "auto never always" -d "Specify when to use the pager (default: auto)" -n "not __fish_seen_subcommand_from cache"
|
||||||
|
|
||||||
complete -c $bat -l ignored-suffix -x -d "Ignore extension" -n __bat_no_excl_args
|
complete -c {{PROJECT_EXECUTABLE}} -s p -l plain -d "Only show plain style, no decorations. Alias for '--style=plain'" -n "not __fish_seen_subcommand_from cache"
|
||||||
|
|
||||||
complete -c $bat -l italic-text -x -a "$italic_text_opts" -d "When to use italic text in the output" -n __bat_no_excl_args
|
complete -c {{PROJECT_EXECUTABLE}} -s P -d "Disable paging. Alias for '--paging=never'" -n "not __fish_seen_subcommand_from cache"
|
||||||
|
|
||||||
complete -c $bat -s l -l language -x -k -a "(__bat_complete_list_languages)" -d "Set the syntax highlighting language" -n __bat_no_excl_args
|
complete -c {{PROJECT_EXECUTABLE}} -s A -l show-all -d "Show non-printable characters like space/tab/newline" -n "not __fish_seen_subcommand_from cache"
|
||||||
|
|
||||||
complete -c $bat -l lessopen -d "Enable the $LESSOPEN preprocessor" -n __fish_is_first_arg
|
complete -c {{PROJECT_EXECUTABLE}} -l style -xka "auto full plain changes header header-filename header-filesize grid rule numbers snip" -d "Comma-separated list of style elements or presets to display with file contents" -n "not __fish_seen_subcommand_from cache"
|
||||||
|
|
||||||
complete -c $bat -s r -l line-range -x -d "Only print lines [M]:[N] (either optional)" -n __bat_no_excl_args
|
complete -c {{PROJECT_EXECUTABLE}} -l tabs -x -d "<T> Set the tab width to T spaces (width of 0 passes tabs through directly)" -n "not __fish_seen_subcommand_from cache"
|
||||||
|
|
||||||
complete -c $bat -l list-languages -f -d "List syntax highlighting languages" -n __fish_is_first_arg
|
complete -c {{PROJECT_EXECUTABLE}} -l terminal-width -x -d "<width> Explicitly set terminal width; Prefix with '+' or '-' to offset (default width is auto determined)" -n "not __fish_seen_subcommand_from cache"
|
||||||
|
|
||||||
complete -c $bat -l list-themes -f -d "List syntax highlighting themes" -n __fish_is_first_arg
|
complete -c {{PROJECT_EXECUTABLE}} -l theme -xka "({{PROJECT_EXECUTABLE}} --list-themes | cat)" -d "Set the theme for syntax highlighting" -n "not __fish_seen_subcommand_from cache"
|
||||||
|
|
||||||
complete -c $bat -s m -l map-syntax -x -a "(__bat_complete_map_syntax)" -d "Map <glob pattern>:<language syntax>" -n __bat_no_excl_args
|
complete -c {{PROJECT_EXECUTABLE}} -s u -l unbuffered -d "POSIX-compliant unbuffered output. Option is ignored" -n "not __fish_seen_subcommand_from cache"
|
||||||
|
|
||||||
complete -c $bat -l no-config -d "Do not use the configuration file"
|
complete -c {{PROJECT_EXECUTABLE}} -s V -l version -d "Show version information" -n "not __fish_seen_subcommand_from cache"
|
||||||
|
|
||||||
complete -c $bat -l no-custom-assets -d "Do not load custom assets"
|
complete -c {{PROJECT_EXECUTABLE}} -l wrap -xka "auto never character" -d "<mode> Specify the text-wrapping mode (default: auto)" -n "not __fish_seen_subcommand_from cache"
|
||||||
|
|
||||||
complete -c $bat -l no-lessopen -d "Disable the $LESSOPEN preprocessor if enabled (overrides --lessopen)"
|
|
||||||
|
|
||||||
complete -c $bat -s n -l number -d "Only show line numbers, no other decorations" -n __bat_no_excl_args
|
|
||||||
|
|
||||||
complete -c $bat -l pager -x -a "$pager_opts" -d "Which pager to use" -n __bat_no_excl_args
|
|
||||||
|
|
||||||
complete -c $bat -l paging -x -a "$paging_opts" -d "When to use the pager" -n __bat_no_excl_args
|
|
||||||
|
|
||||||
complete -c $bat -s p -l plain -d "Disable decorations" -n __bat_no_excl_args
|
|
||||||
|
|
||||||
complete -c $bat -o pp -d "Disable decorations and paging" -n __bat_no_excl_args
|
|
||||||
|
|
||||||
complete -c $bat -s P -d "Disable paging" -n __bat_no_excl_args
|
|
||||||
|
|
||||||
complete -c $bat -s A -l show-all -d "Show non-printable characters" -n __bat_no_excl_args
|
|
||||||
|
|
||||||
complete -c $bat -l style -x -k -a "(__fish_complete_list , __bat_style_opts)" -d "Specify which non-content elements to display" -n __bat_no_excl_args
|
|
||||||
|
|
||||||
complete -c $bat -l tabs -x -a "$tabs_opts" -d "Set tab width" -n __bat_no_excl_args
|
|
||||||
|
|
||||||
complete -c $bat -l terminal-width -x -d "Set terminal <width>, +<offset>, or -<offset>" -n __bat_no_excl_args
|
|
||||||
|
|
||||||
complete -c $bat -l theme -x -a "(command $bat --list-themes | command cat)" -d "Set the syntax highlighting theme" -n __bat_no_excl_args
|
|
||||||
|
|
||||||
complete -c $bat -s V -l version -f -d "Show version information" -n __fish_is_first_arg
|
|
||||||
|
|
||||||
complete -c $bat -l wrap -x -a "$wrap_opts" -d "Text-wrapping mode" -n __bat_no_excl_args
|
|
||||||
|
|
||||||
# Sub-command 'cache' completions
|
# Sub-command 'cache' completions
|
||||||
## Completion of the 'cache' command itself is removed for better UX
|
complete -c {{PROJECT_EXECUTABLE}} -a "cache" -d "Modify the syntax/language definition cache" -n "not __fish_seen_subcommand_from cache"
|
||||||
## See https://github.com/sharkdp/bat/issues/2085#issuecomment-1271646802
|
|
||||||
|
|
||||||
complete -c $bat -l build -f -d "Parse new definitions into cache" -n __bat_cache_no_excl
|
complete -c {{PROJECT_EXECUTABLE}} -l build -f -d "Parse syntaxes/language definitions into cache" -n "__fish_seen_subcommand_from cache"
|
||||||
|
|
||||||
complete -c $bat -l clear -f -d "Reset definitions to defaults" -n __bat_cache_no_excl
|
complete -c {{PROJECT_EXECUTABLE}} -l clear -f -d "Reset syntaxes/language definitions to default settings" -n "__fish_seen_subcommand_from cache"
|
||||||
|
|
||||||
complete -c $bat -l blank -f -d "Create new data instead of appending" -n "__bat_cache_subcommand; and not __fish_seen_argument -l clear"
|
|
||||||
|
|
||||||
complete -c $bat -l source -x -a "(__fish_complete_directories)" -d "Load syntaxes and themes from DIR" -n "__bat_cache_subcommand; and not __fish_seen_argument -l clear"
|
|
||||||
|
|
||||||
complete -c $bat -l target -x -a "(__fish_complete_directories)" -d "Store cache in DIR" -n __bat_cache_subcommand
|
|
||||||
|
|
||||||
complete -c $bat -l acknowledgements -d "Build acknowledgements.bin" -n __bat_cache_no_excl
|
|
||||||
|
|
||||||
complete -c $bat -s h -d "Print a concise overview of $bat-cache help" -n __bat_cache_no_excl
|
|
||||||
|
|
||||||
complete -c $bat -l help -f -d "Print all $bat-cache help" -n __bat_cache_no_excl
|
|
||||||
|
|
||||||
# vim:ft=fish
|
|
||||||
|
124
assets/completions/bat.zsh.in
vendored
124
assets/completions/bat.zsh.in
vendored
@ -1,20 +1,19 @@
|
|||||||
#compdef {{PROJECT_EXECUTABLE}}
|
#compdef {{PROJECT_EXECUTABLE}}
|
||||||
|
|
||||||
local curcontext="$curcontext" ret=1
|
local context state state_descr line
|
||||||
local -a state state_descr line
|
|
||||||
typeset -A opt_args
|
typeset -A opt_args
|
||||||
|
|
||||||
(( $+functions[_{{PROJECT_EXECUTABLE}}_cache_subcommand] )) ||
|
(( $+functions[_{{PROJECT_EXECUTABLE}}_cache_subcommand] )) ||
|
||||||
_{{PROJECT_EXECUTABLE}}_cache_subcommand() {
|
_{{PROJECT_EXECUTABLE}}_cache_subcommand() {
|
||||||
local -a args
|
local -a args
|
||||||
args=(
|
args=(
|
||||||
'(-b --build -c --clear)'{-b,--build}'[initialize or update the syntax/theme cache]'
|
'(-b --build -c --clear)'{-b,--build}'[Initialize or update the syntax/theme cache]'
|
||||||
'(-b --build -c --clear)'{-c,--clear}'[remove the cached syntax definitions and themes]'
|
'(-b --build -c --clear)'{-c,--clear}'[Remove the cached syntax definitions and themes]'
|
||||||
--source='[specify directory to load syntaxes and themes from]:directory:_files -/'
|
'(--source)'--source='[Use a different directory to load syntaxes and themes from]:directory:_files -/'
|
||||||
--target='[specify directory to store the cached syntax and theme set in]:directory:_files -/'
|
'(--target)'--target='[Use a different directory to store the cached syntax and theme set]:directory:_files -/'
|
||||||
--blank'[create completely new syntax and theme sets]'
|
'(--blank)'--blank'[Create completely new syntax and theme sets]'
|
||||||
--acknowledgements'[build acknowledgements.bin]'
|
'(: -)'{-h,--help}'[Prints help information]'
|
||||||
'(: -)'{-h,--help}'[show help information]'
|
'*: :'
|
||||||
)
|
)
|
||||||
|
|
||||||
_arguments -S -s $args
|
_arguments -S -s $args
|
||||||
@ -24,80 +23,72 @@ _{{PROJECT_EXECUTABLE}}_cache_subcommand() {
|
|||||||
_{{PROJECT_EXECUTABLE}}_main() {
|
_{{PROJECT_EXECUTABLE}}_main() {
|
||||||
local -a args
|
local -a args
|
||||||
args=(
|
args=(
|
||||||
'(-A --show-all)'{-A,--show-all}'[show non-printable characters (space, tab, newline, ..)]'
|
'(-A --show-all)'{-A,--show-all}'[Show non-printable characters (space, tab, newline, ..)]'
|
||||||
--nonprintable-notation='[specify how to display non-printable characters when using --show-all]:notation:(caret unicode)'
|
'*'{-p,--plain}'[Show plain style (alias for `--style=plain`), repeat twice to disable disable automatic paging (alias for `--paging=never`)]'
|
||||||
\*{-p,--plain}'[show plain style (alias for `--style=plain`), repeat twice to disable disable automatic paging (alias for `--paging=never`)]'
|
'(-l --language)'{-l+,--language=}'[Set the language for syntax highlighting]:<language>:->language'
|
||||||
'(-l --language)'{-l+,--language=}'[set the language for syntax highlighting]:language:->languages'
|
'(-H --highlight-line)'{-H,--highlight-line}'[Highlight lines N through M]:<N\:M>...'
|
||||||
\*{-H+,--highlight-line=}'[highlight specified block of lines]:start\:end'
|
'(--file-name)'--file-name'[Specify the name to display for a file]:<name>...:_files'
|
||||||
\*--file-name='[specify the name to display for a file]:name:_files'
|
'(-d --diff)'--diff'[Only show lines that have been added/removed/modified]'
|
||||||
'(-d --diff)'--diff'[only show lines that have been added/removed/modified]'
|
'(--diff-context)'--diff-context'[Include N lines of context around added/removed/modified lines when using `--diff`]:<N> (lines):()'
|
||||||
--diff-context='[specify lines of context around added/removed/modified lines when using `--diff`]:lines'
|
'(--tabs)'--tabs'[Set the tab width to T spaces]:<T> (tab width):()'
|
||||||
--tabs='[set the tab width]:tab width [4]'
|
'(--wrap)'--wrap='[Specify the text-wrapping mode]:<when>:(auto never character)'
|
||||||
--wrap='[specify the text-wrapping mode]:mode [auto]:(auto never character)'
|
'(--terminal-width)'--terminal-width'[Explicitly set the width of the terminal instead of determining it automatically]:<width>'
|
||||||
'!(--wrap)'{-S,--chop-long-lines}
|
'(-n --number)'{-n,--number}'[Show line numbers]'
|
||||||
--terminal-width='[explicitly set the width of the terminal instead of determining it automatically]:width'
|
'(--color)'--color='[When to use colors]:<when>:(auto never always)'
|
||||||
'(-n --number --diff --diff-context)'{-n,--number}'[show line numbers]'
|
'(--italic-text)'--italic-text='[Use italics in output]:<when>:(always never)'
|
||||||
--color='[specify when to use colors]:when:(auto never always)'
|
'(--decorations)'--decorations='[When to show the decorations]:<when>:(auto never always)'
|
||||||
--italic-text='[use italics in output]:when:(always never)'
|
'(--paging)'--paging='[Specify when to use the pager]:<when>:(auto never always)'
|
||||||
--decorations='[specify when to show the decorations]:when:(auto never always)'
|
'(-m --map-syntax)'{-m+,--map-syntax=}'[Use the specified syntax for files matching the glob pattern]:<glob\:syntax>...'
|
||||||
--paging='[specify when to use the pager]:when:(auto never always)'
|
'(--theme)'--theme='[Set the color theme for syntax highlighting]:<theme>:->theme'
|
||||||
'(-m --map-syntax)'{-m+,--map-syntax=}'[map a glob pattern to an existing syntax name]: :->syntax-maps'
|
'(: --list-themes --list-languages -L)'--list-themes'[Display all supported highlighting themes]'
|
||||||
'(--theme)'--theme='[set the color theme for syntax highlighting]:theme:->themes'
|
'(--style)'--style='[Comma-separated list of style elements to display]:<components>:->style'
|
||||||
'(: --list-themes --list-languages -L)'--list-themes'[show all supported highlighting themes]'
|
'(-r --line-range)'{-r+,--line-range=}'[Only print the lines from N to M]:<N\:M>...'
|
||||||
--style='[comma-separated list of style elements to display]: : _values "style [default]"
|
'(: --list-themes --list-languages -L)'{-L,--list-languages}'[Display all supported languages]'
|
||||||
default auto full plain changes header header-filename header-filesize grid rule numbers snip'
|
'(: --no-config)'--no-config'[Do not use the configuration file]'
|
||||||
\*{-r+,--line-range=}'[only print the specified line range]:start\:end'
|
'(: --no-custom-assets)'--no-custom-assets'[Do not load custom assets]'
|
||||||
'(* -)'{-L,--list-languages}'[display all supported languages]'
|
'(: --config-dir)'--config-dir'[Show bat'"'"'s configuration directory]'
|
||||||
-P'[disable paging]'
|
'(: --config-file)'--config-file'[Show path to the configuration file]'
|
||||||
"--no-config[don't use the configuration file]"
|
'(: --generate-config-file)'--generate-config-file'[Generates a default configuration file]'
|
||||||
"--no-custom-assets[don't load custom assets]"
|
'(: --cache-dir)'--cache-dir'[Show bat'"'"'s cache directory]'
|
||||||
'(--no-lessopen)'--lessopen'[enable the $LESSOPEN preprocessor]'
|
'(: -)'{-h,--help}'[Print this help message]'
|
||||||
'(--lessopen)'--no-lessopen'[disable the $LESSOPEN preprocessor if enabled (overrides --lessopen)]'
|
'(: -)'{-V,--version}'[Show version information]'
|
||||||
'(* -)'--config-dir"[show bat's configuration directory]"
|
'*: :_files'
|
||||||
'(* -)'--config-file'[show path to the configuration file]'
|
|
||||||
'(* -)'--generate-config-file'[generate a default configuration file]'
|
|
||||||
'(* -)'--cache-dir"[show bat's cache directory]"
|
|
||||||
'(* -)'{-h,--help}'[show help information]'
|
|
||||||
'(* -)'{-V,--version}'[show version information]'
|
|
||||||
'*: :{ _files || compadd cache }'
|
|
||||||
)
|
)
|
||||||
|
|
||||||
_arguments -S -s $args && ret=0
|
_arguments -S -s $args
|
||||||
|
|
||||||
case "$state" in
|
case "$state" in
|
||||||
syntax-maps)
|
language)
|
||||||
if ! compset -P '*:'; then
|
|
||||||
_message -e patterns 'glob pattern:language'
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
;& # fall-through
|
|
||||||
|
|
||||||
languages)
|
|
||||||
local IFS=$'\n'
|
local IFS=$'\n'
|
||||||
local -a languages
|
local -a languages
|
||||||
languages=( $({{PROJECT_EXECUTABLE}} --list-languages | awk -F':|,' '{ for (i = 1; i <= NF; ++i) printf("%s:%s\n", $i, $1) }') )
|
languages=( $({{PROJECT_EXECUTABLE}} --list-languages | awk -F':|,' '{ for (i = 1; i <= NF; ++i) printf("%s:%s\n", $i, $1) }') )
|
||||||
|
|
||||||
_describe 'language' languages && ret=0
|
_describe 'language' languages
|
||||||
;;
|
;;
|
||||||
|
|
||||||
themes)
|
theme)
|
||||||
local -a themes expl
|
local IFS=$'\n'
|
||||||
themes=( ${(f)"$(_call_program themes {{PROJECT_EXECUTABLE}} --list-themes)"} )
|
local -a themes
|
||||||
|
themes=( $({{PROJECT_EXECUTABLE}} --list-themes | sort) )
|
||||||
|
|
||||||
_wanted themes expl 'theme' compadd -a themes && ret=0
|
_values 'theme' $themes
|
||||||
|
;;
|
||||||
|
|
||||||
|
style)
|
||||||
|
_values -s , 'style' auto full plain changes header header-filename header-filesize grid rule numbers snip
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
return ret
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# first positional argument
|
||||||
|
if (( ${#words} == 2 )); then
|
||||||
|
local -a subcommands
|
||||||
|
subcommands=('cache:Modify the syntax-definition and theme cache')
|
||||||
|
_describe subcommand subcommands
|
||||||
|
_{{PROJECT_EXECUTABLE}}_main
|
||||||
|
else
|
||||||
case $words[2] in
|
case $words[2] in
|
||||||
cache)
|
cache)
|
||||||
## Completion of the 'cache' command itself is removed for better UX
|
|
||||||
## See https://github.com/sharkdp/bat/issues/2085#issuecomment-1271646802
|
|
||||||
shift words
|
|
||||||
(( CURRENT-- ))
|
|
||||||
curcontext="${curcontext%:*}-${words[1]}:"
|
|
||||||
_{{PROJECT_EXECUTABLE}}_cache_subcommand
|
_{{PROJECT_EXECUTABLE}}_cache_subcommand
|
||||||
;;
|
;;
|
||||||
|
|
||||||
@ -105,3 +96,4 @@ case $words[2] in
|
|||||||
_{{PROJECT_EXECUTABLE}}_main
|
_{{PROJECT_EXECUTABLE}}_main
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
fi
|
||||||
|
98
assets/manual/bat.1.in
vendored
98
assets/manual/bat.1.in
vendored
@ -25,23 +25,11 @@ either '--language value', '--language=value', '-l value' or '-lvalue'.
|
|||||||
Show non\-printable characters like space, tab or newline. Use '\-\-tabs' to
|
Show non\-printable characters like space, tab or newline. Use '\-\-tabs' to
|
||||||
control the width of the tab\-placeholders.
|
control the width of the tab\-placeholders.
|
||||||
.HP
|
.HP
|
||||||
\fB\-\-nonprintable\-notation\fR <notation>
|
|
||||||
.IP
|
|
||||||
Specify how to display non-printable characters when using \-\-show\-all.
|
|
||||||
|
|
||||||
Possible values:
|
|
||||||
.RS
|
|
||||||
.IP "caret"
|
|
||||||
Use character sequences like ^G, ^J, ^@, .. to identify non-printable characters
|
|
||||||
.IP "unicode"
|
|
||||||
Use special Unicode code points to identify non-printable characters
|
|
||||||
.RE
|
|
||||||
.HP
|
|
||||||
\fB\-p\fR, \fB\-\-plain\fR
|
\fB\-p\fR, \fB\-\-plain\fR
|
||||||
.IP
|
.IP
|
||||||
Only show plain style, no decorations. This is an alias for
|
Only show plain style, no decorations. This is an alias for
|
||||||
\&'\-\-style=plain'. When '\-p' is used twice ('\-pp'), it also disables
|
\&'\-\-style=plain'. When '\-p' is used twice ('\-pp'), it also disables
|
||||||
automatic paging (alias for '\-\-style=plain \fB\-\-paging\fR=\fI\,never\/\fR').
|
automatic paging (alias for '\-\-style=plain \fB\-\-pager\fR=\fI\,never\/\fR').
|
||||||
.HP
|
.HP
|
||||||
\fB\-l\fR, \fB\-\-language\fR <language>
|
\fB\-l\fR, \fB\-\-language\fR <language>
|
||||||
.IP
|
.IP
|
||||||
@ -87,10 +75,6 @@ Set the tab width to T spaces. Use a width of 0 to pass tabs through directly
|
|||||||
Specify the text\-wrapping mode (*auto*, never, character). The '\-\-terminal\-width' option
|
Specify the text\-wrapping mode (*auto*, never, character). The '\-\-terminal\-width' option
|
||||||
can be used in addition to control the output width.
|
can be used in addition to control the output width.
|
||||||
.HP
|
.HP
|
||||||
\fB\-S\fR, \fB\-\-chop\-long\-lines\fR
|
|
||||||
.IP
|
|
||||||
Truncate all lines longer than screen width. Alias for '\-\-wrap=never'.
|
|
||||||
.HP
|
|
||||||
\fB\-\-terminal\-width\fR <width>
|
\fB\-\-terminal\-width\fR <width>
|
||||||
.IP
|
.IP
|
||||||
Explicitly set the width of the terminal instead of determining it automatically. If
|
Explicitly set the width of the terminal instead of determining it automatically. If
|
||||||
@ -145,11 +129,6 @@ use -m '*.build:Python'. To highlight files named '.myignore' with the Git Ignor
|
|||||||
syntax, use -m '.myignore:Git Ignore'.
|
syntax, use -m '.myignore:Git Ignore'.
|
||||||
Note that the right-hand side is the *name* of the syntax, not a file extension.
|
Note that the right-hand side is the *name* of the syntax, not a file extension.
|
||||||
.HP
|
.HP
|
||||||
\fB\-\-ignored\-suffix\fR <ignored-suffix>
|
|
||||||
.IP
|
|
||||||
Ignore extension. For example: 'bat \-\-ignored-suffix ".dev" my_file.json.dev'
|
|
||||||
will use JSON syntax, and ignore '.dev'
|
|
||||||
.HP
|
|
||||||
\fB\-\-theme\fR <theme>
|
\fB\-\-theme\fR <theme>
|
||||||
.IP
|
.IP
|
||||||
Set the theme for syntax highlighting. Use '\-\-list\-themes' to see all available themes.
|
Set the theme for syntax highlighting. Use '\-\-list\-themes' to see all available themes.
|
||||||
@ -160,14 +139,6 @@ export the BAT_THEME environment variable (e.g.: export BAT_THEME="...").
|
|||||||
.IP
|
.IP
|
||||||
Display a list of supported themes for syntax highlighting.
|
Display a list of supported themes for syntax highlighting.
|
||||||
.HP
|
.HP
|
||||||
\fB\-s\fR, \fB\-\-squeeze\-blank\fR
|
|
||||||
.IP
|
|
||||||
Squeeze consecutive empty lines into a single empty line.
|
|
||||||
.HP
|
|
||||||
\fB\-\-squeeze\-limit\fR <squeeze-limit>
|
|
||||||
.IP
|
|
||||||
Set the maximum number of consecutive empty lines to be printed.
|
|
||||||
.HP
|
|
||||||
\fB\-\-style\fR <style\-components>
|
\fB\-\-style\fR <style\-components>
|
||||||
.IP
|
.IP
|
||||||
Configure which elements (line numbers, file headers, grid borders, Git modifications,
|
Configure which elements (line numbers, file headers, grid borders, Git modifications,
|
||||||
@ -175,7 +146,7 @@ Configure which elements (line numbers, file headers, grid borders, Git modifica
|
|||||||
of components to display (e.g. 'numbers,changes,grid') or a pre\-defined style ('full').
|
of components to display (e.g. 'numbers,changes,grid') or a pre\-defined style ('full').
|
||||||
To set a default style, add the '\-\-style=".."' option to the configuration file or
|
To set a default style, add the '\-\-style=".."' option to the configuration file or
|
||||||
export the BAT_STYLE environment variable (e.g.: export BAT_STYLE=".."). Possible
|
export the BAT_STYLE environment variable (e.g.: export BAT_STYLE=".."). Possible
|
||||||
values: *default*, full, auto, plain, changes, header, header-filename, header-filesize, grid,
|
values: *full*, auto, plain, changes, header, header-filename, header-filesize, grid,
|
||||||
rule, numbers, snip.
|
rule, numbers, snip.
|
||||||
.HP
|
.HP
|
||||||
\fB\-r\fR, \fB\-\-line\-range\fR <N:M>...
|
\fB\-r\fR, \fB\-\-line\-range\fR <N:M>...
|
||||||
@ -201,30 +172,6 @@ Display a list of supported languages for syntax highlighting.
|
|||||||
This option exists for POSIX\-compliance reasons ('u' is for 'unbuffered'). The output is
|
This option exists for POSIX\-compliance reasons ('u' is for 'unbuffered'). The output is
|
||||||
always unbuffered \- this option is simply ignored.
|
always unbuffered \- this option is simply ignored.
|
||||||
.HP
|
.HP
|
||||||
\fB\-\-no\-custom\-assets\fR
|
|
||||||
.IP
|
|
||||||
Do not load custom assets.
|
|
||||||
.HP
|
|
||||||
\fB\-\-config\-dir\fR
|
|
||||||
.IP
|
|
||||||
Show bat's configuration directory.
|
|
||||||
.HP
|
|
||||||
\fB\-\-cache\-dir\fR
|
|
||||||
.IP
|
|
||||||
Show bat's cache directory.
|
|
||||||
.HP
|
|
||||||
\fB\-\-diagnostic\fR
|
|
||||||
.IP
|
|
||||||
Show diagnostic information for bug reports.
|
|
||||||
.HP
|
|
||||||
\fB\-\-acknowledgements\fR
|
|
||||||
.IP
|
|
||||||
Show acknowledgements.
|
|
||||||
.HP
|
|
||||||
\fB\-\-set\-terminal\-title\fR
|
|
||||||
.IP
|
|
||||||
Sets terminal title to filenames when using a pager.
|
|
||||||
.HP
|
|
||||||
\fB\-h\fR, \fB\-\-help\fR
|
\fB\-h\fR, \fB\-\-help\fR
|
||||||
.IP
|
.IP
|
||||||
Print this help message.
|
Print this help message.
|
||||||
@ -253,20 +200,6 @@ location of the configuration file.
|
|||||||
To generate a default configuration file, call:
|
To generate a default configuration file, call:
|
||||||
|
|
||||||
\fB{{PROJECT_EXECUTABLE}} --generate-config-file\fR
|
\fB{{PROJECT_EXECUTABLE}} --generate-config-file\fR
|
||||||
|
|
||||||
These are related options:
|
|
||||||
.HP
|
|
||||||
\fB\-\-config\-file\fR
|
|
||||||
.IP
|
|
||||||
Show path to the configuration file.
|
|
||||||
.HP
|
|
||||||
\fB\-\-generate-config\-file\fR
|
|
||||||
.IP
|
|
||||||
Generates a default configuration file.
|
|
||||||
.HP
|
|
||||||
\fB\-\-no\-config\fR
|
|
||||||
.IP
|
|
||||||
Do not use the configuration file.
|
|
||||||
.SH "ADDING CUSTOM LANGUAGES"
|
.SH "ADDING CUSTOM LANGUAGES"
|
||||||
{{PROJECT_EXECUTABLE}} supports Sublime Text \fB.sublime-syntax\fR language files, and can be
|
{{PROJECT_EXECUTABLE}} supports Sublime Text \fB.sublime-syntax\fR language files, and can be
|
||||||
customized to add additional languages to your local installation. To do this, add the \fB.sublime-syntax\fR language
|
customized to add additional languages to your local installation. To do this, add the \fB.sublime-syntax\fR language
|
||||||
@ -298,33 +231,6 @@ If you ever want to remove the custom languages, you can clear the cache with `\
|
|||||||
Similarly to custom languages, {{PROJECT_EXECUTABLE}} supports Sublime Text \fB.tmTheme\fR themes.
|
Similarly to custom languages, {{PROJECT_EXECUTABLE}} supports Sublime Text \fB.tmTheme\fR themes.
|
||||||
These can be installed to `\fB$({{PROJECT_EXECUTABLE}} --config-dir)/themes\fR`, and are added to the cache with
|
These can be installed to `\fB$({{PROJECT_EXECUTABLE}} --config-dir)/themes\fR`, and are added to the cache with
|
||||||
`\fB{{PROJECT_EXECUTABLE}} cache --build`.
|
`\fB{{PROJECT_EXECUTABLE}} cache --build`.
|
||||||
|
|
||||||
.SH "INPUT PREPROCESSOR"
|
|
||||||
Much like less(1) does, {{PROJECT_EXECUTABLE}} supports input preprocessors via the LESSOPEN and LESSCLOSE environment variables.
|
|
||||||
In addition, {{PROJECT_EXECUTABLE}} attempts to be as compatible with less's preprocessor implementation as possible.
|
|
||||||
|
|
||||||
To use the preprocessor, call:
|
|
||||||
|
|
||||||
\fB{{PROJECT_EXECUTABLE}} --lessopen\fR
|
|
||||||
|
|
||||||
Alternatively, the preprocessor may be enabled by default by adding the '\-\-lessopen' option to the configuration file.
|
|
||||||
|
|
||||||
To temporarily disable the preprocessor if it is enabled by default, call:
|
|
||||||
|
|
||||||
\fB{{PROJECT_EXECUTABLE}} --no-lessopen\fR
|
|
||||||
|
|
||||||
These are related options:
|
|
||||||
.HP
|
|
||||||
\fB\-\-lessopen\fR
|
|
||||||
.IP
|
|
||||||
Enable the $LESSOPEN preprocessor.
|
|
||||||
.HP
|
|
||||||
\fB\-\-no\-lessopen\fR
|
|
||||||
.IP
|
|
||||||
Disable the $LESSOPEN preprocessor if enabled (overrides --lessopen)
|
|
||||||
.PP
|
|
||||||
For more information, see the "INPUT PREPROCESSOR" section of less(1).
|
|
||||||
|
|
||||||
.SH "MORE INFORMATION"
|
.SH "MORE INFORMATION"
|
||||||
|
|
||||||
For more information and up-to-date documentation, visit the {{PROJECT_EXECUTABLE}} repo:
|
For more information and up-to-date documentation, visit the {{PROJECT_EXECUTABLE}} repo:
|
||||||
|
14
assets/patches/JavaScript.sublime-syntax.patch
vendored
14
assets/patches/JavaScript.sublime-syntax.patch
vendored
@ -1,14 +0,0 @@
|
|||||||
Submodule assets/syntaxes/01_Packages contains modified content
|
|
||||||
diff --git syntaxes/01_Packages/JavaScript/JavaScript.sublime-syntax syntaxes/01_Packages/JavaScript/JavaScript.sublime-syntax
|
|
||||||
index 05a4fed6..78a7bf55 100644
|
|
||||||
--- syntaxes/01_Packages/JavaScript/JavaScript.sublime-syntax
|
|
||||||
+++ syntaxes/01_Packages/JavaScript/JavaScript.sublime-syntax
|
|
||||||
@@ -5,7 +5,7 @@ name: JavaScript
|
|
||||||
file_extensions:
|
|
||||||
- js
|
|
||||||
- htc
|
|
||||||
-first_line_match: ^#!\s*/.*\b(node|js)\b
|
|
||||||
+first_line_match: ^#!\s*/.*\b(node|bun|js)\b
|
|
||||||
scope: source.js
|
|
||||||
variables:
|
|
||||||
bin_digit: '[01_]'
|
|
2365
assets/patches/Lisp.sublime-syntax.patch
vendored
2365
assets/patches/Lisp.sublime-syntax.patch
vendored
File diff suppressed because one or more lines are too long
13
assets/patches/TodoTxt.sublime-syntax.patch
vendored
13
assets/patches/TodoTxt.sublime-syntax.patch
vendored
@ -1,13 +0,0 @@
|
|||||||
diff --git syntaxes/02_Extra/TodoTxt/TodoTxt.sublime-syntax syntaxes/02_Extra/TodoTxt/TodoTxt.sublime-syntax
|
|
||||||
index 6c75dbb..0115978 100644
|
|
||||||
--- syntaxes/02_Extra/TodoTxt/TodoTxt.sublime-syntax
|
|
||||||
+++ syntaxes/02_Extra/TodoTxt/TodoTxt.sublime-syntax
|
|
||||||
@@ -68,7 +68,7 @@ contexts:
|
|
||||||
|
|
||||||
- match: (\s+[^\s:]+:[^\s:]+)+\s*$
|
|
||||||
comment: Custom attributes
|
|
||||||
- scope: variable.annotation.todotxt.attribute
|
|
||||||
+ scope: variable.other.todotxt.attribute
|
|
||||||
|
|
||||||
comments:
|
|
||||||
# Comments begin with a '//' and finish at the end of the line.
|
|
20
assets/patches/TwoDark.tmTheme.patch
vendored
20
assets/patches/TwoDark.tmTheme.patch
vendored
@ -1,20 +0,0 @@
|
|||||||
diff --git themes/TwoDark/TwoDark.tmTheme themes/TwoDark/TwoDark.tmTheme
|
|
||||||
index 87fd358..56376d3 100644
|
|
||||||
--- themes/TwoDark/TwoDark.tmTheme
|
|
||||||
+++ themes/TwoDark/TwoDark.tmTheme
|
|
||||||
@@ -533,7 +533,7 @@
|
|
||||||
<key>name</key>
|
|
||||||
<string>Json key</string>
|
|
||||||
<key>scope</key>
|
|
||||||
- <string>source.json meta.structure.dictionary.json string.quoted.double.json</string>
|
|
||||||
+ <string>source.json meta.mapping.key.json string.quoted.double.json</string>
|
|
||||||
<key>settings</key>
|
|
||||||
<dict>
|
|
||||||
<key>foreground</key>
|
|
||||||
@@ -875,4 +875,4 @@
|
|
||||||
<key>comment</key>
|
|
||||||
<string>Work in progress</string>
|
|
||||||
</dict>
|
|
||||||
-</plist>
|
|
||||||
\ No newline at end of file
|
|
||||||
+</plist>
|
|
BIN
assets/syntaxes.bin
vendored
BIN
assets/syntaxes.bin
vendored
Binary file not shown.
1
assets/syntaxes/02_Extra/Ada
vendored
1
assets/syntaxes/02_Extra/Ada
vendored
@ -1 +0,0 @@
|
|||||||
Subproject commit e2b8fd51756e0cc42172c1c3405832ce9c19b6b6
|
|
1
assets/syntaxes/02_Extra/CFML
vendored
1
assets/syntaxes/02_Extra/CFML
vendored
@ -1 +0,0 @@
|
|||||||
Subproject commit b91c44a32e251c20c6359a8d9232287e1b408e6c
|
|
2
assets/syntaxes/02_Extra/CMake
vendored
2
assets/syntaxes/02_Extra/CMake
vendored
@ -1 +1 @@
|
|||||||
Subproject commit eb40ede56c2d4d5a4a129b2a5bc7095a2df46bb1
|
Subproject commit ab6ef4ef9f9b974806ea0788430a8c087ebe3761
|
1
assets/syntaxes/02_Extra/Crontab
vendored
1
assets/syntaxes/02_Extra/Crontab
vendored
@ -1 +0,0 @@
|
|||||||
Subproject commit 54f1fa7ff0c9d18aea3790555dba6e533ce3749b
|
|
2
assets/syntaxes/02_Extra/Docker
vendored
2
assets/syntaxes/02_Extra/Docker
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 0f6b7bc87acf684f7b0790fd480731ffb4615b87
|
Subproject commit 9e9a518aed93031042c54710f8f02c839301de26
|
@ -8,7 +8,6 @@ file_extensions:
|
|||||||
- .env.local
|
- .env.local
|
||||||
- .env.sample
|
- .env.sample
|
||||||
- .env.example
|
- .env.example
|
||||||
- .env.template
|
|
||||||
- .env.test
|
- .env.test
|
||||||
- .env.test.local
|
- .env.test.local
|
||||||
- .env.testing
|
- .env.testing
|
||||||
@ -24,10 +23,6 @@ file_extensions:
|
|||||||
- .env.defaults
|
- .env.defaults
|
||||||
- .envrc
|
- .envrc
|
||||||
- .flaskenv
|
- .flaskenv
|
||||||
- env
|
|
||||||
- env.example
|
|
||||||
- env.sample
|
|
||||||
- env.template
|
|
||||||
scope: source.env
|
scope: source.env
|
||||||
contexts:
|
contexts:
|
||||||
main:
|
main:
|
||||||
|
2
assets/syntaxes/02_Extra/Fish
vendored
2
assets/syntaxes/02_Extra/Fish
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 98316d4332936f74babb51cb56161410ae9d6e2c
|
Subproject commit 2c254cc8512d53b7af306e4379fc9744ee5b4aee
|
@ -95,7 +95,7 @@ contexts:
|
|||||||
|
|
||||||
fstab_dump:
|
fstab_dump:
|
||||||
- include: comment
|
- include: comment
|
||||||
- match: '\s*[012]\s*'
|
- match: '\s*[01]\s*'
|
||||||
comment: dump field
|
comment: dump field
|
||||||
scope: constant.numeric
|
scope: constant.numeric
|
||||||
set: fstab_pass
|
set: fstab_pass
|
||||||
@ -107,7 +107,7 @@ contexts:
|
|||||||
|
|
||||||
fstab_pass:
|
fstab_pass:
|
||||||
- include: comment
|
- include: comment
|
||||||
- match: '\s*[012]\s*'
|
- match: '\s*[01]\s*'
|
||||||
comment: pass field
|
comment: pass field
|
||||||
scope: constant.numeric
|
scope: constant.numeric
|
||||||
set: expected_eol
|
set: expected_eol
|
||||||
|
2
assets/syntaxes/02_Extra/HTML (Twig)
vendored
2
assets/syntaxes/02_Extra/HTML (Twig)
vendored
@ -1 +1 @@
|
|||||||
Subproject commit aedf955eba9753554815b2cbef5e072415e42068
|
Subproject commit 77def406d70b90dff33d006478198b729e23d22c
|
7
assets/syntaxes/02_Extra/INI.sublime-syntax
vendored
7
assets/syntaxes/02_Extra/INI.sublime-syntax
vendored
@ -5,8 +5,8 @@ name: INI
|
|||||||
file_extensions:
|
file_extensions:
|
||||||
- ini
|
- ini
|
||||||
- INI
|
- INI
|
||||||
- "inf"
|
- inf
|
||||||
- "INF"
|
- INF
|
||||||
- reg
|
- reg
|
||||||
- REG
|
- REG
|
||||||
- lng
|
- lng
|
||||||
@ -16,9 +16,6 @@ file_extensions:
|
|||||||
- url
|
- url
|
||||||
- URL
|
- URL
|
||||||
- .editorconfig
|
- .editorconfig
|
||||||
- .coveragerc
|
|
||||||
- .pylintrc
|
|
||||||
- .gitlint
|
|
||||||
- .hgrc
|
- .hgrc
|
||||||
- hgrc
|
- hgrc
|
||||||
scope: source.ini
|
scope: source.ini
|
||||||
|
2
assets/syntaxes/02_Extra/Julia
vendored
2
assets/syntaxes/02_Extra/Julia
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 3366b10be91aaab7a61ae0bc0a5af5cc375e58d1
|
Subproject commit 1e55f3211b282ffd555d54b1798668bf5097df6a
|
2
assets/syntaxes/02_Extra/LiveScript
vendored
2
assets/syntaxes/02_Extra/LiveScript
vendored
@ -1 +1 @@
|
|||||||
Subproject commit d82aeb737d4883d1a74aba7a07053f90211d427b
|
Subproject commit 25750138511925b74da9508050c766f360618055
|
37
assets/syntaxes/02_Extra/Manpage.sublime-syntax
vendored
37
assets/syntaxes/02_Extra/Manpage.sublime-syntax
vendored
@ -53,16 +53,6 @@ contexts:
|
|||||||
embed: synopsis
|
embed: synopsis
|
||||||
escape: '(?={{section_heading}})'
|
escape: '(?={{section_heading}})'
|
||||||
|
|
||||||
- match: '^(?:COMMANDS)\b'
|
|
||||||
scope: markup.heading.commands.man
|
|
||||||
embed: commands-start
|
|
||||||
escape: '(?={{section_heading}})'
|
|
||||||
|
|
||||||
- match: '^(?:ENVIRONMENT\s+VARIABLES)'
|
|
||||||
scope: markup.heading.env.man
|
|
||||||
embed: environment-variables
|
|
||||||
escape: '(?={{section_heading}})'
|
|
||||||
|
|
||||||
- match: '{{section_heading}}'
|
- match: '{{section_heading}}'
|
||||||
scope: markup.heading.other.man
|
scope: markup.heading.other.man
|
||||||
embed: options # some man pages put command line options under the description heading
|
embed: options # some man pages put command line options under the description heading
|
||||||
@ -85,7 +75,7 @@ contexts:
|
|||||||
|
|
||||||
options:
|
options:
|
||||||
# command-line options like --option=value, --some-flag, or -x
|
# command-line options like --option=value, --some-flag, or -x
|
||||||
- match: '^[ ]{7}(?=-|\+)'
|
- match: '^[ ]{7}(?=-)'
|
||||||
push: expect-command-line-option
|
push: expect-command-line-option
|
||||||
- match: '(?:[^a-zA-Z0-9_-]|^|\s){{command_line_option}}'
|
- match: '(?:[^a-zA-Z0-9_-]|^|\s){{command_line_option}}'
|
||||||
captures:
|
captures:
|
||||||
@ -106,7 +96,7 @@ contexts:
|
|||||||
- include: env-var
|
- include: env-var
|
||||||
|
|
||||||
expect-command-line-option:
|
expect-command-line-option:
|
||||||
- match: '[A-Za-z0-9-\.\?:#\$\+]+'
|
- match: '[A-Za-z0-9-]+'
|
||||||
scope: entity.name.command-line-option.man
|
scope: entity.name.command-line-option.man
|
||||||
- match: '(\[)(=)'
|
- match: '(\[)(=)'
|
||||||
captures:
|
captures:
|
||||||
@ -132,7 +122,7 @@ contexts:
|
|||||||
pop: true
|
pop: true
|
||||||
|
|
||||||
expect-parameter:
|
expect-parameter:
|
||||||
- match: '[A-Za-z0-9-_]+'
|
- match: '[A-Za-z0-9-]+'
|
||||||
scope: variable.parameter.man
|
scope: variable.parameter.man
|
||||||
- match: (?=\s+\|)
|
- match: (?=\s+\|)
|
||||||
pop: true
|
pop: true
|
||||||
@ -145,10 +135,6 @@ contexts:
|
|||||||
scope: punctuation.section.brackets.end.man
|
scope: punctuation.section.brackets.end.man
|
||||||
pop: true
|
pop: true
|
||||||
- include: expect-parameter
|
- include: expect-parameter
|
||||||
- match: '<'
|
|
||||||
scope: punctuation.definition.generic.begin.man
|
|
||||||
- match: '>'
|
|
||||||
scope: punctuation.definition.generic.end.man
|
|
||||||
- match: '$|(?=[],]|{{command_line_option}})'
|
- match: '$|(?=[],]|{{command_line_option}})'
|
||||||
pop: true
|
pop: true
|
||||||
|
|
||||||
@ -183,20 +169,3 @@ contexts:
|
|||||||
- match: \[
|
- match: \[
|
||||||
scope: punctuation.section.brackets.begin.man
|
scope: punctuation.section.brackets.begin.man
|
||||||
push: command-line-option-or-pipe
|
push: command-line-option-or-pipe
|
||||||
|
|
||||||
commands-start:
|
|
||||||
- match: (?=^[ ]{7}.*(?:[ ]<|[|]))
|
|
||||||
push: commands
|
|
||||||
|
|
||||||
commands:
|
|
||||||
- match: '^[ ]{7}([a-z_\-]+)(?=[ ]|$)'
|
|
||||||
captures:
|
|
||||||
1: entity.name.command.man
|
|
||||||
push: expect-parameter
|
|
||||||
- match: '^[ ]{7}(?=[\[<]|\w+[|\]])'
|
|
||||||
push: expect-parameter
|
|
||||||
|
|
||||||
environment-variables:
|
|
||||||
- match: '^[ ]{7}([A-Z_]+)\b'
|
|
||||||
captures:
|
|
||||||
1: support.constant.environment-variable.man
|
|
||||||
|
2
assets/syntaxes/02_Extra/MediaWiki
vendored
2
assets/syntaxes/02_Extra/MediaWiki
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 5dceaa9dd9af0d2266f1c9e45966d8a610226213
|
Subproject commit 81bf97cace59bedcb1668e7830b85c36e014428e
|
1
assets/syntaxes/02_Extra/NSIS
vendored
1
assets/syntaxes/02_Extra/NSIS
vendored
@ -1 +0,0 @@
|
|||||||
Subproject commit 619a65a04efbf343bdfcde875700675b9b273368
|
|
2
assets/syntaxes/02_Extra/Nginx
vendored
2
assets/syntaxes/02_Extra/Nginx
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 65f5a63c0d1760c5db2264e50e3b14a7a4567cc0
|
Subproject commit 15a1db15106fb668b3b1396a725ab002a8ef286c
|
2
assets/syntaxes/02_Extra/PowerShell
vendored
2
assets/syntaxes/02_Extra/PowerShell
vendored
@ -1 +1 @@
|
|||||||
Subproject commit c0372a1d2df136ca6b3d1a9f7b85031dedf117f9
|
Subproject commit 742f0b5d4b60f5930c0b47fcc1f646860521296e
|
2
assets/syntaxes/02_Extra/Protobuf
vendored
2
assets/syntaxes/02_Extra/Protobuf
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 1365331580b0e4bb86f74d0c599dccc87e7bdacb
|
Subproject commit 726e21d74dac23cbb036f2fbbd626decdc954060
|
@ -1,120 +0,0 @@
|
|||||||
%YAML 1.2
|
|
||||||
---
|
|
||||||
# http://www.sublimetext.com/docs/syntax.html
|
|
||||||
name: Requirements.txt
|
|
||||||
scope: source.requirements-txt
|
|
||||||
# https://pip.pypa.io/en/stable/reference/requirements-file-format/
|
|
||||||
# https://github.com/raimon49/requirements.txt.vim/blob/f246bd10155fbc3b1a9e2fff6c95b21521b09116/ftdetect/requirements.vim
|
|
||||||
file_extensions:
|
|
||||||
- requirements.txt
|
|
||||||
- requirements.in
|
|
||||||
- pip
|
|
||||||
# https://github.com/sublimehq/Packages/pull/2760/files
|
|
||||||
first_line_match: |-
|
|
||||||
(?xi:
|
|
||||||
^ \#! .* \bpip # shebang
|
|
||||||
| ^ \s* \# .*? -\*- .*? \bpip-requirements\b .*? -\*- # editorconfig
|
|
||||||
| ^ \s* \# (vim?|ex): .*? \brequirements\b # modeline
|
|
||||||
)
|
|
||||||
# pip install -r
|
|
||||||
# pip-compile
|
|
||||||
|
|
||||||
variables:
|
|
||||||
operator: '===?|<=?|>=?|~=|!='
|
|
||||||
|
|
||||||
contexts:
|
|
||||||
main:
|
|
||||||
- match: '(?i)\d+[\da-z\-_\.\*]*'
|
|
||||||
scope: constant.other.version-control.requirements-txt
|
|
||||||
- match: '(?i)^\[?--?[\da-z\-]*\]?'
|
|
||||||
scope: entity.name.function.option.requirements-txt
|
|
||||||
- match: '{{operator}}'
|
|
||||||
scope: keyword.operator.logical.requirements-txt
|
|
||||||
- match: '(\[)'
|
|
||||||
captures:
|
|
||||||
1: punctuation.section.braces.begin.requirements-txt
|
|
||||||
push:
|
|
||||||
- meta_scope: variable.function.extra.requirements-txt
|
|
||||||
- match: ','
|
|
||||||
scope: punctuation.separator.requirements-txt
|
|
||||||
- match: '(\])'
|
|
||||||
captures:
|
|
||||||
1: punctuation.section.braces.end.requirements-txt
|
|
||||||
pop: true
|
|
||||||
- match: '(git\+?|hg\+|svn\+|bzr\+).*://.\S+'
|
|
||||||
scope: markup.underline.link.versioncontrols.requirements-txt
|
|
||||||
- match: '(@\s)?(https?|ftp|gopher)://?[^\s/$.?#].\S*'
|
|
||||||
scope: markup.underline.link.url.requirements-txt
|
|
||||||
captures:
|
|
||||||
1: punctuation.definition.keyword.requirements-txt
|
|
||||||
- match: '(?i)^[a-z\d_\-\.]*[a-z\d]'
|
|
||||||
scope: variable.parameter.package-name.requirements-txt
|
|
||||||
- match: '(;)'
|
|
||||||
captures:
|
|
||||||
1: punctuation.definition.annotation.requirements-txt
|
|
||||||
push:
|
|
||||||
- meta_scope: meta.annotation.requirements-txt
|
|
||||||
# https://pip.pypa.io/en/stable/reference/inspect-report/#example
|
|
||||||
- match: |-
|
|
||||||
(?x:
|
|
||||||
implementation_name
|
|
||||||
| implementation_version
|
|
||||||
| os_name
|
|
||||||
| platform_machine
|
|
||||||
| platform_release
|
|
||||||
| platform_system
|
|
||||||
| platform_version
|
|
||||||
| python_full_version
|
|
||||||
| platform_python_implementation
|
|
||||||
| python_version
|
|
||||||
| sys_platform
|
|
||||||
)
|
|
||||||
scope: variable.language.requirements-txt
|
|
||||||
- match: '{{operator}}'
|
|
||||||
scope: keyword.operator.logical.requirements-txt
|
|
||||||
# https://pip.pypa.io/en/stable/reference/requirement-specifiers/#examples
|
|
||||||
- match: '(")'
|
|
||||||
captures:
|
|
||||||
1: punctuation.definition.string.begin.double.requirements-txt
|
|
||||||
push:
|
|
||||||
- meta_scope: string.quoted.double.requirements-txt
|
|
||||||
- match: '\\"'
|
|
||||||
scope: constant.character.escape.double.requirements-txt
|
|
||||||
- match: '(")'
|
|
||||||
captures:
|
|
||||||
1: punctuation.definition.string.end.double.requirements-txt
|
|
||||||
pop: true
|
|
||||||
- match: "(')"
|
|
||||||
captures:
|
|
||||||
1: punctuation.definition.string.begin.single.requirements-txt
|
|
||||||
push:
|
|
||||||
- meta_scope: string.quoted.single.requirements-txt
|
|
||||||
- match: '\\'''
|
|
||||||
scope: constant.character.escape.single.requirements-txt
|
|
||||||
- match: "(')"
|
|
||||||
captures:
|
|
||||||
1: punctuation.definition.string.end.single.requirements-txt
|
|
||||||
pop: true
|
|
||||||
- match: '(.(?=#)|$)'
|
|
||||||
pop: true
|
|
||||||
- match: '(\$)(\{)'
|
|
||||||
captures:
|
|
||||||
1: punctuation.definition.keyword.requirements-txt
|
|
||||||
2: punctuation.definition.begin.parameter.requirements-txt
|
|
||||||
push:
|
|
||||||
- meta_scope: variable.parameter.requirements-txt
|
|
||||||
- match: '(\})'
|
|
||||||
captures:
|
|
||||||
1: punctuation.definition.end.parameter.requirements-txt
|
|
||||||
pop: true
|
|
||||||
- match: '(#)'
|
|
||||||
captures:
|
|
||||||
1: punctuation.definition.comment.requirements-txt
|
|
||||||
push:
|
|
||||||
- meta_scope: comment.line.requirements-txt
|
|
||||||
- match: '(-*-) coding: .* (-*-)'
|
|
||||||
captures:
|
|
||||||
1: punctuation.definition.begin.pep263.requirements-txt
|
|
||||||
2: punctuation.definition.end.pep263.requirements-txt
|
|
||||||
- match: '$'
|
|
||||||
pop: true
|
|
2
assets/syntaxes/02_Extra/SublimeJQ
vendored
2
assets/syntaxes/02_Extra/SublimeJQ
vendored
@ -1 +1 @@
|
|||||||
Subproject commit b7e53e5d86814f04a48d2e441bcf5f9fdf07e9c1
|
Subproject commit 687058289c1a888e0895378432d66b41609a84d8
|
2
assets/syntaxes/02_Extra/TOML
vendored
2
assets/syntaxes/02_Extra/TOML
vendored
@ -1 +1 @@
|
|||||||
Subproject commit fd0bf3e5d6c9e6397c0dc9639a0514d9bf55b800
|
Subproject commit ed38438900d6b128353cd1aa1364e2e3b8ffb8a2
|
1
assets/syntaxes/02_Extra/TodoTxt
vendored
1
assets/syntaxes/02_Extra/TodoTxt
vendored
@ -1 +0,0 @@
|
|||||||
Subproject commit 071a004217f981152c78dc7a530536374a753d98
|
|
@ -4,8 +4,6 @@
|
|||||||
name: TypeScript
|
name: TypeScript
|
||||||
file_extensions:
|
file_extensions:
|
||||||
- ts
|
- ts
|
||||||
- mts
|
|
||||||
- cts
|
|
||||||
scope: source.ts
|
scope: source.ts
|
||||||
contexts:
|
contexts:
|
||||||
main:
|
main:
|
||||||
|
104
assets/syntaxes/02_Extra/VimHelp.sublime-syntax
vendored
104
assets/syntaxes/02_Extra/VimHelp.sublime-syntax
vendored
@ -1,104 +0,0 @@
|
|||||||
%YAML 1.2
|
|
||||||
---
|
|
||||||
# http://www.sublimetext.com/docs/syntax.html
|
|
||||||
scope: source.vimhelp
|
|
||||||
file_extensions:
|
|
||||||
# shortname
|
|
||||||
- vimhelp
|
|
||||||
|
|
||||||
# $VIMRUNTIME/syntax/help.vim
|
|
||||||
contexts:
|
|
||||||
main:
|
|
||||||
- match: '(?<=^\s*)(vim?|ex):\s*([a-z]+(=[^\s:]+)?(\s+|:))+'
|
|
||||||
scope: comment.line.modeline.vimhelp
|
|
||||||
- match: '^[-A-Z .][-A-Z0-9 .()_]*(?=\s+\*|$)'
|
|
||||||
scope: markup.heading.headline.vimhelp
|
|
||||||
- match: '^(===.*===)$'
|
|
||||||
captures:
|
|
||||||
1: punctuation.definition.heading.1.setext.vimhelp
|
|
||||||
push:
|
|
||||||
- meta_scope: markup.heading.1.setext.vimhelp
|
|
||||||
- match: '\t| '
|
|
||||||
pop: true
|
|
||||||
- match: '^(---.*---)$'
|
|
||||||
captures:
|
|
||||||
1: punctuation.definition.heading.2.setext.vimhelp
|
|
||||||
push:
|
|
||||||
- meta_scope: markup.heading.2.setext.vimhelp
|
|
||||||
- match: '\t| '
|
|
||||||
pop: true
|
|
||||||
- match: '(?:^| )(>)$'
|
|
||||||
captures:
|
|
||||||
1: punctuation.definition.blockquote.begin.vimhelp
|
|
||||||
push:
|
|
||||||
- meta_scope: markup.quote.vimhelp
|
|
||||||
- match: '^(<)'
|
|
||||||
captures:
|
|
||||||
1: punctuation.definition.blockquote.end.vimhelp
|
|
||||||
pop: true
|
|
||||||
- match: '^(?=\S)'
|
|
||||||
pop: true
|
|
||||||
- match: '(?<!\\)(\|)([#-)!+-~]+)(\|)'
|
|
||||||
captures:
|
|
||||||
1: punctuation.definition.link.begin.vimhelp
|
|
||||||
2: markup.underline.link.vimhelp
|
|
||||||
3: punctuation.definition.link.end.vimhelp
|
|
||||||
- match: '(\*)([#-)!+-~]+)(\*)(?:\s|$)'
|
|
||||||
captures:
|
|
||||||
1: punctuation.definition.constant.begin.vimhelp
|
|
||||||
2: entity.name.reference.link.vimhelp
|
|
||||||
3: punctuation.definition.constant.end.vimhelp
|
|
||||||
- match: '\bVim version [0-9][0-9.a-z]*'
|
|
||||||
scope: variable.language.vimhelp
|
|
||||||
- match: 'N?VIM REFERENCE.*'
|
|
||||||
scope: variable.language.vimhelp
|
|
||||||
- match: '('')([a-z]{2,}|t_..)('')'
|
|
||||||
captures:
|
|
||||||
1: punctuation.definition.link.option.begin.vimhelp
|
|
||||||
2: markup.underline.link.option.vimhelp
|
|
||||||
3: punctuation.definition.link.option.end.vimhelp
|
|
||||||
- match: '(`)([^` \t]+)(`)'
|
|
||||||
captures:
|
|
||||||
1: punctuation.definition.link.command.begin.vimhelp
|
|
||||||
2: markup.underline.link.command.vimhelp
|
|
||||||
3: punctuation.definition.link.command.end.vimhelp
|
|
||||||
- match: '(?<=^|[^a-z"\[])(`)([^`]+)(`)(?=[^a-z\t."'']|$)'
|
|
||||||
captures:
|
|
||||||
1: punctuation.definition.link.command.begin.vimhelp
|
|
||||||
2: markup.underline.link.command.vimhelp
|
|
||||||
3: punctuation.definition.link.command.end.vimhelp
|
|
||||||
- match: '(?<=\s*)(.*?)(?=\s?)(~)$'
|
|
||||||
captures:
|
|
||||||
1: markup.heading.header.vimhelp
|
|
||||||
2: punctuation.definition.keyword.vimhelp
|
|
||||||
- match: '(.*) (?=`$)'
|
|
||||||
captures:
|
|
||||||
1: variable.other.graphic.vimhelp
|
|
||||||
2: punctuation.definition.keyword.vimhelp
|
|
||||||
- match: '\b(note:?|Note:?|NOTE:?|Notes:?)\b'
|
|
||||||
scope: constant.other.note.vimhelp
|
|
||||||
- match: '\b(WARNING:?|Warning:)\b'
|
|
||||||
scope: constant.other.warning.vimhelp
|
|
||||||
- match: '\b(DEPRECATED:?|Deprecated:)\b'
|
|
||||||
scope: constant.other.deprecated.vimhelp
|
|
||||||
- match: '(\{)([-_a-zA-Z0-9''"*+/:%#=\[\]<>.,]+)(\})'
|
|
||||||
captures:
|
|
||||||
1: punctuation.definition.constant.begin.vimhelp
|
|
||||||
2: constant.numeric.vimhelp
|
|
||||||
3: punctuation.definition.constant.end.vimhelp
|
|
||||||
- match: '\[(range|line|count|offset|\+?cmd|(\+|-|)num|\+\+opt)\]'
|
|
||||||
scope: constant.numeric.vimhelp
|
|
||||||
- match: '\[(arg(uments)?|ident|addr|group)\]'
|
|
||||||
scope: constant.numeric.vimhelp
|
|
||||||
- match: '\[(readonly|fifo|socket|converted|crypted)\]'
|
|
||||||
scope: constant.numeric.vimhelp
|
|
||||||
- match: '<[-a-zA-Z0-9_]+>'
|
|
||||||
scope: markup.underline.link.key.vimhelp
|
|
||||||
- match: '<[SCM]-.>'
|
|
||||||
scope: markup.underline.link.key.vimhelp
|
|
||||||
- match: 'CTRL-((SHIFT-)?.|Break|PageUp|PageDown|Insert|Del|\{char\})'
|
|
||||||
scope: markup.underline.link.key.vimhelp
|
|
||||||
- match: '(META|ALT)-.'
|
|
||||||
scope: markup.underline.link.key.vimhelp
|
|
||||||
- match: '\b(((https?|ftp|gopher)://|(mailto|file|news):)[^'' <>"]+|(www|web|w3)[a-z0-9_-]*\.[a-z0-9._-]+\.[^'' <>"]+)[a-zA-Z0-9/]'
|
|
||||||
scope: markup.underline.link.url.vimhelp
|
|
2
assets/syntaxes/02_Extra/Zig
vendored
2
assets/syntaxes/02_Extra/Zig
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 1a4a38445fec495817625bafbeb01e79c44abcba
|
Subproject commit 87ecbcae6fb5718369ce3bb3472ca0b2634e78e6
|
1
assets/syntaxes/02_Extra/cmd-help
vendored
1
assets/syntaxes/02_Extra/cmd-help
vendored
@ -1 +0,0 @@
|
|||||||
Subproject commit 209559b72f7e8848c988828088231b3a4d8b6838
|
|
98
assets/syntaxes/02_Extra/log.sublime-syntax
vendored
98
assets/syntaxes/02_Extra/log.sublime-syntax
vendored
@ -6,16 +6,8 @@ file_extensions:
|
|||||||
scope: text.log
|
scope: text.log
|
||||||
variables:
|
variables:
|
||||||
ipv4_part: (?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)
|
ipv4_part: (?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)
|
||||||
hours_minutes_seconds: (?:[01]\d|2[0-3]):(?:[0-5]\d):(?:[0-5]\d)
|
|
||||||
error: \b(?i:fail(?:ure|ed)?|error|exception|fatal|critical)\b
|
|
||||||
warning: \b(?i:warn(?:ing)?)\b
|
|
||||||
info: \b(?i:info)\b
|
|
||||||
debug: \b(?i:debug)\b
|
|
||||||
contexts:
|
contexts:
|
||||||
main:
|
main:
|
||||||
- include: log_level_lines
|
|
||||||
- include: main_without_log_level_line
|
|
||||||
main_without_log_level_line:
|
|
||||||
- match: (\w+)(=)
|
- match: (\w+)(=)
|
||||||
captures:
|
captures:
|
||||||
1: variable.parameter.log
|
1: variable.parameter.log
|
||||||
@ -25,85 +17,31 @@ contexts:
|
|||||||
captures:
|
captures:
|
||||||
1: punctuation.definition.string.begin.log
|
1: punctuation.definition.string.begin.log
|
||||||
3: punctuation.definition.string.end.log
|
3: punctuation.definition.string.end.log
|
||||||
- match: \"
|
- match: (")([^"]*)(")
|
||||||
|
scope: string.quoted.double.log
|
||||||
captures:
|
captures:
|
||||||
1: punctuation.definition.string.begin.log
|
1: punctuation.definition.string.begin.log
|
||||||
push: double_quoted_string
|
3: punctuation.definition.string.end.log
|
||||||
- include: dates
|
- include: dates
|
||||||
- include: ip_addresses
|
- include: ip_addresses
|
||||||
- include: numbers
|
- include: numbers
|
||||||
- include: log_levels
|
- match: \b(?i:fail(?:ure|ed)?|error|exception)\b
|
||||||
|
scope: markup.error.log
|
||||||
|
- match: \b(?i:warn(?:ing)?)\b
|
||||||
|
scope: markup.warning.log
|
||||||
#- include: scope:text.html.markdown#autolink-inet
|
#- include: scope:text.html.markdown#autolink-inet
|
||||||
- match: \b\w+:/{2,3}
|
- match: \b\w+:/{2,3}
|
||||||
scope: markup.underline.link.scheme.log
|
scope: markup.underline.link.scheme.log
|
||||||
push: url-host
|
push: url-host
|
||||||
log_level_lines:
|
|
||||||
- match: ^(?=.*{{error}})
|
|
||||||
push:
|
|
||||||
- error_line
|
|
||||||
- main_pop_at_eol
|
|
||||||
- match: ^(?=.*{{warning}})
|
|
||||||
push:
|
|
||||||
- warning_line
|
|
||||||
- main_pop_at_eol
|
|
||||||
- match: ^(?=.*{{info}})
|
|
||||||
push:
|
|
||||||
- info_line
|
|
||||||
- main_pop_at_eol
|
|
||||||
- match: ^(?=.*{{debug}})
|
|
||||||
push:
|
|
||||||
- debug_line
|
|
||||||
- main_pop_at_eol
|
|
||||||
log_levels:
|
|
||||||
- match: '{{error}}'
|
|
||||||
scope: markup.error.log
|
|
||||||
- match: '{{warning}}'
|
|
||||||
scope: markup.warning.log
|
|
||||||
- match: '{{info}}'
|
|
||||||
scope: markup.info.log
|
|
||||||
- match: '{{debug}}'
|
|
||||||
scope: markup.info.log
|
|
||||||
error_line:
|
|
||||||
- meta_scope: meta.annotation.error-line.log
|
|
||||||
- include: immediately_pop
|
|
||||||
warning_line:
|
|
||||||
- meta_scope: meta.annotation.warning-line.log
|
|
||||||
- include: immediately_pop
|
|
||||||
info_line:
|
|
||||||
- meta_scope: meta.annotation.info-line.log
|
|
||||||
- include: immediately_pop
|
|
||||||
debug_line:
|
|
||||||
- meta_scope: meta.annotation.debug-line.log
|
|
||||||
- include: immediately_pop
|
|
||||||
immediately_pop:
|
|
||||||
- match: ''
|
|
||||||
pop: true
|
|
||||||
pop_at_eol:
|
|
||||||
- match: $
|
|
||||||
pop: true
|
|
||||||
main_pop_at_eol:
|
|
||||||
- include: main_without_log_level_line
|
|
||||||
- include: pop_at_eol
|
|
||||||
dates:
|
dates:
|
||||||
- match: \b\d{4}-\d{2}-\d{2}(?=\b|T)
|
- match: \b\d{4}-\d{2}-\d{2}\b
|
||||||
scope: meta.date.log meta.number.integer.decimal.log constant.numeric.value.log
|
scope: meta.date.log meta.number.integer.decimal.log constant.numeric.value.log
|
||||||
push: maybe_date_time_separator
|
- match: \b\d{4}/\d{2}/\d{2}\b
|
||||||
- match: \b\d{4}/\d{2}/\d{2}(?=\b|T)
|
|
||||||
scope: meta.date.log meta.number.integer.decimal.log constant.numeric.value.log
|
scope: meta.date.log meta.number.integer.decimal.log constant.numeric.value.log
|
||||||
push: maybe_date_time_separator
|
- match: \b(?:[01]\d|2[0-3]):(?:[0-5]\d):(?:[0-5]\d)(?:(\.)\d{3})?\b
|
||||||
- match: \b(?={{hours_minutes_seconds}})
|
|
||||||
push: time
|
|
||||||
time:
|
|
||||||
- match: (?:{{hours_minutes_seconds}})(?:(\.)\d{3})?\b
|
|
||||||
scope: meta.time.log meta.number.integer.decimal.log constant.numeric.value.log
|
scope: meta.time.log meta.number.integer.decimal.log constant.numeric.value.log
|
||||||
captures:
|
captures:
|
||||||
1: punctuation.separator.decimal.log
|
1: punctuation.separator.decimal.log
|
||||||
- include: immediately_pop
|
|
||||||
maybe_date_time_separator:
|
|
||||||
- match: T(?={{hours_minutes_seconds}})
|
|
||||||
scope: meta.date.log meta.time.log keyword.other.log
|
|
||||||
set: time
|
|
||||||
- include: immediately_pop
|
|
||||||
ip_addresses:
|
ip_addresses:
|
||||||
- match: \b(?=(?:{{ipv4_part}}\.){3}{{ipv4_part}}\b)
|
- match: \b(?=(?:{{ipv4_part}}\.){3}{{ipv4_part}}\b)
|
||||||
push:
|
push:
|
||||||
@ -112,7 +50,8 @@ contexts:
|
|||||||
scope: constant.numeric.value.log
|
scope: constant.numeric.value.log
|
||||||
- match: \.
|
- match: \.
|
||||||
scope: punctuation.separator.sequence.log
|
scope: punctuation.separator.sequence.log
|
||||||
- include: immediately_pop
|
- match: ''
|
||||||
|
pop: true
|
||||||
- match: (?=(?:\h{0,4}:){2,6}\h{1,4}\b)
|
- match: (?=(?:\h{0,4}:){2,6}\h{1,4}\b)
|
||||||
push:
|
push:
|
||||||
- meta_scope: meta.ipaddress.v6.log meta.number.integer.hexadecimal.log
|
- meta_scope: meta.ipaddress.v6.log meta.number.integer.hexadecimal.log
|
||||||
@ -120,7 +59,8 @@ contexts:
|
|||||||
scope: constant.numeric.value.log
|
scope: constant.numeric.value.log
|
||||||
- match: ':'
|
- match: ':'
|
||||||
scope: punctuation.separator.sequence.log
|
scope: punctuation.separator.sequence.log
|
||||||
- include: immediately_pop
|
- match: ''
|
||||||
|
pop: true
|
||||||
numbers:
|
numbers:
|
||||||
- match: \b(0x)(\h+)(?:(\.)(\h+))?\b
|
- match: \b(0x)(\h+)(?:(\.)(\h+))?\b
|
||||||
scope: meta.number.float.hexadecimal.log
|
scope: meta.number.float.hexadecimal.log
|
||||||
@ -172,13 +112,5 @@ contexts:
|
|||||||
pop: true
|
pop: true
|
||||||
- match: '[^?!.,:*_~\s<&()%]+|\S'
|
- match: '[^?!.,:*_~\s<&()%]+|\S'
|
||||||
scope: markup.underline.link.path.log
|
scope: markup.underline.link.path.log
|
||||||
- include: immediately_pop
|
- match: ''
|
||||||
double_quoted_string:
|
|
||||||
- meta_scope: string.quoted.double.log
|
|
||||||
- match: \\"
|
|
||||||
scope: constant.character.escape.log
|
|
||||||
- match: \\n
|
|
||||||
scope: constant.character.escape.log
|
|
||||||
- match: \"
|
|
||||||
scope: punctuation.definition.string.end.log
|
|
||||||
pop: true
|
pop: true
|
||||||
|
2
assets/syntaxes/02_Extra/ssh-config
vendored
2
assets/syntaxes/02_Extra/ssh-config
vendored
@ -1 +1 @@
|
|||||||
Subproject commit bf49e9181c6bf992a86beb133144d2651e826ddc
|
Subproject commit e1012e9f13c6073f559b14206df2ede35720e884
|
419
assets/syntaxes/02_Extra/syntax_test_helphelp.txt
vendored
419
assets/syntaxes/02_Extra/syntax_test_helphelp.txt
vendored
@ -1,419 +0,0 @@
|
|||||||
# SYNTAX TEST "VimHelp.sublime-syntax"
|
|
||||||
*helphelp.txt* Nvim
|
|
||||||
# <- punctuation.definition.constant.begin
|
|
||||||
#^^^^^^^^^^^^ entity.name.reference.link
|
|
||||||
# ^ punctuation.definition.constant.end
|
|
||||||
|
|
||||||
|
|
||||||
VIM REFERENCE MANUAL by Bram Moolenaar
|
|
||||||
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ variable.language
|
|
||||||
|
|
||||||
|
|
||||||
Help on help files *helphelp*
|
|
||||||
|
|
||||||
Type |gO| to see the table of contents.
|
|
||||||
# ^ punctuation.definition.link.begin
|
|
||||||
# ^^ markup.underline.link
|
|
||||||
# ^ punctuation.definition.link.end
|
|
||||||
|
|
||||||
==============================================================================
|
|
||||||
#^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ punctuation.definition.heading.1.setext
|
|
||||||
1. Help commands *online-help*
|
|
||||||
#^^^^^^^^^^^^^^^ markup.heading.1.setext
|
|
||||||
|
|
||||||
*help* *<Help>* *:h* *:help* *<F1>* *i_<F1>* *i_<Help>*
|
|
||||||
<Help> or
|
|
||||||
#^^^^^ markup.underline.link.key
|
|
||||||
:h[elp] Open a window and display the help file in read-only
|
|
||||||
mode. If there is a help window open already, use
|
|
||||||
that one. Otherwise, if the current window uses the
|
|
||||||
full width of the screen or is at least 80 characters
|
|
||||||
wide, the help window will appear just above the
|
|
||||||
current window. Otherwise the new window is put at
|
|
||||||
the very top.
|
|
||||||
The 'helplang' option is used to select a language, if
|
|
||||||
# ^ punctuation.definition.link.option.begin
|
|
||||||
# ^^^^^^^^ markup.underline.link.option
|
|
||||||
# ^ punctuation.definition.link.option.end
|
|
||||||
the main help file is available in several languages.
|
|
||||||
|
|
||||||
Type |gO| to see the table of contents.
|
|
||||||
|
|
||||||
*{subject}* *E149* *E661*
|
|
||||||
:h[elp] {subject} Like ":help", additionally jump to the tag {subject}.
|
|
||||||
For example: >
|
|
||||||
:help options
|
|
||||||
|
|
||||||
< {subject} can include wildcards such as "*", "?" and
|
|
||||||
# ^ punctuation.definition.constant.begin
|
|
||||||
# ^^^^^^^ constant.numeric
|
|
||||||
# ^ punctuation.definition.constant.end
|
|
||||||
"[a-z]":
|
|
||||||
:help z? jump to help for any "z" command
|
|
||||||
:help z. jump to the help for "z."
|
|
||||||
But when a tag exists it is taken literally:
|
|
||||||
:help :? jump to help for ":?"
|
|
||||||
|
|
||||||
If there is no full match for the pattern, or there
|
|
||||||
are several matches, the "best" match will be used.
|
|
||||||
A sophisticated algorithm is used to decide which
|
|
||||||
match is better than another one. These items are
|
|
||||||
considered in the computation:
|
|
||||||
- A match with same case is much better than a match
|
|
||||||
with different case.
|
|
||||||
- A match that starts after a non-alphanumeric
|
|
||||||
character is better than a match in the middle of a
|
|
||||||
word.
|
|
||||||
- A match at or near the beginning of the tag is
|
|
||||||
better than a match further on.
|
|
||||||
- The more alphanumeric characters match, the better.
|
|
||||||
- The shorter the length of the match, the better.
|
|
||||||
|
|
||||||
The 'helplang' option is used to select a language, if
|
|
||||||
the {subject} is available in several languages.
|
|
||||||
To find a tag in a specific language, append "@ab",
|
|
||||||
where "ab" is the two-letter language code. See
|
|
||||||
|help-translated|.
|
|
||||||
|
|
||||||
Note that the longer the {subject} you give, the less
|
|
||||||
matches will be found. You can get an idea how this
|
|
||||||
all works by using commandline completion (type CTRL-D
|
|
||||||
# ^^^^^^ markup.underline.link.key
|
|
||||||
after ":help subject" |c_CTRL-D|).
|
|
||||||
If there are several matches, you can have them listed
|
|
||||||
by hitting CTRL-D. Example: >
|
|
||||||
:help cont<Ctrl-D>
|
|
||||||
|
|
||||||
< Instead of typing ":help CTRL-V" to search for help
|
|
||||||
for CTRL-V you can type: >
|
|
||||||
:help ^V
|
|
||||||
< This also works together with other characters, for
|
|
||||||
example to find help for CTRL-V in Insert mode: >
|
|
||||||
:help i^V
|
|
||||||
<
|
|
||||||
It is also possible to first do ":help" and then
|
|
||||||
use ":tag {pattern}" in the help window. The
|
|
||||||
":tnext" command can then be used to jump to other
|
|
||||||
matches, "tselect" to list matches and choose one. >
|
|
||||||
:help index
|
|
||||||
:tselect /.*mode
|
|
||||||
|
|
||||||
< When there is no argument you will see matches for
|
|
||||||
"help", to avoid listing all possible matches (that
|
|
||||||
would be very slow).
|
|
||||||
The number of matches displayed is limited to 300.
|
|
||||||
|
|
||||||
The `:help` command can be followed by '|' and another
|
|
||||||
command, but you don't need to escape the '|' inside a
|
|
||||||
help command. So these both work: >
|
|
||||||
:help |
|
|
||||||
:help k| only
|
|
||||||
< Note that a space before the '|' is seen as part of
|
|
||||||
# ^^^^ constant.other.note
|
|
||||||
the ":help" argument.
|
|
||||||
You can also use <NL> or <CR> to separate the help
|
|
||||||
command from a following command. You need to type
|
|
||||||
CTRL-V first to insert the <NL> or <CR>. Example: >
|
|
||||||
:help so<C-V><CR>only
|
|
||||||
<
|
|
||||||
|
|
||||||
:h[elp]! [subject] Like ":help", but in non-English help files prefer to
|
|
||||||
find a tag in a file with the same language as the
|
|
||||||
current file. See |help-translated|.
|
|
||||||
|
|
||||||
*:helpc* *:helpclose*
|
|
||||||
:helpc[lose] Close one help window, if there is one.
|
|
||||||
Vim will try to restore the window layout (including
|
|
||||||
cursor position) to the same layout it was before
|
|
||||||
opening the help window initially. This might cause
|
|
||||||
triggering several autocommands.
|
|
||||||
|
|
||||||
*:helpg* *:helpgrep*
|
|
||||||
:helpg[rep] {pattern}[@xx]
|
|
||||||
Search all help text files and make a list of lines
|
|
||||||
in which {pattern} matches. Jumps to the first match.
|
|
||||||
The optional [@xx] specifies that only matches in the
|
|
||||||
"xx" language are to be found.
|
|
||||||
You can navigate through the matches with the
|
|
||||||
|quickfix| commands, e.g., |:cnext| to jump to the
|
|
||||||
next one. Or use |:cwindow| to get the list of
|
|
||||||
matches in the quickfix window.
|
|
||||||
{pattern} is used as a Vim regexp |pattern|.
|
|
||||||
'ignorecase' is not used, add "\c" to ignore case.
|
|
||||||
Example for case sensitive search: >
|
|
||||||
:helpgrep Uganda
|
|
||||||
< Example for case ignoring search: >
|
|
||||||
:helpgrep uganda\c
|
|
||||||
< Example for searching in French help: >
|
|
||||||
:helpgrep backspace@fr
|
|
||||||
< The pattern does not support line breaks, it must
|
|
||||||
match within one line. You can use |:grep| instead,
|
|
||||||
but then you need to get the list of help files in a
|
|
||||||
complicated way.
|
|
||||||
Cannot be followed by another command, everything is
|
|
||||||
used as part of the pattern. But you can use
|
|
||||||
|:execute| when needed.
|
|
||||||
Compressed help files will not be searched (Fedora
|
|
||||||
compresses the help files).
|
|
||||||
|
|
||||||
*:lh* *:lhelpgrep*
|
|
||||||
:lh[elpgrep] {pattern}[@xx]
|
|
||||||
Same as ":helpgrep", except the location list is used
|
|
||||||
instead of the quickfix list. If the help window is
|
|
||||||
already opened, then the location list for that window
|
|
||||||
is used. Otherwise, a new help window is opened and
|
|
||||||
the location list for that window is set. The
|
|
||||||
location list for the current window is not changed
|
|
||||||
then.
|
|
||||||
|
|
||||||
*:exu* *:exusage*
|
|
||||||
:exu[sage] Show help on Ex commands. Added to simulate the Nvi
|
|
||||||
command.
|
|
||||||
|
|
||||||
*:viu* *:viusage*
|
|
||||||
:viu[sage] Show help on Normal mode commands. Added to simulate
|
|
||||||
the Nvi command.
|
|
||||||
|
|
||||||
When no argument is given to |:help| the file given with the 'helpfile' option
|
|
||||||
will be opened. Otherwise the specified tag is searched for in all "doc/tags"
|
|
||||||
files in the directories specified in the 'runtimepath' option.
|
|
||||||
|
|
||||||
If you would like to open the help in the current window, see this tip:
|
|
||||||
|help-curwin|.
|
|
||||||
|
|
||||||
The initial height of the help window can be set with the 'helpheight' option
|
|
||||||
(default 20).
|
|
||||||
*help-buffer-options*
|
|
||||||
When the help buffer is created, several local options are set to make sure
|
|
||||||
the help text is displayed as it was intended:
|
|
||||||
'iskeyword' nearly all ASCII chars except ' ', '*', '"' and '|'
|
|
||||||
'foldmethod' "manual"
|
|
||||||
'tabstop' 8
|
|
||||||
'arabic' off
|
|
||||||
'binary' off
|
|
||||||
'buflisted' off
|
|
||||||
'cursorbind' off
|
|
||||||
'diff' off
|
|
||||||
'foldenable' off
|
|
||||||
'list' off
|
|
||||||
'modifiable' off
|
|
||||||
'number' off
|
|
||||||
'relativenumber' off
|
|
||||||
'rightleft' off
|
|
||||||
'scrollbind' off
|
|
||||||
'spell' off
|
|
||||||
|
|
||||||
Jump to specific subjects by using tags. This can be done in two ways:
|
|
||||||
- Use the "CTRL-]" command while standing on the name of a command or option.
|
|
||||||
This only works when the tag is a keyword. "<C-Leftmouse>" and
|
|
||||||
"g<LeftMouse>" work just like "CTRL-]".
|
|
||||||
- use the ":ta {subject}" command. This also works with non-keyword
|
|
||||||
characters.
|
|
||||||
|
|
||||||
Use CTRL-T or CTRL-O to jump back.
|
|
||||||
Use ":q" to close the help window.
|
|
||||||
|
|
||||||
If there are several matches for an item you are looking for, this is how you
|
|
||||||
can jump to each one of them:
|
|
||||||
1. Open a help window
|
|
||||||
2. Use the ":tag" command with a slash prepended to the tag. E.g.: >
|
|
||||||
:tag /min
|
|
||||||
3. Use ":tnext" to jump to the next matching tag.
|
|
||||||
|
|
||||||
It is possible to add help files for plugins and other items. You don't need
|
|
||||||
to change the distributed help files for that. See |add-local-help|.
|
|
||||||
|
|
||||||
To write a local help file, see |write-local-help|.
|
|
||||||
|
|
||||||
Note that the title lines from the local help files are automagically added to
|
|
||||||
the "LOCAL ADDITIONS" section in the "help.txt" help file |local-additions|.
|
|
||||||
This is done when viewing the file in Vim, the file itself is not changed. It
|
|
||||||
is done by going through all help files and obtaining the first line of each
|
|
||||||
file. The files in $VIMRUNTIME/doc are skipped.
|
|
||||||
|
|
||||||
*help-xterm-window*
|
|
||||||
If you want to have the help in another xterm window, you could use this
|
|
||||||
command: >
|
|
||||||
:!xterm -e vim +help &
|
|
||||||
<
|
|
||||||
|
|
||||||
*:helpt* *:helptags*
|
|
||||||
*E150* *E151* *E152* *E153* *E154* *E670* *E856*
|
|
||||||
:helpt[ags] [++t] {dir}
|
|
||||||
Generate the help tags file(s) for directory {dir}.
|
|
||||||
When {dir} is ALL then all "doc" directories in
|
|
||||||
'runtimepath' will be used.
|
|
||||||
|
|
||||||
All "*.txt" and "*.??x" files in the directory and
|
|
||||||
sub-directories are scanned for a help tag definition
|
|
||||||
in between stars. The "*.??x" files are for
|
|
||||||
translated docs, they generate the "tags-??" file, see
|
|
||||||
|help-translated|. The generated tags files are
|
|
||||||
sorted.
|
|
||||||
When there are duplicates an error message is given.
|
|
||||||
An existing tags file is silently overwritten.
|
|
||||||
|
|
||||||
The optional "++t" argument forces adding the
|
|
||||||
"help-tags" tag. This is also done when the {dir} is
|
|
||||||
equal to $VIMRUNTIME/doc.
|
|
||||||
|
|
||||||
To rebuild the help tags in the runtime directory
|
|
||||||
(requires write permission there): >
|
|
||||||
:helptags $VIMRUNTIME/doc
|
|
||||||
<
|
|
||||||
|
|
||||||
|
|
||||||
==============================================================================
|
|
||||||
2. Translated help files *help-translated*
|
|
||||||
|
|
||||||
It is possible to add translated help files, next to the original English help
|
|
||||||
files. Vim will search for all help in "doc" directories in 'runtimepath'.
|
|
||||||
|
|
||||||
At this moment translations are available for:
|
|
||||||
Chinese - multiple authors
|
|
||||||
French - translated by David Blanchet
|
|
||||||
Italian - translated by Antonio Colombo
|
|
||||||
Japanese - multiple authors
|
|
||||||
Polish - translated by Mikolaj Machowski
|
|
||||||
Russian - translated by Vassily Ragosin
|
|
||||||
See the Vim website to find them: http://www.vim.org/translations.php
|
|
||||||
|
|
||||||
A set of translated help files consists of these files:
|
|
||||||
|
|
||||||
help.abx
|
|
||||||
howto.abx
|
|
||||||
...
|
|
||||||
tags-ab
|
|
||||||
|
|
||||||
"ab" is the two-letter language code. Thus for Italian the names are:
|
|
||||||
|
|
||||||
help.itx
|
|
||||||
howto.itx
|
|
||||||
...
|
|
||||||
tags-it
|
|
||||||
|
|
||||||
The 'helplang' option can be set to the preferred language(s). The default is
|
|
||||||
set according to the environment. Vim will first try to find a matching tag
|
|
||||||
in the preferred language(s). English is used when it cannot be found.
|
|
||||||
|
|
||||||
To find a tag in a specific language, append "@ab" to a tag, where "ab" is the
|
|
||||||
two-letter language code. Example: >
|
|
||||||
:he user-manual@it
|
|
||||||
:he user-manual@en
|
|
||||||
The first one finds the Italian user manual, even when 'helplang' is empty.
|
|
||||||
The second one finds the English user manual, even when 'helplang' is set to
|
|
||||||
"it".
|
|
||||||
|
|
||||||
When using command-line completion for the ":help" command, the "@en"
|
|
||||||
extension is only shown when a tag exists for multiple languages. When the
|
|
||||||
tag only exists for English "@en" is omitted. When the first candidate has an
|
|
||||||
"@ab" extension and it matches the first language in 'helplang' "@ab" is also
|
|
||||||
omitted.
|
|
||||||
|
|
||||||
When using |CTRL-]| or ":help!" in a non-English help file Vim will try to
|
|
||||||
find the tag in the same language. If not found then 'helplang' will be used
|
|
||||||
to select a language.
|
|
||||||
|
|
||||||
Help files must use latin1 or utf-8 encoding. Vim assumes the encoding is
|
|
||||||
utf-8 when finding non-ASCII characters in the first line. Thus you must
|
|
||||||
translate the header with "For Vim version".
|
|
||||||
|
|
||||||
The same encoding must be used for the help files of one language in one
|
|
||||||
directory. You can use a different encoding for different languages and use
|
|
||||||
a different encoding for help files of the same language but in a different
|
|
||||||
directory.
|
|
||||||
|
|
||||||
Hints for translators:
|
|
||||||
- Do not translate the tags. This makes it possible to use 'helplang' to
|
|
||||||
specify the preferred language. You may add new tags in your language.
|
|
||||||
- When you do not translate a part of a file, add tags to the English version,
|
|
||||||
using the "tag@en" notation.
|
|
||||||
- Make a package with all the files and the tags file available for download.
|
|
||||||
Users can drop it in one of the "doc" directories and start use it.
|
|
||||||
Report this to Bram, so that he can add a link on www.vim.org.
|
|
||||||
- Use the |:helptags| command to generate the tags files. It will find all
|
|
||||||
languages in the specified directory.
|
|
||||||
|
|
||||||
==============================================================================
|
|
||||||
3. Writing help files *help-writing*
|
|
||||||
|
|
||||||
For ease of use, a Vim help file for a plugin should follow the format of the
|
|
||||||
standard Vim help files, except for the first line. If you are writing a new
|
|
||||||
help file it's best to copy one of the existing files and use it as a
|
|
||||||
template.
|
|
||||||
|
|
||||||
The first line in a help file should have the following format:
|
|
||||||
|
|
||||||
*plugin_name.txt* {short description of the plugin}
|
|
||||||
|
|
||||||
The first field is a help tag where ":help plugin_name" will jump to. The
|
|
||||||
remainder of the line, after a Tab, describes the plugin purpose in a short
|
|
||||||
way. This will show up in the "LOCAL ADDITIONS" section of the main help
|
|
||||||
file. Check there that it shows up properly: |local-additions|.
|
|
||||||
|
|
||||||
If you want to add a version number or last modification date, put it in the
|
|
||||||
second line, right aligned.
|
|
||||||
|
|
||||||
At the bottom of the help file, place a Vim modeline to set the 'textwidth'
|
|
||||||
and 'tabstop' options and the 'filetype' to "help". Never set a global option
|
|
||||||
in such a modeline, that can have undesired consequences.
|
|
||||||
|
|
||||||
|
|
||||||
TAGS
|
|
||||||
|
|
||||||
To define a help tag, place the name between asterisks (*tag-name*). The
|
|
||||||
tag-name should be different from all the Vim help tag names and ideally
|
|
||||||
should begin with the name of the Vim plugin. The tag name is usually right
|
|
||||||
aligned on a line.
|
|
||||||
|
|
||||||
When referring to an existing help tag and to create a hot-link, place the
|
|
||||||
name between two bars (|) eg. |help-writing|.
|
|
||||||
|
|
||||||
When referring to a Vim command and to create a hot-link, place the
|
|
||||||
name between two backticks, eg. inside `:filetype`. You will see this is
|
|
||||||
highlighted as a command, like a code block (see below).
|
|
||||||
|
|
||||||
When referring to a Vim option in the help file, place the option name between
|
|
||||||
two single quotes, eg. 'statusline'
|
|
||||||
|
|
||||||
When referring to any other technical term, such as a filename or function
|
|
||||||
parameter, surround it in backticks, eg. `~/.path/to/init.vim`.
|
|
||||||
|
|
||||||
|
|
||||||
HIGHLIGHTING
|
|
||||||
|
|
||||||
To define a column heading, use a tilde character at the end of the line.
|
|
||||||
This will highlight the column heading in a different color. E.g.
|
|
||||||
|
|
||||||
Column heading~
|
|
||||||
#^^^^^^^^^^^^^ markup.heading.header
|
|
||||||
# ^ punctuation.definition.keyword
|
|
||||||
|
|
||||||
To separate sections in a help file, place a series of '=' characters in a
|
|
||||||
line starting from the first column. The section separator line is highlighted
|
|
||||||
differently.
|
|
||||||
|
|
||||||
To quote a block of ex-commands verbatim, place a greater than (>) character
|
|
||||||
at the end of the line before the block and a less than (<) character as the
|
|
||||||
first non-blank on a line following the block. Any line starting in column 1
|
|
||||||
also implicitly stops the block of ex-commands before it. E.g. >
|
|
||||||
function Example_Func()
|
|
||||||
echo "Example"
|
|
||||||
endfunction
|
|
||||||
<
|
|
||||||
|
|
||||||
The following are highlighted differently in a Vim help file:
|
|
||||||
- a special key name expressed either in <> notation as in <PageDown>, or
|
|
||||||
as a Ctrl character as in CTRL-X
|
|
||||||
- anything between {braces}, e.g. {lhs} and {rhs}
|
|
||||||
|
|
||||||
The word "Note", "Notes" and similar automagically receive distinctive
|
|
||||||
highlighting. So do these:
|
|
||||||
*Todo something to do
|
|
||||||
*Error something wrong
|
|
||||||
|
|
||||||
You can find the details in $VIMRUNTIME/syntax/help.vim
|
|
||||||
|
|
||||||
|
|
||||||
vim:tw=78:ts=8:noet:ft=help:norl:
|
|
||||||
#^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ comment.line.modeline
|
|
102
assets/syntaxes/02_Extra/syntax_test_man.man
vendored
102
assets/syntaxes/02_Extra/syntax_test_man.man
vendored
@ -157,108 +157,6 @@ ENVIRONMENT
|
|||||||
systemd reads the log level from this environment variable. This
|
systemd reads the log level from this environment variable. This
|
||||||
can be overridden with --log-level=.
|
can be overridden with --log-level=.
|
||||||
|
|
||||||
ENVIRONMENT VARIABLES
|
|
||||||
Various Git commands use the following environment variables:
|
|
||||||
|
|
||||||
The Git Repository
|
|
||||||
These environment variables apply to all core Git commands. Nb: it is
|
|
||||||
worth noting that they may be used/overridden by SCMS sitting above Git
|
|
||||||
so take care if using a foreign front-end.
|
|
||||||
|
|
||||||
GIT_INDEX_FILE
|
|
||||||
# ^^^^^^^^^^^^^^ support.constant.environment-variable
|
|
||||||
This environment allows the specification of an alternate index
|
|
||||||
file. If not specified, the default of $GIT_DIR/index is used.
|
|
||||||
|
|
||||||
GIT_INDEX_VERSION
|
|
||||||
# ^^^^^^^^^^^^^^^^^ support.constant.environment-variable
|
|
||||||
This environment variable allows the specification of an index
|
|
||||||
version for new repositories. It won’t affect existing index files.
|
|
||||||
By default index file version 2 or 3 is used. See git-update-
|
|
||||||
index(1) for more information.
|
|
||||||
|
|
||||||
COMMANDS
|
|
||||||
This section only lists general commands. For input and output com‐
|
|
||||||
mands, refer to sway-input(5) and sway-output(5).
|
|
||||||
|
|
||||||
The following commands may only be used in the configuration file.
|
|
||||||
|
|
||||||
bar [<bar-id>] <bar-subcommands...>
|
|
||||||
# ^^^ entity.name.command
|
|
||||||
# ^ punctuation.section.brackets.begin
|
|
||||||
# ^ punctuation.definition.generic.begin
|
|
||||||
# ^^^^^^ variable.parameter
|
|
||||||
# ^ punctuation.definition.generic.end
|
|
||||||
# ^ punctuation.section.brackets.end
|
|
||||||
# ^ punctuation.definition.generic.begin
|
|
||||||
# ^^^^^^^^^^^^^^^ variable.parameter
|
|
||||||
# ^ punctuation.definition.generic.end
|
|
||||||
For details on bar subcommands, see sway-bar(5).
|
|
||||||
|
|
||||||
default_orientation horizontal|vertical|auto
|
|
||||||
# ^^^^^^^^^^^^^^^^^^^ entity.name.command
|
|
||||||
# ^^^^^^^^^^ variable.parameter
|
|
||||||
# ^ keyword.operator.logical
|
|
||||||
# ^^^^^^^^ variable.parameter
|
|
||||||
# ^ keyword.operator.logical
|
|
||||||
# ^^^^ variable.parameter
|
|
||||||
Sets the default container layout for tiled containers.
|
|
||||||
|
|
||||||
include <path>
|
|
||||||
Includes another file from path. path can be either a full path or
|
|
||||||
a path relative to the parent config, and expands shell syntax (see
|
|
||||||
wordexp(3) for details). The same include file can only be included
|
|
||||||
once; subsequent attempts will be ignored.
|
|
||||||
|
|
||||||
The following commands cannot be used directly in the configuration
|
|
||||||
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - variable - entity
|
|
||||||
file. They are expected to be used with bindsym or at runtime through
|
|
||||||
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - variable - entity
|
|
||||||
swaymsg(1).
|
|
||||||
|
|
||||||
border none|normal|csd|pixel [<n>]
|
|
||||||
Set border style for focused window. normal includes a border of
|
|
||||||
thickness n and a title bar. pixel is a border without title bar n
|
|
||||||
pixels thick. Default is normal with border thickness 2. csd is
|
|
||||||
short for client-side-decorations, which allows the client to draw
|
|
||||||
its own decorations.
|
|
||||||
|
|
||||||
border toggle
|
|
||||||
# ^^^^^^ entity.name.command
|
|
||||||
Cycles through the available border styles.
|
|
||||||
|
|
||||||
exit
|
|
||||||
# ^^^^ entity.name.command
|
|
||||||
Exit sway and end your Wayland session.
|
|
||||||
|
|
||||||
floating enable|disable|toggle
|
|
||||||
Make focused view floating, non-floating, or the opposite of what
|
|
||||||
it is now.
|
|
||||||
|
|
||||||
<criteria> focus
|
|
||||||
# ^ punctuation.definition.generic.begin
|
|
||||||
# ^^^^^^^^ variable.parameter
|
|
||||||
# ^ punctuation.definition.generic.end
|
|
||||||
# ^^^^^ variable.parameter
|
|
||||||
Moves focus to the container that matches the specified criteria.
|
|
||||||
|
|
||||||
gaps inner|outer|horizontal|vertical|top|right|bottom|left all|current
|
|
||||||
set|plus|minus|toggle <amount>
|
|
||||||
# ^^^ variable.parameter
|
|
||||||
# ^ keyword.operator.logical
|
|
||||||
Changes the inner or outer gaps for either all workspaces or the
|
|
||||||
current workspace. outer gaps can be altered per side with top,
|
|
||||||
right, bottom, and left or per direction with horizontal and verti‐
|
|
||||||
cal.
|
|
||||||
|
|
||||||
layout toggle [split|tabbed|stacking|splitv|splith]
|
|
||||||
[split|tabbed|stacking|splitv|splith]...
|
|
||||||
# ^ punctuation.section.brackets.begin
|
|
||||||
# ^^^^^ variable.parameter
|
|
||||||
# ^ keyword.operator.logical
|
|
||||||
Cycles the layout mode of the focused container through a list of
|
|
||||||
layouts.
|
|
||||||
|
|
||||||
SEE ALSO
|
SEE ALSO
|
||||||
The systemd Homepage[11], systemd-system.conf(5), locale.conf(5)
|
The systemd Homepage[11], systemd-system.conf(5), locale.conf(5)
|
||||||
# ^^^^^^^^^^^^^^^^^^^ entity.name.function
|
# ^^^^^^^^^^^^^^^^^^^ entity.name.function
|
||||||
|
@ -1,82 +0,0 @@
|
|||||||
# SYNTAX TEST "Requirementstxt.sublime-syntax"
|
|
||||||
# Options
|
|
||||||
# <- punctuation.definition.comment
|
|
||||||
# ^^^^^^^ comment.line
|
|
||||||
--allow-external
|
|
||||||
#^^^^^^^^^^^^^^^ entity.name.function.option
|
|
||||||
--allow-unverified
|
|
||||||
|
|
||||||
# Freeze packages
|
|
||||||
alabaster==0.7.6
|
|
||||||
Babel>=2.9.1
|
|
||||||
docutils==0.12
|
|
||||||
gevent_subprocess==0.1.2
|
|
||||||
gitpython==3.0.7
|
|
||||||
hg-diff==1.2.4
|
|
||||||
#^^^^^^ variable.parameter.package-name
|
|
||||||
# ^^ keyword.operator.logical
|
|
||||||
# ^^^^^ constant.other
|
|
||||||
Jinja2>=2.8.1
|
|
||||||
MarkupSafe==0.23
|
|
||||||
Pygments==2.7.4
|
|
||||||
pytz==2015.7
|
|
||||||
six==1.10.0
|
|
||||||
snowballstemmer==1.2.0
|
|
||||||
Sphinx==1.3.3
|
|
||||||
sphinx-rtd-theme==0.1.9
|
|
||||||
svn==1.0.1
|
|
||||||
zope.interface==4.2.0
|
|
||||||
|
|
||||||
# Examples from PEP508
|
|
||||||
# c.f. https://www.python.org/dev/peps/pep-0508/
|
|
||||||
requests [security,tests] >= 2.8.1, == 2.8.* ; python_version < "2.7" # Comment
|
|
||||||
#^^^^^^^ variable.parameter.package-name
|
|
||||||
# ^^^^^^^^^^^^^^^^ variable.function.extra
|
|
||||||
# ^ punctuation.section.braces.begin
|
|
||||||
# ^ punctuation.separator
|
|
||||||
# ^ punctuation.section.braces.end
|
|
||||||
# ^^ keyword.operator.logical
|
|
||||||
# ^^^^^ constant.other
|
|
||||||
# ^^ keyword.operator.logical
|
|
||||||
# ^^^^^ constant.other
|
|
||||||
# ^ punctuation.definition.annotation
|
|
||||||
# ^^^^^^^^^^^^^^^^^^^^^^^^ meta.annotation
|
|
||||||
# ^^^^^^^^^^^^^^ variable.language
|
|
||||||
# ^ keyword.operator.logical
|
|
||||||
# ^ punctuation.definition.string.begin.double
|
|
||||||
# ^^^^^ string.quoted.double.requirements-txt
|
|
||||||
# ^ punctuation.definition.string.end.double
|
|
||||||
# ^^^^^^^^^ comment.line
|
|
||||||
pip @ https://github.com/pypa/pip/archive/1.3.1.zip#sha1=da9234ee9982d4bbb3c72346a6de940a148ea686
|
|
||||||
# ^ punctuation.definition.keyword
|
|
||||||
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ markup.underline.link.url
|
|
||||||
name @ gopher:/foo/com"
|
|
||||||
foobar[quux]<2,>=3; os_name=='a'
|
|
||||||
|
|
||||||
# VCS repositories
|
|
||||||
-e git+git://git.myproject.org/MyProject#egg=MyProject # Git
|
|
||||||
# <- entity.name.function.option
|
|
||||||
#^ entity.name.function.option
|
|
||||||
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ markup.underline.link.versioncontrols
|
|
||||||
# ^^^^^^^^^^^^^^^ - comment.line
|
|
||||||
# ^^^^^ comment.line
|
|
||||||
-e git://git.myproject.org/MyProject.git@v1.0#egg=MyProject
|
|
||||||
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ markup.underline.link.versioncontrols
|
|
||||||
-e hg+https://hg.myproject.org/MyProject#egg=MyProject # Mercurial
|
|
||||||
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ markup.underline.link.versioncontrols
|
|
||||||
# ^^^^^^^^^^^ comment.line
|
|
||||||
-e hg+http://hg.myproject.org/MyProject@da39a3ee5e6b#egg=MyProject
|
|
||||||
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ markup.underline.link.versioncontrols
|
|
||||||
-e svn+http://svn.myproject.org/svn/MyProject/trunk@2019#egg=MyProject # Subversion
|
|
||||||
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ markup.underline.link.versioncontrols
|
|
||||||
# ^^^^^^^^^^^^ comment.line
|
|
||||||
-e bzr+ssh://user@myproject.org/MyProject/trunk#egg=MyProject # Bazaar
|
|
||||||
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ markup.underline.link.versioncontrols
|
|
||||||
# ^^^^^^^^ comment.line
|
|
||||||
-e bzr+https://bzr.myproject.org/MyProject/trunk@2019#egg=MyProject
|
|
||||||
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ markup.underline.link.versioncontrols
|
|
||||||
|
|
||||||
# Project or archive URL
|
|
||||||
https://github.com/pallets/click/archive/7.0.zip#egg=click
|
|
||||||
#^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ markup.underline.link.url
|
|
||||||
# ^^^^^^^^^^ - comment.line
|
|
1
assets/syntaxes/02_Extra/vscode-wgsl
vendored
1
assets/syntaxes/02_Extra/vscode-wgsl
vendored
@ -1 +0,0 @@
|
|||||||
Subproject commit acf26718d7a327377641e31d8f9a9dab376efa84
|
|
198
assets/syntaxes/02_Extra/wgsl.sublime-syntax
vendored
198
assets/syntaxes/02_Extra/wgsl.sublime-syntax
vendored
@ -1,198 +0,0 @@
|
|||||||
%YAML 1.2
|
|
||||||
---
|
|
||||||
# http://www.sublimetext.com/docs/syntax.html
|
|
||||||
name: WGSL
|
|
||||||
file_extensions:
|
|
||||||
- wgsl
|
|
||||||
scope: source.wgsl
|
|
||||||
contexts:
|
|
||||||
main:
|
|
||||||
- include: line_comments
|
|
||||||
- include: block_comments
|
|
||||||
- include: keywords
|
|
||||||
- include: attributes
|
|
||||||
- include: functions
|
|
||||||
- include: function_calls
|
|
||||||
- include: constants
|
|
||||||
- include: types
|
|
||||||
- include: variables
|
|
||||||
- include: punctuation
|
|
||||||
attributes:
|
|
||||||
- match: '(@)([A-Za-z_]+)'
|
|
||||||
comment: attribute declaration
|
|
||||||
scope: meta.attribute.wgsl
|
|
||||||
captures:
|
|
||||||
1: keyword.operator.attribute.at
|
|
||||||
2: entity.name.attribute.wgsl
|
|
||||||
block_comments:
|
|
||||||
- match: /\*\*/
|
|
||||||
comment: empty block comments
|
|
||||||
scope: comment.block.wgsl
|
|
||||||
- match: /\*\*
|
|
||||||
comment: block documentation comments
|
|
||||||
push:
|
|
||||||
- meta_scope: comment.block.documentation.wgsl
|
|
||||||
- match: \*/
|
|
||||||
pop: true
|
|
||||||
- include: block_comments
|
|
||||||
- match: /\*(?!\*)
|
|
||||||
comment: block comments
|
|
||||||
push:
|
|
||||||
- meta_scope: comment.block.wgsl
|
|
||||||
- match: \*/
|
|
||||||
pop: true
|
|
||||||
- include: block_comments
|
|
||||||
constants:
|
|
||||||
- match: '(-?\b[0-9][0-9]*\.[0-9][0-9]*)([eE][+-]?[0-9]+)?\b'
|
|
||||||
comment: decimal float literal
|
|
||||||
scope: constant.numeric.float.wgsl
|
|
||||||
- match: '-?\b0x[0-9a-fA-F]+\b|\b0\b|-?\b[1-9][0-9]*\b'
|
|
||||||
comment: int literal
|
|
||||||
scope: constant.numeric.decimal.wgsl
|
|
||||||
- match: '\b0x[0-9a-fA-F]+u\b|\b0u\b|\b[1-9][0-9]*u\b'
|
|
||||||
comment: uint literal
|
|
||||||
scope: constant.numeric.decimal.wgsl
|
|
||||||
- match: \b(true|false)\b
|
|
||||||
comment: boolean constant
|
|
||||||
scope: constant.language.boolean.wgsl
|
|
||||||
function_calls:
|
|
||||||
- match: '([A-Za-z0-9_]+)(\()'
|
|
||||||
comment: function/method calls
|
|
||||||
captures:
|
|
||||||
1: entity.name.function.wgsl
|
|
||||||
2: punctuation.brackets.round.wgsl
|
|
||||||
push:
|
|
||||||
- meta_scope: meta.function.call.wgsl
|
|
||||||
- match: \)
|
|
||||||
captures:
|
|
||||||
0: punctuation.brackets.round.wgsl
|
|
||||||
pop: true
|
|
||||||
- include: line_comments
|
|
||||||
- include: block_comments
|
|
||||||
- include: keywords
|
|
||||||
- include: attributes
|
|
||||||
- include: function_calls
|
|
||||||
- include: constants
|
|
||||||
- include: types
|
|
||||||
- include: variables
|
|
||||||
- include: punctuation
|
|
||||||
functions:
|
|
||||||
- match: '\b(fn)\s+([A-Za-z0-9_]+)((\()|(<))'
|
|
||||||
comment: function definition
|
|
||||||
captures:
|
|
||||||
1: keyword.other.fn.wgsl
|
|
||||||
2: entity.name.function.wgsl
|
|
||||||
4: punctuation.brackets.round.wgsl
|
|
||||||
push:
|
|
||||||
- meta_scope: meta.function.definition.wgsl
|
|
||||||
- match: '\{'
|
|
||||||
captures:
|
|
||||||
0: punctuation.brackets.curly.wgsl
|
|
||||||
pop: true
|
|
||||||
- include: line_comments
|
|
||||||
- include: block_comments
|
|
||||||
- include: keywords
|
|
||||||
- include: attributes
|
|
||||||
- include: function_calls
|
|
||||||
- include: constants
|
|
||||||
- include: types
|
|
||||||
- include: variables
|
|
||||||
- include: punctuation
|
|
||||||
keywords:
|
|
||||||
- match: \b(bitcast|block|break|case|continue|continuing|default|discard|else|elseif|enable|fallthrough|for|function|if|loop|private|read|read_write|return|storage|switch|uniform|while|workgroup|write)\b
|
|
||||||
comment: other keywords
|
|
||||||
scope: keyword.control.wgsl
|
|
||||||
- match: \b(asm|const|do|enum|handle|mat|premerge|regardless|typedef|unless|using|vec|void)\b
|
|
||||||
comment: reserved keywords
|
|
||||||
scope: keyword.control.wgsl
|
|
||||||
- match: \b(let|var)\b
|
|
||||||
comment: storage keywords
|
|
||||||
scope: keyword.other.wgsl storage.type.wgsl
|
|
||||||
- match: \b(type)\b
|
|
||||||
comment: type keyword
|
|
||||||
scope: keyword.declaration.type.wgsl storage.type.wgsl
|
|
||||||
- match: \b(enum)\b
|
|
||||||
comment: enum keyword
|
|
||||||
scope: keyword.declaration.enum.wgsl storage.type.wgsl
|
|
||||||
- match: \b(struct)\b
|
|
||||||
comment: struct keyword
|
|
||||||
scope: keyword.declaration.struct.wgsl storage.type.wgsl
|
|
||||||
- match: \bfn\b
|
|
||||||
comment: fn
|
|
||||||
scope: keyword.other.fn.wgsl
|
|
||||||
- match: (\^|\||\|\||&&|<<|>>|!)(?!=)
|
|
||||||
comment: logical operators
|
|
||||||
scope: keyword.operator.logical.wgsl
|
|
||||||
- match: '&(?![&=])'
|
|
||||||
comment: logical AND, borrow references
|
|
||||||
scope: keyword.operator.borrow.and.wgsl
|
|
||||||
- match: (\+=|-=|\*=|/=|%=|\^=|&=|\|=|<<=|>>=)
|
|
||||||
comment: assignment operators
|
|
||||||
scope: keyword.operator.assignment.wgsl
|
|
||||||
- match: '(?<![<>])=(?!=|>)'
|
|
||||||
comment: single equal
|
|
||||||
scope: keyword.operator.assignment.equal.wgsl
|
|
||||||
- match: (=(=)?(?!>)|!=|<=|(?<!=)>=)
|
|
||||||
comment: comparison operators
|
|
||||||
scope: keyword.operator.comparison.wgsl
|
|
||||||
- match: '(([+%]|(\*(?!\w)))(?!=))|(-(?!>))|(/(?!/))'
|
|
||||||
comment: math operators
|
|
||||||
scope: keyword.operator.math.wgsl
|
|
||||||
- match: \.(?!\.)
|
|
||||||
comment: dot access
|
|
||||||
scope: keyword.operator.access.dot.wgsl
|
|
||||||
- match: '->'
|
|
||||||
comment: dashrocket, skinny arrow
|
|
||||||
scope: keyword.operator.arrow.skinny.wgsl
|
|
||||||
line_comments:
|
|
||||||
- match: \s*//.*
|
|
||||||
comment: single line comment
|
|
||||||
scope: comment.line.double-slash.wgsl
|
|
||||||
punctuation:
|
|
||||||
- match: ','
|
|
||||||
comment: comma
|
|
||||||
scope: punctuation.comma.wgsl
|
|
||||||
- match: '[{}]'
|
|
||||||
comment: curly braces
|
|
||||||
scope: punctuation.brackets.curly.wgsl
|
|
||||||
- match: '[()]'
|
|
||||||
comment: parentheses, round brackets
|
|
||||||
scope: punctuation.brackets.round.wgsl
|
|
||||||
- match: ;
|
|
||||||
comment: semicolon
|
|
||||||
scope: punctuation.semi.wgsl
|
|
||||||
- match: '[\[\]]'
|
|
||||||
comment: square brackets
|
|
||||||
scope: punctuation.brackets.square.wgsl
|
|
||||||
- match: '(?<![=-])[<>]'
|
|
||||||
comment: angle brackets
|
|
||||||
scope: punctuation.brackets.angle.wgsl
|
|
||||||
types:
|
|
||||||
- match: \b(bool|i32|u32|f32)\b
|
|
||||||
comment: scalar Types
|
|
||||||
scope: storage.type.wgsl
|
|
||||||
- match: \b(i64|u64|f64)\b
|
|
||||||
comment: reserved scalar Types
|
|
||||||
scope: storage.type.wgsl
|
|
||||||
- match: \b(vec2i|vec3i|vec4i|vec2u|vec3u|vec4u|vec2f|vec3f|vec4f|vec2h|vec3h|vec4h)\b
|
|
||||||
comment: vector type aliasses
|
|
||||||
scope: storage.type.wgsl
|
|
||||||
- match: \b(mat2x2f|mat2x3f|mat2x4f|mat3x2f|mat3x3f|mat3x4f|mat4x2f|mat4x3f|mat4x4f|mat2x2h|mat2x3h|mat2x4h|mat3x2h|mat3x3h|mat3x4h|mat4x2h|mat4x3h|mat4x4h)\b
|
|
||||||
comment: matrix type aliasses
|
|
||||||
scope: storage.type.wgsl
|
|
||||||
- match: '\b(vec[2-4]|mat[2-4]x[2-4])\b'
|
|
||||||
comment: vector/matrix types
|
|
||||||
scope: storage.type.wgsl
|
|
||||||
- match: \b(atomic)\b
|
|
||||||
comment: atomic types
|
|
||||||
scope: storage.type.wgsl
|
|
||||||
- match: \b(array)\b
|
|
||||||
comment: array types
|
|
||||||
scope: storage.type.wgsl
|
|
||||||
- match: '\b([A-Z][A-Za-z0-9]*)\b'
|
|
||||||
comment: Custom type
|
|
||||||
scope: entity.name.type.wgsl
|
|
||||||
variables:
|
|
||||||
- match: '\b(?<!(?<!\.)\.)(?:r#(?!(crate|[Ss]elf|super)))?[a-z0-9_]+\b'
|
|
||||||
comment: variables
|
|
||||||
scope: variable.other.wgsl
|
|
BIN
assets/themes.bin
vendored
BIN
assets/themes.bin
vendored
Binary file not shown.
2
assets/themes/zenburn
vendored
2
assets/themes/zenburn
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 86d4ee7a1f884851a1d21d66249687f527fced32
|
Subproject commit 702023d80d9f845a5847eefc4c81c2d4dbbdac59
|
106
build.rs
Normal file
106
build.rs
Normal file
@ -0,0 +1,106 @@
|
|||||||
|
// TODO: Re-enable generation of shell completion files (below) when clap 3 is out.
|
||||||
|
// For more details, see https://github.com/sharkdp/bat/issues/372
|
||||||
|
|
||||||
|
// For bat-as-a-library, no build script is required. The build script is for
|
||||||
|
// the manpage and completions, which are only relevant to the bat application.
|
||||||
|
#[cfg(not(feature = "application"))]
|
||||||
|
fn main() {}
|
||||||
|
|
||||||
|
#[cfg(feature = "application")]
|
||||||
|
fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||||
|
use std::collections::HashMap;
|
||||||
|
use std::error::Error;
|
||||||
|
use std::fs;
|
||||||
|
use std::path::Path;
|
||||||
|
|
||||||
|
// Read environment variables.
|
||||||
|
let project_name = option_env!("PROJECT_NAME").unwrap_or("bat");
|
||||||
|
let executable_name = option_env!("PROJECT_EXECUTABLE").unwrap_or(project_name);
|
||||||
|
let executable_name_uppercase = executable_name.to_uppercase();
|
||||||
|
static PROJECT_VERSION: &str = env!("CARGO_PKG_VERSION");
|
||||||
|
|
||||||
|
/// Generates a file from a template.
|
||||||
|
fn template(
|
||||||
|
variables: &HashMap<&str, &str>,
|
||||||
|
in_file: &str,
|
||||||
|
out_file: impl AsRef<Path>,
|
||||||
|
) -> Result<(), Box<dyn Error>> {
|
||||||
|
let mut content = fs::read_to_string(in_file)?;
|
||||||
|
|
||||||
|
for (variable_name, value) in variables {
|
||||||
|
// Replace {{variable_name}} by the value
|
||||||
|
let pattern = format!("{{{{{variable_name}}}}}", variable_name = variable_name);
|
||||||
|
content = content.replace(&pattern, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
fs::write(out_file, content)?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut variables = HashMap::new();
|
||||||
|
variables.insert("PROJECT_NAME", project_name);
|
||||||
|
variables.insert("PROJECT_EXECUTABLE", executable_name);
|
||||||
|
variables.insert("PROJECT_EXECUTABLE_UPPERCASE", &executable_name_uppercase);
|
||||||
|
variables.insert("PROJECT_VERSION", PROJECT_VERSION);
|
||||||
|
|
||||||
|
let out_dir_env = std::env::var_os("OUT_DIR").expect("OUT_DIR to be set in build.rs");
|
||||||
|
let out_dir = Path::new(&out_dir_env);
|
||||||
|
|
||||||
|
fs::create_dir_all(out_dir.join("assets/manual")).unwrap();
|
||||||
|
fs::create_dir_all(out_dir.join("assets/completions")).unwrap();
|
||||||
|
|
||||||
|
template(
|
||||||
|
&variables,
|
||||||
|
"assets/manual/bat.1.in",
|
||||||
|
out_dir.join("assets/manual/bat.1"),
|
||||||
|
)?;
|
||||||
|
template(
|
||||||
|
&variables,
|
||||||
|
"assets/completions/bat.bash.in",
|
||||||
|
out_dir.join("assets/completions/bat.bash"),
|
||||||
|
)?;
|
||||||
|
template(
|
||||||
|
&variables,
|
||||||
|
"assets/completions/bat.fish.in",
|
||||||
|
out_dir.join("assets/completions/bat.fish"),
|
||||||
|
)?;
|
||||||
|
template(
|
||||||
|
&variables,
|
||||||
|
"assets/completions/_bat.ps1.in",
|
||||||
|
out_dir.join("assets/completions/_bat.ps1"),
|
||||||
|
)?;
|
||||||
|
template(
|
||||||
|
&variables,
|
||||||
|
"assets/completions/bat.zsh.in",
|
||||||
|
out_dir.join("assets/completions/bat.zsh"),
|
||||||
|
)?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
// #[macro_use]
|
||||||
|
// extern crate clap;
|
||||||
|
|
||||||
|
// use clap::Shell;
|
||||||
|
// use std::fs;
|
||||||
|
|
||||||
|
// include!("src/clap_app.rs");
|
||||||
|
|
||||||
|
// const BIN_NAME: &str = "bat";
|
||||||
|
|
||||||
|
// fn main() {
|
||||||
|
// let outdir = std::env::var_os("SHELL_COMPLETIONS_DIR").or(std::env::var_os("OUT_DIR"));
|
||||||
|
|
||||||
|
// let outdir = match outdir {
|
||||||
|
// None => return,
|
||||||
|
// Some(outdir) => outdir,
|
||||||
|
// };
|
||||||
|
|
||||||
|
// fs::create_dir_all(&outdir).unwrap();
|
||||||
|
|
||||||
|
// let mut app = build_app(true);
|
||||||
|
// app.gen_completions(BIN_NAME, Shell::Bash, &outdir);
|
||||||
|
// app.gen_completions(BIN_NAME, Shell::Fish, &outdir);
|
||||||
|
// app.gen_completions(BIN_NAME, Shell::Zsh, &outdir);
|
||||||
|
// app.gen_completions(BIN_NAME, Shell::PowerShell, &outdir);
|
||||||
|
// }
|
@ -1,67 +0,0 @@
|
|||||||
use std::{env, fs, path::PathBuf};
|
|
||||||
|
|
||||||
use crate::util::render_template;
|
|
||||||
|
|
||||||
/// Generate manpage and shell completions for the bat application.
|
|
||||||
pub fn gen_man_and_comp() -> anyhow::Result<()> {
|
|
||||||
println!("cargo:rerun-if-changed=assets/manual/");
|
|
||||||
println!("cargo:rerun-if-changed=assets/completions/");
|
|
||||||
|
|
||||||
println!("cargo:rerun-if-env-changed=PROJECT_NAME");
|
|
||||||
println!("cargo:rerun-if-env-changed=PROJECT_EXECUTABLE");
|
|
||||||
println!("cargo:rerun-if-env-changed=CARGO_PKG_VERSION");
|
|
||||||
println!("cargo:rerun-if-env-changed=BAT_ASSETS_GEN_DIR");
|
|
||||||
|
|
||||||
// Read environment variables.
|
|
||||||
let project_name = env::var("PROJECT_NAME").unwrap_or("bat".into());
|
|
||||||
let executable_name = env::var("PROJECT_EXECUTABLE").unwrap_or(project_name.clone());
|
|
||||||
let executable_name_uppercase = executable_name.to_uppercase();
|
|
||||||
let project_version = env::var("CARGO_PKG_VERSION")?;
|
|
||||||
|
|
||||||
let variables = [
|
|
||||||
("PROJECT_NAME", project_name),
|
|
||||||
("PROJECT_EXECUTABLE", executable_name),
|
|
||||||
("PROJECT_EXECUTABLE_UPPERCASE", executable_name_uppercase),
|
|
||||||
("PROJECT_VERSION", project_version),
|
|
||||||
]
|
|
||||||
.into_iter()
|
|
||||||
.collect();
|
|
||||||
|
|
||||||
let Some(out_dir) = env::var_os("BAT_ASSETS_GEN_DIR")
|
|
||||||
.or_else(|| env::var_os("OUT_DIR"))
|
|
||||||
.map(PathBuf::from)
|
|
||||||
else {
|
|
||||||
anyhow::bail!("BAT_ASSETS_GEN_DIR or OUT_DIR should be set for build.rs");
|
|
||||||
};
|
|
||||||
|
|
||||||
fs::create_dir_all(out_dir.join("assets/manual")).unwrap();
|
|
||||||
fs::create_dir_all(out_dir.join("assets/completions")).unwrap();
|
|
||||||
|
|
||||||
render_template(
|
|
||||||
&variables,
|
|
||||||
"assets/manual/bat.1.in",
|
|
||||||
out_dir.join("assets/manual/bat.1"),
|
|
||||||
)?;
|
|
||||||
render_template(
|
|
||||||
&variables,
|
|
||||||
"assets/completions/bat.bash.in",
|
|
||||||
out_dir.join("assets/completions/bat.bash"),
|
|
||||||
)?;
|
|
||||||
render_template(
|
|
||||||
&variables,
|
|
||||||
"assets/completions/bat.fish.in",
|
|
||||||
out_dir.join("assets/completions/bat.fish"),
|
|
||||||
)?;
|
|
||||||
render_template(
|
|
||||||
&variables,
|
|
||||||
"assets/completions/_bat.ps1.in",
|
|
||||||
out_dir.join("assets/completions/_bat.ps1"),
|
|
||||||
)?;
|
|
||||||
render_template(
|
|
||||||
&variables,
|
|
||||||
"assets/completions/bat.zsh.in",
|
|
||||||
out_dir.join("assets/completions/bat.zsh"),
|
|
||||||
)?;
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
@ -1,17 +0,0 @@
|
|||||||
#[cfg(feature = "application")]
|
|
||||||
mod application;
|
|
||||||
mod syntax_mapping;
|
|
||||||
mod util;
|
|
||||||
|
|
||||||
fn main() -> anyhow::Result<()> {
|
|
||||||
// only watch manually-designated files
|
|
||||||
// see: https://doc.rust-lang.org/cargo/reference/build-scripts.html#rerun-if-changed
|
|
||||||
println!("cargo:rerun-if-changed=build/");
|
|
||||||
|
|
||||||
syntax_mapping::build_static_mappings()?;
|
|
||||||
|
|
||||||
#[cfg(feature = "application")]
|
|
||||||
application::gen_man_and_comp()?;
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
@ -1,294 +0,0 @@
|
|||||||
use std::{
|
|
||||||
convert::Infallible,
|
|
||||||
env, fs,
|
|
||||||
path::{Path, PathBuf},
|
|
||||||
str::FromStr,
|
|
||||||
};
|
|
||||||
|
|
||||||
use anyhow::{anyhow, bail};
|
|
||||||
use indexmap::IndexMap;
|
|
||||||
use itertools::Itertools;
|
|
||||||
use once_cell::sync::Lazy;
|
|
||||||
use regex::Regex;
|
|
||||||
use serde_derive::Deserialize;
|
|
||||||
use serde_with::DeserializeFromStr;
|
|
||||||
use walkdir::WalkDir;
|
|
||||||
|
|
||||||
/// Known mapping targets.
|
|
||||||
///
|
|
||||||
/// Corresponds to `syntax_mapping::MappingTarget`.
|
|
||||||
#[allow(clippy::enum_variant_names)]
|
|
||||||
#[derive(Clone, Debug, Eq, PartialEq, Hash, DeserializeFromStr)]
|
|
||||||
pub enum MappingTarget {
|
|
||||||
MapTo(String),
|
|
||||||
MapToUnknown,
|
|
||||||
MapExtensionToUnknown,
|
|
||||||
}
|
|
||||||
impl FromStr for MappingTarget {
|
|
||||||
type Err = Infallible;
|
|
||||||
fn from_str(s: &str) -> Result<Self, Self::Err> {
|
|
||||||
match s {
|
|
||||||
"MappingTarget::MapToUnknown" => Ok(Self::MapToUnknown),
|
|
||||||
"MappingTarget::MapExtensionToUnknown" => Ok(Self::MapExtensionToUnknown),
|
|
||||||
syntax => Ok(Self::MapTo(syntax.into())),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
impl MappingTarget {
|
|
||||||
fn codegen(&self) -> String {
|
|
||||||
match self {
|
|
||||||
Self::MapTo(syntax) => format!(r###"MappingTarget::MapTo(r#"{syntax}"#)"###),
|
|
||||||
Self::MapToUnknown => "MappingTarget::MapToUnknown".into(),
|
|
||||||
Self::MapExtensionToUnknown => "MappingTarget::MapExtensionToUnknown".into(),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Clone, Debug, PartialEq, Eq, Hash, DeserializeFromStr)]
|
|
||||||
/// A single matcher.
|
|
||||||
///
|
|
||||||
/// Codegen converts this into a `Lazy<Option<GlobMatcher>>`.
|
|
||||||
struct Matcher(Vec<MatcherSegment>);
|
|
||||||
/// Parse a matcher.
|
|
||||||
///
|
|
||||||
/// Note that this implementation is rather strict: it will greedily interpret
|
|
||||||
/// every valid environment variable replacement as such, then immediately
|
|
||||||
/// hard-error if it finds a '$' anywhere in the remaining text segments.
|
|
||||||
///
|
|
||||||
/// The reason for this strictness is I currently cannot think of a valid reason
|
|
||||||
/// why you would ever need '$' as plaintext in a glob pattern. Therefore any
|
|
||||||
/// such occurrences are likely human errors.
|
|
||||||
///
|
|
||||||
/// If we later discover some edge cases, it's okay to make it more permissive.
|
|
||||||
///
|
|
||||||
/// Revision history:
|
|
||||||
/// - 2024-02-20: allow `{` and `}` (glob brace expansion)
|
|
||||||
impl FromStr for Matcher {
|
|
||||||
type Err = anyhow::Error;
|
|
||||||
fn from_str(s: &str) -> Result<Self, Self::Err> {
|
|
||||||
use MatcherSegment as Seg;
|
|
||||||
static VAR_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new(r"\$\{([\w\d_]+)\}").unwrap());
|
|
||||||
|
|
||||||
let mut segments = vec![];
|
|
||||||
let mut text_start = 0;
|
|
||||||
for capture in VAR_REGEX.captures_iter(s) {
|
|
||||||
let match_0 = capture.get(0).unwrap();
|
|
||||||
|
|
||||||
// text before this var
|
|
||||||
let text_end = match_0.start();
|
|
||||||
segments.push(Seg::Text(s[text_start..text_end].into()));
|
|
||||||
text_start = match_0.end();
|
|
||||||
|
|
||||||
// this var
|
|
||||||
segments.push(Seg::Env(capture.get(1).unwrap().as_str().into()));
|
|
||||||
}
|
|
||||||
// possible trailing text
|
|
||||||
segments.push(Seg::Text(s[text_start..].into()));
|
|
||||||
|
|
||||||
// cleanup empty text segments
|
|
||||||
let non_empty_segments = segments
|
|
||||||
.into_iter()
|
|
||||||
.filter(|seg| seg.text().map(|t| !t.is_empty()).unwrap_or(true))
|
|
||||||
.collect_vec();
|
|
||||||
|
|
||||||
// sanity check
|
|
||||||
if non_empty_segments
|
|
||||||
.windows(2)
|
|
||||||
.any(|segs| segs[0].is_text() && segs[1].is_text())
|
|
||||||
{
|
|
||||||
unreachable!("Parsed into consecutive text segments: {non_empty_segments:?}");
|
|
||||||
}
|
|
||||||
|
|
||||||
// guard empty case
|
|
||||||
if non_empty_segments.is_empty() {
|
|
||||||
bail!(r#"Parsed an empty matcher: "{s}""#);
|
|
||||||
}
|
|
||||||
|
|
||||||
// guard variable syntax leftover fragments
|
|
||||||
if non_empty_segments
|
|
||||||
.iter()
|
|
||||||
.filter_map(Seg::text)
|
|
||||||
.any(|t| t.contains('$'))
|
|
||||||
{
|
|
||||||
bail!(r#"Invalid matcher: "{s}""#);
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(Self(non_empty_segments))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
impl Matcher {
|
|
||||||
fn codegen(&self) -> String {
|
|
||||||
match self.0.len() {
|
|
||||||
0 => unreachable!("0-length matcher should never be created"),
|
|
||||||
// if-let guard would be ideal here
|
|
||||||
// see: https://github.com/rust-lang/rust/issues/51114
|
|
||||||
1 if self.0[0].is_text() => {
|
|
||||||
let s = self.0[0].text().unwrap();
|
|
||||||
format!(r###"Lazy::new(|| Some(build_matcher_fixed(r#"{s}"#)))"###)
|
|
||||||
}
|
|
||||||
// parser logic ensures that this case can only happen when there are dynamic segments
|
|
||||||
_ => {
|
|
||||||
let segs = self.0.iter().map(MatcherSegment::codegen).join(", ");
|
|
||||||
format!(r###"Lazy::new(|| build_matcher_dynamic(&[{segs}]))"###)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// A segment in a matcher.
|
|
||||||
///
|
|
||||||
/// Corresponds to `syntax_mapping::MatcherSegment`.
|
|
||||||
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
|
|
||||||
enum MatcherSegment {
|
|
||||||
Text(String),
|
|
||||||
Env(String),
|
|
||||||
}
|
|
||||||
#[allow(dead_code)]
|
|
||||||
impl MatcherSegment {
|
|
||||||
fn is_text(&self) -> bool {
|
|
||||||
matches!(self, Self::Text(_))
|
|
||||||
}
|
|
||||||
fn is_env(&self) -> bool {
|
|
||||||
matches!(self, Self::Env(_))
|
|
||||||
}
|
|
||||||
fn text(&self) -> Option<&str> {
|
|
||||||
match self {
|
|
||||||
Self::Text(t) => Some(t),
|
|
||||||
Self::Env(_) => None,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
fn env(&self) -> Option<&str> {
|
|
||||||
match self {
|
|
||||||
Self::Text(_) => None,
|
|
||||||
Self::Env(t) => Some(t),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
fn codegen(&self) -> String {
|
|
||||||
match self {
|
|
||||||
Self::Text(s) => format!(r###"MatcherSegment::Text(r#"{s}"#)"###),
|
|
||||||
Self::Env(s) => format!(r###"MatcherSegment::Env(r#"{s}"#)"###),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// A struct that models a single .toml file in /src/syntax_mapping/builtins/.
|
|
||||||
#[derive(Clone, Debug, Deserialize)]
|
|
||||||
struct MappingDefModel {
|
|
||||||
mappings: IndexMap<MappingTarget, Vec<Matcher>>,
|
|
||||||
}
|
|
||||||
impl MappingDefModel {
|
|
||||||
fn into_mapping_list(self) -> MappingList {
|
|
||||||
let list = self
|
|
||||||
.mappings
|
|
||||||
.into_iter()
|
|
||||||
.flat_map(|(target, matchers)| {
|
|
||||||
matchers
|
|
||||||
.into_iter()
|
|
||||||
.map(|matcher| (matcher, target.clone()))
|
|
||||||
.collect::<Vec<_>>()
|
|
||||||
})
|
|
||||||
.collect();
|
|
||||||
MappingList(list)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Clone, Debug)]
|
|
||||||
struct MappingList(Vec<(Matcher, MappingTarget)>);
|
|
||||||
impl MappingList {
|
|
||||||
fn codegen(&self) -> String {
|
|
||||||
let array_items: Vec<_> = self
|
|
||||||
.0
|
|
||||||
.iter()
|
|
||||||
.map(|(matcher, target)| {
|
|
||||||
format!("({m}, {t})", m = matcher.codegen(), t = target.codegen())
|
|
||||||
})
|
|
||||||
.collect();
|
|
||||||
let len = array_items.len();
|
|
||||||
|
|
||||||
format!(
|
|
||||||
"/// Generated by build script from /src/syntax_mapping/builtins/.\n\
|
|
||||||
pub(crate) static BUILTIN_MAPPINGS: [(Lazy<Option<GlobMatcher>>, MappingTarget); {len}] = [\n{items}\n];",
|
|
||||||
items = array_items.join(",\n")
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Get the list of paths to all mapping definition files that should be
|
|
||||||
/// included for the current target platform.
|
|
||||||
fn get_def_paths() -> anyhow::Result<Vec<PathBuf>> {
|
|
||||||
let source_subdirs = [
|
|
||||||
"common",
|
|
||||||
#[cfg(target_family = "unix")]
|
|
||||||
"unix-family",
|
|
||||||
#[cfg(any(
|
|
||||||
target_os = "freebsd",
|
|
||||||
target_os = "netbsd",
|
|
||||||
target_os = "openbsd",
|
|
||||||
target_os = "macos"
|
|
||||||
))]
|
|
||||||
"bsd-family",
|
|
||||||
#[cfg(target_os = "linux")]
|
|
||||||
"linux",
|
|
||||||
#[cfg(target_os = "macos")]
|
|
||||||
"macos",
|
|
||||||
#[cfg(target_os = "windows")]
|
|
||||||
"windows",
|
|
||||||
];
|
|
||||||
|
|
||||||
let mut toml_paths = vec![];
|
|
||||||
for subdir in source_subdirs {
|
|
||||||
let wd = WalkDir::new(Path::new("src/syntax_mapping/builtins").join(subdir));
|
|
||||||
let paths = wd
|
|
||||||
.into_iter()
|
|
||||||
.filter_map_ok(|entry| {
|
|
||||||
let path = entry.path();
|
|
||||||
(path.is_file() && path.extension().map(|ext| ext == "toml").unwrap_or(false))
|
|
||||||
.then(|| path.to_owned())
|
|
||||||
})
|
|
||||||
.collect::<Result<Vec<_>, _>>()?;
|
|
||||||
toml_paths.extend(paths);
|
|
||||||
}
|
|
||||||
|
|
||||||
toml_paths.sort_by_key(|path| {
|
|
||||||
path.file_name()
|
|
||||||
.expect("file name should not terminate in ..")
|
|
||||||
.to_owned()
|
|
||||||
});
|
|
||||||
|
|
||||||
Ok(toml_paths)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn read_all_mappings() -> anyhow::Result<MappingList> {
|
|
||||||
let mut all_mappings = vec![];
|
|
||||||
|
|
||||||
for path in get_def_paths()? {
|
|
||||||
let toml_string = fs::read_to_string(path)?;
|
|
||||||
let mappings = toml::from_str::<MappingDefModel>(&toml_string)?.into_mapping_list();
|
|
||||||
all_mappings.extend(mappings.0);
|
|
||||||
}
|
|
||||||
|
|
||||||
let duplicates = all_mappings
|
|
||||||
.iter()
|
|
||||||
.duplicates_by(|(matcher, _)| matcher)
|
|
||||||
.collect_vec();
|
|
||||||
if !duplicates.is_empty() {
|
|
||||||
bail!("Rules with duplicate matchers found: {duplicates:?}");
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(MappingList(all_mappings))
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Build the static syntax mappings defined in /src/syntax_mapping/builtins/
|
|
||||||
/// into a .rs source file, which is to be inserted with `include!`.
|
|
||||||
pub fn build_static_mappings() -> anyhow::Result<()> {
|
|
||||||
println!("cargo:rerun-if-changed=src/syntax_mapping/builtins/");
|
|
||||||
|
|
||||||
let mappings = read_all_mappings()?;
|
|
||||||
|
|
||||||
let codegen_path = Path::new(&env::var_os("OUT_DIR").ok_or(anyhow!("OUT_DIR is unset"))?)
|
|
||||||
.join("codegen_static_syntax_mappings.rs");
|
|
||||||
|
|
||||||
fs::write(codegen_path, mappings.codegen())?;
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
@ -1,21 +0,0 @@
|
|||||||
#![allow(dead_code)]
|
|
||||||
|
|
||||||
use std::{collections::HashMap, fs, path::Path};
|
|
||||||
|
|
||||||
/// Generates a file from a template.
|
|
||||||
pub fn render_template(
|
|
||||||
variables: &HashMap<&str, String>,
|
|
||||||
in_file: &str,
|
|
||||||
out_file: impl AsRef<Path>,
|
|
||||||
) -> anyhow::Result<()> {
|
|
||||||
let mut content = fs::read_to_string(in_file)?;
|
|
||||||
|
|
||||||
for (variable_name, value) in variables {
|
|
||||||
// Replace {{variable_name}} by the value
|
|
||||||
let pattern = format!("{{{{{variable_name}}}}}");
|
|
||||||
content = content.replace(&pattern, value);
|
|
||||||
}
|
|
||||||
|
|
||||||
fs::write(out_file, content)?;
|
|
||||||
Ok(())
|
|
||||||
}
|
|
@ -181,12 +181,12 @@ man 2 select
|
|||||||
|
|
||||||
## インストール
|
## インストール
|
||||||
|
|
||||||
[![Packaging status](https://repology.org/badge/vertical-allrepos/bat-cat.svg?columns=3&exclude_unsupported=1)](https://repology.org/project/bat-cat/versions)
|
[![Packaging status](https://repology.org/badge/vertical-allrepos/bat-cat.svg)](https://repology.org/project/bat-cat/versions)
|
||||||
|
|
||||||
### On Ubuntu (`apt` を使用)
|
### On Ubuntu (`apt` を使用)
|
||||||
*... や他のDebianベースのLinuxディストリビューション*
|
*... や他のDebianベースのLinuxディストリビューション*
|
||||||
|
|
||||||
[20.04 ("Focal") 以降の Ubuntu](https://packages.ubuntu.com/search?keywords=bat&exact=1) または [2021 年 8 月以降の Debian (Debian 11 - "Bullseye")](https://packages.debian.org/bullseye/bat) では `bat` パッケージが利用できます。
|
Ubuntu Eoan 19.10 または Debian 不安定版 sid 以降の [the Ubuntu `bat` package](https://packages.ubuntu.com/eoan/bat) または [the Debian `bat` package](https://packages.debian.org/sid/bat) からインストールできます:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
apt install bat
|
apt install bat
|
||||||
@ -219,7 +219,7 @@ apk add bat
|
|||||||
|
|
||||||
### On Arch Linux
|
### On Arch Linux
|
||||||
|
|
||||||
[Arch Linuxの公式リソース](https://www.archlinux.org/packages/extra/x86_64/bat/)
|
[Arch Linuxの公式リソース](https://www.archlinux.org/packages/community/x86_64/bat/)
|
||||||
からインストールできます。
|
からインストールできます。
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
@ -366,7 +366,7 @@ ansible-galaxy install aeimer.install_bat
|
|||||||
### From source
|
### From source
|
||||||
|
|
||||||
|
|
||||||
`bat` をソースからビルドしたいならば、Rust 1.70.0 以上の環境が必要です。
|
`bat` をソースからビルドしたいならば、Rust 1.51 以上の環境が必要です。
|
||||||
`cargo` を使用してビルドすることができます:
|
`cargo` を使用してビルドすることができます:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
|
@ -214,7 +214,7 @@ man 2 select
|
|||||||
|
|
||||||
## 설치
|
## 설치
|
||||||
|
|
||||||
[![Packaging status](https://repology.org/badge/vertical-allrepos/bat-cat.svg?columns=3&exclude_unsupported=1)](https://repology.org/project/bat-cat/versions)
|
[![Packaging status](https://repology.org/badge/vertical-allrepos/bat-cat.svg)](https://repology.org/project/bat-cat/versions)
|
||||||
|
|
||||||
### Ubuntu에서 (`apt` 사용)
|
### Ubuntu에서 (`apt` 사용)
|
||||||
*... 그리고 다른 Debian 기반의 Linux 배포판들에서.*
|
*... 그리고 다른 Debian 기반의 Linux 배포판들에서.*
|
||||||
@ -264,7 +264,7 @@ apk add bat
|
|||||||
### Arch Linux에서
|
### Arch Linux에서
|
||||||
|
|
||||||
공식 소스를 통해
|
공식 소스를 통해
|
||||||
[`bat` 패키지](https://www.archlinux.org/packages/extra/x86_64/bat/)를
|
[`bat` 패키지](https://www.archlinux.org/packages/community/x86_64/bat/)를
|
||||||
설치할 수 있습니다:
|
설치할 수 있습니다:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
@ -416,7 +416,7 @@ scoop install bat
|
|||||||
|
|
||||||
### 소스에서
|
### 소스에서
|
||||||
|
|
||||||
`bat`의 소스를 빌드하기 위해서는, Rust 1.70.0 이상이 필요합니다.
|
`bat`의 소스를 빌드하기 위해서는, Rust 1.51 이상이 필요합니다.
|
||||||
`cargo`를 이용해 전부 빌드할 수 있습니다:
|
`cargo`를 이용해 전부 빌드할 수 있습니다:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
<a href="#установка">Установка</a> •
|
<a href="#установка">Установка</a> •
|
||||||
<a href="#кастомизация">Кастомизация</a> •
|
<a href="#кастомизация">Кастомизация</a> •
|
||||||
<a href="#цели-и-альтернативы">Цели и альтернативы </a><br>
|
<a href="#цели-и-альтернативы">Цели и альтернативы </a><br>
|
||||||
[<a href="../README.md">English</a>]
|
[<a href="../README.md">English]
|
||||||
[<a href="README-zh.md">中文</a>]
|
[<a href="README-zh.md">中文</a>]
|
||||||
[<a href="README-ja.md">日本語</a>]
|
[<a href="README-ja.md">日本語</a>]
|
||||||
[<a href="README-ko.md">한국어</a>]
|
[<a href="README-ko.md">한국어</a>]
|
||||||
@ -130,8 +130,8 @@ git show v0.6.0:src/main.rs | bat -l rs
|
|||||||
|
|
||||||
#### `xclip`
|
#### `xclip`
|
||||||
|
|
||||||
Нумерация строк и отображение изменений затрудняет копирование содержимого файлов в буфер обмена.
|
Нумерация стро и отображение изменений затрудняет копирование содержимого файлов в буфер обмена.
|
||||||
Чтобы справиться с этим, используйте флаг `-p`/`--plain` или просто перенаправьте стандартный вывод в `xclip`:
|
Чтобы спроваиться с этим, используйте флаг `-p`/`--plain` или просто перенаправьте стандартный вывод в `xclip`:
|
||||||
```bash
|
```bash
|
||||||
bat main.cpp | xclip
|
bat main.cpp | xclip
|
||||||
```
|
```
|
||||||
@ -160,7 +160,7 @@ man 2 select
|
|||||||
|
|
||||||
## Установка
|
## Установка
|
||||||
|
|
||||||
[![Packaging status](https://repology.org/badge/vertical-allrepos/bat-cat.svg?columns=3&exclude_unsupported=1)](https://repology.org/project/bat-cat/versions)
|
[![Packaging status](https://repology.org/badge/vertical-allrepos/bat-cat.svg)](https://repology.org/project/bat-cat/versions)
|
||||||
|
|
||||||
### Ubuntu (с помощью `apt`)
|
### Ubuntu (с помощью `apt`)
|
||||||
*... и другие дистрибутивы основанные на Debian.*
|
*... и другие дистрибутивы основанные на Debian.*
|
||||||
@ -201,7 +201,7 @@ apk add bat
|
|||||||
|
|
||||||
### Arch Linux
|
### Arch Linux
|
||||||
|
|
||||||
Вы можете установить [`bat`](https://www.archlinux.org/packages/extra/x86_64/bat/) из официального источника:
|
Вы можете установить [`bat`](https://www.archlinux.org/packages/community/x86_64/bat/) из официального источника:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
pacman -S bat
|
pacman -S bat
|
||||||
@ -344,7 +344,7 @@ ansible-galaxy install aeimer.install_bat
|
|||||||
|
|
||||||
### Из исходников
|
### Из исходников
|
||||||
|
|
||||||
Если вы желаете установить `bat` из исходников, вам понадобится Rust 1.70.0 или выше. После этого используйте `cargo`, чтобы все скомпилировать:
|
Если вы желаете установить `bat` из исходников, вам понадобится Rust 1.51 или выше. После этого используйте `cargo`, чтобы все скомпилировать:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
cargo install --locked bat
|
cargo install --locked bat
|
||||||
@ -487,7 +487,7 @@ bat --generate-config-file
|
|||||||
# Использовать синтаксис C++ для всех Arduino .ino файлов
|
# Использовать синтаксис C++ для всех Arduino .ino файлов
|
||||||
--map-syntax "*.ino:C++"
|
--map-syntax "*.ino:C++"
|
||||||
|
|
||||||
# Использовать синтаксис Git Ignore для всех файлов .ignore
|
# Использовать синтаксик Git Ignore для всех файлов .ignore
|
||||||
--map-syntax ".ignore:Git Ignore"
|
--map-syntax ".ignore:Git Ignore"
|
||||||
```
|
```
|
||||||
|
|
||||||
@ -535,7 +535,7 @@ bat() {
|
|||||||
`bat` поддерживает терминалы *с* и *без* поддержки truecolor. Однако подсветка синтаксиса не оптимизирована для терминалов с 8-битными цветами, и рекомендуется использовать терминалы с поддержкой 24-битных цветов (`terminator`, `konsole`, `iTerm2`, ...).
|
`bat` поддерживает терминалы *с* и *без* поддержки truecolor. Однако подсветка синтаксиса не оптимизирована для терминалов с 8-битными цветами, и рекомендуется использовать терминалы с поддержкой 24-битных цветов (`terminator`, `konsole`, `iTerm2`, ...).
|
||||||
Смотрите [эту статью](https://gist.github.com/XVilka/8346728) для полного списка терминалов.
|
Смотрите [эту статью](https://gist.github.com/XVilka/8346728) для полного списка терминалов.
|
||||||
|
|
||||||
Удостоверьтесь, что переменная `COLORTERM` равна `truecolor` или
|
Удостовертесь, что переменная `COLORTERM` равна `truecolor` или
|
||||||
`24bit`. Иначе `bat` не сможет определить поддержку 24-битных цветов (и будет использовать 8-битные).
|
`24bit`. Иначе `bat` не сможет определить поддержку 24-битных цветов (и будет использовать 8-битные).
|
||||||
|
|
||||||
### Текст и номера строк плохо видны
|
### Текст и номера строк плохо видны
|
||||||
@ -550,7 +550,7 @@ bat() {
|
|||||||
``` bash
|
``` bash
|
||||||
iconv -f ISO-8859-1 -t UTF-8 my-file.php | bat
|
iconv -f ISO-8859-1 -t UTF-8 my-file.php | bat
|
||||||
```
|
```
|
||||||
Внимание: вам может понадобиться флаг `-l`/`--language`, если `bat` не сможет автоматически определить синтаксис.
|
Внимание: вам может понадобится флаг `-l`/`--language`, если `bat` не сможет автоматически определить синтаксис.
|
||||||
|
|
||||||
## Разработка
|
## Разработка
|
||||||
|
|
||||||
@ -568,7 +568,7 @@ cargo test
|
|||||||
# Установка (релизная версия)
|
# Установка (релизная версия)
|
||||||
cargo install --locked
|
cargo install --locked
|
||||||
|
|
||||||
# Компилирование исполняемого файла bat с другим синтаксисом и темами
|
# Компилирование исполняего файла bat с другим синтаксисом и темами
|
||||||
bash assets/create.sh
|
bash assets/create.sh
|
||||||
cargo install --locked --force
|
cargo install --locked --force
|
||||||
```
|
```
|
||||||
@ -592,6 +592,6 @@ cargo install --locked --force
|
|||||||
## Лицензия
|
## Лицензия
|
||||||
Copyright (c) 2018-2021 [Разработчики bat](https://github.com/sharkdp/bat).
|
Copyright (c) 2018-2021 [Разработчики bat](https://github.com/sharkdp/bat).
|
||||||
|
|
||||||
`bat` распространяется под лицензиями MIT License и Apache License 2.0 (на выбор пользователя).
|
`bat` распостраняется под лицензями MIT License и Apache License 2.0 (на выбор пользователя).
|
||||||
|
|
||||||
Смотрите [LICENSE-APACHE](LICENSE-APACHE) и [LICENSE-MIT](LICENSE-MIT) для более подробного ознакомления.
|
Смотрите [LICENSE-APACHE](LICENSE-APACHE) и [LICENSE-MIT](LICENSE-MIT) для более подробного ознакомления.
|
||||||
|
@ -191,7 +191,7 @@ man 2 select
|
|||||||
|
|
||||||
## 安装
|
## 安装
|
||||||
|
|
||||||
[![Packaging status](https://repology.org/badge/vertical-allrepos/bat-cat.svg?columns=3&exclude_unsupported=1)](https://repology.org/project/bat-cat/versions)
|
[![Packaging status](https://repology.org/badge/vertical-allrepos/bat-cat.svg)](https://repology.org/project/bat-cat/versions)
|
||||||
|
|
||||||
### Ubuntu (使用 `apt`)
|
### Ubuntu (使用 `apt`)
|
||||||
|
|
||||||
@ -232,7 +232,7 @@ apk add bat
|
|||||||
|
|
||||||
### Arch Linux
|
### Arch Linux
|
||||||
|
|
||||||
你可以用下面下列命令从官方源中安装[`bat`包](https://www.archlinux.org/packages/extra/x86_64/bat/):
|
你可以用下面下列命令从官方源中安装[`bat`包](https://www.archlinux.org/packages/community/x86_64/bat/):
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
pacman -S bat
|
pacman -S bat
|
||||||
@ -372,7 +372,7 @@ scoop install bat
|
|||||||
|
|
||||||
### 从源码编译
|
### 从源码编译
|
||||||
|
|
||||||
如果你想要自己构建`bat`,那么你需要安装有高于1.70.0版本的 Rust。
|
如果你想要自己构建`bat`,那么你需要安装有高于1.51版本的 Rust。
|
||||||
|
|
||||||
使用以下命令编译。
|
使用以下命令编译。
|
||||||
|
|
||||||
@ -412,7 +412,7 @@ bat --list-themes | fzf --preview="bat --theme={} --color=always /path/to/file"
|
|||||||
|
|
||||||
### 输出样式
|
### 输出样式
|
||||||
|
|
||||||
你可以用`--style`参数来控制`bat`输出的样式。使用`--style=numbers,changes`可以只开启 Git 修改和行号显示而不添加其他内容。`BAT_STYLE`环境变量具有相同功能。
|
你可以用`--style`参数来控制`bat`输出的样式。使用`--style=numbers,chanegs`可以只开启 Git 修改和行号显示而不添加其他内容。`BAT_STYLE`环境变量具有相同功能。
|
||||||
|
|
||||||
### 添加新的语言和语法
|
### 添加新的语言和语法
|
||||||
|
|
||||||
@ -550,7 +550,7 @@ bat --generate-config-file
|
|||||||
# 在终端中以斜体输出文本(不是所有终端都支持)
|
# 在终端中以斜体输出文本(不是所有终端都支持)
|
||||||
--italic-text=always
|
--italic-text=always
|
||||||
|
|
||||||
# 使用 C++ 语法来给 Arduino 的 .ino 文件提供高亮
|
# 使用 C++ 语法来给 Ardiuno 的 .ino 文件提供高亮
|
||||||
--map-syntax "*.ino:C++"
|
--map-syntax "*.ino:C++"
|
||||||
```
|
```
|
||||||
|
|
||||||
@ -616,59 +616,63 @@ iconv -f ISO-8859-1 -t UTF-8 my-file.php | bat
|
|||||||
|
|
||||||
注意: 当`bat`无法识别语言时你可能会需要`-l`/`--language`参数。
|
注意: 当`bat`无法识别语言时你可能会需要`-l`/`--language`参数。
|
||||||
|
|
||||||
## 开发
|
## Development
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
# 递归 clone 以获取所有子模块
|
# Recursive clone to retrieve all submodules
|
||||||
git clone --recursive https://github.com/sharkdp/bat
|
git clone --recursive https://github.com/sharkdp/bat
|
||||||
|
|
||||||
# 构建(调试版本)
|
# Build (debug version)
|
||||||
cd bat
|
cd bat
|
||||||
cargo build --bins
|
cargo build --bins
|
||||||
|
|
||||||
# 运行单元测试和集成测试
|
# Run unit tests and integration tests
|
||||||
cargo test
|
cargo test
|
||||||
|
|
||||||
# 安装(发布版本)
|
# Install (release version)
|
||||||
cargo install --path . --locked
|
cargo install --path . --locked
|
||||||
|
|
||||||
# 使用修改后的语法和主题构建一个 bat 二进制文件
|
# Build a bat binary with modified syntaxes and themes
|
||||||
bash assets/create.sh
|
bash assets/create.sh
|
||||||
cargo install --path . --locked --force
|
cargo install --path . --locked --force
|
||||||
```
|
```
|
||||||
|
|
||||||
如果你想构建一个使用 `bat` 美化打印功能的应用程序,请查看 [API 文档](https://docs.rs/bat/)。请注意,当你依赖 `bat` 作为库时,必须使用 `regex-onig` 或 `regex-fancy` 作为特性。
|
If you want to build an application that uses `bat`s pretty-printing
|
||||||
|
features as a library, check out the [the API documentation](https://docs.rs/bat/).
|
||||||
|
Note that you have to use either `regex-onig` or `regex-fancy` as a feature
|
||||||
|
when you depend on `bat` as a library.
|
||||||
|
|
||||||
## 贡献指南
|
## Contributing
|
||||||
|
|
||||||
请查看 [`CONTRIBUTING.md`](CONTRIBUTING.md) 指南。
|
Take a look at the [`CONTRIBUTING.md`](CONTRIBUTING.md) guide.
|
||||||
|
|
||||||
## 维护者
|
## Maintainers
|
||||||
|
|
||||||
- [sharkdp](https://github.com/sharkdp)
|
- [sharkdp](https://github.com/sharkdp)
|
||||||
- [eth-p](https://github.com/eth-p)
|
- [eth-p](https://github.com/eth-p)
|
||||||
- [keith-hall](https://github.com/keith-hall)
|
- [keith-hall](https://github.com/keith-hall)
|
||||||
- [Enselic](https://github.com/Enselic)
|
- [Enselic](https://github.com/Enselic)
|
||||||
|
|
||||||
## 安全漏洞
|
## Security vulnerabilities
|
||||||
|
|
||||||
如果你想报告 `bat` 中的漏洞,请通过邮件联系 [David Peter](https://david-peter.de/)。
|
Please contact [David Peter](https://david-peter.de/) via email if you want to report a vulnerability in `bat`.
|
||||||
|
|
||||||
## 项目目标和替代方案
|
## Project goals and alternatives
|
||||||
|
|
||||||
`bat` 试图实现以下目标:
|
`bat` tries to achieve the following goals:
|
||||||
|
|
||||||
- 提供美观的高级语法高亮
|
- Provide beautiful, advanced syntax highlighting
|
||||||
- 与 Git 集成以显示文件修改
|
- Integrate with Git to show file modifications
|
||||||
- 成为 (POSIX) `cat` 的替代品
|
- Be a drop-in replacement for (POSIX) `cat`
|
||||||
- 提供用户友好的命令行界面
|
- Offer a user-friendly command-line interface
|
||||||
|
|
||||||
如果你在寻找类似的程序,有很多替代方案。请参阅[本文档](doc/alternatives.md)进行比较。
|
There are a lot of alternatives, if you are looking for similar programs. See
|
||||||
|
[this document](doc/alternatives.md) for a comparison.
|
||||||
|
|
||||||
## 许可证
|
## License
|
||||||
|
|
||||||
版权所有 (c) 2018-2021 [bat-developers](https://github.com/sharkdp/bat)。
|
Copyright (c) 2018-2021 [bat-developers](https://github.com/sharkdp/bat).
|
||||||
|
|
||||||
`bat` 可根据 MIT 许可证或 Apache 许可证 2.0 的条款使用,任选其一。
|
`bat` is made available under the terms of either the MIT License or the Apache License 2.0, at your option.
|
||||||
|
|
||||||
有关许可证的详细信息,请参阅 [LICENSE-APACHE](LICENSE-APACHE) 和 [LICENSE-MIT](LICENSE-MIT) 文件。
|
See the [LICENSE-APACHE](LICENSE-APACHE) and [LICENSE-MIT](LICENSE-MIT) files for license details.
|
||||||
|
@ -4,17 +4,17 @@ The following table tries to give an overview *from `bat`s perspective*, i.e. we
|
|||||||
categories which are relevant for `bat`. Some of these projects have completely different goals and
|
categories which are relevant for `bat`. Some of these projects have completely different goals and
|
||||||
if you are not looking for a program like `bat`, this comparison might not be for you.
|
if you are not looking for a program like `bat`, this comparison might not be for you.
|
||||||
|
|
||||||
| | bat | [pygments](http://pygments.org/) | [highlight](http://www.andre-simon.de/doku/highlight/highlight.php) | [ccat](https://github.com/jingweno/ccat) | [source-highlight](https://www.gnu.org/software/src-highlite/) | [hicat](https://github.com/rstacruz/hicat) | [coderay](https://github.com/rubychan/coderay) | [rouge](https://github.com/jneen/rouge) | [clp](https://github.com/jpe90/clp) |
|
| | bat | [pygments](http://pygments.org/) | [highlight](http://www.andre-simon.de/doku/highlight/highlight.php) | [ccat](https://github.com/jingweno/ccat) | [source-highlight](https://www.gnu.org/software/src-highlite/) | [hicat](https://github.com/rstacruz/hicat) | [coderay](https://github.com/rubychan/coderay) | [rouge](https://github.com/jneen/rouge) |
|
||||||
|----------------------------------------------|---------------------------------------------------------------------|----------------------------------|---------------------------------------------------------------------|------------------------------------------|----------------------------------------------------------------|-----------------------------------------------------|-----------------------------------------------------|-----------------------------------------------------|-----------------------------------------------------|
|
|----------------------------------------------|---------------------------------------------------------------------|----------------------------------|---------------------------------------------------------------------|------------------------------------------|----------------------------------------------------------------|-----------------------------------------------------|-----------------------------------------------------|-----------------------------------------------------|
|
||||||
| Drop-in `cat` replacement | :heavy_check_mark: [*](https://github.com/sharkdp/bat/issues/134) | :x: | :x: | (:heavy_check_mark:) | :x: | :x: [*](https://github.com/rstacruz/hicat/issues/6) | :x: | :x: | :x: |
|
| Drop-in `cat` replacement | :heavy_check_mark: [*](https://github.com/sharkdp/bat/issues/134) | :x: | :x: | (:heavy_check_mark:) | :x: | :x: [*](https://github.com/rstacruz/hicat/issues/6) | :x: | :x: |
|
||||||
| Git integration | :heavy_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
|
| Git integration | :heavy_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
|
||||||
| Automatic paging | :heavy_check_mark: | :x: | :x: | :x: | :x: | :heavy_check_mark: | :x: | :x: | :x: |
|
| Automatic paging | :heavy_check_mark: | :x: | :x: | :x: | :x: | :heavy_check_mark: | :x: | :x: |
|
||||||
| Languages (circa) | 150 | 300 | 200 | 7 | 80 | 130 | 30 | 130 | 150 |
|
| Languages (circa) | 150 | 300 | 200 | 7 | 80 | 130 | 30 | 130 |
|
||||||
| Extensible (languages, themes) | :heavy_check_mark: | (:heavy_check_mark:) | (:heavy_check_mark:) | :x: | (:heavy_check_mark:) | :x: | :x: | :x: | :heavy_check_mark: |
|
| Extensible (languages, themes) | :heavy_check_mark: | (:heavy_check_mark:) | (:heavy_check_mark:) | :x: | (:heavy_check_mark:) | :x: | :x: | :x: |
|
||||||
| Advanced highlighting (e.g. nested syntaxes) | :heavy_check_mark: | :heavy_check_mark: | (:heavy_check_mark:) ? | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
|
| Advanced highlighting (e.g. nested syntaxes) | :heavy_check_mark: | :heavy_check_mark: | (:heavy_check_mark:) ? | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
|
||||||
| Execution time [ms] (`jquery-3.3.1.js`) | 422 | 455 | 299 | 39 | 208 | 287 | 128 | 740 | 22 |
|
| Execution time [ms] (`jquery-3.3.1.js`) | 624 | 789 | 400 | 80 | 300 | 316 | 157 | 695 |
|
||||||
| Execution time [ms] (`miniz.c`) | 27 | 169 | 19 | 4 | 36 | 131 | 58 | 231 | 4 |
|
| Execution time [ms] (`miniz.c`) | 66 | 656 | 26 | 8 | 53 | 141 | 75 | 254 |
|
||||||
| Execution time [ms] (957 kB XML file) | 215 | 296 | 236 | 165 | 83 | 412 | 135 | 386 | 127 |
|
| Execution time [ms] (370 kB XML file) | 238 | 487 | 129 | 111 | 110 | 339 | 147 | 359 |
|
||||||
|
|
||||||
If you think that some entries in this table are outdated or wrong, please open a ticket or pull
|
If you think that some entries in this table are outdated or wrong, please open a ticket or pull
|
||||||
request.
|
request.
|
||||||
@ -49,7 +49,6 @@ cmd_source_highlight="source-highlight --failsafe --infer-lang -f esc -i '$SRC'"
|
|||||||
cmd_hicat="hicat '$SRC'"
|
cmd_hicat="hicat '$SRC'"
|
||||||
cmd_coderay="coderay '$SRC'"
|
cmd_coderay="coderay '$SRC'"
|
||||||
cmd_rouge="rougify '$SRC'"
|
cmd_rouge="rougify '$SRC'"
|
||||||
cmd_clp="clp '$SRC'"
|
|
||||||
|
|
||||||
hyperfine --warmup 3 \
|
hyperfine --warmup 3 \
|
||||||
"$cmd_bat" \
|
"$cmd_bat" \
|
||||||
@ -61,5 +60,4 @@ hyperfine --warmup 3 \
|
|||||||
"$cmd_hicat" \
|
"$cmd_hicat" \
|
||||||
"$cmd_coderay" \
|
"$cmd_coderay" \
|
||||||
"$cmd_rouge" \
|
"$cmd_rouge" \
|
||||||
"$cmd_clp" \
|
|
||||||
```
|
```
|
||||||
|
@ -16,9 +16,6 @@ in the `.sublime-syntax` format.
|
|||||||
2. If the Sublime Text syntax is only available as a `.tmLanguage` file, open the file in
|
2. If the Sublime Text syntax is only available as a `.tmLanguage` file, open the file in
|
||||||
Sublime Text and convert it to a `.sublime-syntax` file via *Tools* -> *Developer* ->
|
Sublime Text and convert it to a `.sublime-syntax` file via *Tools* -> *Developer* ->
|
||||||
*New Syntax from XXX.tmLanguage...*. Save the new file in the `assets/syntaxes` folder.
|
*New Syntax from XXX.tmLanguage...*. Save the new file in the `assets/syntaxes` folder.
|
||||||
If only `.tmLanguage.json` or `.tmLanguage.yml` file is available, use
|
|
||||||
[PackageDev](https://packagecontrol.io/packages/PackageDev) to convert it to `.tmLanguage.plist`
|
|
||||||
format and then rename the converted file to `.tmLanguage` file.
|
|
||||||
|
|
||||||
3. Run the `assets/create.sh` script. It calls `bat cache --build` to parse all available
|
3. Run the `assets/create.sh` script. It calls `bat cache --build` to parse all available
|
||||||
`.sublime-syntax` files and serialize them to a `syntaxes.bin` file.
|
`.sublime-syntax` files and serialize them to a `syntaxes.bin` file.
|
||||||
@ -80,14 +77,12 @@ themes (`bat cache --clear`).
|
|||||||
|
|
||||||
The following files have been manually modified after converting from a `.tmLanguage` file:
|
The following files have been manually modified after converting from a `.tmLanguage` file:
|
||||||
|
|
||||||
* `Apache.sublime_syntax`=> removed `conf` and `CONF` file types.
|
* `Apache.sublime_syntax`=> removed `.conf` and `.CONF` file types.
|
||||||
* `Dart.sublime-syntax` => removed `#regex.dart` include.
|
* `Dart.sublime-syntax` => removed `#regex.dart` include.
|
||||||
* `DotENV.sublime-syntax` => added `.env.template`, `env` and `env.*` file types ([upstream PR](https://github.com/zaynali53/DotENV/pull/17)).
|
* `INI.sublime-syntax` => added `.hgrc`, `hgrc`, and `desktop` file types and support for comments after section headers
|
||||||
* `INI.sublime-syntax` => added `.coveragerc`, `.pylintrc`, `.gitlint`, `.hgrc`, `hgrc`, and `desktop` file types and support for comments after section headers.
|
|
||||||
* `Org mode.sublime-syntax` => removed `task` file type.
|
* `Org mode.sublime-syntax` => removed `task` file type.
|
||||||
* `Robot.sublime_syntax` => changed name to "Robot Framework", added `.resource` extension.
|
|
||||||
* `SML.sublime_syntax` => removed `ml` file type.
|
* `SML.sublime_syntax` => removed `ml` file type.
|
||||||
* `wgsl.sublime-syntax` => added `wgsl` file extension.
|
* `Robot.sublime_syntax` => changed name to "Robot Framework", added `.resource` extension
|
||||||
|
|
||||||
### Non-submodule additions
|
### Non-submodule additions
|
||||||
|
|
||||||
|
@ -1,190 +0,0 @@
|
|||||||
A cat(1) clone with syntax highlighting and Git integration.
|
|
||||||
|
|
||||||
Usage: bat [OPTIONS] [FILE]...
|
|
||||||
bat <COMMAND>
|
|
||||||
|
|
||||||
Arguments:
|
|
||||||
[FILE]...
|
|
||||||
File(s) to print / concatenate. Use a dash ('-') or no argument at all to read from
|
|
||||||
standard input.
|
|
||||||
|
|
||||||
Options:
|
|
||||||
-A, --show-all
|
|
||||||
Show non-printable characters like space, tab or newline. This option can also be used to
|
|
||||||
print binary files. Use '--tabs' to control the width of the tab-placeholders.
|
|
||||||
|
|
||||||
--nonprintable-notation <notation>
|
|
||||||
Set notation for non-printable characters.
|
|
||||||
|
|
||||||
Possible values:
|
|
||||||
* unicode (␇, ␊, ␀, ..)
|
|
||||||
* caret (^G, ^J, ^@, ..)
|
|
||||||
|
|
||||||
-p, --plain...
|
|
||||||
Only show plain style, no decorations. This is an alias for '--style=plain'. When '-p' is
|
|
||||||
used twice ('-pp'), it also disables automatic paging (alias for '--style=plain
|
|
||||||
--paging=never').
|
|
||||||
|
|
||||||
-l, --language <language>
|
|
||||||
Explicitly set the language for syntax highlighting. The language can be specified as a
|
|
||||||
name (like 'C++' or 'LaTeX') or possible file extension (like 'cpp', 'hpp' or 'md'). Use
|
|
||||||
'--list-languages' to show all supported language names and file extensions.
|
|
||||||
|
|
||||||
-H, --highlight-line <N:M>
|
|
||||||
Highlight the specified line ranges with a different background color For example:
|
|
||||||
'--highlight-line 40' highlights line 40
|
|
||||||
'--highlight-line 30:40' highlights lines 30 to 40
|
|
||||||
'--highlight-line :40' highlights lines 1 to 40
|
|
||||||
'--highlight-line 40:' highlights lines 40 to the end of the file
|
|
||||||
'--highlight-line 30:+10' highlights lines 30 to 40
|
|
||||||
|
|
||||||
--file-name <name>
|
|
||||||
Specify the name to display for a file. Useful when piping data to bat from STDIN when bat
|
|
||||||
does not otherwise know the filename. Note that the provided file name is also used for
|
|
||||||
syntax detection.
|
|
||||||
|
|
||||||
-d, --diff
|
|
||||||
Only show lines that have been added/removed/modified with respect to the Git index. Use
|
|
||||||
--diff-context=N to control how much context you want to see.
|
|
||||||
|
|
||||||
--diff-context <N>
|
|
||||||
Include N lines of context around added/removed/modified lines when using '--diff'.
|
|
||||||
|
|
||||||
--tabs <T>
|
|
||||||
Set the tab width to T spaces. Use a width of 0 to pass tabs through directly
|
|
||||||
|
|
||||||
--wrap <mode>
|
|
||||||
Specify the text-wrapping mode (*auto*, never, character). The '--terminal-width' option
|
|
||||||
can be used in addition to control the output width.
|
|
||||||
|
|
||||||
-S, --chop-long-lines
|
|
||||||
Truncate all lines longer than screen width. Alias for '--wrap=never'.
|
|
||||||
|
|
||||||
--terminal-width <width>
|
|
||||||
Explicitly set the width of the terminal instead of determining it automatically. If
|
|
||||||
prefixed with '+' or '-', the value will be treated as an offset to the actual terminal
|
|
||||||
width. See also: '--wrap'.
|
|
||||||
|
|
||||||
-n, --number
|
|
||||||
Only show line numbers, no other decorations. This is an alias for '--style=numbers'
|
|
||||||
|
|
||||||
--color <when>
|
|
||||||
Specify when to use colored output. The automatic mode only enables colors if an
|
|
||||||
interactive terminal is detected - colors are automatically disabled if the output goes to
|
|
||||||
a pipe.
|
|
||||||
Possible values: *auto*, never, always.
|
|
||||||
|
|
||||||
--italic-text <when>
|
|
||||||
Specify when to use ANSI sequences for italic text in the output. Possible values: always,
|
|
||||||
*never*.
|
|
||||||
|
|
||||||
--decorations <when>
|
|
||||||
Specify when to use the decorations that have been specified via '--style'. The automatic
|
|
||||||
mode only enables decorations if an interactive terminal is detected. Possible values:
|
|
||||||
*auto*, never, always.
|
|
||||||
|
|
||||||
-f, --force-colorization
|
|
||||||
Alias for '--decorations=always --color=always'. This is useful if the output of bat is
|
|
||||||
piped to another program, but you want to keep the colorization/decorations.
|
|
||||||
|
|
||||||
--paging <when>
|
|
||||||
Specify when to use the pager. To disable the pager, use --paging=never' or its
|
|
||||||
alias,'-P'. To disable the pager permanently, set BAT_PAGING to 'never'. To control which
|
|
||||||
pager is used, see the '--pager' option. Possible values: *auto*, never, always.
|
|
||||||
|
|
||||||
--pager <command>
|
|
||||||
Determine which pager is used. This option will override the PAGER and BAT_PAGER
|
|
||||||
environment variables. The default pager is 'less'. To control when the pager is used, see
|
|
||||||
the '--paging' option. Example: '--pager "less -RF"'.
|
|
||||||
|
|
||||||
-m, --map-syntax <glob:syntax>
|
|
||||||
Map a glob pattern to an existing syntax name. The glob pattern is matched on the full
|
|
||||||
path and the filename. For example, to highlight *.build files with the Python syntax, use
|
|
||||||
-m '*.build:Python'. To highlight files named '.myignore' with the Git Ignore syntax, use
|
|
||||||
-m '.myignore:Git Ignore'. Note that the right-hand side is the *name* of the syntax, not
|
|
||||||
a file extension.
|
|
||||||
|
|
||||||
--ignored-suffix <ignored-suffix>
|
|
||||||
Ignore extension. For example:
|
|
||||||
'bat --ignored-suffix ".dev" my_file.json.dev' will use JSON syntax, and ignore '.dev'
|
|
||||||
|
|
||||||
--theme <theme>
|
|
||||||
Set the theme for syntax highlighting. Use '--list-themes' to see all available themes. To
|
|
||||||
set a default theme, add the '--theme="..."' option to the configuration file or export
|
|
||||||
the BAT_THEME environment variable (e.g.: export BAT_THEME="...").
|
|
||||||
|
|
||||||
--list-themes
|
|
||||||
Display a list of supported themes for syntax highlighting.
|
|
||||||
|
|
||||||
-s, --squeeze-blank
|
|
||||||
Squeeze consecutive empty lines into a single empty line.
|
|
||||||
|
|
||||||
--squeeze-limit <squeeze-limit>
|
|
||||||
Set the maximum number of consecutive empty lines to be printed.
|
|
||||||
|
|
||||||
--strip-ansi <when>
|
|
||||||
Specify when to strip ANSI escape sequences from the input. The automatic mode will remove
|
|
||||||
escape sequences unless the syntax highlighting language is plain text. Possible values:
|
|
||||||
auto, always, *never*.
|
|
||||||
|
|
||||||
--style <components>
|
|
||||||
Configure which elements (line numbers, file headers, grid borders, Git modifications, ..)
|
|
||||||
to display in addition to the file contents. The argument is a comma-separated list of
|
|
||||||
components to display (e.g. 'numbers,changes,grid') or a pre-defined style ('full'). To
|
|
||||||
set a default style, add the '--style=".."' option to the configuration file or export the
|
|
||||||
BAT_STYLE environment variable (e.g.: export BAT_STYLE="..").
|
|
||||||
|
|
||||||
When styles are specified in multiple places, the "nearest" set of styles take precedence.
|
|
||||||
The command-line arguments are the highest priority, followed by the BAT_STYLE environment
|
|
||||||
variable, and then the configuration file. If any set of styles consists entirely of
|
|
||||||
components prefixed with "+" or "-", it will modify the previous set of styles instead of
|
|
||||||
replacing them.
|
|
||||||
|
|
||||||
By default, the following components are enabled:
|
|
||||||
changes, grid, header-filename, numbers, snip
|
|
||||||
|
|
||||||
Possible values:
|
|
||||||
|
|
||||||
* default: enables recommended style components (default).
|
|
||||||
* full: enables all available components.
|
|
||||||
* auto: same as 'default', unless the output is piped.
|
|
||||||
* plain: disables all available components.
|
|
||||||
* changes: show Git modification markers.
|
|
||||||
* header: alias for 'header-filename'.
|
|
||||||
* header-filename: show filenames before the content.
|
|
||||||
* header-filesize: show file sizes before the content.
|
|
||||||
* grid: vertical/horizontal lines to separate side bar
|
|
||||||
and the header from the content.
|
|
||||||
* rule: horizontal lines to delimit files.
|
|
||||||
* numbers: show line numbers in the side bar.
|
|
||||||
* snip: draw separation lines between distinct line ranges.
|
|
||||||
|
|
||||||
-r, --line-range <N:M>
|
|
||||||
Only print the specified range of lines for each file. For example:
|
|
||||||
'--line-range 30:40' prints lines 30 to 40
|
|
||||||
'--line-range :40' prints lines 1 to 40
|
|
||||||
'--line-range 40:' prints lines 40 to the end of the file
|
|
||||||
'--line-range 40' only prints line 40
|
|
||||||
'--line-range 30:+10' prints lines 30 to 40
|
|
||||||
|
|
||||||
-L, --list-languages
|
|
||||||
Display a list of supported languages for syntax highlighting.
|
|
||||||
|
|
||||||
-u, --unbuffered
|
|
||||||
This option exists for POSIX-compliance reasons ('u' is for 'unbuffered'). The output is
|
|
||||||
always unbuffered - this option is simply ignored.
|
|
||||||
|
|
||||||
--diagnostic
|
|
||||||
Show diagnostic information for bug reports.
|
|
||||||
|
|
||||||
--acknowledgements
|
|
||||||
Show acknowledgements.
|
|
||||||
|
|
||||||
--set-terminal-title
|
|
||||||
Sets terminal title to filenames when using a pager.
|
|
||||||
|
|
||||||
-h, --help
|
|
||||||
Print help (see a summary with '-h')
|
|
||||||
|
|
||||||
-V, --version
|
|
||||||
Print version
|
|
@ -5,33 +5,23 @@
|
|||||||
- [ ] Update version in `Cargo.toml`. Run `cargo build` to update `Cargo.lock`.
|
- [ ] Update version in `Cargo.toml`. Run `cargo build` to update `Cargo.lock`.
|
||||||
Make sure to `git add` the `Cargo.lock` changes as well.
|
Make sure to `git add` the `Cargo.lock` changes as well.
|
||||||
- [ ] Find the current min. supported Rust version by running
|
- [ ] Find the current min. supported Rust version by running
|
||||||
`cargo metadata --no-deps --format-version 1 | jq -r '.packages[0].rust_version'`.
|
`grep '^\s*MIN_SUPPORTED_RUST_VERSION' .github/workflows/CICD.yml`.
|
||||||
- [ ] Update the version and the min. supported Rust version in `README.md` and
|
- [ ] Update the version and the min. supported Rust version in `README.md` and
|
||||||
`doc/README-*.md`. Check with
|
`doc/README-*.md`. Check with `git grep -i 'rust.*1\.'` and
|
||||||
`git grep -i -e 'rust.*1\.' -e '1\..*rust' | grep README | grep -v tests/`.
|
`git grep -i '1\..*rust'`.
|
||||||
|
- [ ] Update `CHANGELOG.md`. Introduce a section for the new release.
|
||||||
## CHANGELOG.md updates
|
|
||||||
|
|
||||||
- [ ] Go to https://github.com/sharkdp/bat/releases/new, click "Choose a tag",
|
|
||||||
type the name of the tag that will be created later, click "Generate release
|
|
||||||
notes". DO NOT ACTUALLY CREATE ANY RELEASE IN THIS STEP.
|
|
||||||
- [ ] Compare current `CHANGELOG.md` with auto-generated release notes and add
|
|
||||||
missing entries. Expect in particular dependabot PRs to not be in
|
|
||||||
`CHANGELOG.md` since they are [auto-merged] if CI passes.
|
|
||||||
- [ ] Introduce a section for the new release and perform final touch-ups.
|
|
||||||
|
|
||||||
## Update syntaxes and themes (build assets)
|
## Update syntaxes and themes (build assets)
|
||||||
|
|
||||||
- [ ] Install the latest master version (`cargo clean && cargo install --locked -f --path .`) and make
|
- [ ] Install the latest master version (`cargo clean && cargo install -f --path .`) and make
|
||||||
sure that it is available on the `PATH` (`bat --version` should show the
|
sure that it is available on the `PATH` (`bat --version` should show the
|
||||||
new version).
|
new version).
|
||||||
- [ ] Run `assets/create.sh` and check in the binary asset files.
|
- [ ] Run `assets/create.sh` and check in the binary asset files.
|
||||||
|
|
||||||
## Documentation
|
## Documentation
|
||||||
|
|
||||||
- [ ] Review [`-h`](./short-help.txt), [`--help`](./long-help.txt), and the `man` page. The `man` page is shown in
|
- [ ] Review the `-h` and `--help` texts
|
||||||
the output of the CI job called *Documentation*, so look there.
|
- [ ] Review the `man` page (`man $(fd -HIp target/release/build.*out/assets/manual/bat.1) | tee`)
|
||||||
The CI workflow corresponding to the tip of the master branch is a good place to look.
|
|
||||||
|
|
||||||
## Pre-release checks
|
## Pre-release checks
|
||||||
|
|
||||||
@ -40,14 +30,13 @@
|
|||||||
- [ ] Optional: manually test the new features and command-line options. To do
|
- [ ] Optional: manually test the new features and command-line options. To do
|
||||||
this, install the latest `bat` version again (to include the new syntaxes
|
this, install the latest `bat` version again (to include the new syntaxes
|
||||||
and themes).
|
and themes).
|
||||||
- [ ] Run `cargo publish --dry-run` to make sure that it will
|
- [ ] Run `cargo publish --dry-run --allow-dirty` to make sure that it will
|
||||||
succeed later (after creating the GitHub release).
|
succeed later (after creating the GitHub release).
|
||||||
|
|
||||||
## Release
|
## Release
|
||||||
|
|
||||||
- [ ] Create a tag and push it: `git tag vX.Y.Z; git push origin tag vX.Y.Z`.
|
- [ ] Create a tag and push it: `git tag vX.Y.Z; git push origin tag vX.Y.Z`.
|
||||||
This will trigger the deployment via GitHub Actions.
|
This will trigger the deployment via GitHub Actions.
|
||||||
REMINDER: If your `origin` is a fork, don't forget to push to e.g. `upstream` instead!
|
|
||||||
- [ ] Go to https://github.com/sharkdp/bat/releases/new to create the new
|
- [ ] Go to https://github.com/sharkdp/bat/releases/new to create the new
|
||||||
release. Select the new tag and also use it as the release title. For the
|
release. Select the new tag and also use it as the release title. For the
|
||||||
release notes, copy the corresponding section from `CHANGELOG.md` and
|
release notes, copy the corresponding section from `CHANGELOG.md` and
|
||||||
@ -60,25 +49,4 @@
|
|||||||
|
|
||||||
## Post-release
|
## Post-release
|
||||||
|
|
||||||
- [ ] Prepare a new "unreleased" section at the top of `CHANGELOG.md`.
|
- [ ] Prepare a new (empty) "unreleased" section at the top of `CHANGELOG.md`.
|
||||||
Put this at the top:
|
|
||||||
|
|
||||||
```
|
|
||||||
# unreleased
|
|
||||||
|
|
||||||
## Features
|
|
||||||
|
|
||||||
## Bugfixes
|
|
||||||
|
|
||||||
## Other
|
|
||||||
|
|
||||||
## Syntaxes
|
|
||||||
|
|
||||||
## Themes
|
|
||||||
|
|
||||||
## `bat` as a library
|
|
||||||
|
|
||||||
|
|
||||||
```
|
|
||||||
|
|
||||||
[auto-merged]: https://github.com/sharkdp/bat/blob/master/.github/workflows/Auto-merge-dependabot-PRs.yml
|
|
||||||
|
@ -1,58 +0,0 @@
|
|||||||
A cat(1) clone with wings.
|
|
||||||
|
|
||||||
Usage: bat [OPTIONS] [FILE]...
|
|
||||||
bat <COMMAND>
|
|
||||||
|
|
||||||
Arguments:
|
|
||||||
[FILE]... File(s) to print / concatenate. Use '-' for standard input.
|
|
||||||
|
|
||||||
Options:
|
|
||||||
-A, --show-all
|
|
||||||
Show non-printable characters (space, tab, newline, ..).
|
|
||||||
--nonprintable-notation <notation>
|
|
||||||
Set notation for non-printable characters.
|
|
||||||
-p, --plain...
|
|
||||||
Show plain style (alias for '--style=plain').
|
|
||||||
-l, --language <language>
|
|
||||||
Set the language for syntax highlighting.
|
|
||||||
-H, --highlight-line <N:M>
|
|
||||||
Highlight lines N through M.
|
|
||||||
--file-name <name>
|
|
||||||
Specify the name to display for a file.
|
|
||||||
-d, --diff
|
|
||||||
Only show lines that have been added/removed/modified.
|
|
||||||
--tabs <T>
|
|
||||||
Set the tab width to T spaces.
|
|
||||||
--wrap <mode>
|
|
||||||
Specify the text-wrapping mode (*auto*, never, character).
|
|
||||||
-S, --chop-long-lines
|
|
||||||
Truncate all lines longer than screen width. Alias for '--wrap=never'.
|
|
||||||
-n, --number
|
|
||||||
Show line numbers (alias for '--style=numbers').
|
|
||||||
--color <when>
|
|
||||||
When to use colors (*auto*, never, always).
|
|
||||||
--italic-text <when>
|
|
||||||
Use italics in output (always, *never*)
|
|
||||||
--decorations <when>
|
|
||||||
When to show the decorations (*auto*, never, always).
|
|
||||||
--paging <when>
|
|
||||||
Specify when to use the pager, or use `-P` to disable (*auto*, never, always).
|
|
||||||
-m, --map-syntax <glob:syntax>
|
|
||||||
Use the specified syntax for files matching the glob pattern ('*.cpp:C++').
|
|
||||||
--theme <theme>
|
|
||||||
Set the color theme for syntax highlighting.
|
|
||||||
--list-themes
|
|
||||||
Display all supported highlighting themes.
|
|
||||||
-s, --squeeze-blank
|
|
||||||
Squeeze consecutive empty lines.
|
|
||||||
--style <components>
|
|
||||||
Comma-separated list of style elements to display (*default*, auto, full, plain, changes,
|
|
||||||
header, header-filename, header-filesize, grid, rule, numbers, snip).
|
|
||||||
-r, --line-range <N:M>
|
|
||||||
Only print the lines from N to M.
|
|
||||||
-L, --list-languages
|
|
||||||
Display all supported languages.
|
|
||||||
-h, --help
|
|
||||||
Print help (see more with '--help')
|
|
||||||
-V, --version
|
|
||||||
Print version
|
|
Binary file not shown.
Before Width: | Height: | Size: 79 KiB |
@ -1,17 +0,0 @@
|
|||||||
use bat::{assets::HighlightingAssets, config::Config, controller::Controller, Input};
|
|
||||||
|
|
||||||
fn main() {
|
|
||||||
let mut buffer = String::new();
|
|
||||||
let config = Config {
|
|
||||||
colored_output: true,
|
|
||||||
..Default::default()
|
|
||||||
};
|
|
||||||
let assets = HighlightingAssets::from_binary();
|
|
||||||
let controller = Controller::new(&config, &assets);
|
|
||||||
let input = Input::from_file(file!());
|
|
||||||
controller
|
|
||||||
.run(vec![input.into()], Some(&mut buffer))
|
|
||||||
.unwrap();
|
|
||||||
|
|
||||||
println!("{buffer}");
|
|
||||||
}
|
|
@ -1,4 +1,4 @@
|
|||||||
/// A simple program that lists all supported syntaxes and themes.
|
/// A simple program that prints its own source code using the bat library
|
||||||
use bat::PrettyPrinter;
|
use bat::PrettyPrinter;
|
||||||
|
|
||||||
fn main() {
|
fn main() {
|
||||||
@ -13,6 +13,6 @@ fn main() {
|
|||||||
|
|
||||||
println!("Themes:");
|
println!("Themes:");
|
||||||
for theme in printer.themes() {
|
for theme in printer.themes() {
|
||||||
println!("- {theme}");
|
println!("- {}", theme);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -23,8 +23,7 @@ fn main() {
|
|||||||
}],
|
}],
|
||||||
};
|
};
|
||||||
|
|
||||||
let mut bytes = Vec::with_capacity(128);
|
let bytes = serde_yaml::to_vec(&person).unwrap();
|
||||||
serde_yaml::to_writer(&mut bytes, &person).unwrap();
|
|
||||||
PrettyPrinter::new()
|
PrettyPrinter::new()
|
||||||
.language("yaml")
|
.language("yaml")
|
||||||
.line_numbers(true)
|
.line_numbers(true)
|
||||||
|
@ -43,9 +43,8 @@ pub struct SyntaxReferenceInSet<'a> {
|
|||||||
pub syntax_set: &'a SyntaxSet,
|
pub syntax_set: &'a SyntaxSet,
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Lazy-loaded syntaxes are already compressed, and we don't want to compress
|
/// Compress for size of ~700 kB instead of ~4600 kB at the cost of ~30% longer deserialization time
|
||||||
/// already compressed data.
|
pub(crate) const COMPRESS_SYNTAXES: bool = true;
|
||||||
pub(crate) const COMPRESS_SYNTAXES: bool = false;
|
|
||||||
|
|
||||||
/// We don't want to compress our [LazyThemeSet] since the lazy-loaded themes
|
/// We don't want to compress our [LazyThemeSet] since the lazy-loaded themes
|
||||||
/// within it are already compressed, and compressing another time just makes
|
/// within it are already compressed, and compressing another time just makes
|
||||||
@ -69,57 +68,10 @@ impl HighlightingAssets {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// The default theme.
|
|
||||||
///
|
|
||||||
/// ### Windows and Linux
|
|
||||||
///
|
|
||||||
/// Windows and most Linux distributions has a dark terminal theme by
|
|
||||||
/// default. On these platforms, this function always returns a theme that
|
|
||||||
/// looks good on a dark background.
|
|
||||||
///
|
|
||||||
/// ### macOS
|
|
||||||
///
|
|
||||||
/// On macOS the default terminal background is light, but it is common that
|
|
||||||
/// Dark Mode is active, which makes the terminal background dark. On this
|
|
||||||
/// platform, the default theme depends on
|
|
||||||
/// ```bash
|
|
||||||
/// defaults read -globalDomain AppleInterfaceStyle
|
|
||||||
/// ```
|
|
||||||
/// To avoid the overhead of the check on macOS, simply specify a theme
|
|
||||||
/// explicitly via `--theme`, `BAT_THEME`, or `~/.config/bat`.
|
|
||||||
///
|
|
||||||
/// See <https://github.com/sharkdp/bat/issues/1746> and
|
|
||||||
/// <https://github.com/sharkdp/bat/issues/1928> for more context.
|
|
||||||
pub fn default_theme() -> &'static str {
|
pub fn default_theme() -> &'static str {
|
||||||
#[cfg(not(target_os = "macos"))]
|
|
||||||
{
|
|
||||||
Self::default_dark_theme()
|
|
||||||
}
|
|
||||||
#[cfg(target_os = "macos")]
|
|
||||||
{
|
|
||||||
if macos_dark_mode_active() {
|
|
||||||
Self::default_dark_theme()
|
|
||||||
} else {
|
|
||||||
Self::default_light_theme()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The default theme that looks good on a dark background.
|
|
||||||
*/
|
|
||||||
fn default_dark_theme() -> &'static str {
|
|
||||||
"Monokai Extended"
|
"Monokai Extended"
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* The default theme that looks good on a light background.
|
|
||||||
*/
|
|
||||||
#[cfg(target_os = "macos")]
|
|
||||||
fn default_light_theme() -> &'static str {
|
|
||||||
"Monokai Extended Light"
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn from_cache(cache_path: &Path) -> Result<Self> {
|
pub fn from_cache(cache_path: &Path) -> Result<Self> {
|
||||||
Ok(HighlightingAssets::new(
|
Ok(HighlightingAssets::new(
|
||||||
SerializedSyntaxSet::FromFile(cache_path.join("syntaxes.bin")),
|
SerializedSyntaxSet::FromFile(cache_path.join("syntaxes.bin")),
|
||||||
@ -380,7 +332,7 @@ fn asset_from_contents<T: serde::de::DeserializeOwned>(
|
|||||||
} else {
|
} else {
|
||||||
bincode::deserialize_from(contents)
|
bincode::deserialize_from(contents)
|
||||||
}
|
}
|
||||||
.map_err(|_| format!("Could not parse {description}").into())
|
.map_err(|_| format!("Could not parse {}", description).into())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn asset_from_cache<T: serde::de::DeserializeOwned>(
|
fn asset_from_cache<T: serde::de::DeserializeOwned>(
|
||||||
@ -396,27 +348,7 @@ fn asset_from_cache<T: serde::de::DeserializeOwned>(
|
|||||||
)
|
)
|
||||||
})?;
|
})?;
|
||||||
asset_from_contents(&contents[..], description, compressed)
|
asset_from_contents(&contents[..], description, compressed)
|
||||||
.map_err(|_| format!("Could not parse cached {description}").into())
|
.map_err(|_| format!("Could not parse cached {}", description).into())
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(target_os = "macos")]
|
|
||||||
fn macos_dark_mode_active() -> bool {
|
|
||||||
const PREFERENCES_FILE: &str = "Library/Preferences/.GlobalPreferences.plist";
|
|
||||||
const STYLE_KEY: &str = "AppleInterfaceStyle";
|
|
||||||
|
|
||||||
let preferences_file = home::home_dir()
|
|
||||||
.map(|home| home.join(PREFERENCES_FILE))
|
|
||||||
.expect("Could not get home directory");
|
|
||||||
|
|
||||||
match plist::Value::from_file(preferences_file).map(|file| file.into_dictionary()) {
|
|
||||||
Ok(Some(preferences)) => match preferences.get(STYLE_KEY).and_then(|val| val.as_string()) {
|
|
||||||
Some(value) => value == "Dark",
|
|
||||||
// If the key does not exist, then light theme is currently in use.
|
|
||||||
None => false,
|
|
||||||
},
|
|
||||||
// Unreachable, in theory. All macOS users have a home directory and preferences file setup.
|
|
||||||
Ok(None) | Err(_) => true,
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
@ -441,7 +373,7 @@ mod tests {
|
|||||||
fn new() -> Self {
|
fn new() -> Self {
|
||||||
SyntaxDetectionTest {
|
SyntaxDetectionTest {
|
||||||
assets: HighlightingAssets::from_binary(),
|
assets: HighlightingAssets::from_binary(),
|
||||||
syntax_mapping: SyntaxMapping::new(),
|
syntax_mapping: SyntaxMapping::builtin(),
|
||||||
temp_dir: TempDir::new().expect("creation of temporary directory"),
|
temp_dir: TempDir::new().expect("creation of temporary directory"),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -466,7 +398,7 @@ mod tests {
|
|||||||
let file_path = self.temp_dir.path().join(file_name);
|
let file_path = self.temp_dir.path().join(file_name);
|
||||||
{
|
{
|
||||||
let mut temp_file = File::create(&file_path).unwrap();
|
let mut temp_file = File::create(&file_path).unwrap();
|
||||||
writeln!(temp_file, "{first_line}").unwrap();
|
writeln!(temp_file, "{}", first_line).unwrap();
|
||||||
}
|
}
|
||||||
|
|
||||||
let input = Input::ordinary_file(&file_path);
|
let input = Input::ordinary_file(&file_path);
|
||||||
@ -514,7 +446,8 @@ mod tests {
|
|||||||
|
|
||||||
if !consistent {
|
if !consistent {
|
||||||
eprintln!(
|
eprintln!(
|
||||||
"Inconsistent syntax detection:\nFor File: {as_file}\nFor Reader: {as_reader}"
|
"Inconsistent syntax detection:\nFor File: {}\nFor Reader: {}",
|
||||||
|
as_file, as_reader
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -648,22 +581,13 @@ mod tests {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn syntax_detection_is_case_insensitive() {
|
fn syntax_detection_is_case_sensitive() {
|
||||||
let mut test = SyntaxDetectionTest::new();
|
let mut test = SyntaxDetectionTest::new();
|
||||||
|
|
||||||
assert_eq!(test.syntax_for_file("README.md"), "Markdown");
|
assert_ne!(test.syntax_for_file("README.MD"), "Markdown");
|
||||||
assert_eq!(test.syntax_for_file("README.mD"), "Markdown");
|
|
||||||
assert_eq!(test.syntax_for_file("README.Md"), "Markdown");
|
|
||||||
assert_eq!(test.syntax_for_file("README.MD"), "Markdown");
|
|
||||||
|
|
||||||
// Adding a mapping for "MD" in addition to "md" should not break the mapping
|
|
||||||
test.syntax_mapping
|
test.syntax_mapping
|
||||||
.insert("*.MD", MappingTarget::MapTo("Markdown"))
|
.insert("*.MD", MappingTarget::MapTo("Markdown"))
|
||||||
.ok();
|
.ok();
|
||||||
|
|
||||||
assert_eq!(test.syntax_for_file("README.md"), "Markdown");
|
|
||||||
assert_eq!(test.syntax_for_file("README.mD"), "Markdown");
|
|
||||||
assert_eq!(test.syntax_for_file("README.Md"), "Markdown");
|
|
||||||
assert_eq!(test.syntax_for_file("README.MD"), "Markdown");
|
assert_eq!(test.syntax_for_file("README.MD"), "Markdown");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3,11 +3,11 @@ use std::path::Path;
|
|||||||
use std::time::SystemTime;
|
use std::time::SystemTime;
|
||||||
|
|
||||||
use semver::Version;
|
use semver::Version;
|
||||||
use serde_derive::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
use crate::error::*;
|
use crate::error::*;
|
||||||
|
|
||||||
#[derive(Debug, PartialEq, Eq, Default, Serialize, Deserialize)]
|
#[derive(Debug, PartialEq, Default, Serialize, Deserialize)]
|
||||||
pub struct AssetsMetadata {
|
pub struct AssetsMetadata {
|
||||||
bat_version: Option<String>,
|
bat_version: Option<String>,
|
||||||
creation_time: Option<SystemTime>,
|
creation_time: Option<SystemTime>,
|
||||||
|
@ -93,7 +93,7 @@ fn print_unlinked_contexts(syntax_set: &SyntaxSet) {
|
|||||||
if !missing_contexts.is_empty() {
|
if !missing_contexts.is_empty() {
|
||||||
println!("Some referenced contexts could not be found!");
|
println!("Some referenced contexts could not be found!");
|
||||||
for context in missing_contexts {
|
for context in missing_contexts {
|
||||||
println!("- {context}");
|
println!("- {}", context);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -152,7 +152,7 @@ pub(crate) fn asset_to_contents<T: serde::Serialize>(
|
|||||||
} else {
|
} else {
|
||||||
bincode::serialize_into(&mut contents, asset)
|
bincode::serialize_into(&mut contents, asset)
|
||||||
}
|
}
|
||||||
.map_err(|_| format!("Could not serialize {description}"))?;
|
.map_err(|_| format!("Could not serialize {}", description))?;
|
||||||
Ok(contents)
|
Ok(contents)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
use std::fmt::Write;
|
|
||||||
use std::fs::read_to_string;
|
use std::fs::read_to_string;
|
||||||
use std::path::{Path, PathBuf};
|
use std::path::{Path, PathBuf};
|
||||||
|
|
||||||
@ -80,7 +79,7 @@ fn handle_license(path: &Path) -> Result<Option<String>> {
|
|||||||
} else if license_not_needed_in_acknowledgements(&license_text) {
|
} else if license_not_needed_in_acknowledgements(&license_text) {
|
||||||
Ok(None)
|
Ok(None)
|
||||||
} else {
|
} else {
|
||||||
Err(format!("ERROR: License is of unknown type: {path:?}").into())
|
Err(format!("ERROR: License is of unknown type: {:?}", path).into())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -125,7 +124,7 @@ fn append_to_acknowledgements(
|
|||||||
relative_path: &str,
|
relative_path: &str,
|
||||||
license_text: &str,
|
license_text: &str,
|
||||||
) {
|
) {
|
||||||
write!(acknowledgements, "## {relative_path}\n\n{license_text}").ok();
|
acknowledgements.push_str(&format!("## {}\n\n{}", relative_path, license_text));
|
||||||
|
|
||||||
// Make sure the last char is a newline to not mess up formatting later
|
// Make sure the last char is a newline to not mess up formatting later
|
||||||
if acknowledgements
|
if acknowledgements
|
||||||
|
@ -3,7 +3,8 @@ use super::*;
|
|||||||
use std::collections::BTreeMap;
|
use std::collections::BTreeMap;
|
||||||
use std::convert::TryFrom;
|
use std::convert::TryFrom;
|
||||||
|
|
||||||
use serde_derive::{Deserialize, Serialize};
|
use serde::Deserialize;
|
||||||
|
use serde::Serialize;
|
||||||
|
|
||||||
use once_cell::unsync::OnceCell;
|
use once_cell::unsync::OnceCell;
|
||||||
|
|
||||||
@ -88,7 +89,7 @@ impl TryFrom<ThemeSet> for LazyThemeSet {
|
|||||||
let lazy_theme = LazyTheme {
|
let lazy_theme = LazyTheme {
|
||||||
serialized: crate::assets::build_assets::asset_to_contents(
|
serialized: crate::assets::build_assets::asset_to_contents(
|
||||||
&theme,
|
&theme,
|
||||||
&format!("theme {name}"),
|
&format!("theme {}", name),
|
||||||
COMPRESS_LAZY_THEMES,
|
COMPRESS_LAZY_THEMES,
|
||||||
)?,
|
)?,
|
||||||
deserialized: OnceCell::new(),
|
deserialized: OnceCell::new(),
|
||||||
|
@ -1,15 +1,14 @@
|
|||||||
use std::collections::HashSet;
|
use std::collections::HashSet;
|
||||||
use std::env;
|
use std::env;
|
||||||
use std::io::IsTerminal;
|
use std::path::Path;
|
||||||
use std::path::{Path, PathBuf};
|
|
||||||
use std::str::FromStr;
|
use std::str::FromStr;
|
||||||
|
|
||||||
|
use atty::{self, Stream};
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
clap_app,
|
clap_app,
|
||||||
config::{get_args_from_config_file, get_args_from_env_opts_var, get_args_from_env_vars},
|
config::{get_args_from_config_file, get_args_from_env_var},
|
||||||
};
|
};
|
||||||
use bat::style::StyleComponentList;
|
|
||||||
use bat::StripAnsiMode;
|
|
||||||
use clap::ArgMatches;
|
use clap::ArgMatches;
|
||||||
|
|
||||||
use console::Term;
|
use console::Term;
|
||||||
@ -23,7 +22,7 @@ use bat::{
|
|||||||
input::Input,
|
input::Input,
|
||||||
line_range::{HighlightedLineRanges, LineRange, LineRanges},
|
line_range::{HighlightedLineRanges, LineRange, LineRanges},
|
||||||
style::{StyleComponent, StyleComponents},
|
style::{StyleComponent, StyleComponents},
|
||||||
MappingTarget, NonprintableNotation, PagingMode, SyntaxMapping, WrappingMode,
|
MappingTarget, PagingMode, SyntaxMapping, WrappingMode,
|
||||||
};
|
};
|
||||||
|
|
||||||
fn is_truecolor_terminal() -> bool {
|
fn is_truecolor_terminal() -> bool {
|
||||||
@ -32,21 +31,17 @@ fn is_truecolor_terminal() -> bool {
|
|||||||
.unwrap_or(false)
|
.unwrap_or(false)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn env_no_color() -> bool {
|
|
||||||
env::var_os("NO_COLOR").is_some_and(|x| !x.is_empty())
|
|
||||||
}
|
|
||||||
|
|
||||||
pub struct App {
|
pub struct App {
|
||||||
pub matches: ArgMatches,
|
pub matches: ArgMatches<'static>,
|
||||||
interactive_output: bool,
|
interactive_output: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl App {
|
impl App {
|
||||||
pub fn new() -> Result<Self> {
|
pub fn new() -> Result<Self> {
|
||||||
#[cfg(windows)]
|
#[cfg(windows)]
|
||||||
let _ = nu_ansi_term::enable_ansi_support();
|
let _ = ansi_term::enable_ansi_support();
|
||||||
|
|
||||||
let interactive_output = std::io::stdout().is_terminal();
|
let interactive_output = atty::is(Stream::Stdout);
|
||||||
|
|
||||||
Ok(App {
|
Ok(App {
|
||||||
matches: Self::matches(interactive_output)?,
|
matches: Self::matches(interactive_output)?,
|
||||||
@ -54,40 +49,27 @@ impl App {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
fn matches(interactive_output: bool) -> Result<ArgMatches> {
|
fn matches(interactive_output: bool) -> Result<ArgMatches<'static>> {
|
||||||
let args = if wild::args_os().nth(1) == Some("cache".into()) {
|
let args = if wild::args_os().nth(1) == Some("cache".into())
|
||||||
// Skip the config file and env vars
|
|| wild::args_os().any(|arg| arg == "--no-config")
|
||||||
|
{
|
||||||
wild::args_os().collect::<Vec<_>>()
|
|
||||||
} else if wild::args_os().any(|arg| arg == "--no-config") {
|
|
||||||
// Skip the arguments in bats config file
|
// Skip the arguments in bats config file
|
||||||
|
|
||||||
let mut cli_args = wild::args_os();
|
wild::args_os().collect::<Vec<_>>()
|
||||||
let mut args = get_args_from_env_vars();
|
|
||||||
|
|
||||||
// Put the zero-th CLI argument (program name) first
|
|
||||||
args.insert(0, cli_args.next().unwrap());
|
|
||||||
|
|
||||||
// .. and the rest at the end
|
|
||||||
cli_args.for_each(|a| args.push(a));
|
|
||||||
|
|
||||||
args
|
|
||||||
} else {
|
} else {
|
||||||
let mut cli_args = wild::args_os();
|
let mut cli_args = wild::args_os();
|
||||||
|
|
||||||
// Read arguments from bats config file
|
// Read arguments from bats config file
|
||||||
let mut args = get_args_from_env_opts_var()
|
let mut args = get_args_from_env_var()
|
||||||
.unwrap_or_else(get_args_from_config_file)
|
.unwrap_or_else(get_args_from_config_file)
|
||||||
.map_err(|_| "Could not parse configuration file")?;
|
.map_err(|_| "Could not parse configuration file")?;
|
||||||
|
|
||||||
// Selected env vars supersede config vars
|
|
||||||
args.extend(get_args_from_env_vars());
|
|
||||||
|
|
||||||
// Put the zero-th CLI argument (program name) first
|
// Put the zero-th CLI argument (program name) first
|
||||||
args.insert(0, cli_args.next().unwrap());
|
args.insert(0, cli_args.next().unwrap());
|
||||||
|
|
||||||
// .. and the rest at the end
|
// .. and the rest at the end
|
||||||
cli_args.for_each(|a| args.push(a));
|
cli_args.for_each(|a| args.push(a));
|
||||||
|
|
||||||
args
|
args
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -97,19 +79,19 @@ impl App {
|
|||||||
pub fn config(&self, inputs: &[Input]) -> Result<Config> {
|
pub fn config(&self, inputs: &[Input]) -> Result<Config> {
|
||||||
let style_components = self.style_components()?;
|
let style_components = self.style_components()?;
|
||||||
|
|
||||||
let paging_mode = match self.matches.get_one::<String>("paging").map(|s| s.as_str()) {
|
let paging_mode = match self.matches.value_of("paging") {
|
||||||
Some("always") => PagingMode::Always,
|
Some("always") => PagingMode::Always,
|
||||||
Some("never") => PagingMode::Never,
|
Some("never") => PagingMode::Never,
|
||||||
Some("auto") | None => {
|
Some("auto") | None => {
|
||||||
// If we have -pp as an option when in auto mode, the pager should be disabled.
|
// If we have -pp as an option when in auto mode, the pager should be disabled.
|
||||||
let extra_plain = self.matches.get_count("plain") > 1;
|
let extra_plain = self.matches.occurrences_of("plain") > 1;
|
||||||
if extra_plain || self.matches.get_flag("no-paging") {
|
if extra_plain || self.matches.is_present("no-paging") {
|
||||||
PagingMode::Never
|
PagingMode::Never
|
||||||
} else if inputs.iter().any(Input::is_stdin) {
|
} else if inputs.iter().any(Input::is_stdin) {
|
||||||
// If we are reading from stdin, only enable paging if we write to an
|
// If we are reading from stdin, only enable paging if we write to an
|
||||||
// interactive terminal and if we do not *read* from an interactive
|
// interactive terminal and if we do not *read* from an interactive
|
||||||
// terminal.
|
// terminal.
|
||||||
if self.interactive_output && !std::io::stdin().is_terminal() {
|
if self.interactive_output && !atty::is(Stream::Stdin) {
|
||||||
PagingMode::QuitIfOneScreen
|
PagingMode::QuitIfOneScreen
|
||||||
} else {
|
} else {
|
||||||
PagingMode::Never
|
PagingMode::Never
|
||||||
@ -123,22 +105,16 @@ impl App {
|
|||||||
_ => unreachable!("other values for --paging are not allowed"),
|
_ => unreachable!("other values for --paging are not allowed"),
|
||||||
};
|
};
|
||||||
|
|
||||||
let mut syntax_mapping = SyntaxMapping::new();
|
let mut syntax_mapping = SyntaxMapping::builtin();
|
||||||
// start building glob matchers for builtin mappings immediately
|
|
||||||
// this is an appropriate approach because it's statistically likely that
|
|
||||||
// all the custom mappings need to be checked
|
|
||||||
syntax_mapping.start_offload_build_all();
|
|
||||||
|
|
||||||
if let Some(values) = self.matches.get_many::<String>("ignored-suffix") {
|
if let Some(values) = self.matches.values_of("ignored-suffix") {
|
||||||
for suffix in values {
|
for suffix in values {
|
||||||
syntax_mapping.insert_ignored_suffix(suffix);
|
syntax_mapping.insert_ignored_suffix(suffix);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if let Some(values) = self.matches.get_many::<String>("map-syntax") {
|
if let Some(values) = self.matches.values_of("map-syntax") {
|
||||||
// later args take precedence over earlier ones, hence `.rev()`
|
for from_to in values {
|
||||||
// see: https://github.com/sharkdp/bat/pull/2755#discussion_r1456416875
|
|
||||||
for from_to in values.rev() {
|
|
||||||
let parts: Vec<_> = from_to.split(':').collect();
|
let parts: Vec<_> = from_to.split(':').collect();
|
||||||
|
|
||||||
if parts.len() != 2 {
|
if parts.len() != 2 {
|
||||||
@ -149,10 +125,7 @@ impl App {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let maybe_term_width = self
|
let maybe_term_width = self.matches.value_of("terminal-width").and_then(|w| {
|
||||||
.matches
|
|
||||||
.get_one::<String>("terminal-width")
|
|
||||||
.and_then(|w| {
|
|
||||||
if w.starts_with('+') || w.starts_with('-') {
|
if w.starts_with('+') || w.starts_with('-') {
|
||||||
// Treat argument as a delta to the current terminal width
|
// Treat argument as a delta to the current terminal width
|
||||||
w.parse().ok().map(|delta: i16| {
|
w.parse().ok().map(|delta: i16| {
|
||||||
@ -172,30 +145,16 @@ impl App {
|
|||||||
|
|
||||||
Ok(Config {
|
Ok(Config {
|
||||||
true_color: is_truecolor_terminal(),
|
true_color: is_truecolor_terminal(),
|
||||||
language: self
|
language: self.matches.value_of("language").or_else(|| {
|
||||||
.matches
|
if self.matches.is_present("show-all") {
|
||||||
.get_one::<String>("language")
|
|
||||||
.map(|s| s.as_str())
|
|
||||||
.or_else(|| {
|
|
||||||
if self.matches.get_flag("show-all") {
|
|
||||||
Some("show-nonprintable")
|
Some("show-nonprintable")
|
||||||
} else {
|
} else {
|
||||||
None
|
None
|
||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
show_nonprintable: self.matches.get_flag("show-all"),
|
show_nonprintable: self.matches.is_present("show-all"),
|
||||||
nonprintable_notation: match self
|
|
||||||
.matches
|
|
||||||
.get_one::<String>("nonprintable-notation")
|
|
||||||
.map(|s| s.as_str())
|
|
||||||
{
|
|
||||||
Some("unicode") => NonprintableNotation::Unicode,
|
|
||||||
Some("caret") => NonprintableNotation::Caret,
|
|
||||||
_ => unreachable!("other values for --nonprintable-notation are not allowed"),
|
|
||||||
},
|
|
||||||
wrapping_mode: if self.interactive_output || maybe_term_width.is_some() {
|
wrapping_mode: if self.interactive_output || maybe_term_width.is_some() {
|
||||||
if !self.matches.get_flag("chop-long-lines") {
|
match self.matches.value_of("wrap") {
|
||||||
match self.matches.get_one::<String>("wrap").map(|s| s.as_str()) {
|
|
||||||
Some("character") => WrappingMode::Character,
|
Some("character") => WrappingMode::Character,
|
||||||
Some("never") => WrappingMode::NoWrapping(true),
|
Some("never") => WrappingMode::NoWrapping(true),
|
||||||
Some("auto") | None => {
|
Some("auto") | None => {
|
||||||
@ -207,35 +166,29 @@ impl App {
|
|||||||
}
|
}
|
||||||
_ => unreachable!("other values for --wrap are not allowed"),
|
_ => unreachable!("other values for --wrap are not allowed"),
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
WrappingMode::NoWrapping(true)
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
// We don't have the tty width when piping to another program.
|
// We don't have the tty width when piping to another program.
|
||||||
// There's no point in wrapping when this is the case.
|
// There's no point in wrapping when this is the case.
|
||||||
WrappingMode::NoWrapping(false)
|
WrappingMode::NoWrapping(false)
|
||||||
},
|
},
|
||||||
colored_output: self.matches.get_flag("force-colorization")
|
colored_output: self.matches.is_present("force-colorization")
|
||||||
|| match self.matches.get_one::<String>("color").map(|s| s.as_str()) {
|
|| match self.matches.value_of("color") {
|
||||||
Some("always") => true,
|
Some("always") => true,
|
||||||
Some("never") => false,
|
Some("never") => false,
|
||||||
Some("auto") => !env_no_color() && self.interactive_output,
|
Some("auto") => env::var_os("NO_COLOR").is_none() && self.interactive_output,
|
||||||
_ => unreachable!("other values for --color are not allowed"),
|
_ => unreachable!("other values for --color are not allowed"),
|
||||||
},
|
},
|
||||||
paging_mode,
|
paging_mode,
|
||||||
term_width: maybe_term_width.unwrap_or(Term::stdout().size().1 as usize),
|
term_width: maybe_term_width.unwrap_or(Term::stdout().size().1 as usize),
|
||||||
loop_through: !(self.interactive_output
|
loop_through: !(self.interactive_output
|
||||||
|| self.matches.get_one::<String>("color").map(|s| s.as_str()) == Some("always")
|
|| self.matches.value_of("color") == Some("always")
|
||||||
|| self
|
|| self.matches.value_of("decorations") == Some("always")
|
||||||
.matches
|
|| self.matches.is_present("force-colorization")),
|
||||||
.get_one::<String>("decorations")
|
|
||||||
.map(|s| s.as_str())
|
|
||||||
== Some("always")
|
|
||||||
|| self.matches.get_flag("force-colorization")),
|
|
||||||
tab_width: self
|
tab_width: self
|
||||||
.matches
|
.matches
|
||||||
.get_one::<String>("tabs")
|
.value_of("tabs")
|
||||||
.map(String::from)
|
.map(String::from)
|
||||||
|
.or_else(|| env::var("BAT_TABS").ok())
|
||||||
.and_then(|t| t.parse().ok())
|
.and_then(|t| t.parse().ok())
|
||||||
.unwrap_or(
|
.unwrap_or(
|
||||||
if style_components.plain() && paging_mode == PagingMode::Never {
|
if style_components.plain() && paging_mode == PagingMode::Never {
|
||||||
@ -244,20 +197,11 @@ impl App {
|
|||||||
4
|
4
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
strip_ansi: match self
|
|
||||||
.matches
|
|
||||||
.get_one::<String>("strip-ansi")
|
|
||||||
.map(|s| s.as_str())
|
|
||||||
{
|
|
||||||
Some("never") => StripAnsiMode::Never,
|
|
||||||
Some("always") => StripAnsiMode::Always,
|
|
||||||
Some("auto") => StripAnsiMode::Auto,
|
|
||||||
_ => unreachable!("other values for --strip-ansi are not allowed"),
|
|
||||||
},
|
|
||||||
theme: self
|
theme: self
|
||||||
.matches
|
.matches
|
||||||
.get_one::<String>("theme")
|
.value_of("theme")
|
||||||
.map(String::from)
|
.map(String::from)
|
||||||
|
.or_else(|| env::var("BAT_THEME").ok())
|
||||||
.map(|s| {
|
.map(|s| {
|
||||||
if s == "default" {
|
if s == "default" {
|
||||||
String::from(HighlightingAssets::default_theme())
|
String::from(HighlightingAssets::default_theme())
|
||||||
@ -266,21 +210,19 @@ impl App {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
.unwrap_or_else(|| String::from(HighlightingAssets::default_theme())),
|
.unwrap_or_else(|| String::from(HighlightingAssets::default_theme())),
|
||||||
visible_lines: match self.matches.try_contains_id("diff").unwrap_or_default()
|
visible_lines: match self.matches.is_present("diff") {
|
||||||
&& self.matches.get_flag("diff")
|
|
||||||
{
|
|
||||||
#[cfg(feature = "git")]
|
#[cfg(feature = "git")]
|
||||||
true => VisibleLines::DiffContext(
|
true => VisibleLines::DiffContext(
|
||||||
self.matches
|
self.matches
|
||||||
.get_one::<String>("diff-context")
|
.value_of("diff-context")
|
||||||
.and_then(|t| t.parse().ok())
|
.and_then(|t| t.parse().ok())
|
||||||
.unwrap_or(2),
|
.unwrap_or(2),
|
||||||
),
|
),
|
||||||
|
|
||||||
_ => VisibleLines::Ranges(
|
_ => VisibleLines::Ranges(
|
||||||
self.matches
|
self.matches
|
||||||
.get_many::<String>("line-range")
|
.values_of("line-range")
|
||||||
.map(|vs| vs.map(|s| LineRange::from(s.as_str())).collect())
|
.map(|vs| vs.map(LineRange::from).collect())
|
||||||
.transpose()?
|
.transpose()?
|
||||||
.map(LineRanges::from)
|
.map(LineRanges::from)
|
||||||
.unwrap_or_default(),
|
.unwrap_or_default(),
|
||||||
@ -288,60 +230,45 @@ impl App {
|
|||||||
},
|
},
|
||||||
style_components,
|
style_components,
|
||||||
syntax_mapping,
|
syntax_mapping,
|
||||||
pager: self.matches.get_one::<String>("pager").map(|s| s.as_str()),
|
pager: self.matches.value_of("pager"),
|
||||||
use_italic_text: self
|
use_italic_text: self.matches.value_of("italic-text") == Some("always"),
|
||||||
.matches
|
|
||||||
.get_one::<String>("italic-text")
|
|
||||||
.map(|s| s.as_str())
|
|
||||||
== Some("always"),
|
|
||||||
highlighted_lines: self
|
highlighted_lines: self
|
||||||
.matches
|
.matches
|
||||||
.get_many::<String>("highlight-line")
|
.values_of("highlight-line")
|
||||||
.map(|ws| ws.map(|s| LineRange::from(s.as_str())).collect())
|
.map(|ws| ws.map(LineRange::from).collect())
|
||||||
.transpose()?
|
.transpose()?
|
||||||
.map(LineRanges::from)
|
.map(LineRanges::from)
|
||||||
.map(HighlightedLineRanges)
|
.map(HighlightedLineRanges)
|
||||||
.unwrap_or_default(),
|
.unwrap_or_default(),
|
||||||
use_custom_assets: !self.matches.get_flag("no-custom-assets"),
|
use_custom_assets: !self.matches.is_present("no-custom-assets"),
|
||||||
#[cfg(feature = "lessopen")]
|
|
||||||
use_lessopen: self.matches.get_flag("lessopen"),
|
|
||||||
set_terminal_title: self.matches.get_flag("set-terminal-title"),
|
|
||||||
squeeze_lines: if self.matches.get_flag("squeeze-blank") {
|
|
||||||
Some(
|
|
||||||
self.matches
|
|
||||||
.get_one::<usize>("squeeze-limit")
|
|
||||||
.map(|limit| limit.to_owned())
|
|
||||||
.unwrap_or(1),
|
|
||||||
)
|
|
||||||
} else {
|
|
||||||
None
|
|
||||||
},
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn inputs(&self) -> Result<Vec<Input>> {
|
pub fn inputs(&self) -> Result<Vec<Input>> {
|
||||||
let filenames: Option<Vec<&Path>> = self
|
|
||||||
.matches
|
|
||||||
.get_many::<PathBuf>("file-name")
|
|
||||||
.map(|vs| vs.map(|p| p.as_path()).collect::<Vec<_>>());
|
|
||||||
|
|
||||||
let files: Option<Vec<&Path>> = self
|
|
||||||
.matches
|
|
||||||
.get_many::<PathBuf>("FILE")
|
|
||||||
.map(|vs| vs.map(|p| p.as_path()).collect::<Vec<_>>());
|
|
||||||
|
|
||||||
// verify equal length of file-names and input FILEs
|
// verify equal length of file-names and input FILEs
|
||||||
if filenames.is_some()
|
match self.matches.values_of("file-name") {
|
||||||
&& files.is_some()
|
Some(ref filenames)
|
||||||
&& filenames.as_ref().map(|v| v.len()) != files.as_ref().map(|v| v.len())
|
if self.matches.values_of_os("FILE").is_some()
|
||||||
|
&& filenames.len() != self.matches.values_of_os("FILE").unwrap().len() =>
|
||||||
{
|
{
|
||||||
return Err("Must be one file name per input type.".into());
|
return Err("Must be one file name per input type.".into());
|
||||||
}
|
}
|
||||||
|
_ => {}
|
||||||
|
}
|
||||||
|
let filenames: Option<Vec<&Path>> = self
|
||||||
|
.matches
|
||||||
|
.values_of_os("file-name")
|
||||||
|
.map(|values| values.map(Path::new).collect());
|
||||||
|
|
||||||
let mut filenames_or_none: Box<dyn Iterator<Item = Option<&Path>>> = match filenames {
|
let mut filenames_or_none: Box<dyn Iterator<Item = Option<&Path>>> = match filenames {
|
||||||
Some(filenames) => Box::new(filenames.into_iter().map(Some)),
|
Some(filenames) => Box::new(filenames.into_iter().map(Some)),
|
||||||
None => Box::new(std::iter::repeat(None)),
|
None => Box::new(std::iter::repeat(None)),
|
||||||
};
|
};
|
||||||
|
let files: Option<Vec<&Path>> = self
|
||||||
|
.matches
|
||||||
|
.values_of_os("FILE")
|
||||||
|
.map(|vs| vs.map(Path::new).collect());
|
||||||
|
|
||||||
if files.is_none() {
|
if files.is_none() {
|
||||||
return Ok(vec![new_stdin_input(
|
return Ok(vec![new_stdin_input(
|
||||||
filenames_or_none.next().unwrap_or(None),
|
filenames_or_none.next().unwrap_or(None),
|
||||||
@ -365,57 +292,44 @@ impl App {
|
|||||||
Ok(file_input)
|
Ok(file_input)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn forced_style_components(&self) -> Option<StyleComponents> {
|
|
||||||
// No components if `--decorations=never``.
|
|
||||||
if self
|
|
||||||
.matches
|
|
||||||
.get_one::<String>("decorations")
|
|
||||||
.map(|s| s.as_str())
|
|
||||||
== Some("never")
|
|
||||||
{
|
|
||||||
return Some(StyleComponents(HashSet::new()));
|
|
||||||
}
|
|
||||||
|
|
||||||
// Only line numbers if `--number`.
|
|
||||||
if self.matches.get_flag("number") {
|
|
||||||
return Some(StyleComponents(HashSet::from([
|
|
||||||
StyleComponent::LineNumbers,
|
|
||||||
])));
|
|
||||||
}
|
|
||||||
|
|
||||||
// Plain if `--plain` is specified at least once.
|
|
||||||
if self.matches.get_count("plain") > 0 {
|
|
||||||
return Some(StyleComponents(HashSet::from([StyleComponent::Plain])));
|
|
||||||
}
|
|
||||||
|
|
||||||
// Default behavior.
|
|
||||||
None
|
|
||||||
}
|
|
||||||
|
|
||||||
fn style_components(&self) -> Result<StyleComponents> {
|
fn style_components(&self) -> Result<StyleComponents> {
|
||||||
let matches = &self.matches;
|
let matches = &self.matches;
|
||||||
let mut styled_components = match self.forced_style_components() {
|
let mut styled_components =
|
||||||
Some(forced_components) => forced_components,
|
StyleComponents(if matches.value_of("decorations") == Some("never") {
|
||||||
|
HashSet::new()
|
||||||
|
} else if matches.is_present("number") {
|
||||||
|
[StyleComponent::LineNumbers].iter().cloned().collect()
|
||||||
|
} else if matches.is_present("plain") {
|
||||||
|
[StyleComponent::Plain].iter().cloned().collect()
|
||||||
|
} else {
|
||||||
|
let env_style_components: Option<Vec<StyleComponent>> = env::var("BAT_STYLE")
|
||||||
|
.ok()
|
||||||
|
.map(|style_str| {
|
||||||
|
style_str
|
||||||
|
.split(',')
|
||||||
|
.map(StyleComponent::from_str)
|
||||||
|
.collect::<Result<Vec<StyleComponent>>>()
|
||||||
|
})
|
||||||
|
.transpose()?;
|
||||||
|
|
||||||
// Parse the `--style` arguments and merge them.
|
matches
|
||||||
None if matches.contains_id("style") => {
|
.value_of("style")
|
||||||
let lists = matches
|
.map(|styles| {
|
||||||
.get_many::<String>("style")
|
styles
|
||||||
.expect("styles present")
|
.split(',')
|
||||||
.map(|v| StyleComponentList::from_str(v))
|
.map(|style| style.parse::<StyleComponent>())
|
||||||
.collect::<Result<Vec<StyleComponentList>>>()?;
|
.filter_map(|style| style.ok())
|
||||||
|
.collect::<Vec<_>>()
|
||||||
StyleComponentList::to_components(lists, self.interactive_output, true)
|
})
|
||||||
}
|
.or(env_style_components)
|
||||||
|
.unwrap_or_else(|| vec![StyleComponent::Full])
|
||||||
// Use the default.
|
|
||||||
None => StyleComponents(HashSet::from_iter(
|
|
||||||
StyleComponent::Default
|
|
||||||
.components(self.interactive_output)
|
|
||||||
.into_iter()
|
.into_iter()
|
||||||
.cloned(),
|
.map(|style| style.components(self.interactive_output))
|
||||||
)),
|
.fold(HashSet::new(), |mut acc, components| {
|
||||||
};
|
acc.extend(components.iter().cloned());
|
||||||
|
acc
|
||||||
|
})
|
||||||
|
});
|
||||||
|
|
||||||
// If `grid` is set, remove `rule` as it is a subset of `grid`, and print a warning.
|
// If `grid` is set, remove `rule` as it is a subset of `grid`, and print a warning.
|
||||||
if styled_components.grid() && styled_components.0.remove(&StyleComponent::Rule) {
|
if styled_components.grid() && styled_components.0.remove(&StyleComponent::Rule) {
|
||||||
|
@ -1,24 +1,31 @@
|
|||||||
|
use std::borrow::Cow;
|
||||||
use std::fs;
|
use std::fs;
|
||||||
use std::io;
|
use std::io;
|
||||||
use std::path::Path;
|
|
||||||
use std::path::PathBuf;
|
|
||||||
|
|
||||||
use clap::crate_version;
|
use clap::crate_version;
|
||||||
|
|
||||||
|
use crate::directories::PROJECT_DIRS;
|
||||||
|
|
||||||
use bat::assets::HighlightingAssets;
|
use bat::assets::HighlightingAssets;
|
||||||
use bat::assets_metadata::AssetsMetadata;
|
use bat::assets_metadata::AssetsMetadata;
|
||||||
use bat::error::*;
|
use bat::error::*;
|
||||||
|
|
||||||
pub fn clear_assets(cache_dir: &Path) {
|
pub fn config_dir() -> Cow<'static, str> {
|
||||||
clear_asset(cache_dir.join("themes.bin"), "theme set cache");
|
PROJECT_DIRS.config_dir().to_string_lossy()
|
||||||
clear_asset(cache_dir.join("syntaxes.bin"), "syntax set cache");
|
|
||||||
clear_asset(cache_dir.join("metadata.yaml"), "metadata file");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn assets_from_cache_or_binary(
|
pub fn cache_dir() -> Cow<'static, str> {
|
||||||
use_custom_assets: bool,
|
PROJECT_DIRS.cache_dir().to_string_lossy()
|
||||||
cache_dir: &Path,
|
}
|
||||||
) -> Result<HighlightingAssets> {
|
|
||||||
|
pub fn clear_assets() {
|
||||||
|
clear_asset("themes.bin", "theme set cache");
|
||||||
|
clear_asset("syntaxes.bin", "syntax set cache");
|
||||||
|
clear_asset("metadata.yaml", "metadata file");
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn assets_from_cache_or_binary(use_custom_assets: bool) -> Result<HighlightingAssets> {
|
||||||
|
let cache_dir = PROJECT_DIRS.cache_dir();
|
||||||
if let Some(metadata) = AssetsMetadata::load_from_folder(cache_dir)? {
|
if let Some(metadata) = AssetsMetadata::load_from_folder(cache_dir)? {
|
||||||
if !metadata.is_compatible_with(crate_version!()) {
|
if !metadata.is_compatible_with(crate_version!()) {
|
||||||
return Err(format!(
|
return Err(format!(
|
||||||
@ -43,8 +50,9 @@ pub fn assets_from_cache_or_binary(
|
|||||||
Ok(custom_assets.unwrap_or_else(HighlightingAssets::from_binary))
|
Ok(custom_assets.unwrap_or_else(HighlightingAssets::from_binary))
|
||||||
}
|
}
|
||||||
|
|
||||||
fn clear_asset(path: PathBuf, description: &str) {
|
fn clear_asset(filename: &str, description: &str) {
|
||||||
print!("Clearing {description} ... ");
|
print!("Clearing {} ... ", description);
|
||||||
|
let path = PROJECT_DIRS.cache_dir().join(filename);
|
||||||
match fs::remove_file(&path) {
|
match fs::remove_file(&path) {
|
||||||
Err(err) if err.kind() == io::ErrorKind::NotFound => {
|
Err(err) if err.kind() == io::ErrorKind::NotFound => {
|
||||||
println!("skipped (not present)");
|
println!("skipped (not present)");
|
||||||
|
@ -1,11 +1,7 @@
|
|||||||
use bat::style::StyleComponentList;
|
use clap::{crate_name, crate_version, App as ClapApp, AppSettings, Arg, ArgGroup, SubCommand};
|
||||||
use clap::{
|
|
||||||
crate_name, crate_version, value_parser, Arg, ArgAction, ArgGroup, ColorChoice, Command,
|
|
||||||
};
|
|
||||||
use once_cell::sync::Lazy;
|
use once_cell::sync::Lazy;
|
||||||
use std::env;
|
use std::env;
|
||||||
use std::path::{Path, PathBuf};
|
use std::path::Path;
|
||||||
use std::str::FromStr;
|
|
||||||
|
|
||||||
static VERSION: Lazy<String> = Lazy::new(|| {
|
static VERSION: Lazy<String> = Lazy::new(|| {
|
||||||
#[cfg(feature = "bugreport")]
|
#[cfg(feature = "bugreport")]
|
||||||
@ -20,39 +16,48 @@ static VERSION: Lazy<String> = Lazy::new(|| {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
pub fn build_app(interactive_output: bool) -> Command {
|
pub fn build_app(interactive_output: bool) -> ClapApp<'static, 'static> {
|
||||||
let color_when = if interactive_output && !crate::app::env_no_color() {
|
let clap_color_setting = if interactive_output && env::var_os("NO_COLOR").is_none() {
|
||||||
ColorChoice::Auto
|
AppSettings::ColoredHelp
|
||||||
} else {
|
} else {
|
||||||
ColorChoice::Never
|
AppSettings::ColorNever
|
||||||
};
|
};
|
||||||
|
|
||||||
let mut app = Command::new(crate_name!())
|
let mut app = ClapApp::new(crate_name!())
|
||||||
.version(VERSION.as_str())
|
.version(VERSION.as_str())
|
||||||
.color(color_when)
|
.global_setting(clap_color_setting)
|
||||||
.hide_possible_values(true)
|
.global_setting(AppSettings::DeriveDisplayOrder)
|
||||||
.args_conflicts_with_subcommands(true)
|
.global_setting(AppSettings::UnifiedHelpMessage)
|
||||||
.allow_external_subcommands(true)
|
.global_setting(AppSettings::HidePossibleValuesInHelp)
|
||||||
.disable_help_subcommand(true)
|
.setting(AppSettings::ArgsNegateSubcommands)
|
||||||
|
.setting(AppSettings::AllowExternalSubcommands)
|
||||||
|
.setting(AppSettings::DisableHelpSubcommand)
|
||||||
|
.setting(AppSettings::VersionlessSubcommands)
|
||||||
.max_term_width(100)
|
.max_term_width(100)
|
||||||
.about("A cat(1) clone with wings.")
|
.about(
|
||||||
|
"A cat(1) clone with wings.\n\n\
|
||||||
|
Use '--help' instead of '-h' to see a more detailed version of the help text.",
|
||||||
|
)
|
||||||
|
.after_help(
|
||||||
|
"Note: `bat -h` prints a short and concise overview while `bat --help` gives all \
|
||||||
|
details.",
|
||||||
|
)
|
||||||
.long_about("A cat(1) clone with syntax highlighting and Git integration.")
|
.long_about("A cat(1) clone with syntax highlighting and Git integration.")
|
||||||
.arg(
|
.arg(
|
||||||
Arg::new("FILE")
|
Arg::with_name("FILE")
|
||||||
.help("File(s) to print / concatenate. Use '-' for standard input.")
|
.help("File(s) to print / concatenate. Use '-' for standard input.")
|
||||||
.long_help(
|
.long_help(
|
||||||
"File(s) to print / concatenate. Use a dash ('-') or no argument at all \
|
"File(s) to print / concatenate. Use a dash ('-') or no argument at all \
|
||||||
to read from standard input.",
|
to read from standard input.",
|
||||||
)
|
)
|
||||||
.num_args(1..)
|
.multiple(true)
|
||||||
.value_parser(value_parser!(PathBuf)),
|
.empty_values(false),
|
||||||
)
|
)
|
||||||
.arg(
|
.arg(
|
||||||
Arg::new("show-all")
|
Arg::with_name("show-all")
|
||||||
.long("show-all")
|
.long("show-all")
|
||||||
.alias("show-nonprintable")
|
.alias("show-nonprintable")
|
||||||
.short('A')
|
.short("A")
|
||||||
.action(ArgAction::SetTrue)
|
|
||||||
.conflicts_with("language")
|
.conflicts_with("language")
|
||||||
.help("Show non-printable characters (space, tab, newline, ..).")
|
.help("Show non-printable characters (space, tab, newline, ..).")
|
||||||
.long_help(
|
.long_help(
|
||||||
@ -62,39 +67,22 @@ pub fn build_app(interactive_output: bool) -> Command {
|
|||||||
),
|
),
|
||||||
)
|
)
|
||||||
.arg(
|
.arg(
|
||||||
Arg::new("nonprintable-notation")
|
Arg::with_name("plain")
|
||||||
.long("nonprintable-notation")
|
|
||||||
.action(ArgAction::Set)
|
|
||||||
.default_value("unicode")
|
|
||||||
.value_parser(["unicode", "caret"])
|
|
||||||
.value_name("notation")
|
|
||||||
.hide_default_value(true)
|
|
||||||
.help("Set notation for non-printable characters.")
|
|
||||||
.long_help(
|
|
||||||
"Set notation for non-printable characters.\n\n\
|
|
||||||
Possible values:\n \
|
|
||||||
* unicode (␇, ␊, ␀, ..)\n \
|
|
||||||
* caret (^G, ^J, ^@, ..)",
|
|
||||||
),
|
|
||||||
)
|
|
||||||
.arg(
|
|
||||||
Arg::new("plain")
|
|
||||||
.overrides_with("plain")
|
.overrides_with("plain")
|
||||||
.overrides_with("number")
|
.overrides_with("number")
|
||||||
.overrides_with("paging")
|
.short("p")
|
||||||
.short('p')
|
|
||||||
.long("plain")
|
.long("plain")
|
||||||
.action(ArgAction::Count)
|
.multiple(true)
|
||||||
.help("Show plain style (alias for '--style=plain').")
|
.help("Show plain style (alias for '--style=plain').")
|
||||||
.long_help(
|
.long_help(
|
||||||
"Only show plain style, no decorations. This is an alias for \
|
"Only show plain style, no decorations. This is an alias for \
|
||||||
'--style=plain'. When '-p' is used twice ('-pp'), it also disables \
|
'--style=plain'. When '-p' is used twice ('-pp'), it also disables \
|
||||||
automatic paging (alias for '--style=plain --paging=never').",
|
automatic paging (alias for '--style=plain --pager=never').",
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
.arg(
|
.arg(
|
||||||
Arg::new("language")
|
Arg::with_name("language")
|
||||||
.short('l')
|
.short("l")
|
||||||
.long("language")
|
.long("language")
|
||||||
.overrides_with("language")
|
.overrides_with("language")
|
||||||
.help("Set the language for syntax highlighting.")
|
.help("Set the language for syntax highlighting.")
|
||||||
@ -103,13 +91,16 @@ pub fn build_app(interactive_output: bool) -> Command {
|
|||||||
specified as a name (like 'C++' or 'LaTeX') or possible file extension \
|
specified as a name (like 'C++' or 'LaTeX') or possible file extension \
|
||||||
(like 'cpp', 'hpp' or 'md'). Use '--list-languages' to show all supported \
|
(like 'cpp', 'hpp' or 'md'). Use '--list-languages' to show all supported \
|
||||||
language names and file extensions.",
|
language names and file extensions.",
|
||||||
),
|
)
|
||||||
|
.takes_value(true),
|
||||||
)
|
)
|
||||||
.arg(
|
.arg(
|
||||||
Arg::new("highlight-line")
|
Arg::with_name("highlight-line")
|
||||||
.long("highlight-line")
|
.long("highlight-line")
|
||||||
.short('H')
|
.short("H")
|
||||||
.action(ArgAction::Append)
|
.takes_value(true)
|
||||||
|
.number_of_values(1)
|
||||||
|
.multiple(true)
|
||||||
.value_name("N:M")
|
.value_name("N:M")
|
||||||
.help("Highlight lines N through M.")
|
.help("Highlight lines N through M.")
|
||||||
.long_help(
|
.long_help(
|
||||||
@ -123,11 +114,12 @@ pub fn build_app(interactive_output: bool) -> Command {
|
|||||||
),
|
),
|
||||||
)
|
)
|
||||||
.arg(
|
.arg(
|
||||||
Arg::new("file-name")
|
Arg::with_name("file-name")
|
||||||
.long("file-name")
|
.long("file-name")
|
||||||
.action(ArgAction::Append)
|
.takes_value(true)
|
||||||
|
.number_of_values(1)
|
||||||
|
.multiple(true)
|
||||||
.value_name("name")
|
.value_name("name")
|
||||||
.value_parser(value_parser!(PathBuf))
|
|
||||||
.help("Specify the name to display for a file.")
|
.help("Specify the name to display for a file.")
|
||||||
.long_help(
|
.long_help(
|
||||||
"Specify the name to display for a file. Useful when piping \
|
"Specify the name to display for a file. Useful when piping \
|
||||||
@ -141,11 +133,9 @@ pub fn build_app(interactive_output: bool) -> Command {
|
|||||||
{
|
{
|
||||||
app = app
|
app = app
|
||||||
.arg(
|
.arg(
|
||||||
Arg::new("diff")
|
Arg::with_name("diff")
|
||||||
.long("diff")
|
.long("diff")
|
||||||
.short('d')
|
.short("d")
|
||||||
.action(ArgAction::SetTrue)
|
|
||||||
.conflicts_with("line-range")
|
|
||||||
.help("Only show lines that have been added/removed/modified.")
|
.help("Only show lines that have been added/removed/modified.")
|
||||||
.long_help(
|
.long_help(
|
||||||
"Only show lines that have been added/removed/modified with respect \
|
"Only show lines that have been added/removed/modified with respect \
|
||||||
@ -153,19 +143,20 @@ pub fn build_app(interactive_output: bool) -> Command {
|
|||||||
),
|
),
|
||||||
)
|
)
|
||||||
.arg(
|
.arg(
|
||||||
Arg::new("diff-context")
|
Arg::with_name("diff-context")
|
||||||
.long("diff-context")
|
.long("diff-context")
|
||||||
.overrides_with("diff-context")
|
.overrides_with("diff-context")
|
||||||
|
.takes_value(true)
|
||||||
.value_name("N")
|
.value_name("N")
|
||||||
.value_parser(
|
.validator(
|
||||||
|n: &str| {
|
|n| {
|
||||||
n.parse::<usize>()
|
n.parse::<usize>()
|
||||||
.map_err(|_| "must be a number")
|
.map_err(|_| "must be a number")
|
||||||
.map(|_| n.to_owned()) // Convert to Result<String, &str>
|
.map(|_| ()) // Convert to Result<(), &str>
|
||||||
.map_err(|e| e.to_string())
|
.map_err(|e| e.to_string())
|
||||||
}, // Convert to Result<(), String>
|
}, // Convert to Result<(), String>
|
||||||
)
|
)
|
||||||
.hide_short_help(true)
|
.hidden_short_help(true)
|
||||||
.long_help(
|
.long_help(
|
||||||
"Include N lines of context around added/removed/modified lines when using '--diff'.",
|
"Include N lines of context around added/removed/modified lines when using '--diff'.",
|
||||||
),
|
),
|
||||||
@ -173,15 +164,16 @@ pub fn build_app(interactive_output: bool) -> Command {
|
|||||||
}
|
}
|
||||||
|
|
||||||
app = app.arg(
|
app = app.arg(
|
||||||
Arg::new("tabs")
|
Arg::with_name("tabs")
|
||||||
.long("tabs")
|
.long("tabs")
|
||||||
.overrides_with("tabs")
|
.overrides_with("tabs")
|
||||||
|
.takes_value(true)
|
||||||
.value_name("T")
|
.value_name("T")
|
||||||
.value_parser(
|
.validator(
|
||||||
|t: &str| {
|
|t| {
|
||||||
t.parse::<u32>()
|
t.parse::<u32>()
|
||||||
.map_err(|_t| "must be a number")
|
.map_err(|_t| "must be a number")
|
||||||
.map(|_t| t.to_owned()) // Convert to Result<String, &str>
|
.map(|_t| ()) // Convert to Result<(), &str>
|
||||||
.map_err(|e| e.to_string())
|
.map_err(|e| e.to_string())
|
||||||
}, // Convert to Result<(), String>
|
}, // Convert to Result<(), String>
|
||||||
)
|
)
|
||||||
@ -192,11 +184,12 @@ pub fn build_app(interactive_output: bool) -> Command {
|
|||||||
),
|
),
|
||||||
)
|
)
|
||||||
.arg(
|
.arg(
|
||||||
Arg::new("wrap")
|
Arg::with_name("wrap")
|
||||||
.long("wrap")
|
.long("wrap")
|
||||||
.overrides_with("wrap")
|
.overrides_with("wrap")
|
||||||
|
.takes_value(true)
|
||||||
.value_name("mode")
|
.value_name("mode")
|
||||||
.value_parser(["auto", "never", "character"])
|
.possible_values(&["auto", "never", "character"])
|
||||||
.default_value("auto")
|
.default_value("auto")
|
||||||
.hide_default_value(true)
|
.hide_default_value(true)
|
||||||
.help("Specify the text-wrapping mode (*auto*, never, character).")
|
.help("Specify the text-wrapping mode (*auto*, never, character).")
|
||||||
@ -205,27 +198,21 @@ pub fn build_app(interactive_output: bool) -> Command {
|
|||||||
control the output width."),
|
control the output width."),
|
||||||
)
|
)
|
||||||
.arg(
|
.arg(
|
||||||
Arg::new("chop-long-lines")
|
Arg::with_name("terminal-width")
|
||||||
.long("chop-long-lines")
|
|
||||||
.short('S')
|
|
||||||
.action(ArgAction::SetTrue)
|
|
||||||
.help("Truncate all lines longer than screen width. Alias for '--wrap=never'."),
|
|
||||||
)
|
|
||||||
.arg(
|
|
||||||
Arg::new("terminal-width")
|
|
||||||
.long("terminal-width")
|
.long("terminal-width")
|
||||||
|
.takes_value(true)
|
||||||
.value_name("width")
|
.value_name("width")
|
||||||
.hide_short_help(true)
|
.hidden_short_help(true)
|
||||||
.allow_hyphen_values(true)
|
.allow_hyphen_values(true)
|
||||||
.value_parser(
|
.validator(
|
||||||
|t: &str| {
|
|t| {
|
||||||
let is_offset = t.starts_with('+') || t.starts_with('-');
|
let is_offset = t.starts_with('+') || t.starts_with('-');
|
||||||
t.parse::<i32>()
|
t.parse::<i32>()
|
||||||
.map_err(|_e| "must be an offset or number")
|
.map_err(|_e| "must be an offset or number")
|
||||||
.and_then(|v| if v == 0 && !is_offset {
|
.and_then(|v| if v == 0 && !is_offset {
|
||||||
Err("terminal width cannot be zero")
|
Err("terminal width cannot be zero")
|
||||||
} else {
|
} else {
|
||||||
Ok(t.to_owned())
|
Ok(())
|
||||||
})
|
})
|
||||||
.map_err(|e| e.to_string())
|
.map_err(|e| e.to_string())
|
||||||
})
|
})
|
||||||
@ -236,11 +223,10 @@ pub fn build_app(interactive_output: bool) -> Command {
|
|||||||
),
|
),
|
||||||
)
|
)
|
||||||
.arg(
|
.arg(
|
||||||
Arg::new("number")
|
Arg::with_name("number")
|
||||||
.long("number")
|
.long("number")
|
||||||
.overrides_with("number")
|
.overrides_with("number")
|
||||||
.short('n')
|
.short("n")
|
||||||
.action(ArgAction::SetTrue)
|
|
||||||
.help("Show line numbers (alias for '--style=numbers').")
|
.help("Show line numbers (alias for '--style=numbers').")
|
||||||
.long_help(
|
.long_help(
|
||||||
"Only show line numbers, no other decorations. This is an alias for \
|
"Only show line numbers, no other decorations. This is an alias for \
|
||||||
@ -248,11 +234,12 @@ pub fn build_app(interactive_output: bool) -> Command {
|
|||||||
),
|
),
|
||||||
)
|
)
|
||||||
.arg(
|
.arg(
|
||||||
Arg::new("color")
|
Arg::with_name("color")
|
||||||
.long("color")
|
.long("color")
|
||||||
.overrides_with("color")
|
.overrides_with("color")
|
||||||
|
.takes_value(true)
|
||||||
.value_name("when")
|
.value_name("when")
|
||||||
.value_parser(["auto", "never", "always"])
|
.possible_values(&["auto", "never", "always"])
|
||||||
.hide_default_value(true)
|
.hide_default_value(true)
|
||||||
.default_value("auto")
|
.default_value("auto")
|
||||||
.help("When to use colors (*auto*, never, always).")
|
.help("When to use colors (*auto*, never, always).")
|
||||||
@ -264,21 +251,23 @@ pub fn build_app(interactive_output: bool) -> Command {
|
|||||||
),
|
),
|
||||||
)
|
)
|
||||||
.arg(
|
.arg(
|
||||||
Arg::new("italic-text")
|
Arg::with_name("italic-text")
|
||||||
.long("italic-text")
|
.long("italic-text")
|
||||||
|
.takes_value(true)
|
||||||
.value_name("when")
|
.value_name("when")
|
||||||
.value_parser(["always", "never"])
|
.possible_values(&["always", "never"])
|
||||||
.default_value("never")
|
.default_value("never")
|
||||||
.hide_default_value(true)
|
.hide_default_value(true)
|
||||||
.help("Use italics in output (always, *never*)")
|
.help("Use italics in output (always, *never*)")
|
||||||
.long_help("Specify when to use ANSI sequences for italic text in the output. Possible values: always, *never*."),
|
.long_help("Specify when to use ANSI sequences for italic text in the output. Possible values: always, *never*."),
|
||||||
)
|
)
|
||||||
.arg(
|
.arg(
|
||||||
Arg::new("decorations")
|
Arg::with_name("decorations")
|
||||||
.long("decorations")
|
.long("decorations")
|
||||||
.overrides_with("decorations")
|
.overrides_with("decorations")
|
||||||
|
.takes_value(true)
|
||||||
.value_name("when")
|
.value_name("when")
|
||||||
.value_parser(["auto", "never", "always"])
|
.possible_values(&["auto", "never", "always"])
|
||||||
.default_value("auto")
|
.default_value("auto")
|
||||||
.hide_default_value(true)
|
.hide_default_value(true)
|
||||||
.help("When to show the decorations (*auto*, never, always).")
|
.help("When to show the decorations (*auto*, never, always).")
|
||||||
@ -289,53 +278,51 @@ pub fn build_app(interactive_output: bool) -> Command {
|
|||||||
),
|
),
|
||||||
)
|
)
|
||||||
.arg(
|
.arg(
|
||||||
Arg::new("force-colorization")
|
Arg::with_name("force-colorization")
|
||||||
.long("force-colorization")
|
.long("force-colorization")
|
||||||
.short('f')
|
.short("f")
|
||||||
.action(ArgAction::SetTrue)
|
|
||||||
.conflicts_with("color")
|
.conflicts_with("color")
|
||||||
.conflicts_with("decorations")
|
.conflicts_with("decorations")
|
||||||
.overrides_with("force-colorization")
|
.overrides_with("force-colorization")
|
||||||
.hide_short_help(true)
|
.hidden_short_help(true)
|
||||||
.long_help("Alias for '--decorations=always --color=always'. This is useful \
|
.long_help("Alias for '--decorations=always --color=always'. This is useful \
|
||||||
if the output of bat is piped to another program, but you want \
|
if the output of bat is piped to another program, but you want \
|
||||||
to keep the colorization/decorations.")
|
to keep the colorization/decorations.")
|
||||||
)
|
)
|
||||||
.arg(
|
.arg(
|
||||||
Arg::new("paging")
|
Arg::with_name("paging")
|
||||||
.long("paging")
|
.long("paging")
|
||||||
.overrides_with("paging")
|
.overrides_with("paging")
|
||||||
.overrides_with("no-paging")
|
.takes_value(true)
|
||||||
.overrides_with("plain")
|
|
||||||
.value_name("when")
|
.value_name("when")
|
||||||
.value_parser(["auto", "never", "always"])
|
.possible_values(&["auto", "never", "always"])
|
||||||
.default_value("auto")
|
.default_value("auto")
|
||||||
.hide_default_value(true)
|
.hide_default_value(true)
|
||||||
.help("Specify when to use the pager, or use `-P` to disable (*auto*, never, always).")
|
.help("Specify when to use the pager, or use `-P` to disable (*auto*, never, always).")
|
||||||
.long_help(
|
.long_help(
|
||||||
"Specify when to use the pager. To disable the pager, use \
|
"Specify when to use the pager. To disable the pager, use \
|
||||||
--paging=never' or its alias,'-P'. To disable the pager permanently, \
|
--paging=never' or its alias,'-P'. To disable the pager permanently, \
|
||||||
set BAT_PAGING to 'never'. To control which pager is used, see the \
|
set BAT_PAGER to an empty string. To control which pager is used, see the \
|
||||||
'--pager' option. Possible values: *auto*, never, always."
|
'--pager' option. Possible values: *auto*, never, always."
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
.arg(
|
.arg(
|
||||||
Arg::new("no-paging")
|
Arg::with_name("no-paging")
|
||||||
.short('P')
|
.short("P")
|
||||||
.long("no-paging")
|
.long("no-paging")
|
||||||
.alias("no-pager")
|
.alias("no-pager")
|
||||||
.action(ArgAction::SetTrue)
|
|
||||||
.overrides_with("no-paging")
|
.overrides_with("no-paging")
|
||||||
.hide(true)
|
.hidden(true)
|
||||||
.hide_short_help(true)
|
.hidden_short_help(true)
|
||||||
.help("Alias for '--paging=never'")
|
.help("Alias for '--paging=never'")
|
||||||
)
|
)
|
||||||
.arg(
|
.arg(
|
||||||
Arg::new("pager")
|
Arg::with_name("pager")
|
||||||
.long("pager")
|
.long("pager")
|
||||||
.overrides_with("pager")
|
.overrides_with("pager")
|
||||||
|
.takes_value(true)
|
||||||
.value_name("command")
|
.value_name("command")
|
||||||
.hide_short_help(true)
|
.hidden_short_help(true)
|
||||||
.help("Determine which pager to use.")
|
.help("Determine which pager to use.")
|
||||||
.long_help(
|
.long_help(
|
||||||
"Determine which pager is used. This option will override the \
|
"Determine which pager is used. This option will override the \
|
||||||
@ -345,10 +332,12 @@ pub fn build_app(interactive_output: bool) -> Command {
|
|||||||
),
|
),
|
||||||
)
|
)
|
||||||
.arg(
|
.arg(
|
||||||
Arg::new("map-syntax")
|
Arg::with_name("map-syntax")
|
||||||
.short('m')
|
.short("m")
|
||||||
.long("map-syntax")
|
.long("map-syntax")
|
||||||
.action(ArgAction::Append)
|
.multiple(true)
|
||||||
|
.takes_value(true)
|
||||||
|
.number_of_values(1)
|
||||||
.value_name("glob:syntax")
|
.value_name("glob:syntax")
|
||||||
.help("Use the specified syntax for files matching the glob pattern ('*.cpp:C++').")
|
.help("Use the specified syntax for files matching the glob pattern ('*.cpp:C++').")
|
||||||
.long_help(
|
.long_help(
|
||||||
@ -358,21 +347,25 @@ pub fn build_app(interactive_output: bool) -> Command {
|
|||||||
'.myignore' with the Git Ignore syntax, use -m '.myignore:Git Ignore'. Note \
|
'.myignore' with the Git Ignore syntax, use -m '.myignore:Git Ignore'. Note \
|
||||||
that the right-hand side is the *name* of the syntax, not a file extension.",
|
that the right-hand side is the *name* of the syntax, not a file extension.",
|
||||||
)
|
)
|
||||||
|
.takes_value(true),
|
||||||
)
|
)
|
||||||
.arg(
|
.arg(
|
||||||
Arg::new("ignored-suffix")
|
Arg::with_name("ignored-suffix")
|
||||||
.action(ArgAction::Append)
|
.number_of_values(1)
|
||||||
|
.multiple(true)
|
||||||
|
.takes_value(true)
|
||||||
.long("ignored-suffix")
|
.long("ignored-suffix")
|
||||||
.hide_short_help(true)
|
.hidden_short_help(true)
|
||||||
.help(
|
.help(
|
||||||
"Ignore extension. For example:\n \
|
"Ignore extension. For example:\n \
|
||||||
'bat --ignored-suffix \".dev\" my_file.json.dev' will use JSON syntax, and ignore '.dev'"
|
'bat --ignored-suffix \".dev\" my_file.json.dev' will use JSON syntax, and ignore '.dev'"
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
.arg(
|
.arg(
|
||||||
Arg::new("theme")
|
Arg::with_name("theme")
|
||||||
.long("theme")
|
.long("theme")
|
||||||
.overrides_with("theme")
|
.overrides_with("theme")
|
||||||
|
.takes_value(true)
|
||||||
.help("Set the color theme for syntax highlighting.")
|
.help("Set the color theme for syntax highlighting.")
|
||||||
.long_help(
|
.long_help(
|
||||||
"Set the theme for syntax highlighting. Use '--list-themes' to \
|
"Set the theme for syntax highlighting. Use '--list-themes' to \
|
||||||
@ -383,56 +376,50 @@ pub fn build_app(interactive_output: bool) -> Command {
|
|||||||
),
|
),
|
||||||
)
|
)
|
||||||
.arg(
|
.arg(
|
||||||
Arg::new("list-themes")
|
Arg::with_name("list-themes")
|
||||||
.long("list-themes")
|
.long("list-themes")
|
||||||
.action(ArgAction::SetTrue)
|
|
||||||
.help("Display all supported highlighting themes.")
|
.help("Display all supported highlighting themes.")
|
||||||
.long_help("Display a list of supported themes for syntax highlighting."),
|
.long_help("Display a list of supported themes for syntax highlighting."),
|
||||||
)
|
)
|
||||||
.arg(
|
.arg(
|
||||||
Arg::new("squeeze-blank")
|
Arg::with_name("style")
|
||||||
.long("squeeze-blank")
|
|
||||||
.short('s')
|
|
||||||
.action(ArgAction::SetTrue)
|
|
||||||
.help("Squeeze consecutive empty lines.")
|
|
||||||
.long_help("Squeeze consecutive empty lines into a single empty line.")
|
|
||||||
)
|
|
||||||
.arg(
|
|
||||||
Arg::new("squeeze-limit")
|
|
||||||
.long("squeeze-limit")
|
|
||||||
.value_parser(|s: &str| s.parse::<usize>().map_err(|_| "Requires a non-negative number".to_owned()))
|
|
||||||
.long_help("Set the maximum number of consecutive empty lines to be printed.")
|
|
||||||
.hide_short_help(true)
|
|
||||||
)
|
|
||||||
.arg(
|
|
||||||
Arg::new("strip-ansi")
|
|
||||||
.long("strip-ansi")
|
|
||||||
.overrides_with("strip-ansi")
|
|
||||||
.value_name("when")
|
|
||||||
.value_parser(["auto", "always", "never"])
|
|
||||||
.default_value("never")
|
|
||||||
.hide_default_value(true)
|
|
||||||
.help("Strip colors from the input (auto, always, *never*)")
|
|
||||||
.long_help("Specify when to strip ANSI escape sequences from the input. \
|
|
||||||
The automatic mode will remove escape sequences unless the syntax highlighting \
|
|
||||||
language is plain text. Possible values: auto, always, *never*.")
|
|
||||||
.hide_short_help(true)
|
|
||||||
)
|
|
||||||
.arg(
|
|
||||||
Arg::new("style")
|
|
||||||
.long("style")
|
.long("style")
|
||||||
.action(ArgAction::Append)
|
|
||||||
.value_name("components")
|
.value_name("components")
|
||||||
|
// Need to turn this off for overrides_with to work as we want. See the bottom most
|
||||||
|
// example at https://docs.rs/clap/2.32.0/clap/struct.Arg.html#method.overrides_with
|
||||||
|
.use_delimiter(false)
|
||||||
|
.takes_value(true)
|
||||||
|
.overrides_with("style")
|
||||||
|
.overrides_with("plain")
|
||||||
|
.overrides_with("number")
|
||||||
// Cannot use claps built in validation because we have to turn off clap's delimiters
|
// Cannot use claps built in validation because we have to turn off clap's delimiters
|
||||||
.value_parser(|val: &str| {
|
.validator(|val| {
|
||||||
match StyleComponentList::from_str(val) {
|
let mut invalid_vals = val.split(',').filter(|style| {
|
||||||
Err(err) => Err(err),
|
!&[
|
||||||
Ok(_) => Ok(val.to_owned()),
|
"auto",
|
||||||
|
"full",
|
||||||
|
"plain",
|
||||||
|
"header",
|
||||||
|
"header-filename",
|
||||||
|
"header-filesize",
|
||||||
|
"grid",
|
||||||
|
"rule",
|
||||||
|
"numbers",
|
||||||
|
"snip",
|
||||||
|
#[cfg(feature = "git")]
|
||||||
|
"changes",
|
||||||
|
].contains(style)
|
||||||
|
});
|
||||||
|
|
||||||
|
if let Some(invalid) = invalid_vals.next() {
|
||||||
|
Err(format!("Unknown style, '{}'", invalid))
|
||||||
|
} else {
|
||||||
|
Ok(())
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.help(
|
.help(
|
||||||
"Comma-separated list of style elements to display \
|
"Comma-separated list of style elements to display \
|
||||||
(*default*, auto, full, plain, changes, header, header-filename, header-filesize, grid, rule, numbers, snip).",
|
(*auto*, full, plain, changes, header, grid, rule, numbers, snip).",
|
||||||
)
|
)
|
||||||
.long_help(
|
.long_help(
|
||||||
"Configure which elements (line numbers, file headers, grid \
|
"Configure which elements (line numbers, file headers, grid \
|
||||||
@ -442,18 +429,9 @@ pub fn build_app(interactive_output: bool) -> Command {
|
|||||||
pre-defined style ('full'). To set a default style, add the \
|
pre-defined style ('full'). To set a default style, add the \
|
||||||
'--style=\"..\"' option to the configuration file or export the \
|
'--style=\"..\"' option to the configuration file or export the \
|
||||||
BAT_STYLE environment variable (e.g.: export BAT_STYLE=\"..\").\n\n\
|
BAT_STYLE environment variable (e.g.: export BAT_STYLE=\"..\").\n\n\
|
||||||
When styles are specified in multiple places, the \"nearest\" set \
|
|
||||||
of styles take precedence. The command-line arguments are the highest \
|
|
||||||
priority, followed by the BAT_STYLE environment variable, and then \
|
|
||||||
the configuration file. If any set of styles consists entirely of \
|
|
||||||
components prefixed with \"+\" or \"-\", it will modify the \
|
|
||||||
previous set of styles instead of replacing them.\n\n\
|
|
||||||
By default, the following components are enabled:\n \
|
|
||||||
changes, grid, header-filename, numbers, snip\n\n\
|
|
||||||
Possible values:\n\n \
|
Possible values:\n\n \
|
||||||
* default: enables recommended style components (default).\n \
|
* full: enables all available components (default).\n \
|
||||||
* full: enables all available components.\n \
|
* auto: same as 'full', unless the output is piped.\n \
|
||||||
* auto: same as 'default', unless the output is piped.\n \
|
|
||||||
* plain: disables all available components.\n \
|
* plain: disables all available components.\n \
|
||||||
* changes: show Git modification markers.\n \
|
* changes: show Git modification markers.\n \
|
||||||
* header: alias for 'header-filename'.\n \
|
* header: alias for 'header-filename'.\n \
|
||||||
@ -467,11 +445,14 @@ pub fn build_app(interactive_output: bool) -> Command {
|
|||||||
),
|
),
|
||||||
)
|
)
|
||||||
.arg(
|
.arg(
|
||||||
Arg::new("line-range")
|
Arg::with_name("line-range")
|
||||||
.long("line-range")
|
.long("line-range")
|
||||||
.short('r')
|
.short("r")
|
||||||
.action(ArgAction::Append)
|
.multiple(true)
|
||||||
|
.takes_value(true)
|
||||||
|
.number_of_values(1)
|
||||||
.value_name("N:M")
|
.value_name("N:M")
|
||||||
|
.conflicts_with("diff")
|
||||||
.help("Only print the lines from N to M.")
|
.help("Only print the lines from N to M.")
|
||||||
.long_help(
|
.long_help(
|
||||||
"Only print the specified range of lines for each file. \
|
"Only print the specified range of lines for each file. \
|
||||||
@ -484,20 +465,18 @@ pub fn build_app(interactive_output: bool) -> Command {
|
|||||||
),
|
),
|
||||||
)
|
)
|
||||||
.arg(
|
.arg(
|
||||||
Arg::new("list-languages")
|
Arg::with_name("list-languages")
|
||||||
.long("list-languages")
|
.long("list-languages")
|
||||||
.short('L')
|
.short("L")
|
||||||
.action(ArgAction::SetTrue)
|
|
||||||
.conflicts_with("list-themes")
|
.conflicts_with("list-themes")
|
||||||
.help("Display all supported languages.")
|
.help("Display all supported languages.")
|
||||||
.long_help("Display a list of supported languages for syntax highlighting."),
|
.long_help("Display a list of supported languages for syntax highlighting."),
|
||||||
)
|
)
|
||||||
.arg(
|
.arg(
|
||||||
Arg::new("unbuffered")
|
Arg::with_name("unbuffered")
|
||||||
.short('u')
|
.short("u")
|
||||||
.long("unbuffered")
|
.long("unbuffered")
|
||||||
.action(ArgAction::SetTrue)
|
.hidden_short_help(true)
|
||||||
.hide_short_help(true)
|
|
||||||
.long_help(
|
.long_help(
|
||||||
"This option exists for POSIX-compliance reasons ('u' is for \
|
"This option exists for POSIX-compliance reasons ('u' is for \
|
||||||
'unbuffered'). The output is always unbuffered - this option \
|
'unbuffered'). The output is always unbuffered - this option \
|
||||||
@ -505,94 +484,60 @@ pub fn build_app(interactive_output: bool) -> Command {
|
|||||||
),
|
),
|
||||||
)
|
)
|
||||||
.arg(
|
.arg(
|
||||||
Arg::new("no-config")
|
Arg::with_name("no-config")
|
||||||
.long("no-config")
|
.long("no-config")
|
||||||
.action(ArgAction::SetTrue)
|
.hidden(true)
|
||||||
.hide(true)
|
|
||||||
.help("Do not use the configuration file"),
|
.help("Do not use the configuration file"),
|
||||||
)
|
)
|
||||||
.arg(
|
.arg(
|
||||||
Arg::new("no-custom-assets")
|
Arg::with_name("no-custom-assets")
|
||||||
.long("no-custom-assets")
|
.long("no-custom-assets")
|
||||||
.action(ArgAction::SetTrue)
|
.hidden(true)
|
||||||
.hide(true)
|
|
||||||
.help("Do not load custom assets"),
|
.help("Do not load custom assets"),
|
||||||
);
|
|
||||||
|
|
||||||
#[cfg(feature = "lessopen")]
|
|
||||||
{
|
|
||||||
app = app
|
|
||||||
.arg(
|
|
||||||
Arg::new("lessopen")
|
|
||||||
.long("lessopen")
|
|
||||||
.action(ArgAction::SetTrue)
|
|
||||||
.help("Enable the $LESSOPEN preprocessor"),
|
|
||||||
)
|
)
|
||||||
.arg(
|
.arg(
|
||||||
Arg::new("no-lessopen")
|
Arg::with_name("config-file")
|
||||||
.long("no-lessopen")
|
|
||||||
.action(ArgAction::SetTrue)
|
|
||||||
.overrides_with("lessopen")
|
|
||||||
.hide(true)
|
|
||||||
.help("Disable the $LESSOPEN preprocessor if enabled (overrides --lessopen)"),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
app = app
|
|
||||||
.arg(
|
|
||||||
Arg::new("config-file")
|
|
||||||
.long("config-file")
|
.long("config-file")
|
||||||
.action(ArgAction::SetTrue)
|
|
||||||
.conflicts_with("list-languages")
|
.conflicts_with("list-languages")
|
||||||
.conflicts_with("list-themes")
|
.conflicts_with("list-themes")
|
||||||
.hide(true)
|
.hidden(true)
|
||||||
.help("Show path to the configuration file."),
|
.help("Show path to the configuration file."),
|
||||||
)
|
)
|
||||||
.arg(
|
.arg(
|
||||||
Arg::new("generate-config-file")
|
Arg::with_name("generate-config-file")
|
||||||
.long("generate-config-file")
|
.long("generate-config-file")
|
||||||
.action(ArgAction::SetTrue)
|
|
||||||
.conflicts_with("list-languages")
|
.conflicts_with("list-languages")
|
||||||
.conflicts_with("list-themes")
|
.conflicts_with("list-themes")
|
||||||
.hide(true)
|
.hidden(true)
|
||||||
.help("Generates a default configuration file."),
|
.help("Generates a default configuration file."),
|
||||||
)
|
)
|
||||||
.arg(
|
.arg(
|
||||||
Arg::new("config-dir")
|
Arg::with_name("config-dir")
|
||||||
.long("config-dir")
|
.long("config-dir")
|
||||||
.action(ArgAction::SetTrue)
|
.hidden(true)
|
||||||
.hide(true)
|
|
||||||
.help("Show bat's configuration directory."),
|
.help("Show bat's configuration directory."),
|
||||||
)
|
)
|
||||||
.arg(
|
.arg(
|
||||||
Arg::new("cache-dir")
|
Arg::with_name("cache-dir")
|
||||||
.long("cache-dir")
|
.long("cache-dir")
|
||||||
.action(ArgAction::SetTrue)
|
.hidden(true)
|
||||||
.hide(true)
|
|
||||||
.help("Show bat's cache directory."),
|
.help("Show bat's cache directory."),
|
||||||
)
|
)
|
||||||
.arg(
|
.arg(
|
||||||
Arg::new("diagnostic")
|
Arg::with_name("diagnostic")
|
||||||
.long("diagnostic")
|
.long("diagnostic")
|
||||||
.alias("diagnostics")
|
.alias("diagnostics")
|
||||||
.action(ArgAction::SetTrue)
|
.hidden_short_help(true)
|
||||||
.hide_short_help(true)
|
.help("Show diagnostic information for bug reports.")
|
||||||
.help("Show diagnostic information for bug reports."),
|
|
||||||
)
|
)
|
||||||
.arg(
|
.arg(
|
||||||
Arg::new("acknowledgements")
|
Arg::with_name("acknowledgements")
|
||||||
.long("acknowledgements")
|
.long("acknowledgements")
|
||||||
.action(ArgAction::SetTrue)
|
.hidden_short_help(true)
|
||||||
.hide_short_help(true)
|
|
||||||
.help("Show acknowledgements."),
|
.help("Show acknowledgements."),
|
||||||
)
|
)
|
||||||
.arg(
|
.help_message("Print this help message.")
|
||||||
Arg::new("set-terminal-title")
|
.version_message("Show version information.");
|
||||||
.long("set-terminal-title")
|
|
||||||
.action(ArgAction::SetTrue)
|
|
||||||
.hide_short_help(true)
|
|
||||||
.help("Sets terminal title to filenames when using a pager."),
|
|
||||||
);
|
|
||||||
|
|
||||||
// Check if the current directory contains a file name cache. Otherwise,
|
// Check if the current directory contains a file name cache. Otherwise,
|
||||||
// enable the 'bat cache' subcommand.
|
// enable the 'bat cache' subcommand.
|
||||||
@ -600,14 +545,12 @@ pub fn build_app(interactive_output: bool) -> Command {
|
|||||||
app
|
app
|
||||||
} else {
|
} else {
|
||||||
app.subcommand(
|
app.subcommand(
|
||||||
Command::new("cache")
|
SubCommand::with_name("cache")
|
||||||
.hide(true)
|
|
||||||
.about("Modify the syntax-definition and theme cache")
|
.about("Modify the syntax-definition and theme cache")
|
||||||
.arg(
|
.arg(
|
||||||
Arg::new("build")
|
Arg::with_name("build")
|
||||||
.long("build")
|
.long("build")
|
||||||
.short('b')
|
.short("b")
|
||||||
.action(ArgAction::SetTrue)
|
|
||||||
.help("Initialize (or update) the syntax/theme cache.")
|
.help("Initialize (or update) the syntax/theme cache.")
|
||||||
.long_help(
|
.long_help(
|
||||||
"Initialize (or update) the syntax/theme cache by loading from \
|
"Initialize (or update) the syntax/theme cache by loading from \
|
||||||
@ -615,37 +558,37 @@ pub fn build_app(interactive_output: bool) -> Command {
|
|||||||
),
|
),
|
||||||
)
|
)
|
||||||
.arg(
|
.arg(
|
||||||
Arg::new("clear")
|
Arg::with_name("clear")
|
||||||
.long("clear")
|
.long("clear")
|
||||||
.short('c')
|
.short("c")
|
||||||
.action(ArgAction::SetTrue)
|
|
||||||
.help("Remove the cached syntax definitions and themes."),
|
.help("Remove the cached syntax definitions and themes."),
|
||||||
)
|
)
|
||||||
.group(
|
.group(
|
||||||
ArgGroup::new("cache-actions")
|
ArgGroup::with_name("cache-actions")
|
||||||
.args(["build", "clear"])
|
.args(&["build", "clear"])
|
||||||
.required(true),
|
.required(true),
|
||||||
)
|
)
|
||||||
.arg(
|
.arg(
|
||||||
Arg::new("source")
|
Arg::with_name("source")
|
||||||
.long("source")
|
.long("source")
|
||||||
.requires("build")
|
.requires("build")
|
||||||
|
.takes_value(true)
|
||||||
.value_name("dir")
|
.value_name("dir")
|
||||||
.help("Use a different directory to load syntaxes and themes from."),
|
.help("Use a different directory to load syntaxes and themes from."),
|
||||||
)
|
)
|
||||||
.arg(
|
.arg(
|
||||||
Arg::new("target")
|
Arg::with_name("target")
|
||||||
.long("target")
|
.long("target")
|
||||||
.requires("build")
|
.requires("build")
|
||||||
|
.takes_value(true)
|
||||||
.value_name("dir")
|
.value_name("dir")
|
||||||
.help(
|
.help(
|
||||||
"Use a different directory to store the cached syntax and theme set.",
|
"Use a different directory to store the cached syntax and theme set.",
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
.arg(
|
.arg(
|
||||||
Arg::new("blank")
|
Arg::with_name("blank")
|
||||||
.long("blank")
|
.long("blank")
|
||||||
.action(ArgAction::SetTrue)
|
|
||||||
.requires("build")
|
.requires("build")
|
||||||
.help(
|
.help(
|
||||||
"Create completely new syntax and theme sets \
|
"Create completely new syntax and theme sets \
|
||||||
@ -653,21 +596,11 @@ pub fn build_app(interactive_output: bool) -> Command {
|
|||||||
),
|
),
|
||||||
)
|
)
|
||||||
.arg(
|
.arg(
|
||||||
Arg::new("acknowledgements")
|
Arg::with_name("acknowledgements")
|
||||||
.long("acknowledgements")
|
.long("acknowledgements")
|
||||||
.action(ArgAction::SetTrue)
|
|
||||||
.requires("build")
|
.requires("build")
|
||||||
.help("Build acknowledgements.bin."),
|
.help("Build acknowledgements.bin."),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
.after_long_help(
|
|
||||||
"You can use 'bat cache' to customize syntaxes and themes. \
|
|
||||||
See 'bat cache --help' for more information",
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn verify_app() {
|
|
||||||
build_app(false).debug_assert();
|
|
||||||
}
|
|
||||||
|
@ -6,22 +6,6 @@ use std::path::PathBuf;
|
|||||||
|
|
||||||
use crate::directories::PROJECT_DIRS;
|
use crate::directories::PROJECT_DIRS;
|
||||||
|
|
||||||
#[cfg(not(target_os = "windows"))]
|
|
||||||
const DEFAULT_SYSTEM_CONFIG_PREFIX: &str = "/etc";
|
|
||||||
|
|
||||||
#[cfg(target_os = "windows")]
|
|
||||||
const DEFAULT_SYSTEM_CONFIG_PREFIX: &str = "C:\\ProgramData";
|
|
||||||
|
|
||||||
pub fn system_config_file() -> PathBuf {
|
|
||||||
let folder = option_env!("BAT_SYSTEM_CONFIG_PREFIX").unwrap_or(DEFAULT_SYSTEM_CONFIG_PREFIX);
|
|
||||||
let mut path = PathBuf::from(folder);
|
|
||||||
|
|
||||||
path.push("bat");
|
|
||||||
path.push("config");
|
|
||||||
|
|
||||||
path
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn config_file() -> PathBuf {
|
pub fn config_file() -> PathBuf {
|
||||||
env::var("BAT_CONFIG_PATH")
|
env::var("BAT_CONFIG_PATH")
|
||||||
.ok()
|
.ok()
|
||||||
@ -103,21 +87,14 @@ pub fn generate_config_file() -> bat::error::Result<()> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_args_from_config_file() -> Result<Vec<OsString>, shell_words::ParseError> {
|
pub fn get_args_from_config_file() -> Result<Vec<OsString>, shell_words::ParseError> {
|
||||||
let mut config = String::new();
|
Ok(fs::read_to_string(config_file())
|
||||||
|
.ok()
|
||||||
if let Ok(c) = fs::read_to_string(system_config_file()) {
|
.map(|content| get_args_from_str(&content))
|
||||||
config.push_str(&c);
|
.transpose()?
|
||||||
config.push('\n');
|
.unwrap_or_else(Vec::new))
|
||||||
}
|
}
|
||||||
|
|
||||||
if let Ok(c) = fs::read_to_string(config_file()) {
|
pub fn get_args_from_env_var() -> Option<Result<Vec<OsString>, shell_words::ParseError>> {
|
||||||
config.push_str(&c);
|
|
||||||
}
|
|
||||||
|
|
||||||
get_args_from_str(&config)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn get_args_from_env_opts_var() -> Option<Result<Vec<OsString>, shell_words::ParseError>> {
|
|
||||||
env::var("BAT_OPTS").ok().map(|s| get_args_from_str(&s))
|
env::var("BAT_OPTS").ok().map(|s| get_args_from_str(&s))
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -137,24 +114,6 @@ fn get_args_from_str(content: &str) -> Result<Vec<OsString>, shell_words::ParseE
|
|||||||
.collect())
|
.collect())
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_args_from_env_vars() -> Vec<OsString> {
|
|
||||||
[
|
|
||||||
("--tabs", "BAT_TABS"),
|
|
||||||
("--theme", "BAT_THEME"),
|
|
||||||
("--pager", "BAT_PAGER"),
|
|
||||||
("--paging", "BAT_PAGING"),
|
|
||||||
("--style", "BAT_STYLE"),
|
|
||||||
]
|
|
||||||
.iter()
|
|
||||||
.filter_map(|(flag, key)| {
|
|
||||||
env::var(key)
|
|
||||||
.ok()
|
|
||||||
.map(|var| [flag.to_string(), var].join("="))
|
|
||||||
})
|
|
||||||
.map(|a| a.into())
|
|
||||||
.collect()
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn empty() {
|
fn empty() {
|
||||||
let args = get_args_from_str("").unwrap();
|
let args = get_args_from_str("").unwrap();
|
||||||
|
@ -1,11 +1,12 @@
|
|||||||
use std::env;
|
use std::env;
|
||||||
use std::path::{Path, PathBuf};
|
use std::path::{Path, PathBuf};
|
||||||
|
|
||||||
use etcetera::BaseStrategy;
|
|
||||||
use once_cell::sync::Lazy;
|
use once_cell::sync::Lazy;
|
||||||
|
|
||||||
/// Wrapper for 'etcetera' that checks BAT_CACHE_PATH and BAT_CONFIG_DIR and falls back to the
|
/// Wrapper for 'dirs' that treats MacOS more like Linux, by following the XDG specification.
|
||||||
/// Windows known folder locations on Windows & the XDG Base Directory Specification everywhere else.
|
/// The `XDG_CACHE_HOME` environment variable is checked first. `BAT_CONFIG_DIR`
|
||||||
|
/// is then checked before the `XDG_CONFIG_HOME` environment variable.
|
||||||
|
/// The fallback directories are `~/.cache/bat` and `~/.config/bat`, respectively.
|
||||||
pub struct BatProjectDirs {
|
pub struct BatProjectDirs {
|
||||||
cache_dir: PathBuf,
|
cache_dir: PathBuf,
|
||||||
config_dir: PathBuf,
|
config_dir: PathBuf,
|
||||||
@ -13,23 +14,24 @@ pub struct BatProjectDirs {
|
|||||||
|
|
||||||
impl BatProjectDirs {
|
impl BatProjectDirs {
|
||||||
fn new() -> Option<BatProjectDirs> {
|
fn new() -> Option<BatProjectDirs> {
|
||||||
let basedirs = etcetera::choose_base_strategy().ok()?;
|
let cache_dir = BatProjectDirs::get_cache_dir()?;
|
||||||
|
|
||||||
// Checks whether or not `$BAT_CACHE_PATH` exists. If it doesn't, set the cache dir to our
|
// Checks whether or not $BAT_CONFIG_DIR exists. If it doesn't, set our config dir
|
||||||
// system's default cache home.
|
// to our system's default configuration home.
|
||||||
let cache_dir = if let Some(cache_dir) = env::var_os("BAT_CACHE_PATH").map(PathBuf::from) {
|
let config_dir =
|
||||||
cache_dir
|
if let Some(config_dir_op) = env::var_os("BAT_CONFIG_DIR").map(PathBuf::from) {
|
||||||
|
config_dir_op
|
||||||
} else {
|
} else {
|
||||||
basedirs.cache_dir().join("bat")
|
#[cfg(target_os = "macos")]
|
||||||
};
|
let config_dir_op = env::var_os("XDG_CONFIG_HOME")
|
||||||
|
.map(PathBuf::from)
|
||||||
|
.filter(|p| p.is_absolute())
|
||||||
|
.or_else(|| dirs_next::home_dir().map(|d| d.join(".config")));
|
||||||
|
|
||||||
// Checks whether or not `$BAT_CONFIG_DIR` exists. If it doesn't, set the config dir to our
|
#[cfg(not(target_os = "macos"))]
|
||||||
// system's default configuration home.
|
let config_dir_op = dirs_next::config_dir();
|
||||||
let config_dir = if let Some(config_dir) = env::var_os("BAT_CONFIG_DIR").map(PathBuf::from)
|
|
||||||
{
|
config_dir_op.map(|d| d.join("bat"))?
|
||||||
config_dir
|
|
||||||
} else {
|
|
||||||
basedirs.config_dir().join("bat")
|
|
||||||
};
|
};
|
||||||
|
|
||||||
Some(BatProjectDirs {
|
Some(BatProjectDirs {
|
||||||
@ -38,6 +40,25 @@ impl BatProjectDirs {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn get_cache_dir() -> Option<PathBuf> {
|
||||||
|
// on all OS prefer BAT_CACHE_PATH if set
|
||||||
|
let cache_dir_op = env::var_os("BAT_CACHE_PATH").map(PathBuf::from);
|
||||||
|
if cache_dir_op.is_some() {
|
||||||
|
return cache_dir_op;
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(target_os = "macos")]
|
||||||
|
let cache_dir_op = env::var_os("XDG_CACHE_HOME")
|
||||||
|
.map(PathBuf::from)
|
||||||
|
.filter(|p| p.is_absolute())
|
||||||
|
.or_else(|| dirs_next::home_dir().map(|d| d.join(".cache")));
|
||||||
|
|
||||||
|
#[cfg(not(target_os = "macos"))]
|
||||||
|
let cache_dir_op = dirs_next::cache_dir();
|
||||||
|
|
||||||
|
cache_dir_op.map(|d| d.join("bat"))
|
||||||
|
}
|
||||||
|
|
||||||
pub fn cache_dir(&self) -> &Path {
|
pub fn cache_dir(&self) -> &Path {
|
||||||
&self.cache_dir
|
&self.cache_dir
|
||||||
}
|
}
|
||||||
|
@ -8,29 +8,24 @@ mod directories;
|
|||||||
mod input;
|
mod input;
|
||||||
|
|
||||||
use std::collections::{HashMap, HashSet};
|
use std::collections::{HashMap, HashSet};
|
||||||
use std::fmt::Write as _;
|
|
||||||
use std::io;
|
use std::io;
|
||||||
use std::io::{BufReader, Write};
|
use std::io::{BufReader, Write};
|
||||||
use std::path::Path;
|
use std::path::Path;
|
||||||
use std::process;
|
use std::process;
|
||||||
|
|
||||||
use nu_ansi_term::Color::Green;
|
use ansi_term::Colour::Green;
|
||||||
use nu_ansi_term::Style;
|
use ansi_term::Style;
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
app::App,
|
app::App,
|
||||||
config::{config_file, generate_config_file},
|
config::{config_file, generate_config_file},
|
||||||
};
|
};
|
||||||
|
|
||||||
#[cfg(feature = "bugreport")]
|
use assets::{assets_from_cache_or_binary, cache_dir, clear_assets, config_dir};
|
||||||
use crate::config::system_config_file;
|
|
||||||
|
|
||||||
use assets::{assets_from_cache_or_binary, clear_assets};
|
|
||||||
use directories::PROJECT_DIRS;
|
use directories::PROJECT_DIRS;
|
||||||
use globset::GlobMatcher;
|
use globset::GlobMatcher;
|
||||||
|
|
||||||
use bat::{
|
use bat::{
|
||||||
assets::HighlightingAssets,
|
|
||||||
config::Config,
|
config::Config,
|
||||||
controller::Controller,
|
controller::Controller,
|
||||||
error::*,
|
error::*,
|
||||||
@ -42,48 +37,41 @@ use bat::{
|
|||||||
const THEME_PREVIEW_DATA: &[u8] = include_bytes!("../../../assets/theme_preview.rs");
|
const THEME_PREVIEW_DATA: &[u8] = include_bytes!("../../../assets/theme_preview.rs");
|
||||||
|
|
||||||
#[cfg(feature = "build-assets")]
|
#[cfg(feature = "build-assets")]
|
||||||
fn build_assets(matches: &clap::ArgMatches, config_dir: &Path, cache_dir: &Path) -> Result<()> {
|
fn build_assets(matches: &clap::ArgMatches) -> Result<()> {
|
||||||
let source_dir = matches
|
let source_dir = matches
|
||||||
.get_one::<String>("source")
|
.value_of("source")
|
||||||
.map(Path::new)
|
.map(Path::new)
|
||||||
.unwrap_or_else(|| config_dir);
|
.unwrap_or_else(|| PROJECT_DIRS.config_dir());
|
||||||
|
let target_dir = matches
|
||||||
|
.value_of("target")
|
||||||
|
.map(Path::new)
|
||||||
|
.unwrap_or_else(|| PROJECT_DIRS.cache_dir());
|
||||||
|
|
||||||
bat::assets::build(
|
bat::assets::build(
|
||||||
source_dir,
|
source_dir,
|
||||||
!matches.get_flag("blank"),
|
!matches.is_present("blank"),
|
||||||
matches.get_flag("acknowledgements"),
|
matches.is_present("acknowledgements"),
|
||||||
cache_dir,
|
target_dir,
|
||||||
clap::crate_version!(),
|
clap::crate_version!(),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn run_cache_subcommand(
|
fn run_cache_subcommand(matches: &clap::ArgMatches) -> Result<()> {
|
||||||
matches: &clap::ArgMatches,
|
if matches.is_present("build") {
|
||||||
#[cfg(feature = "build-assets")] config_dir: &Path,
|
|
||||||
default_cache_dir: &Path,
|
|
||||||
) -> Result<()> {
|
|
||||||
let cache_dir = matches
|
|
||||||
.get_one::<String>("target")
|
|
||||||
.map(Path::new)
|
|
||||||
.unwrap_or_else(|| default_cache_dir);
|
|
||||||
|
|
||||||
if matches.get_flag("build") {
|
|
||||||
#[cfg(feature = "build-assets")]
|
#[cfg(feature = "build-assets")]
|
||||||
build_assets(matches, config_dir, cache_dir)?;
|
build_assets(matches)?;
|
||||||
#[cfg(not(feature = "build-assets"))]
|
#[cfg(not(feature = "build-assets"))]
|
||||||
println!("bat has been built without the 'build-assets' feature. The 'cache --build' option is not available.");
|
println!("bat has been built without the 'build-assets' feature. The 'cache --build' option is not available.");
|
||||||
} else if matches.get_flag("clear") {
|
} else if matches.is_present("clear") {
|
||||||
clear_assets(cache_dir);
|
clear_assets();
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn get_syntax_mapping_to_paths<'r, 't, I>(mappings: I) -> HashMap<&'t str, Vec<String>>
|
fn get_syntax_mapping_to_paths<'a>(
|
||||||
where
|
mappings: &[(GlobMatcher, MappingTarget<'a>)],
|
||||||
I: IntoIterator<Item = (&'r GlobMatcher, &'r MappingTarget<'t>)>,
|
) -> HashMap<&'a str, Vec<String>> {
|
||||||
't: 'r, // target text outlives rule
|
|
||||||
{
|
|
||||||
let mut map = HashMap::new();
|
let mut map = HashMap::new();
|
||||||
for mapping in mappings {
|
for mapping in mappings {
|
||||||
if let (matcher, MappingTarget::MapTo(s)) = mapping {
|
if let (matcher, MappingTarget::MapTo(s)) = mapping {
|
||||||
@ -94,10 +82,10 @@ where
|
|||||||
map
|
map
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_languages(config: &Config, cache_dir: &Path) -> Result<String> {
|
pub fn get_languages(config: &Config) -> Result<String> {
|
||||||
let mut result: String = String::new();
|
let mut result: String = String::new();
|
||||||
|
|
||||||
let assets = assets_from_cache_or_binary(config.use_custom_assets, cache_dir)?;
|
let assets = assets_from_cache_or_binary(config.use_custom_assets)?;
|
||||||
let mut languages = assets
|
let mut languages = assets
|
||||||
.get_syntaxes()?
|
.get_syntaxes()?
|
||||||
.iter()
|
.iter()
|
||||||
@ -126,7 +114,7 @@ pub fn get_languages(config: &Config, cache_dir: &Path) -> Result<String> {
|
|||||||
|
|
||||||
languages.sort_by_key(|lang| lang.name.to_uppercase());
|
languages.sort_by_key(|lang| lang.name.to_uppercase());
|
||||||
|
|
||||||
let configured_languages = get_syntax_mapping_to_paths(config.syntax_mapping.all_mappings());
|
let configured_languages = get_syntax_mapping_to_paths(config.syntax_mapping.mappings());
|
||||||
|
|
||||||
for lang in &mut languages {
|
for lang in &mut languages {
|
||||||
if let Some(additional_paths) = configured_languages.get(lang.name.as_str()) {
|
if let Some(additional_paths) = configured_languages.get(lang.name.as_str()) {
|
||||||
@ -137,7 +125,7 @@ pub fn get_languages(config: &Config, cache_dir: &Path) -> Result<String> {
|
|||||||
|
|
||||||
if config.loop_through {
|
if config.loop_through {
|
||||||
for lang in languages {
|
for lang in languages {
|
||||||
writeln!(result, "{}:{}", lang.name, lang.file_extensions.join(",")).ok();
|
result += &format!("{}:{}\n", lang.name, lang.file_extensions.join(","));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
let longest = languages
|
let longest = languages
|
||||||
@ -158,7 +146,7 @@ pub fn get_languages(config: &Config, cache_dir: &Path) -> Result<String> {
|
|||||||
};
|
};
|
||||||
|
|
||||||
for lang in languages {
|
for lang in languages {
|
||||||
write!(result, "{:width$}{}", lang.name, separator, width = longest).ok();
|
result += &format!("{:width$}{}", lang.name, separator, width = longest);
|
||||||
|
|
||||||
// Number of characters on this line so far, wrap before `desired_width`
|
// Number of characters on this line so far, wrap before `desired_width`
|
||||||
let mut num_chars = 0;
|
let mut num_chars = 0;
|
||||||
@ -169,11 +157,11 @@ pub fn get_languages(config: &Config, cache_dir: &Path) -> Result<String> {
|
|||||||
let new_chars = word.len() + comma_separator.len();
|
let new_chars = word.len() + comma_separator.len();
|
||||||
if num_chars + new_chars >= desired_width {
|
if num_chars + new_chars >= desired_width {
|
||||||
num_chars = 0;
|
num_chars = 0;
|
||||||
write!(result, "\n{:width$}{}", "", separator, width = longest).ok();
|
result += &format!("\n{:width$}{}", "", separator, width = longest);
|
||||||
}
|
}
|
||||||
|
|
||||||
num_chars += new_chars;
|
num_chars += new_chars;
|
||||||
write!(result, "{}", style.paint(&word[..])).ok();
|
result += &format!("{}", style.paint(&word[..]));
|
||||||
if extension.peek().is_some() {
|
if extension.peek().is_some() {
|
||||||
result += comma_separator;
|
result += comma_separator;
|
||||||
}
|
}
|
||||||
@ -189,8 +177,8 @@ fn theme_preview_file<'a>() -> Input<'a> {
|
|||||||
Input::from_reader(Box::new(BufReader::new(THEME_PREVIEW_DATA)))
|
Input::from_reader(Box::new(BufReader::new(THEME_PREVIEW_DATA)))
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn list_themes(cfg: &Config, config_dir: &Path, cache_dir: &Path) -> Result<()> {
|
pub fn list_themes(cfg: &Config) -> Result<()> {
|
||||||
let assets = assets_from_cache_or_binary(cfg.use_custom_assets, cache_dir)?;
|
let assets = assets_from_cache_or_binary(cfg.use_custom_assets)?;
|
||||||
let mut config = cfg.clone();
|
let mut config = cfg.clone();
|
||||||
let mut style = HashSet::new();
|
let mut style = HashSet::new();
|
||||||
style.insert(StyleComponent::Plain);
|
style.insert(StyleComponent::Plain);
|
||||||
@ -200,114 +188,72 @@ pub fn list_themes(cfg: &Config, config_dir: &Path, cache_dir: &Path) -> Result<
|
|||||||
let stdout = io::stdout();
|
let stdout = io::stdout();
|
||||||
let mut stdout = stdout.lock();
|
let mut stdout = stdout.lock();
|
||||||
|
|
||||||
let default_theme = HighlightingAssets::default_theme();
|
|
||||||
for theme in assets.themes() {
|
|
||||||
let default_theme_info = if default_theme == theme {
|
|
||||||
" (default)"
|
|
||||||
} else {
|
|
||||||
""
|
|
||||||
};
|
|
||||||
if config.colored_output {
|
if config.colored_output {
|
||||||
|
for theme in assets.themes() {
|
||||||
writeln!(
|
writeln!(
|
||||||
stdout,
|
stdout,
|
||||||
"Theme: {}{}\n",
|
"Theme: {}\n",
|
||||||
Style::new().bold().paint(theme.to_string()),
|
Style::new().bold().paint(theme.to_string())
|
||||||
default_theme_info
|
|
||||||
)?;
|
)?;
|
||||||
config.theme = theme.to_string();
|
config.theme = theme.to_string();
|
||||||
Controller::new(&config, &assets)
|
Controller::new(&config, &assets)
|
||||||
.run(vec![theme_preview_file()], None)
|
.run(vec![theme_preview_file()])
|
||||||
.ok();
|
.ok();
|
||||||
writeln!(stdout)?;
|
writeln!(stdout)?;
|
||||||
} else {
|
|
||||||
writeln!(stdout, "{theme}{default_theme_info}")?;
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if config.colored_output {
|
|
||||||
writeln!(
|
writeln!(
|
||||||
stdout,
|
stdout,
|
||||||
"Further themes can be installed to '{}', \
|
"Further themes can be installed to '{}', \
|
||||||
and are added to the cache with `bat cache --build`. \
|
and are added to the cache with `bat cache --build`. \
|
||||||
For more information, see:\n\n \
|
For more information, see:\n\n \
|
||||||
https://github.com/sharkdp/bat#adding-new-themes",
|
https://github.com/sharkdp/bat#adding-new-themes",
|
||||||
config_dir.join("themes").to_string_lossy()
|
PROJECT_DIRS.config_dir().join("themes").to_string_lossy()
|
||||||
)?;
|
)?;
|
||||||
|
} else {
|
||||||
|
for theme in assets.themes() {
|
||||||
|
writeln!(stdout, "{}", theme)?;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn set_terminal_title_to(new_terminal_title: String) {
|
fn run_controller(inputs: Vec<Input>, config: &Config) -> Result<bool> {
|
||||||
let osc_command_for_setting_terminal_title = "\x1b]0;";
|
let assets = assets_from_cache_or_binary(config.use_custom_assets)?;
|
||||||
let osc_end_command = "\x07";
|
|
||||||
print!("{osc_command_for_setting_terminal_title}{new_terminal_title}{osc_end_command}");
|
|
||||||
io::stdout().flush().unwrap();
|
|
||||||
}
|
|
||||||
|
|
||||||
fn get_new_terminal_title(inputs: &Vec<Input>) -> String {
|
|
||||||
let mut new_terminal_title = "bat: ".to_string();
|
|
||||||
for (index, input) in inputs.iter().enumerate() {
|
|
||||||
new_terminal_title += input.description().title();
|
|
||||||
if index < inputs.len() - 1 {
|
|
||||||
new_terminal_title += ", ";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
new_terminal_title
|
|
||||||
}
|
|
||||||
|
|
||||||
fn run_controller(inputs: Vec<Input>, config: &Config, cache_dir: &Path) -> Result<bool> {
|
|
||||||
let assets = assets_from_cache_or_binary(config.use_custom_assets, cache_dir)?;
|
|
||||||
let controller = Controller::new(config, &assets);
|
let controller = Controller::new(config, &assets);
|
||||||
if config.paging_mode != PagingMode::Never && config.set_terminal_title {
|
controller.run(inputs)
|
||||||
set_terminal_title_to(get_new_terminal_title(&inputs));
|
|
||||||
}
|
|
||||||
controller.run(inputs, None)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(feature = "bugreport")]
|
#[cfg(feature = "bugreport")]
|
||||||
fn invoke_bugreport(app: &App, cache_dir: &Path) {
|
fn invoke_bugreport(app: &App) {
|
||||||
use bugreport::{bugreport, collector::*, format::Markdown};
|
use bugreport::{bugreport, collector::*, format::Markdown};
|
||||||
let pager = bat::config::get_pager_executable(
|
let pager = bat::config::get_pager_executable(app.matches.value_of("pager"))
|
||||||
app.matches.get_one::<String>("pager").map(|s| s.as_str()),
|
|
||||||
)
|
|
||||||
.unwrap_or_else(|| "less".to_owned()); // FIXME: Avoid non-canonical path to "less".
|
.unwrap_or_else(|| "less".to_owned()); // FIXME: Avoid non-canonical path to "less".
|
||||||
|
|
||||||
let mut custom_assets_metadata = cache_dir.to_path_buf();
|
|
||||||
custom_assets_metadata.push("metadata.yaml");
|
|
||||||
|
|
||||||
let mut report = bugreport!()
|
let mut report = bugreport!()
|
||||||
.info(SoftwareVersion::default())
|
.info(SoftwareVersion::default())
|
||||||
.info(OperatingSystem::default())
|
.info(OperatingSystem::default())
|
||||||
.info(CommandLine::default())
|
.info(CommandLine::default())
|
||||||
.info(EnvironmentVariables::list(&[
|
.info(EnvironmentVariables::list(&[
|
||||||
|
"SHELL",
|
||||||
|
"PAGER",
|
||||||
|
"LESS",
|
||||||
|
"LANG",
|
||||||
|
"LC_ALL",
|
||||||
|
"BAT_PAGER",
|
||||||
"BAT_CACHE_PATH",
|
"BAT_CACHE_PATH",
|
||||||
"BAT_CONFIG_PATH",
|
"BAT_CONFIG_PATH",
|
||||||
"BAT_OPTS",
|
"BAT_OPTS",
|
||||||
"BAT_PAGER",
|
|
||||||
"BAT_PAGING",
|
|
||||||
"BAT_STYLE",
|
"BAT_STYLE",
|
||||||
"BAT_TABS",
|
"BAT_TABS",
|
||||||
"BAT_THEME",
|
"BAT_THEME",
|
||||||
"COLORTERM",
|
|
||||||
"LANG",
|
|
||||||
"LC_ALL",
|
|
||||||
"LESS",
|
|
||||||
"MANPAGER",
|
|
||||||
"NO_COLOR",
|
|
||||||
"PAGER",
|
|
||||||
"SHELL",
|
|
||||||
"TERM",
|
|
||||||
"XDG_CACHE_HOME",
|
|
||||||
"XDG_CONFIG_HOME",
|
"XDG_CONFIG_HOME",
|
||||||
|
"XDG_CACHE_HOME",
|
||||||
|
"COLORTERM",
|
||||||
|
"NO_COLOR",
|
||||||
|
"MANPAGER",
|
||||||
]))
|
]))
|
||||||
.info(FileContent::new("System Config file", system_config_file()))
|
|
||||||
.info(FileContent::new("Config file", config_file()))
|
.info(FileContent::new("Config file", config_file()))
|
||||||
.info(FileContent::new(
|
|
||||||
"Custom assets metadata",
|
|
||||||
custom_assets_metadata,
|
|
||||||
))
|
|
||||||
.info(DirectoryEntries::new("Custom assets", cache_dir))
|
|
||||||
.info(CompileTimeInformation::default());
|
.info(CompileTimeInformation::default());
|
||||||
|
|
||||||
#[cfg(feature = "paging")]
|
#[cfg(feature = "paging")]
|
||||||
@ -326,70 +272,63 @@ fn invoke_bugreport(app: &App, cache_dir: &Path) {
|
|||||||
/// `Ok(false)` if any intermediate errors occurred (were printed).
|
/// `Ok(false)` if any intermediate errors occurred (were printed).
|
||||||
fn run() -> Result<bool> {
|
fn run() -> Result<bool> {
|
||||||
let app = App::new()?;
|
let app = App::new()?;
|
||||||
let config_dir = PROJECT_DIRS.config_dir();
|
|
||||||
let cache_dir = PROJECT_DIRS.cache_dir();
|
|
||||||
|
|
||||||
if app.matches.get_flag("diagnostic") {
|
if app.matches.is_present("diagnostic") {
|
||||||
#[cfg(feature = "bugreport")]
|
#[cfg(feature = "bugreport")]
|
||||||
invoke_bugreport(&app, cache_dir);
|
invoke_bugreport(&app);
|
||||||
#[cfg(not(feature = "bugreport"))]
|
#[cfg(not(feature = "bugreport"))]
|
||||||
println!("bat has been built without the 'bugreport' feature. The '--diagnostic' option is not available.");
|
println!("bat has been built without the 'bugreport' feature. The '--diagnostic' option is not available.");
|
||||||
return Ok(true);
|
return Ok(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
match app.matches.subcommand() {
|
match app.matches.subcommand() {
|
||||||
Some(("cache", cache_matches)) => {
|
("cache", Some(cache_matches)) => {
|
||||||
// If there is a file named 'cache' in the current working directory,
|
// If there is a file named 'cache' in the current working directory,
|
||||||
// arguments for subcommand 'cache' are not mandatory.
|
// arguments for subcommand 'cache' are not mandatory.
|
||||||
// If there are non-zero arguments, execute the subcommand cache, else, open the file cache.
|
// If there are non-zero arguments, execute the subcommand cache, else, open the file cache.
|
||||||
if cache_matches.args_present() {
|
if !cache_matches.args.is_empty() {
|
||||||
run_cache_subcommand(
|
run_cache_subcommand(cache_matches)?;
|
||||||
cache_matches,
|
|
||||||
#[cfg(feature = "build-assets")]
|
|
||||||
config_dir,
|
|
||||||
cache_dir,
|
|
||||||
)?;
|
|
||||||
Ok(true)
|
Ok(true)
|
||||||
} else {
|
} else {
|
||||||
let inputs = vec![Input::ordinary_file("cache")];
|
let inputs = vec![Input::ordinary_file("cache")];
|
||||||
let config = app.config(&inputs)?;
|
let config = app.config(&inputs)?;
|
||||||
|
|
||||||
run_controller(inputs, &config, cache_dir)
|
run_controller(inputs, &config)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
_ => {
|
_ => {
|
||||||
let inputs = app.inputs()?;
|
let inputs = app.inputs()?;
|
||||||
let config = app.config(&inputs)?;
|
let config = app.config(&inputs)?;
|
||||||
|
|
||||||
if app.matches.get_flag("list-languages") {
|
if app.matches.is_present("list-languages") {
|
||||||
let languages: String = get_languages(&config, cache_dir)?;
|
let languages: String = get_languages(&config)?;
|
||||||
let inputs: Vec<Input> = vec![Input::from_reader(Box::new(languages.as_bytes()))];
|
let inputs: Vec<Input> = vec![Input::from_reader(Box::new(languages.as_bytes()))];
|
||||||
let plain_config = Config {
|
let plain_config = Config {
|
||||||
style_components: StyleComponents::new(StyleComponent::Plain.components(false)),
|
style_components: StyleComponents::new(StyleComponent::Plain.components(false)),
|
||||||
paging_mode: PagingMode::QuitIfOneScreen,
|
paging_mode: PagingMode::QuitIfOneScreen,
|
||||||
..Default::default()
|
..Default::default()
|
||||||
};
|
};
|
||||||
run_controller(inputs, &plain_config, cache_dir)
|
run_controller(inputs, &plain_config)
|
||||||
} else if app.matches.get_flag("list-themes") {
|
} else if app.matches.is_present("list-themes") {
|
||||||
list_themes(&config, config_dir, cache_dir)?;
|
list_themes(&config)?;
|
||||||
Ok(true)
|
Ok(true)
|
||||||
} else if app.matches.get_flag("config-file") {
|
} else if app.matches.is_present("config-file") {
|
||||||
println!("{}", config_file().to_string_lossy());
|
println!("{}", config_file().to_string_lossy());
|
||||||
Ok(true)
|
Ok(true)
|
||||||
} else if app.matches.get_flag("generate-config-file") {
|
} else if app.matches.is_present("generate-config-file") {
|
||||||
generate_config_file()?;
|
generate_config_file()?;
|
||||||
Ok(true)
|
Ok(true)
|
||||||
} else if app.matches.get_flag("config-dir") {
|
} else if app.matches.is_present("config-dir") {
|
||||||
writeln!(io::stdout(), "{}", config_dir.to_string_lossy())?;
|
writeln!(io::stdout(), "{}", config_dir())?;
|
||||||
Ok(true)
|
Ok(true)
|
||||||
} else if app.matches.get_flag("cache-dir") {
|
} else if app.matches.is_present("cache-dir") {
|
||||||
writeln!(io::stdout(), "{}", cache_dir.to_string_lossy())?;
|
writeln!(io::stdout(), "{}", cache_dir())?;
|
||||||
Ok(true)
|
Ok(true)
|
||||||
} else if app.matches.get_flag("acknowledgements") {
|
} else if app.matches.is_present("acknowledgements") {
|
||||||
writeln!(io::stdout(), "{}", bat::assets::get_acknowledgements())?;
|
writeln!(io::stdout(), "{}", bat::assets::get_acknowledgements())?;
|
||||||
Ok(true)
|
Ok(true)
|
||||||
} else {
|
} else {
|
||||||
run_controller(inputs, &config, cache_dir)
|
run_controller(inputs, &config)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,11 +1,9 @@
|
|||||||
use crate::line_range::{HighlightedLineRanges, LineRanges};
|
use crate::line_range::{HighlightedLineRanges, LineRanges};
|
||||||
use crate::nonprintable_notation::NonprintableNotation;
|
|
||||||
#[cfg(feature = "paging")]
|
#[cfg(feature = "paging")]
|
||||||
use crate::paging::PagingMode;
|
use crate::paging::PagingMode;
|
||||||
use crate::style::StyleComponents;
|
use crate::style::StyleComponents;
|
||||||
use crate::syntax_mapping::SyntaxMapping;
|
use crate::syntax_mapping::SyntaxMapping;
|
||||||
use crate::wrapping::WrappingMode;
|
use crate::wrapping::WrappingMode;
|
||||||
use crate::StripAnsiMode;
|
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
pub enum VisibleLines {
|
pub enum VisibleLines {
|
||||||
@ -41,9 +39,6 @@ pub struct Config<'a> {
|
|||||||
/// Whether or not to show/replace non-printable characters like space, tab and newline.
|
/// Whether or not to show/replace non-printable characters like space, tab and newline.
|
||||||
pub show_nonprintable: bool,
|
pub show_nonprintable: bool,
|
||||||
|
|
||||||
/// The configured notation for non-printable characters
|
|
||||||
pub nonprintable_notation: NonprintableNotation,
|
|
||||||
|
|
||||||
/// The character width of the terminal
|
/// The character width of the terminal
|
||||||
pub term_width: usize,
|
pub term_width: usize,
|
||||||
|
|
||||||
@ -91,19 +86,6 @@ pub struct Config<'a> {
|
|||||||
/// Whether or not to allow custom assets. If this is false or if custom assets (a.k.a.
|
/// Whether or not to allow custom assets. If this is false or if custom assets (a.k.a.
|
||||||
/// cached assets) are not available, assets from the binary will be used instead.
|
/// cached assets) are not available, assets from the binary will be used instead.
|
||||||
pub use_custom_assets: bool,
|
pub use_custom_assets: bool,
|
||||||
|
|
||||||
// Whether or not to use $LESSOPEN if set
|
|
||||||
#[cfg(feature = "lessopen")]
|
|
||||||
pub use_lessopen: bool,
|
|
||||||
|
|
||||||
// Weather 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
|
|
||||||
pub strip_ansi: StripAnsiMode,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(all(feature = "minimal-application", feature = "paging"))]
|
#[cfg(all(feature = "minimal-application", feature = "paging"))]
|
||||||
|
@ -6,48 +6,34 @@ use crate::config::{Config, VisibleLines};
|
|||||||
use crate::diff::{get_git_diff, LineChanges};
|
use crate::diff::{get_git_diff, LineChanges};
|
||||||
use crate::error::*;
|
use crate::error::*;
|
||||||
use crate::input::{Input, InputReader, OpenedInput};
|
use crate::input::{Input, InputReader, OpenedInput};
|
||||||
#[cfg(feature = "lessopen")]
|
|
||||||
use crate::lessopen::LessOpenPreprocessor;
|
|
||||||
#[cfg(feature = "git")]
|
#[cfg(feature = "git")]
|
||||||
use crate::line_range::LineRange;
|
use crate::line_range::LineRange;
|
||||||
use crate::line_range::{LineRanges, RangeCheckResult};
|
use crate::line_range::{LineRanges, RangeCheckResult};
|
||||||
use crate::output::OutputType;
|
use crate::output::OutputType;
|
||||||
#[cfg(feature = "paging")]
|
#[cfg(feature = "paging")]
|
||||||
use crate::paging::PagingMode;
|
use crate::paging::PagingMode;
|
||||||
use crate::printer::{InteractivePrinter, OutputHandle, Printer, SimplePrinter};
|
use crate::printer::{InteractivePrinter, Printer, SimplePrinter};
|
||||||
|
|
||||||
use clircle::{Clircle, Identifier};
|
use clircle::{Clircle, Identifier};
|
||||||
|
|
||||||
pub struct Controller<'a> {
|
pub struct Controller<'a> {
|
||||||
config: &'a Config<'a>,
|
config: &'a Config<'a>,
|
||||||
assets: &'a HighlightingAssets,
|
assets: &'a HighlightingAssets,
|
||||||
#[cfg(feature = "lessopen")]
|
|
||||||
preprocessor: Option<LessOpenPreprocessor>,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'b> Controller<'b> {
|
impl<'b> Controller<'b> {
|
||||||
pub fn new<'a>(config: &'a Config, assets: &'a HighlightingAssets) -> Controller<'a> {
|
pub fn new<'a>(config: &'a Config, assets: &'a HighlightingAssets) -> Controller<'a> {
|
||||||
Controller {
|
Controller { config, assets }
|
||||||
config,
|
|
||||||
assets,
|
|
||||||
#[cfg(feature = "lessopen")]
|
|
||||||
preprocessor: LessOpenPreprocessor::new().ok(),
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn run(
|
pub fn run(&self, inputs: Vec<Input>) -> Result<bool> {
|
||||||
&self,
|
self.run_with_error_handler(inputs, default_error_handler)
|
||||||
inputs: Vec<Input>,
|
|
||||||
output_buffer: Option<&mut dyn std::fmt::Write>,
|
|
||||||
) -> Result<bool> {
|
|
||||||
self.run_with_error_handler(inputs, output_buffer, default_error_handler)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn run_with_error_handler(
|
pub fn run_with_error_handler(
|
||||||
&self,
|
&self,
|
||||||
inputs: Vec<Input>,
|
inputs: Vec<Input>,
|
||||||
output_buffer: Option<&mut dyn std::fmt::Write>,
|
handle_error: impl Fn(&Error, &mut dyn Write),
|
||||||
mut handle_error: impl FnMut(&Error, &mut dyn Write),
|
|
||||||
) -> Result<bool> {
|
) -> Result<bool> {
|
||||||
let mut output_type;
|
let mut output_type;
|
||||||
|
|
||||||
@ -88,10 +74,7 @@ impl<'b> Controller<'b> {
|
|||||||
clircle::Identifier::stdout()
|
clircle::Identifier::stdout()
|
||||||
};
|
};
|
||||||
|
|
||||||
let mut writer = match output_buffer {
|
let writer = output_type.handle()?;
|
||||||
Some(buf) => OutputHandle::FmtWrite(buf),
|
|
||||||
None => OutputHandle::IoWrite(output_type.handle()?),
|
|
||||||
};
|
|
||||||
let mut no_errors: bool = true;
|
let mut no_errors: bool = true;
|
||||||
let stderr = io::stderr();
|
let stderr = io::stderr();
|
||||||
|
|
||||||
@ -99,24 +82,17 @@ impl<'b> Controller<'b> {
|
|||||||
let identifier = stdout_identifier.as_ref();
|
let identifier = stdout_identifier.as_ref();
|
||||||
let is_first = index == 0;
|
let is_first = index == 0;
|
||||||
let result = if input.is_stdin() {
|
let result = if input.is_stdin() {
|
||||||
self.print_input(input, &mut writer, io::stdin().lock(), identifier, is_first)
|
self.print_input(input, writer, io::stdin().lock(), identifier, is_first)
|
||||||
} else {
|
} else {
|
||||||
// Use dummy stdin since stdin is actually not used (#1902)
|
// Use dummy stdin since stdin is actually not used (#1902)
|
||||||
self.print_input(input, &mut writer, io::empty(), identifier, is_first)
|
self.print_input(input, writer, io::empty(), identifier, is_first)
|
||||||
};
|
};
|
||||||
if let Err(error) = result {
|
if let Err(error) = result {
|
||||||
match writer {
|
|
||||||
// It doesn't make much sense to send errors straight to stderr if the user
|
|
||||||
// provided their own buffer, so we just return it.
|
|
||||||
OutputHandle::FmtWrite(_) => return Err(error),
|
|
||||||
OutputHandle::IoWrite(ref mut writer) => {
|
|
||||||
if attached_to_pager {
|
if attached_to_pager {
|
||||||
handle_error(&error, writer);
|
handle_error(&error, writer);
|
||||||
} else {
|
} else {
|
||||||
handle_error(&error, &mut stderr.lock());
|
handle_error(&error, &mut stderr.lock());
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
no_errors = false;
|
no_errors = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -127,23 +103,12 @@ impl<'b> Controller<'b> {
|
|||||||
fn print_input<R: BufRead>(
|
fn print_input<R: BufRead>(
|
||||||
&self,
|
&self,
|
||||||
input: Input,
|
input: Input,
|
||||||
writer: &mut OutputHandle,
|
writer: &mut dyn Write,
|
||||||
stdin: R,
|
stdin: R,
|
||||||
stdout_identifier: Option<&Identifier>,
|
stdout_identifier: Option<&Identifier>,
|
||||||
is_first: bool,
|
is_first: bool,
|
||||||
) -> Result<()> {
|
) -> Result<()> {
|
||||||
let mut opened_input = {
|
let mut opened_input = input.open(stdin, stdout_identifier)?;
|
||||||
#[cfg(feature = "lessopen")]
|
|
||||||
match self.preprocessor {
|
|
||||||
Some(ref preprocessor) if self.config.use_lessopen => {
|
|
||||||
preprocessor.open(input, stdin, stdout_identifier)?
|
|
||||||
}
|
|
||||||
_ => input.open(stdin, stdout_identifier)?,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(not(feature = "lessopen"))]
|
|
||||||
input.open(stdin, stdout_identifier)?
|
|
||||||
};
|
|
||||||
#[cfg(feature = "git")]
|
#[cfg(feature = "git")]
|
||||||
let line_changes = if self.config.visible_lines.diff_mode()
|
let line_changes = if self.config.visible_lines.diff_mode()
|
||||||
|| (!self.config.loop_through && self.config.style_components.changes())
|
|| (!self.config.loop_through && self.config.style_components.changes())
|
||||||
@ -199,7 +164,7 @@ impl<'b> Controller<'b> {
|
|||||||
fn print_file(
|
fn print_file(
|
||||||
&self,
|
&self,
|
||||||
printer: &mut dyn Printer,
|
printer: &mut dyn Printer,
|
||||||
writer: &mut OutputHandle,
|
writer: &mut dyn Write,
|
||||||
input: &mut OpenedInput,
|
input: &mut OpenedInput,
|
||||||
add_header_padding: bool,
|
add_header_padding: bool,
|
||||||
#[cfg(feature = "git")] line_changes: &Option<LineChanges>,
|
#[cfg(feature = "git")] line_changes: &Option<LineChanges>,
|
||||||
@ -237,7 +202,7 @@ impl<'b> Controller<'b> {
|
|||||||
fn print_file_ranges(
|
fn print_file_ranges(
|
||||||
&self,
|
&self,
|
||||||
printer: &mut dyn Printer,
|
printer: &mut dyn Printer,
|
||||||
writer: &mut OutputHandle,
|
writer: &mut dyn Write,
|
||||||
reader: &mut InputReader,
|
reader: &mut InputReader,
|
||||||
line_ranges: &LineRanges,
|
line_ranges: &LineRanges,
|
||||||
) -> Result<()> {
|
) -> Result<()> {
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#[cfg(feature = "git")]
|
#[cfg(feature = "git")]
|
||||||
use crate::diff::LineChange;
|
use crate::diff::LineChange;
|
||||||
use crate::printer::{Colors, InteractivePrinter};
|
use crate::printer::{Colors, InteractivePrinter};
|
||||||
use nu_ansi_term::Style;
|
use ansi_term::Style;
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
pub(crate) struct DecorationText {
|
pub(crate) struct DecorationText {
|
||||||
@ -46,7 +46,7 @@ impl Decoration for LineNumberDecoration {
|
|||||||
_printer: &InteractivePrinter,
|
_printer: &InteractivePrinter,
|
||||||
) -> DecorationText {
|
) -> DecorationText {
|
||||||
if continuation {
|
if continuation {
|
||||||
if line_number >= self.cached_wrap_invalid_at {
|
if line_number > self.cached_wrap_invalid_at {
|
||||||
let new_width = self.cached_wrap.width + 1;
|
let new_width = self.cached_wrap.width + 1;
|
||||||
return DecorationText {
|
return DecorationText {
|
||||||
text: self.color.paint(" ".repeat(new_width)).to_string(),
|
text: self.color.paint(" ".repeat(new_width)).to_string(),
|
||||||
@ -56,7 +56,7 @@ impl Decoration for LineNumberDecoration {
|
|||||||
|
|
||||||
self.cached_wrap.clone()
|
self.cached_wrap.clone()
|
||||||
} else {
|
} else {
|
||||||
let plain: String = format!("{line_number:4}");
|
let plain: String = format!("{:4}", line_number);
|
||||||
DecorationText {
|
DecorationText {
|
||||||
width: plain.len(),
|
width: plain.len(),
|
||||||
text: self.color.paint(plain).to_string(),
|
text: self.color.paint(plain).to_string(),
|
||||||
|
@ -17,11 +17,11 @@ pub enum LineChange {
|
|||||||
pub type LineChanges = HashMap<u32, LineChange>;
|
pub type LineChanges = HashMap<u32, LineChange>;
|
||||||
|
|
||||||
pub fn get_git_diff(filename: &Path) -> Option<LineChanges> {
|
pub fn get_git_diff(filename: &Path) -> Option<LineChanges> {
|
||||||
let repo = Repository::discover(filename).ok()?;
|
let repo = Repository::discover(&filename).ok()?;
|
||||||
|
|
||||||
let repo_path_absolute = fs::canonicalize(repo.workdir()?).ok()?;
|
let repo_path_absolute = fs::canonicalize(repo.workdir()?).ok()?;
|
||||||
|
|
||||||
let filepath_absolute = fs::canonicalize(filename).ok()?;
|
let filepath_absolute = fs::canonicalize(&filename).ok()?;
|
||||||
let filepath_relative_to_repo = filepath_absolute.strip_prefix(&repo_path_absolute).ok()?;
|
let filepath_relative_to_repo = filepath_absolute.strip_prefix(&repo_path_absolute).ok()?;
|
||||||
|
|
||||||
let mut diff_options = DiffOptions::new();
|
let mut diff_options = DiffOptions::new();
|
||||||
|
15
src/error.rs
15
src/error.rs
@ -2,16 +2,11 @@ use std::io::Write;
|
|||||||
use thiserror::Error;
|
use thiserror::Error;
|
||||||
|
|
||||||
#[derive(Error, Debug)]
|
#[derive(Error, Debug)]
|
||||||
#[non_exhaustive]
|
|
||||||
pub enum Error {
|
pub enum Error {
|
||||||
#[error(transparent)]
|
#[error(transparent)]
|
||||||
Io(#[from] ::std::io::Error),
|
Io(#[from] ::std::io::Error),
|
||||||
#[error(transparent)]
|
#[error(transparent)]
|
||||||
Fmt(#[from] ::std::fmt::Error),
|
SyntectError(#[from] ::syntect::LoadingError),
|
||||||
#[error(transparent)]
|
|
||||||
SyntectError(#[from] ::syntect::Error),
|
|
||||||
#[error(transparent)]
|
|
||||||
SyntectLoadingError(#[from] ::syntect::LoadingError),
|
|
||||||
#[error(transparent)]
|
#[error(transparent)]
|
||||||
ParseIntError(#[from] ::std::num::ParseIntError),
|
ParseIntError(#[from] ::std::num::ParseIntError),
|
||||||
#[error(transparent)]
|
#[error(transparent)]
|
||||||
@ -28,12 +23,6 @@ pub enum Error {
|
|||||||
InvalidPagerValueBat,
|
InvalidPagerValueBat,
|
||||||
#[error("{0}")]
|
#[error("{0}")]
|
||||||
Msg(String),
|
Msg(String),
|
||||||
#[cfg(feature = "lessopen")]
|
|
||||||
#[error(transparent)]
|
|
||||||
VarError(#[from] ::std::env::VarError),
|
|
||||||
#[cfg(feature = "lessopen")]
|
|
||||||
#[error(transparent)]
|
|
||||||
CommandParseError(#[from] ::shell_words::ParseError),
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl From<&'static str> for Error {
|
impl From<&'static str> for Error {
|
||||||
@ -51,7 +40,7 @@ impl From<String> for Error {
|
|||||||
pub type Result<T> = std::result::Result<T, Error>;
|
pub type Result<T> = std::result::Result<T, Error>;
|
||||||
|
|
||||||
pub fn default_error_handler(error: &Error, output: &mut dyn Write) {
|
pub fn default_error_handler(error: &Error, output: &mut dyn Write) {
|
||||||
use nu_ansi_term::Color::Red;
|
use ansi_term::Colour::Red;
|
||||||
|
|
||||||
match error {
|
match error {
|
||||||
Error::Io(ref io_error) if io_error.kind() == ::std::io::ErrorKind::BrokenPipe => {
|
Error::Io(ref io_error) if io_error.kind() == ::std::io::ErrorKind::BrokenPipe => {
|
||||||
|
@ -118,7 +118,7 @@ impl OpenedInput<'_> {
|
|||||||
self.metadata
|
self.metadata
|
||||||
.user_provided_name
|
.user_provided_name
|
||||||
.as_ref()
|
.as_ref()
|
||||||
.or(match self.kind {
|
.or_else(|| match self.kind {
|
||||||
OpenedInputKind::OrdinaryFile(ref path) => Some(path),
|
OpenedInputKind::OrdinaryFile(ref path) => Some(path),
|
||||||
_ => None,
|
_ => None,
|
||||||
})
|
})
|
||||||
@ -197,7 +197,7 @@ impl<'a> Input<'a> {
|
|||||||
InputKind::StdIn => {
|
InputKind::StdIn => {
|
||||||
if let Some(stdout) = stdout_identifier {
|
if let Some(stdout) = stdout_identifier {
|
||||||
let input_identifier = Identifier::try_from(clircle::Stdio::Stdin)
|
let input_identifier = Identifier::try_from(clircle::Stdio::Stdin)
|
||||||
.map_err(|e| format!("Stdin: Error identifying file: {e}"))?;
|
.map_err(|e| format!("Stdin: Error identifying file: {}", e))?;
|
||||||
if stdout.surely_conflicts_with(&input_identifier) {
|
if stdout.surely_conflicts_with(&input_identifier) {
|
||||||
return Err("IO circle detected. The input from stdin is also an output. Aborting to avoid infinite loop.".into());
|
return Err("IO circle detected. The input from stdin is also an output. Aborting to avoid infinite loop.".into());
|
||||||
}
|
}
|
||||||
@ -256,7 +256,7 @@ pub(crate) struct InputReader<'a> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl<'a> InputReader<'a> {
|
impl<'a> InputReader<'a> {
|
||||||
pub(crate) fn new<R: BufRead + 'a>(mut reader: R) -> InputReader<'a> {
|
fn new<R: BufRead + 'a>(mut reader: R) -> InputReader<'a> {
|
||||||
let mut first_line = vec![];
|
let mut first_line = vec![];
|
||||||
reader.read_until(b'\n', &mut first_line).ok();
|
reader.read_until(b'\n', &mut first_line).ok();
|
||||||
|
|
||||||
|
65
src/less.rs
65
src/less.rs
@ -3,38 +3,21 @@
|
|||||||
use std::ffi::OsStr;
|
use std::ffi::OsStr;
|
||||||
use std::process::Command;
|
use std::process::Command;
|
||||||
|
|
||||||
#[derive(Debug, PartialEq, Eq)]
|
pub fn retrieve_less_version(less_path: &dyn AsRef<OsStr>) -> Option<usize> {
|
||||||
pub enum LessVersion {
|
|
||||||
Less(usize),
|
|
||||||
BusyBox,
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn retrieve_less_version(less_path: &dyn AsRef<OsStr>) -> Option<LessVersion> {
|
|
||||||
let resolved_path = grep_cli::resolve_binary(less_path.as_ref()).ok()?;
|
let resolved_path = grep_cli::resolve_binary(less_path.as_ref()).ok()?;
|
||||||
|
|
||||||
let cmd = Command::new(resolved_path).arg("--version").output().ok()?;
|
let cmd = Command::new(resolved_path).arg("--version").output().ok()?;
|
||||||
if cmd.status.success() {
|
|
||||||
parse_less_version(&cmd.stdout)
|
parse_less_version(&cmd.stdout)
|
||||||
} else {
|
|
||||||
parse_less_version_busybox(&cmd.stderr)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn parse_less_version(output: &[u8]) -> Option<LessVersion> {
|
fn parse_less_version(output: &[u8]) -> Option<usize> {
|
||||||
if !output.starts_with(b"less ") {
|
if !output.starts_with(b"less ") {
|
||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
|
|
||||||
let version = std::str::from_utf8(&output[5..]).ok()?;
|
let version = std::str::from_utf8(&output[5..]).ok()?;
|
||||||
let end = version.find(|c: char| !c.is_ascii_digit())?;
|
let end = version.find(|c: char| !c.is_ascii_digit())?;
|
||||||
Some(LessVersion::Less(version[..end].parse::<usize>().ok()?))
|
version[..end].parse::<usize>().ok()
|
||||||
}
|
|
||||||
|
|
||||||
fn parse_less_version_busybox(output: &[u8]) -> Option<LessVersion> {
|
|
||||||
match std::str::from_utf8(output) {
|
|
||||||
Ok(version) if version.contains("BusyBox ") => Some(LessVersion::BusyBox),
|
|
||||||
_ => None,
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
@ -47,7 +30,7 @@ For information about the terms of redistribution,
|
|||||||
see the file named README in the less distribution.
|
see the file named README in the less distribution.
|
||||||
Homepage: http://www.greenwoodsoftware.com/less";
|
Homepage: http://www.greenwoodsoftware.com/less";
|
||||||
|
|
||||||
assert_eq!(Some(LessVersion::Less(487)), parse_less_version(output));
|
assert_eq!(Some(487), parse_less_version(output));
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
@ -60,7 +43,7 @@ For information about the terms of redistribution,
|
|||||||
see the file named README in the less distribution.
|
see the file named README in the less distribution.
|
||||||
Homepage: http://www.greenwoodsoftware.com/less";
|
Homepage: http://www.greenwoodsoftware.com/less";
|
||||||
|
|
||||||
assert_eq!(Some(LessVersion::Less(529)), parse_less_version(output));
|
assert_eq!(Some(529), parse_less_version(output));
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
@ -73,7 +56,7 @@ For information about the terms of redistribution,
|
|||||||
see the file named README in the less distribution.
|
see the file named README in the less distribution.
|
||||||
Home page: http://www.greenwoodsoftware.com/less";
|
Home page: http://www.greenwoodsoftware.com/less";
|
||||||
|
|
||||||
assert_eq!(Some(LessVersion::Less(551)), parse_less_version(output));
|
assert_eq!(Some(551), parse_less_version(output));
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
@ -86,7 +69,7 @@ For information about the terms of redistribution,
|
|||||||
see the file named README in the less distribution.
|
see the file named README in the less distribution.
|
||||||
Home page: https://greenwoodsoftware.com/less";
|
Home page: https://greenwoodsoftware.com/less";
|
||||||
|
|
||||||
assert_eq!(Some(LessVersion::Less(581)), parse_less_version(output));
|
assert_eq!(Some(581), parse_less_version(output));
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
@ -94,38 +77,4 @@ fn test_parse_less_version_wrong_program() {
|
|||||||
let output = b"more from util-linux 2.34";
|
let output = b"more from util-linux 2.34";
|
||||||
|
|
||||||
assert_eq!(None, parse_less_version(output));
|
assert_eq!(None, parse_less_version(output));
|
||||||
assert_eq!(None, parse_less_version_busybox(output));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_parse_less_version_busybox() {
|
|
||||||
let output = b"pkg/less: unrecognized option '--version'
|
|
||||||
BusyBox v1.35.0 (2022-04-21 10:38:11 EDT) multi-call binary.
|
|
||||||
|
|
||||||
Usage: less [-EFIMmNSRh~] [FILE]...
|
|
||||||
|
|
||||||
View FILE (or stdin) one screenful at a time
|
|
||||||
|
|
||||||
-E Quit once the end of a file is reached
|
|
||||||
-F Quit if entire file fits on first screen
|
|
||||||
-I Ignore case in all searches
|
|
||||||
-M,-m Display status line with line numbers
|
|
||||||
and percentage through the file
|
|
||||||
-N Prefix line number to each line
|
|
||||||
-S Truncate long lines
|
|
||||||
-R Remove color escape codes in input
|
|
||||||
-~ Suppress ~s displayed past EOF";
|
|
||||||
|
|
||||||
assert_eq!(
|
|
||||||
Some(LessVersion::BusyBox),
|
|
||||||
parse_less_version_busybox(output)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_parse_less_version_invalid_utf_8() {
|
|
||||||
let output = b"\xff";
|
|
||||||
|
|
||||||
assert_eq!(None, parse_less_version(output));
|
|
||||||
assert_eq!(None, parse_less_version_busybox(output));
|
|
||||||
}
|
}
|
||||||
|
401
src/lessopen.rs
401
src/lessopen.rs
@ -1,401 +0,0 @@
|
|||||||
#![cfg(feature = "lessopen")]
|
|
||||||
|
|
||||||
use std::convert::TryFrom;
|
|
||||||
use std::env;
|
|
||||||
use std::fs::File;
|
|
||||||
use std::io::{BufRead, BufReader, Cursor, Read, Write};
|
|
||||||
use std::path::PathBuf;
|
|
||||||
use std::str;
|
|
||||||
|
|
||||||
use clircle::{Clircle, Identifier};
|
|
||||||
use os_str_bytes::RawOsString;
|
|
||||||
use run_script::{IoOptions, ScriptOptions};
|
|
||||||
|
|
||||||
use crate::error::Result;
|
|
||||||
use crate::{
|
|
||||||
bat_warning,
|
|
||||||
input::{Input, InputKind, InputReader, OpenedInput, OpenedInputKind},
|
|
||||||
};
|
|
||||||
|
|
||||||
/// Preprocess files and/or stdin using $LESSOPEN and $LESSCLOSE
|
|
||||||
pub(crate) struct LessOpenPreprocessor {
|
|
||||||
lessopen: String,
|
|
||||||
lessclose: Option<String>,
|
|
||||||
command_options: ScriptOptions,
|
|
||||||
kind: LessOpenKind,
|
|
||||||
/// Whether or not data piped via stdin is to be preprocessed
|
|
||||||
preprocess_stdin: bool,
|
|
||||||
}
|
|
||||||
|
|
||||||
enum LessOpenKind {
|
|
||||||
Piped,
|
|
||||||
PipedIgnoreExitCode,
|
|
||||||
TempFile,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl LessOpenPreprocessor {
|
|
||||||
/// Create a new instance of LessOpenPreprocessor
|
|
||||||
/// Will return Ok if and only if $LESSOPEN is set and contains exactly one %s
|
|
||||||
pub(crate) fn new() -> Result<LessOpenPreprocessor> {
|
|
||||||
let lessopen = env::var("LESSOPEN")?;
|
|
||||||
|
|
||||||
// Ignore $LESSOPEN if it does not contains exactly one %s
|
|
||||||
// Note that $LESSCLOSE has no such requirement
|
|
||||||
if lessopen.match_indices("%s").count() != 1 {
|
|
||||||
let error_msg = "LESSOPEN ignored: must contain exactly one %s";
|
|
||||||
bat_warning!("{}", error_msg);
|
|
||||||
return Err(error_msg.into());
|
|
||||||
}
|
|
||||||
|
|
||||||
// "||" means pipe directly to bat without making a temporary file
|
|
||||||
// Also, if preprocessor output is empty and exit code is zero, use the empty output
|
|
||||||
// Otherwise, if output is empty and exit code is nonzero, use original file contents
|
|
||||||
let (kind, lessopen) = if lessopen.starts_with("||") {
|
|
||||||
(LessOpenKind::Piped, lessopen.chars().skip(2).collect())
|
|
||||||
// "|" means pipe, but ignore exit code, always using preprocessor output
|
|
||||||
} else if lessopen.starts_with('|') {
|
|
||||||
(
|
|
||||||
LessOpenKind::PipedIgnoreExitCode,
|
|
||||||
lessopen.chars().skip(1).collect(),
|
|
||||||
)
|
|
||||||
// If neither appear, write output to a temporary file and read from that
|
|
||||||
} else {
|
|
||||||
(LessOpenKind::TempFile, lessopen)
|
|
||||||
};
|
|
||||||
|
|
||||||
// "-" means that stdin is preprocessed along with files and may appear alongside "|" and "||"
|
|
||||||
let (stdin, lessopen) = if lessopen.starts_with('-') {
|
|
||||||
(true, lessopen.chars().skip(1).collect())
|
|
||||||
} else {
|
|
||||||
(false, lessopen)
|
|
||||||
};
|
|
||||||
|
|
||||||
let mut command_options = ScriptOptions::new();
|
|
||||||
command_options.runner = env::var("SHELL").ok();
|
|
||||||
command_options.input_redirection = IoOptions::Pipe;
|
|
||||||
|
|
||||||
Ok(Self {
|
|
||||||
lessopen: lessopen.replacen("%s", "$1", 1),
|
|
||||||
lessclose: env::var("LESSCLOSE")
|
|
||||||
.ok()
|
|
||||||
.map(|str| str.replacen("%s", "$1", 1).replacen("%s", "$2", 1)),
|
|
||||||
command_options,
|
|
||||||
kind,
|
|
||||||
preprocess_stdin: stdin,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
pub(crate) fn open<'a, R: BufRead + 'a>(
|
|
||||||
&self,
|
|
||||||
input: Input<'a>,
|
|
||||||
mut stdin: R,
|
|
||||||
stdout_identifier: Option<&Identifier>,
|
|
||||||
) -> Result<OpenedInput<'a>> {
|
|
||||||
let (lessopen_stdout, path_str, kind) = match input.kind {
|
|
||||||
InputKind::OrdinaryFile(ref path) => {
|
|
||||||
let path_str = match path.to_str() {
|
|
||||||
Some(str) => str,
|
|
||||||
None => return input.open(stdin, stdout_identifier),
|
|
||||||
};
|
|
||||||
|
|
||||||
let (exit_code, lessopen_stdout, _) = match run_script::run(
|
|
||||||
&self.lessopen,
|
|
||||||
&vec![path_str.to_string()],
|
|
||||||
&self.command_options,
|
|
||||||
) {
|
|
||||||
Ok(output) => output,
|
|
||||||
Err(_) => return input.open(stdin, stdout_identifier),
|
|
||||||
};
|
|
||||||
|
|
||||||
if self.fall_back_to_original_file(&lessopen_stdout, exit_code) {
|
|
||||||
return input.open(stdin, stdout_identifier);
|
|
||||||
}
|
|
||||||
|
|
||||||
(
|
|
||||||
RawOsString::from_string(lessopen_stdout),
|
|
||||||
path_str.to_string(),
|
|
||||||
OpenedInputKind::OrdinaryFile(path.to_path_buf()),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
InputKind::StdIn => {
|
|
||||||
if self.preprocess_stdin {
|
|
||||||
if let Some(stdout) = stdout_identifier {
|
|
||||||
let input_identifier = Identifier::try_from(clircle::Stdio::Stdin)
|
|
||||||
.map_err(|e| format!("Stdin: Error identifying file: {}", e))?;
|
|
||||||
if stdout.surely_conflicts_with(&input_identifier) {
|
|
||||||
return Err("IO circle detected. The input from stdin is also an output. Aborting to avoid infinite loop.".into());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// stdin isn't Clone, so copy it to a cloneable buffer
|
|
||||||
let mut stdin_buffer = Vec::new();
|
|
||||||
stdin.read_to_end(&mut stdin_buffer).unwrap();
|
|
||||||
|
|
||||||
let mut lessopen_handle = match run_script::spawn(
|
|
||||||
&self.lessopen,
|
|
||||||
&vec!["-".to_string()],
|
|
||||||
&self.command_options,
|
|
||||||
) {
|
|
||||||
Ok(handle) => handle,
|
|
||||||
Err(_) => {
|
|
||||||
return input.open(stdin, stdout_identifier);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
if lessopen_handle
|
|
||||||
.stdin
|
|
||||||
.as_mut()
|
|
||||||
.unwrap()
|
|
||||||
.write_all(&stdin_buffer.clone())
|
|
||||||
.is_err()
|
|
||||||
{
|
|
||||||
return input.open(stdin, stdout_identifier);
|
|
||||||
}
|
|
||||||
|
|
||||||
let lessopen_output = match lessopen_handle.wait_with_output() {
|
|
||||||
Ok(output) => output,
|
|
||||||
Err(_) => {
|
|
||||||
return input.open(Cursor::new(stdin_buffer), stdout_identifier);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
if lessopen_output.stdout.is_empty()
|
|
||||||
&& (!lessopen_output.status.success()
|
|
||||||
|| matches!(self.kind, LessOpenKind::PipedIgnoreExitCode))
|
|
||||||
{
|
|
||||||
return input.open(Cursor::new(stdin_buffer), stdout_identifier);
|
|
||||||
}
|
|
||||||
|
|
||||||
(
|
|
||||||
RawOsString::assert_from_raw_vec(lessopen_output.stdout),
|
|
||||||
"-".to_string(),
|
|
||||||
OpenedInputKind::StdIn,
|
|
||||||
)
|
|
||||||
} else {
|
|
||||||
return input.open(stdin, stdout_identifier);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
InputKind::CustomReader(_) => {
|
|
||||||
return input.open(stdin, stdout_identifier);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
Ok(OpenedInput {
|
|
||||||
kind,
|
|
||||||
reader: InputReader::new(BufReader::new(
|
|
||||||
if matches!(self.kind, LessOpenKind::TempFile) {
|
|
||||||
// Remove newline at end of temporary file path returned by $LESSOPEN
|
|
||||||
let stdout = match lessopen_stdout.strip_suffix("\n") {
|
|
||||||
Some(stripped) => stripped.to_owned(),
|
|
||||||
None => lessopen_stdout,
|
|
||||||
};
|
|
||||||
|
|
||||||
let stdout = stdout.into_os_string();
|
|
||||||
|
|
||||||
let file = match File::open(PathBuf::from(&stdout)) {
|
|
||||||
Ok(file) => file,
|
|
||||||
Err(_) => {
|
|
||||||
return input.open(stdin, stdout_identifier);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
Preprocessed {
|
|
||||||
kind: PreprocessedKind::TempFile(file),
|
|
||||||
lessclose: self.lessclose.clone(),
|
|
||||||
command_args: vec![path_str, stdout.to_str().unwrap().to_string()],
|
|
||||||
command_options: self.command_options.clone(),
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
Preprocessed {
|
|
||||||
kind: PreprocessedKind::Piped(Cursor::new(lessopen_stdout.into_raw_vec())),
|
|
||||||
lessclose: self.lessclose.clone(),
|
|
||||||
command_args: vec![path_str, "-".to_string()],
|
|
||||||
command_options: self.command_options.clone(),
|
|
||||||
}
|
|
||||||
},
|
|
||||||
)),
|
|
||||||
metadata: input.metadata,
|
|
||||||
description: input.description,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
fn fall_back_to_original_file(&self, lessopen_output: &str, exit_code: i32) -> bool {
|
|
||||||
lessopen_output.is_empty()
|
|
||||||
&& (exit_code != 0 || matches!(self.kind, LessOpenKind::PipedIgnoreExitCode))
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
/// For testing purposes only
|
|
||||||
/// Create an instance of LessOpenPreprocessor with specified valued for $LESSOPEN and $LESSCLOSE
|
|
||||||
fn mock_new(lessopen: Option<&str>, lessclose: Option<&str>) -> Result<LessOpenPreprocessor> {
|
|
||||||
if let Some(command) = lessopen {
|
|
||||||
env::set_var("LESSOPEN", command)
|
|
||||||
} else {
|
|
||||||
env::remove_var("LESSOPEN")
|
|
||||||
}
|
|
||||||
|
|
||||||
if let Some(command) = lessclose {
|
|
||||||
env::set_var("LESSCLOSE", command)
|
|
||||||
} else {
|
|
||||||
env::remove_var("LESSCLOSE")
|
|
||||||
}
|
|
||||||
|
|
||||||
Self::new()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
enum PreprocessedKind {
|
|
||||||
Piped(Cursor<Vec<u8>>),
|
|
||||||
TempFile(File),
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Read for PreprocessedKind {
|
|
||||||
fn read(&mut self, buf: &mut [u8]) -> std::result::Result<usize, std::io::Error> {
|
|
||||||
match self {
|
|
||||||
PreprocessedKind::Piped(data) => data.read(buf),
|
|
||||||
PreprocessedKind::TempFile(data) => data.read(buf),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub struct Preprocessed {
|
|
||||||
kind: PreprocessedKind,
|
|
||||||
lessclose: Option<String>,
|
|
||||||
command_args: Vec<String>,
|
|
||||||
command_options: ScriptOptions,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Read for Preprocessed {
|
|
||||||
fn read(&mut self, buf: &mut [u8]) -> std::result::Result<usize, std::io::Error> {
|
|
||||||
self.kind.read(buf)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Drop for Preprocessed {
|
|
||||||
fn drop(&mut self) {
|
|
||||||
if let Some(ref command) = self.lessclose {
|
|
||||||
self.command_options.output_redirection = IoOptions::Inherit;
|
|
||||||
|
|
||||||
run_script::run(command, &self.command_args, &self.command_options)
|
|
||||||
.expect("failed to run $LESSCLOSE to clean up file");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
mod tests {
|
|
||||||
// All tests here are serial because they all involve reading and writing environment variables
|
|
||||||
// Running them in parallel causes these tests and some others to randomly fail
|
|
||||||
use serial_test::serial;
|
|
||||||
|
|
||||||
use super::*;
|
|
||||||
|
|
||||||
/// Reset environment variables after each test as a precaution
|
|
||||||
fn reset_env_vars() {
|
|
||||||
env::remove_var("LESSOPEN");
|
|
||||||
env::remove_var("LESSCLOSE");
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
#[serial]
|
|
||||||
fn test_just_lessopen() -> Result<()> {
|
|
||||||
let preprocessor = LessOpenPreprocessor::mock_new(Some("|batpipe %s"), None)?;
|
|
||||||
|
|
||||||
assert_eq!(preprocessor.lessopen, "batpipe $1");
|
|
||||||
assert!(preprocessor.lessclose.is_none());
|
|
||||||
|
|
||||||
reset_env_vars();
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
#[serial]
|
|
||||||
fn test_just_lessclose() -> Result<()> {
|
|
||||||
let preprocessor = LessOpenPreprocessor::mock_new(None, Some("lessclose.sh %s %s"));
|
|
||||||
|
|
||||||
assert!(preprocessor.is_err());
|
|
||||||
|
|
||||||
reset_env_vars();
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
#[serial]
|
|
||||||
fn test_both_lessopen_and_lessclose() -> Result<()> {
|
|
||||||
let preprocessor =
|
|
||||||
LessOpenPreprocessor::mock_new(Some("lessopen.sh %s"), Some("lessclose.sh %s %s"))?;
|
|
||||||
|
|
||||||
assert_eq!(preprocessor.lessopen, "lessopen.sh $1");
|
|
||||||
assert_eq!(preprocessor.lessclose.unwrap(), "lessclose.sh $1 $2");
|
|
||||||
|
|
||||||
reset_env_vars();
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
#[serial]
|
|
||||||
fn test_lessopen_prefixes() -> Result<()> {
|
|
||||||
let preprocessor = LessOpenPreprocessor::mock_new(Some("batpipe %s"), None)?;
|
|
||||||
|
|
||||||
assert_eq!(preprocessor.lessopen, "batpipe $1");
|
|
||||||
assert!(matches!(preprocessor.kind, LessOpenKind::TempFile));
|
|
||||||
assert!(!preprocessor.preprocess_stdin);
|
|
||||||
|
|
||||||
let preprocessor = LessOpenPreprocessor::mock_new(Some("|batpipe %s"), None)?;
|
|
||||||
|
|
||||||
assert_eq!(preprocessor.lessopen, "batpipe $1");
|
|
||||||
assert!(matches!(
|
|
||||||
preprocessor.kind,
|
|
||||||
LessOpenKind::PipedIgnoreExitCode
|
|
||||||
));
|
|
||||||
assert!(!preprocessor.preprocess_stdin);
|
|
||||||
|
|
||||||
let preprocessor = LessOpenPreprocessor::mock_new(Some("||batpipe %s"), None)?;
|
|
||||||
|
|
||||||
assert_eq!(preprocessor.lessopen, "batpipe $1");
|
|
||||||
assert!(matches!(preprocessor.kind, LessOpenKind::Piped));
|
|
||||||
assert!(!preprocessor.preprocess_stdin);
|
|
||||||
|
|
||||||
let preprocessor = LessOpenPreprocessor::mock_new(Some("-batpipe %s"), None)?;
|
|
||||||
|
|
||||||
assert_eq!(preprocessor.lessopen, "batpipe $1");
|
|
||||||
assert!(matches!(preprocessor.kind, LessOpenKind::TempFile));
|
|
||||||
assert!(preprocessor.preprocess_stdin);
|
|
||||||
|
|
||||||
let preprocessor = LessOpenPreprocessor::mock_new(Some("|-batpipe %s"), None)?;
|
|
||||||
|
|
||||||
assert_eq!(preprocessor.lessopen, "batpipe $1");
|
|
||||||
assert!(matches!(
|
|
||||||
preprocessor.kind,
|
|
||||||
LessOpenKind::PipedIgnoreExitCode
|
|
||||||
));
|
|
||||||
assert!(preprocessor.preprocess_stdin);
|
|
||||||
|
|
||||||
let preprocessor = LessOpenPreprocessor::mock_new(Some("||-batpipe %s"), None)?;
|
|
||||||
|
|
||||||
assert_eq!(preprocessor.lessopen, "batpipe $1");
|
|
||||||
assert!(matches!(preprocessor.kind, LessOpenKind::Piped));
|
|
||||||
assert!(preprocessor.preprocess_stdin);
|
|
||||||
|
|
||||||
reset_env_vars();
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
#[serial]
|
|
||||||
fn replace_part_of_argument() -> Result<()> {
|
|
||||||
let preprocessor =
|
|
||||||
LessOpenPreprocessor::mock_new(Some("|echo File:%s"), Some("echo File:%s Temp:%s"))?;
|
|
||||||
|
|
||||||
assert_eq!(preprocessor.lessopen, "echo File:$1");
|
|
||||||
assert_eq!(preprocessor.lessclose.unwrap(), "echo File:$1 Temp:$2");
|
|
||||||
|
|
||||||
reset_env_vars();
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
}
|
|
@ -34,10 +34,7 @@ mod diff;
|
|||||||
pub mod error;
|
pub mod error;
|
||||||
pub mod input;
|
pub mod input;
|
||||||
mod less;
|
mod less;
|
||||||
#[cfg(feature = "lessopen")]
|
|
||||||
mod lessopen;
|
|
||||||
pub mod line_range;
|
pub mod line_range;
|
||||||
pub(crate) mod nonprintable_notation;
|
|
||||||
mod output;
|
mod output;
|
||||||
#[cfg(feature = "paging")]
|
#[cfg(feature = "paging")]
|
||||||
mod pager;
|
mod pager;
|
||||||
@ -52,9 +49,7 @@ mod terminal;
|
|||||||
mod vscreen;
|
mod vscreen;
|
||||||
pub(crate) mod wrapping;
|
pub(crate) mod wrapping;
|
||||||
|
|
||||||
pub use nonprintable_notation::NonprintableNotation;
|
pub use pretty_printer::{Input, PrettyPrinter};
|
||||||
pub use preprocessor::StripAnsiMode;
|
|
||||||
pub use pretty_printer::{Input, PrettyPrinter, Syntax};
|
|
||||||
pub use syntax_mapping::{MappingTarget, SyntaxMapping};
|
pub use syntax_mapping::{MappingTarget, SyntaxMapping};
|
||||||
pub use wrapping::WrappingMode;
|
pub use wrapping::WrappingMode;
|
||||||
|
|
||||||
|
@ -53,7 +53,7 @@ impl LineRange {
|
|||||||
let more_lines = &line_numbers[1][1..]
|
let more_lines = &line_numbers[1][1..]
|
||||||
.parse()
|
.parse()
|
||||||
.map_err(|_| "Invalid character after +")?;
|
.map_err(|_| "Invalid character after +")?;
|
||||||
new_range.lower.saturating_add(*more_lines)
|
new_range.lower + more_lines
|
||||||
} else if first_byte == Some(b'-') {
|
} else if first_byte == Some(b'-') {
|
||||||
// this will prevent values like "-+5" even though "+5" is valid integer
|
// this will prevent values like "-+5" even though "+5" is valid integer
|
||||||
if line_numbers[1][1..].bytes().next() == Some(b'+') {
|
if line_numbers[1][1..].bytes().next() == Some(b'+') {
|
||||||
@ -128,13 +128,6 @@ fn test_parse_plus() {
|
|||||||
assert_eq!(50, range.upper);
|
assert_eq!(50, range.upper);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_parse_plus_overflow() {
|
|
||||||
let range = LineRange::from(&format!("{}:+1", usize::MAX)).expect("Shouldn't fail on test!");
|
|
||||||
assert_eq!(usize::MAX, range.lower);
|
|
||||||
assert_eq!(usize::MAX, range.upper);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_parse_plus_fail() {
|
fn test_parse_plus_fail() {
|
||||||
let range = LineRange::from("40:+z");
|
let range = LineRange::from("40:+z");
|
||||||
@ -175,7 +168,7 @@ fn test_parse_minus_fail() {
|
|||||||
assert!(range.is_err());
|
assert!(range.is_err());
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
|
#[derive(Copy, Clone, Debug, PartialEq)]
|
||||||
pub enum RangeCheckResult {
|
pub enum RangeCheckResult {
|
||||||
// Within one of the given ranges
|
// Within one of the given ranges
|
||||||
InRange,
|
InRange,
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#[macro_export]
|
#[macro_export]
|
||||||
macro_rules! bat_warning {
|
macro_rules! bat_warning {
|
||||||
($($arg:tt)*) => ({
|
($($arg:tt)*) => ({
|
||||||
use nu_ansi_term::Color::Yellow;
|
use ansi_term::Colour::Yellow;
|
||||||
eprintln!("{}: {}", Yellow.paint("[bat warning]"), format!($($arg)*));
|
eprintln!("{}: {}", Yellow.paint("[bat warning]"), format!($($arg)*));
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user