Experiment: remove CARGO_TEST_OPTIONS

In principle, this *could* work. `cargo cross` runs the tests via QEMU. For integration tests, the only difficulty is that we run `bat` from within the tests. But maybe this is handled by assert_cmd.
2025-09-01 19:02:22 +01:00 · 2021-08-22 16:31:41 +02:00
436 changed files with 4401 additions and 31882 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -7,26 +7,9 @@ assignees: ''

 ---

-<!--
+<!-- Hey there, thank you for creating an issue! -->

-Hey there, thank you for reporting a bug!
-
-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?**
+**Describe the bug you encountered:**

 ...

--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -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. -->
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -16,9 +16,3 @@ updates:
    interval: monthly
    time: "04:00"
    timezone: Europe/Berlin
- package-ecosystem: "github-actions"
-  directory: "/"
-  schedule:
-    interval: monthly
-    time: "04:00"
-    timezone: Europe/Berlin
--- a/.github/workflows/Auto-merge-dependabot-PRs.yml
+++ b/.github/workflows/Auto-merge-dependabot-PRs.yml
@@ -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 }}
--- a/.github/workflows/CICD.yml
+++ b/.github/workflows/CICD.yml
@@ -1,8 +1,8 @@
 name: CICD

 env:
+  MIN_SUPPORTED_RUST_VERSION: "1.45.0"
  CICD_INTERMEDIATES_DIR: "_cicd-intermediates"
-  MSRV_FEATURES: --no-default-features --features minimal-application,bugreport,build-assets

 on:
  workflow_dispatch:
@@ -14,171 +14,108 @@ on:
      - '*'

 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:
-    name: Ensure 'cargo fmt' has been run
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: dtolnay/rust-toolchain@stable
-      with:
-        components: rustfmt
-    - uses: actions/checkout@v4
-    - 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
+      uses: actions/checkout@v2

-    - name: Install rust toolchain (v${{ needs.crate_metadata.outputs.msrv }})
-      uses: dtolnay/rust-toolchain@master
+    - name: Install rust toolchain (v${{ env.MIN_SUPPORTED_RUST_VERSION }})
+      uses: actions-rs/toolchain@v1
      with:
-        toolchain: ${{ needs.crate_metadata.outputs.msrv }}
-        components: clippy
+        toolchain: ${{ env.MIN_SUPPORTED_RUST_VERSION }}
+        default: true
+        profile: minimal # minimal component installation (ie, no documentation)
+        components: clippy, rustfmt
+    - name: Ensure `cargo fmt` has been run
+      uses: actions-rs/cargo@v1
+      with:
+        command: fmt
+        args: -- --check
    - 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:
-    name: License checks
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v4
+      uses: actions-rs/cargo@v1
      with:
-        submodules: true # we especially want to perform license checks on submodules
-    - run: tests/scripts/license-checks.sh
+        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:
    name: Run tests with updated syntaxes and themes
    runs-on: ubuntu-20.04
    steps:
    - name: Git checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v2
      with:
        submodules: true # we need all syntax and theme submodules
    - 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
-      run: cargo install --locked --path .
+      uses: actions-rs/cargo@v1
+      with:
+        command: install
+        args: --locked --path .
    - name: Rebuild binary assets (syntaxes and themes)
      run: bash assets/create.sh
    - 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
-      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
-      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
      run: tests/syntax-tests/regression_test.sh
    - name: List of languages
      run: bat --list-languages
    - name: List of themes
      run: bat --list-themes
-    - name: Test custom assets
-      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:
-    name: Documentation
-    runs-on: ubuntu-20.04
-    steps:
-    - name: Git checkout
-      uses: actions/checkout@v4
-    - name: Install Rust toolchain
-      uses: dtolnay/rust-toolchain@stable
    - name: Check documentation
      env:
        RUSTDOCFLAGS: -D warnings
-      run: cargo doc --locked --no-deps --document-private-items --all-features
-    - name: Show man page
-      run: man $(find . -name bat.1)
-
-  cargo-audit:
-    name: cargo audit
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - run: cargo audit
+      uses: actions-rs/cargo@v1
+      with:
+        command: doc
+        args: --locked --no-deps --document-private-items --all-features

  build:
-    name: ${{ matrix.job.target }} (${{ matrix.job.os }})
+    name: ${{ matrix.job.os }} (${{ matrix.job.target }})
    runs-on: ${{ matrix.job.os }}
-    needs: crate_metadata
    strategy:
      fail-fast: false
      matrix:
        job:
-          - { target: aarch64-unknown-linux-gnu   , os: ubuntu-20.04, dpkg_arch: arm64,            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, dpkg_arch: musl-linux-armhf, use-cross: true }
-          - { target: i686-pc-windows-msvc        , os: windows-2019,                                              }
-          - { target: i686-unknown-linux-gnu      , os: ubuntu-20.04, dpkg_arch: i686,             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-12,                                                  }
-          - { target: x86_64-pc-windows-gnu       , os: windows-2019,                                              }
-          - { target: x86_64-pc-windows-msvc      , os: windows-2019,                                              }
-          - { 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
+          - { os: ubuntu-20.04, target: arm-unknown-linux-gnueabihf , use-cross: true }
+          - { os: ubuntu-20.04, target: arm-unknown-linux-musleabihf, use-cross: true }
+          - { os: ubuntu-20.04, target: aarch64-unknown-linux-gnu   , use-cross: true }
+          - { os: ubuntu-20.04, target: i686-unknown-linux-gnu      , use-cross: true }
+          - { os: ubuntu-20.04, target: i686-unknown-linux-musl     , use-cross: true }
+          - { os: ubuntu-20.04, target: x86_64-unknown-linux-gnu    }
+          - { os: ubuntu-20.04, target: x86_64-unknown-linux-musl   , use-cross: true }
+          - { os: macos-10.15 , target: x86_64-apple-darwin         }
+          # - { os: windows-2019, target: i686-pc-windows-gnu         }  ## disabled; error: linker `i686-w64-mingw32-gcc` not found
+          - { os: windows-2019, target: i686-pc-windows-msvc        }
+          - { os: windows-2019, target: x86_64-pc-windows-gnu       }
+          - { os: windows-2019, target: x86_64-pc-windows-msvc      }
    steps:
    - name: Checkout source code
-      uses: actions/checkout@v4
+      uses: actions/checkout@v2

    - name: Install prerequisites
      shell: bash
@@ -188,21 +125,21 @@ jobs:
          aarch64-unknown-linux-gnu) sudo apt-get -y update ; sudo apt-get -y install gcc-aarch64-linux-gnu ;;
        esac

-    - name: Install Rust toolchain
-      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
+    - name: Extract crate information
      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)
      shell: bash
@@ -215,11 +152,14 @@ jobs:
        rustc -V

    - name: Build
-      shell: bash
-      run: $BUILD_CMD build --locked --release --target=${{ matrix.job.target }}
+      uses: actions-rs/cargo@v1
+      with:
+        use-cross: ${{ matrix.job.use-cross }}
+        command: build
+        args: --locked --release --target=${{ matrix.job.target }}

-    - name: Set binary name & path
-      id: bin
+    - name: Strip debug information from executable
+      id: strip
      shell: bash
      run: |
        # Figure out suffix of binary
@@ -228,69 +168,96 @@ jobs:
          *-pc-windows-*) EXE_suffix=".exe" ;;
        esac;

+        # Figure out what strip tool to use if any
+        STRIP="strip"
+        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;
+
        # Setup paths
-        BIN_NAME="${{ needs.crate_metadata.outputs.name }}${EXE_suffix}"
-        BIN_PATH="target/${{ matrix.job.target }}/release/${BIN_NAME}"
+        BIN_DIR="${{ env.CICD_INTERMEDIATES_DIR }}/stripped-release-bin/"
+        mkdir -p "${BIN_DIR}"
+        BIN_NAME="${{ env.PROJECT_NAME }}${EXE_suffix}"
+        BIN_PATH="${BIN_DIR}/${BIN_NAME}"

-        # Let subsequent steps know where to find the binary
-        echo "BIN_PATH=${BIN_PATH}" >> $GITHUB_OUTPUT
-        echo "BIN_NAME=${BIN_NAME}" >> $GITHUB_OUTPUT
+        # Copy the release build binary to the result location
+        cp "target/${{ matrix.job.target }}/release/${BIN_NAME}" "${BIN_DIR}"

-    - name: Set testing options
-      id: test-options
-      shell: bash
-      run: |
-        # test only library unit tests and binary for arm-type targets
-        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;
-        echo "CARGO_TEST_OPTIONS=${CARGO_TEST_OPTIONS}" >> $GITHUB_OUTPUT
-
-    - name: Run tests
-      shell: bash
-      run: |
-        if [[ ${{ matrix.job.os }} = windows-* ]]
-        then
-          powershell.exe -command "$BUILD_CMD test --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}}
+        # 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: Run tests
+      uses: actions-rs/cargo@v1
+      with:
+        use-cross: ${{ matrix.job.use-cross }}
+        command: test
+        args: --locked --target=${{ matrix.job.target }}
+
    - name: Run bat
-      shell: bash
-      run: $BUILD_CMD run --locked --target=${{ matrix.job.target }} -- --paging=never --color=always --theme=ansi Cargo.toml src/config.rs
+      uses: actions-rs/cargo@v1
+      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)
-      shell: bash
-      run: $BUILD_CMD run --locked --target=${{ matrix.job.target }} -- --paging=never --color=always --theme=ansi Cargo.toml src/config.rs --diagnostic
+      uses: actions-rs/cargo@v1
+      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"
-      shell: bash
-      run: $BUILD_CMD check --locked --target=${{ matrix.job.target }} --verbose --lib --no-default-features --features regex-onig
+      uses: actions-rs/cargo@v1
+      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"
-      shell: bash
-      run: $BUILD_CMD check --locked --target=${{ matrix.job.target }} --verbose --lib --no-default-features --features regex-onig,git
+      uses: actions-rs/cargo@v1
+      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"
-      shell: bash
-      run: $BUILD_CMD check --locked --target=${{ matrix.job.target }} --verbose --lib --no-default-features --features regex-onig,paging
+      uses: actions-rs/cargo@v1
+      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"
-      shell: bash
-      run: $BUILD_CMD check --locked --target=${{ matrix.job.target }} --verbose --lib --no-default-features --features regex-onig,git,paging
+      uses: actions-rs/cargo@v1
+      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"
-      shell: bash
-      run: $BUILD_CMD check --locked --target=${{ matrix.job.target }} --verbose --no-default-features --features minimal-application
+      uses: actions-rs/cargo@v1
+      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
      id: package
      shell: bash
      run: |
        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}
-        echo "PKG_NAME=${PKG_NAME}" >> $GITHUB_OUTPUT
+        echo ::set-output name=PKG_NAME::${PKG_NAME}

        PKG_STAGING="${{ env.CICD_INTERMEDIATES_DIR }}/package"
        ARCHIVE_DIR="${PKG_STAGING}/${PKG_BASENAME}/"
@@ -298,19 +265,18 @@ jobs:
        mkdir -p "${ARCHIVE_DIR}/autocomplete"

        # 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
        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
-        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/${{ 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/${{ 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/${{ 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.bash "$ARCHIVE_DIR/autocomplete/${{ env.PROJECT_NAME }}.bash"
+        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/${{ env.PROJECT_NAME }}'-*/out/assets/completions/bat.zsh "$ARCHIVE_DIR/autocomplete/${{ env.PROJECT_NAME }}.zsh"

        # base compressed package
        pushd "${PKG_STAGING}/" >/dev/null
@@ -321,7 +287,7 @@ jobs:
        popd >/dev/null

        # 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
      id: debian-package
@@ -333,25 +299,33 @@ jobs:
        DPKG_DIR="${DPKG_STAGING}/dpkg"
        mkdir -p "${DPKG_DIR}"

-        DPKG_BASENAME=${{ needs.crate_metadata.outputs.name }}
-        DPKG_CONFLICTS=${{ needs.crate_metadata.outputs.name }}-musl
-        case ${{ matrix.job.target }} in *-musl) DPKG_BASENAME=${{ needs.crate_metadata.outputs.name }}-musl ; DPKG_CONFLICTS=${{ needs.crate_metadata.outputs.name }} ;; esac;
-        DPKG_VERSION=${{ needs.crate_metadata.outputs.version }}
-        DPKG_ARCH="${{ matrix.job.dpkg_arch }}"
+        DPKG_BASENAME=${PROJECT_NAME}
+        DPKG_CONFLICTS=${PROJECT_NAME}-musl
+        case ${{ matrix.job.target }} in *-musl) DPKG_BASENAME=${PROJECT_NAME}-musl ; DPKG_CONFLICTS=${PROJECT_NAME} ;; esac;
+        DPKG_VERSION=${PROJECT_VERSION}
+
+        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"
-        echo "DPKG_NAME=${DPKG_NAME}" >> $GITHUB_OUTPUT
+        echo ::set-output name=DPKG_NAME::${DPKG_NAME}

        # 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
-        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"
-        gzip -n --best "${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/${{ env.PROJECT_NAME }}.1"

        # 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/${{ 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/${{ 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.fish "${DPKG_DIR}/usr/share/fish/vendor_completions.d/${{ env.PROJECT_NAME }}.fish"
+        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
        install -Dm644 "README.md" "${DPKG_DIR}/usr/share/doc/${DPKG_BASENAME}/README.md"
@@ -362,12 +336,12 @@ jobs:

        cat > "${DPKG_DIR}/usr/share/doc/${DPKG_BASENAME}/copyright" <<EOF
        Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-        Upstream-Name: ${{ needs.crate_metadata.outputs.name }}
-        Source: ${{ needs.crate_metadata.outputs.homepage }}
+        Upstream-Name: ${{ env.PROJECT_NAME }}
+        Source: ${{ env.PROJECT_HOMEPAGE }}

        Files: *
-        Copyright: ${{ needs.crate_metadata.outputs.maintainer }}
-        Copyright: $COPYRIGHT_YEARS ${{ needs.crate_metadata.outputs.maintainer }}
+        Copyright: ${{ env.PROJECT_MAINTAINER }}
+        Copyright: $COPYRIGHT_YEARS ${{ env.PROJECT_MAINTAINER }}
        License: Apache-2.0 or MIT

        License: Apache-2.0
@@ -408,17 +382,17 @@ jobs:
        Version: ${DPKG_VERSION}
        Section: utils
        Priority: optional
-        Maintainer: ${{ needs.crate_metadata.outputs.maintainer }}
-        Homepage: ${{ needs.crate_metadata.outputs.homepage }}
+        Maintainer: ${{ env.PROJECT_MAINTAINER }}
+        Homepage: ${{ env.PROJECT_HOMEPAGE }}
        Architecture: ${DPKG_ARCH}
-        Provides: ${{ needs.crate_metadata.outputs.name }}
+        Provides: ${{ env.PROJECT_NAME }}
        Conflicts: ${DPKG_CONFLICTS}
        Description: cat(1) clone with wings.
          A cat(1) clone with syntax highlighting and Git integration.
        EOF

        DPKG_PATH="${DPKG_STAGING}/${DPKG_NAME}"
-        echo "DPKG_PATH=${DPKG_PATH}" >> $GITHUB_OUTPUT
+        echo ::set-output name=DPKG_PATH::${DPKG_PATH}

        # build dpkg
        fakeroot dpkg-deb --build "${DPKG_DIR}" "${DPKG_PATH}"
@@ -441,7 +415,7 @@ jobs:
      shell: bash
      run: |
        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
      uses: softprops/action-gh-release@v1
@@ -452,15 +426,3 @@ jobs:
          ${{ steps.debian-package.outputs.DPKG_PATH }}
      env:
        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 }}
--- a/.github/workflows/require-changelog-for-PRs.yml
+++ b/.github/workflows/require-changelog-for-PRs.yml
@@ -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"
--- a/.gitmodules
+++ b/.gitmodules
@@ -67,6 +67,9 @@
 [submodule "assets/syntaxes/JavaScript (Babel)"]
 	path = assets/syntaxes/02_Extra/JavaScript (Babel)
 	url = https://github.com/babel/babel-sublime
+[submodule "assets/syntaxes/Dart"]
+	path = assets/syntaxes/02_Extra/Dart
+	url = https://github.com/guillermooo/dart-sublime-bundle
 [submodule "assets/syntaxes/FSharp"]
 	path = assets/syntaxes/02_Extra/FSharp
 	url = https://github.com/hoest/sublimetext-fsharp
@@ -110,6 +113,9 @@
 [submodule "assets/syntaxes/Org mode"]
 	path = assets/syntaxes/02_Extra/Org mode
 	url = https://github.com/jezcope/Org.tmbundle.git
+[submodule "assets/syntaxes/requirementstxt"]
+	path = assets/syntaxes/02_Extra/requirementstxt
+	url = https://github.com/wuub/requirementstxt
 [submodule "assets/syntaxes/DotENV"]
 	path = assets/syntaxes/02_Extra/DotENV
 	url = https://github.com/zaynali53/DotENV
@@ -197,9 +203,6 @@
 [submodule "assets/syntaxes/02_Extra/Lean"]
 	path = assets/syntaxes/02_Extra/Lean
 	url = https://github.com/leanprover/vscode-lean.git
-[submodule "assets/syntaxes/02_Extra/LiveScript"]
-	path = assets/syntaxes/02_Extra/LiveScript
-	url = https://github.com/paulmillr/LiveScript.tmbundle
 [submodule "assets/syntaxes/02_Extra/Zig"]
 	path = assets/syntaxes/02_Extra/Zig
 	url = https://github.com/ziglang/sublime-zig-language.git
@@ -227,36 +230,3 @@
 [submodule "assets/syntaxes/02_Extra/Slim"]
 	path = assets/syntaxes/02_Extra/Slim
 	url = https://github.com/slim-template/ruby-slim.tmbundle.git
-[submodule "assets/syntaxes/02_Extra/Racket"]
-	path = assets/syntaxes/02_Extra/Racket
-	url = https://github.com/follesoe/sublime-racket.git
-[submodule "assets/syntaxes/02_Extra/MediaWiki"]
-	path = assets/syntaxes/02_Extra/MediaWiki
-	url = https://github.com/tosher/Mediawiker.git
-[submodule "assets/syntaxes/02_Extra/Dart"]
-	path = assets/syntaxes/02_Extra/Dart
-	url = https://github.com/elMuso/Dartlight.git
-[submodule "assets/syntaxes/02_Extra/SublimeJQ"]
-	path = assets/syntaxes/02_Extra/SublimeJQ
-	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
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,279 +2,17 @@

 ## 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)
-
-## 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)
-
-## 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)
-
-## 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).
- Added auto detect syntax for `.jsonc` #2795 (@mxaddict)
- Added auto detect syntax for `.aws/{config,credentials}` #2795 (@mxaddict)
- Add syntax mapping for Wireguard config #2874 (@cyqsimon)
-
-## 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
-
-## Features
-
- New style component `header-filesize` to show size of the displayed file in the header. See #1988 (@mdibaiee)
- Use underline for line highlighting on ANSI, see #1730 (@mdibaiee)
-
-## Bugfixes
-
- Fix bash completion on bash 3.x and bash-completion 1.x. See #2066 (@joshpencheon)
-
-## Syntaxes
-
- `GraphQL`: Add support for interfaces implementing interfaces and consider ampersand an operator. See #2000
- Associate `_vimrc` and `_gvimrc` files with the `VimL` syntax. See #2002
- Associate `poetry.lock` files with the `TOML` syntax. See #2049
- Associate `.mesh`, `.task`, `.rgen`, `.rint`, `.rahit`, `.rchit`, `.rmiss`, and `.rcall` with the `GLSL` syntax. See #2050
- Added support for `JQ` syntax, see #2072
- Properly associate global git config files rooted in `$XDG_CONFIG_HOME/git/` or `$HOME/.config/git/`. See #2067 (@cyqsimon)
-
-## `bat` as a library
-
- Exposed `get_syntax_set` and `get_theme` methods on `HighlightingAssets`. See #2030 (@dandavison)
- Added `HeaderFilename` and `HeaderFilesize` to `StyleComponent` enum, and mark it `#[non_exhaustive]`. See #1988 (@mdibaiee)
-
-
-# v0.19.0
-
-## Performance
-
- Reduce startup time in loop-through mode (e.g. when redirecting output) by 90%. See #1747 (@Enselic)
- Load themes lazily to make bat start 25% faster when disregarding syntax load time. See #1969 (@Enselic)
- Python syntax highlighting no longer suffers from abysmal performance in specific scenarios. See #1688 (@keith-hall)
- Fix for poor performance when ANSI escape sequences are piped to `bat`, see #1596 (@eth-p)
- Fix for incorrect handling of ANSI escape sequences when using `--wrap=never`, see #1596 (@eth-p)
- Load custom assets as fast as integrated assets, see #1753 (@Enselic)
-
-## Features
-
- Support for `x:-delta` (minus) syntax in line ranges (e.g. `20:-10`). See  #1901 (@bojan88)
- Support for `--ignored-suffix` argument. See #1892 (@bojan88)
 - `$BAT_CONFIG_DIR` is now a recognized environment variable. It has precedence over `$XDG_CONFIG_HOME`, see #1727 (@billrisher)
- Support for `x:+delta` syntax in line ranges (e.g. `20:+10`). See  #1810 (@bojan88)
- Add new `--acknowledgements` option that gives credit to theme and syntax definition authors. See #1971 (@Enselic)
- Include git hash in `bat -V` and `bat --version` output if present. See #1921 (@Enselic)

 ## Bugfixes

- First line not shown in diff context. See #1891 (@divagant-martian)
- Do not ignore syntaxes that handle file names with a `*.conf` extension. See #1703 (@cbolgiano)
+- Python syntax highlighting no longer suffers from abysmal performance in specific scenarios. See #1688 (@keith-hall)

 ## Other

- Add PowerShell completion, see #1826 (@rashil2000)
- Minimum supported Rust version (MSRV) bumped to 1.51, see #1994 (@mdibaiee)
+- Load cached assets as fast as integrated assets, see #1753 (@Enselic)
+- Greatly reduce startup time in loop-through mode, e.g. when redirecting output. Instead of *50 ms* - *100 ms*, startup takes *5 ms* - *10 ms*. See #1747 (@Enselic)
+

 ## Syntaxes

@@ -284,29 +22,15 @@
 - Highlight for `vimrc` and `gvimrc` files, see #1763 (@SuperSandro2000)
 - Syslog highlighting improvements, see #1793 (@scop)
 - Added support for `slim` syntax, see #1693 (@mfinelli)
- Racket, see #1884 (@jubnzv)
- LiveScript, see #1915 (@Enselic)
- MediaWiki, see #1925 (@sorairolake)
- The `requirements.txt` syntax has been removed due to incompatible license requirements.
- Dart, new highlighter, see #1959 (@Ersikan)
- SCSS and Sass syntaxes updated, see #1766 (@Enselic)
- PowerShell syntax updated, see #1935 (@Enselic)
- TypeScript syntax updated, see #1834 (@Enselic)
+
+## New themes
+

 ## `bat` as a library

- Deprecate `HighlightingAssets::syntaxes()` and `HighlightingAssets::syntax_for_file_name()`. Use `HighlightingAssets::get_syntaxes()` and `HighlightingAssets::get_syntax_for_path()` instead. They return a `Result` which is needed for upcoming lazy-loading work to improve startup performance. They also return which `SyntaxSet` the returned `SyntaxReference` belongs to. See #1747, #1755, #1776, #1862 (@Enselic)
- Remove `HighlightingAssets::from_files` and `HighlightingAssets::save_to_cache`. Instead of calling the former and then the latter you now make a single call to `bat::assets::build`. See #1802, #1971 (@Enselic)
- Replace  the `error::Error(error::ErrorKind, _)` struct and enum with an `error::Error` enum. `Error(ErrorKind::UnknownSyntax, _)` becomes `Error::UnknownSyntax`, etc. Also remove the `error::ResultExt` trait. These changes stem from replacing `error-chain` with `thiserror`. See #1820 (@Enselic)
- Add new `MappingTarget` enum variant `MapExtensionToUnknown`. Refer to its documentation for more information. Also mark `MappingTarget` as `#[non_exhaustive]` since more enum variants might be added in the future. See #1703 (@cbolgiano), #2012 (@Enselic)
+- Deprecate `HighlightingAssets::syntaxes()` and `HighlightingAssets::syntax_for_file_name()`. Use `HighlightingAssets::get_syntaxes()` and `HighlightingAssets::get_syntax_for_file_name()` instead. They return a `Result` which is needed for upcoming lazy-loading work to improve startup performance. They also return what `SyntaxSet` the returned `SyntaxReference` belongs to. See #1747, #1755 and #1776 (@Enselic)


-# v0.18.3
-
-## Bugfixes
-
- Bump `git2` dependency to fix build with Rust 1.54, see #1761
-

 # v0.18.2

--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -6,42 +6,21 @@ Thank you for considering to contribute to `bat`!

 ## Add an entry to the changelog

-Keeping the [`CHANGELOG.md`](CHANGELOG.md) file up-to-date makes the release
-process much easier and therefore helps to get your changes into a new `bat`
-release faster. However, not every change to the repository requires a
-changelog entry. Below are a few examples of that.
-
-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
+If your contribution changes the behavior of `bat` (as opposed to a typo-fix
+in the documentation), please update the [`CHANGELOG.md`](CHANGELOG.md) file
+and describe your changes. This makes the release process much easier and
+therefore helps to get your changes into a new `bat` release faster.

 The top of the `CHANGELOG` contains a *"unreleased"* section with a few
 subsections (Features, Bugfixes, …). Please add your entry to the subsection
 that best describes your change.

-Entries must follow this format:
+Entries follow this format:
 ```
 - Short description of what has been changed, see #123 (@user)
 ```
-Please replace `#123` with the number of your pull request (not issue) and
-`@user` by your GitHub username.
+Here, `#123` is the number of the original issue and/or your pull request.
+Please replace `@user` by your GitHub username.


 ## Development
@@ -54,7 +33,7 @@ section in the README.

 Please consider opening a
 [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
@@ -67,25 +46,3 @@ If you really think that a particular syntax or theme should be added for all
 users, please read the corresponding
 [documentation](https://github.com/sharkdp/bat/blob/master/doc/assets.md)
 first.
-
-
-## Regression tests
-
-You are **strongly encouraged** to add regression tests. Regression tests are great,
-not least because they:
-
-* ensure that your contribution will never completely stop working.
-
-* makes code reviews easier, because it becomes very clear what the code is
-  supposed to do.
-
-For functional changes, you most likely want to add a test to
-[`tests/integration_tests.rs`](https://github.com/sharkdp/bat/blob/master/tests/integration_tests.rs).
-Look at existing tests to know how to write a new test. In short, you will
-invoke the `bat` binary with a certain set of arguments, and then assert on
-stdout/stderr.
-
-To learn how to write regression tests for theme and syntax changes, read the
-[Syntax
-tests](https://github.com/sharkdp/bat/blob/master/doc/assets.md#syntax-tests)
-section in `assets.md`.
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,14 +3,13 @@ authors = ["David Peter <mail@david-peter.de>"]
 categories = ["command-line-utilities"]
 description = "A cat(1) clone with wings."
 homepage = "https://github.com/sharkdp/bat"
-license = "MIT OR Apache-2.0"
+license = "MIT/Apache-2.0"
 name = "bat"
 repository = "https://github.com/sharkdp/bat"
-version = "0.24.0"
+version = "0.18.2"
 exclude = ["assets/syntaxes/*", "assets/themes/*"]
-build = "build/main.rs"
-edition = '2021'
-rust-version = "1.70"
+build = "build.rs"
+edition = '2018'

 [features]
 default = ["application"]
@@ -25,99 +24,78 @@ application = [
 # Mainly for developers that want to iterate quickly
 # Be aware that the included features might change in the future
 minimal-application = [
+    "atty",
    "clap",
-    "etcetera",
+    "dirs-next",
+    "lazy_static",
    "paging",
    "regex-onig",
    "wild",
 ]
 git = ["git2"] # Support indicating git modifications
-paging = ["shell-words", "grep-cli"] # Support applying a pager on the output
-lessopen = ["run_script", "os_str_bytes"] # Support $LESSOPEN preprocessor
-build-assets = ["syntect/yaml-load", "syntect/plist-load", "regex", "walkdir"]
+paging = ["shell-words"] # Support applying a pager on the output
+# Add "syntect/plist-load" when https://github.com/trishume/syntect/pull/345 reaches us
+build-assets = ["syntect/yaml-load", "syntect/dump-create"]

 # 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-fancy = ["syntect/regex-fancy"] # Use the rust-only "fancy-regex" engine

 [dependencies]
-nu-ansi-term = "0.50.0"
-ansi_colours = "^1.2"
-bincode = "1.0"
-console = "0.15.7"
-flate2 = "1.0"
-once_cell = "1.19"
-thiserror = "1.0"
-wild = { version = "2.2", optional = true }
+atty = { version = "0.2.14", optional = true }
+ansi_term = "^0.12.1"
+ansi_colours = "^1.0"
+console = "0.14.1"
+lazy_static = { version = "1.4", optional = true }
+lazycell = "1.0"
+wild = { version = "2.0", optional = true }
 content_inspector = "0.2.4"
-shell-words = { version = "1.1.0", optional = true }
-unicode-width = "0.1.11"
+encoding = "0.2"
+shell-words = { version = "1.0.0", optional = true }
+unicode-width = "0.1.8"
 globset = "0.4"
-serde = "1.0"
-serde_derive = "1.0"
-serde_yaml = "0.9.28"
+serde = { version = "1.0", features = ["derive"] }
+serde_yaml = "0.8"
 semver = "1.0"
 path_abs = { version = "0.5", default-features = false }
-clircle = "0.5"
-bugreport = { version = "0.5.0", optional = true }
-etcetera = { version = "0.8.0", optional = true }
-grep-cli = { version = "0.1.10", optional = true }
-regex = { version = "1.10.2", optional = true }
-walkdir = { version = "2.4", optional = true }
-bytesize = { version = "1.3.0" }
-encoding_rs = "0.8.33"
-os_str_bytes = { version = "~6.6", optional = true }
-run_script = { version = "^0.10.1", optional = true}
+clircle = "0.3"
+bugreport = { version = "0.4", optional = true }
+dirs-next = { version = "2.0.0", optional = true }
+grep-cli = "0.1.6"

 [dependencies.git2]
-version = "0.18"
+version = "0.13"
 optional = true
 default-features = false

 [dependencies.syntect]
-version = "5.2.0"
+version = "4.6.0"
 default-features = false
-features = ["parsing"]
+features = ["parsing", "dump-load"]

 [dependencies.clap]
-version = "4.4.12"
+version = "2.33"
 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.6.0"
+[dependencies.error-chain]
+version = "0.12"
+default-features = false

 [dev-dependencies]
-assert_cmd = "2.0.12"
-expect-test = "1.4.1"
-serial_test = { version = "2.0.0", default-features = false }
-predicates = "3.0.4"
+assert_cmd = "1.0.8"
+serial_test = "0.5.1"
+predicates = "2.0.1"
 wait-timeout = "0.2.0"
-tempfile = "3.8.1"
-serde = { version = "1.0", features = ["derive"] }
+tempfile = "3.2.0"

 [target.'cfg(unix)'.dev-dependencies]
-nix = { version = "0.26.4", default-features = false, features = ["term"] }
+nix = "0.22.0"

 [build-dependencies]
-anyhow = "1.0.78"
-indexmap = { version = "2.2.2", features = ["serde"] }
-itertools = "0.12.1"
-once_cell = "1.18"
-regex = "1.10.2"
-serde = "1.0"
-serde_derive = "1.0"
-serde_with = { version = "3.6.1", default-features = false, features = ["macros"] }
-toml = { version = "0.8.9", features = ["preserve_order"] }
-walkdir = "2.4"
-
-[build-dependencies.clap]
-version = "4.4.12"
-optional = true
-features = ["wrap_help", "cargo"]
+clap = { version = "2.33", optional = true }

 [profile.release]
 lto = true
-strip = true
 codegen-units = 1
--- a/2
+++ b/2
@@ -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
 of this software and associated documentation files (the "Software"), to deal
--- a/6
+++ b/6
@@ -1,6 +0,0 @@
-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.
-
-See the LICENSE-APACHE and LICENSE-MIT files for license details.
--- a/README.md
+++ b/README.md
@@ -12,36 +12,9 @@
  <a href="#installation">Installation</a> •
  <a href="#customization">Customization</a> •
  <a href="#project-goals-and-alternatives">Project goals, alternatives</a><br>
-  [English]
-  [<a href="doc/README-zh.md">中文</a>]
-  [<a href="doc/README-ja.md">日本語</a>]
-  [<a href="doc/README-ko.md">한국어</a>]
-  [<a href="doc/README-ru.md">Русский</a>]
+  [<a href="https://github.com/chinanf-boy/bat-zh">中文</a>] [<a href="doc/README-ja.md">日本語</a>] [<a href="doc/README-ko.md">한국어</a>] [<a href="doc/README-ru.md">Русский</a>]
 </p>

-### Sponsors
-
-A special *thank you* goes to our biggest <a href="doc/sponsors.md">sponsors</a>:<br>
-<a href="https://workos.com/?utm_campaign=github_repo&utm_medium=referral&utm_content=bat&utm_source=github">
-  <img src="doc/sponsors/workos-logo-white-bg.svg" width="200" alt="WorkOS">
-  <br>
-  <strong>Your app, enterprise-ready.</strong>
-  <br>
-  <sub>Start selling to enterprise customers with just a few lines of code.</sub>
-  <br>
-  <sup>Add Single Sign-On (and more) in minutes instead of months.</sup>
-</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

 `bat` supports syntax highlighting for a large number of programming and markup
@@ -65,7 +38,7 @@ characters:

 ### Automatic paging

-By default, `bat` pipes its own output to a pager (e.g. `less`) if the output is too large for one screen.
+By default, `bat` pipes its own output to a pager (e.g `less`) if the output is too large for one screen.
 If you would rather `bat` work like `cat` all the time (never page output), you can set `--paging=never` as an option, either on the command line or in your configuration file.
 If you intend to alias `cat` to `bat` in your shell configuration, you can use `alias cat='bat --paging=never'` to preserve the default behavior.

@@ -126,23 +99,19 @@ bat f - g  # output 'f', then stdin, then 'g'.
 You can use `bat` as a previewer for [`fzf`](https://github.com/junegunn/fzf). To do this,
 use `bat`s `--color=always` option to force colorized output. You can also use `--line-range`
 option to restrict the load times for long files:
-
 ```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).

 #### `find` or `fd`

 You can use the `-exec` option of `find` to preview all search results with `bat`:
-
 ```bash
 find … -exec bat {} +
 ```

 If you happen to use [`fd`](https://github.com/sharkdp/fd), you can use the `-X`/`--exec-batch` option to do the same:
-
 ```bash
 fd … -X bat
 ```
@@ -158,11 +127,9 @@ batgrep needle src/
 #### `tail -f`

 `bat` can be combined with `tail -f` to continuously monitor a given file with syntax highlighting.
-
 ```bash
 tail -f /var/log/pacman.log | bat --paging=never -l log
 ```
-
 Note that we have to switch off paging in order for this to work. We have also specified the syntax
 explicitly (`-l log`), as it can not be auto-detected in this case.

@@ -170,7 +137,6 @@ explicitly (`-l log`), as it can not be auto-detected in this case.

 You can combine `bat` with `git show` to view an older version of a given file with proper syntax
 highlighting:
-
 ```bash
 git show v0.6.0:src/main.rs | bat -l rs
 ```
@@ -181,7 +147,7 @@ You can combine `bat` with `git diff` to view lines around code changes with pro
 highlighting:
 ```bash
 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).
@@ -207,7 +173,7 @@ bat main.cpp | xclip
 export MANPAGER="sh -c 'col -bx | bat -l man -p'"
 man 2 select
 ```
-(replace `bat` with `batcat` if you are on Debian or Ubuntu)
+(replace `bat` by `batcat` if you are on Debian or Ubuntu)

 It might also be necessary to set `MANROFFOPT="-c"` if you experience
 formatting problems.
@@ -222,49 +188,23 @@ 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`.

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

-[![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`)
 *... and other Debian-based Linux distributions.*

-`bat` is available on [Ubuntu since 20.04 ("Focal")](https://packages.ubuntu.com/search?keywords=bat&exact=1) and [Debian since August 2021 (Debian 11 - "Bullseye")](https://packages.debian.org/bullseye/bat).
+`bat` is making its way through the [Ubuntu](https://packages.ubuntu.com/eoan/bat) and
+[Debian](https://packages.debian.org/testing/bat) package release process, and is available
+for Ubuntu as of Eoan 19.10. On Debian `bat` is currently available on the unstable
+"Sid" branch and on the testing branch.

 If your Ubuntu/Debian installation is new enough you can simply run:

 ```bash
-sudo apt install bat
+apt install bat
 ```

 **Important**: If you install `bat` this way, please note that the executable may be installed as `batcat` instead of `bat` (due to [a name
@@ -282,7 +222,7 @@ the most recent release of `bat`, download the latest `.deb` package from the
 [release page](https://github.com/sharkdp/bat/releases) and install it via:

 ```bash
-sudo dpkg -i bat_0.18.3_amd64.deb  # adapt version number and architecture
+sudo dpkg -i bat_0.18.2_amd64.deb  # adapt version number and architecture
 ```

 ### On Alpine Linux
@@ -296,7 +236,7 @@ apk add bat

 ### 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:

 ```bash
@@ -311,14 +251,6 @@ You can install [the `bat` package](https://koji.fedoraproject.org/koji/packagei
 dnf install bat
 ```

-### On Funtoo Linux
-
-You can install [the `bat` package](https://github.com/funtoo/dev-kit/tree/1.4-release/sys-apps/bat) from dev-kit.
-
-```bash
-emerge sys-apps/bat
-```
-
 ### On Gentoo Linux

 You can install [the `bat` package](https://packages.gentoo.org/packages/sys-apps/bat)
@@ -357,14 +289,6 @@ cd /usr/ports/textproc/bat
 make install
 ```

-### On OpenBSD
-
-You can install `bat` package using [`pkg_add(1)`](https://man.openbsd.org/pkg_add.1):
-
-```bash
-pkg_add bat
-```
-
 ### Via nix

 You can install `bat` using the [nix package manager](https://nixos.org/nix):
@@ -388,7 +312,7 @@ Existing packages may be available, but are not officially supported and may con

 ### 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
 brew install bat
@@ -411,14 +335,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.

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

 You can install `bat` via [Chocolatey](https://chocolatey.org/packages/Bat):
@@ -447,7 +363,7 @@ binaries are also available: look for archives with `musl` in the file name.

 ### 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.45 or
 higher. You can then use `cargo` to build everything:

 ```bash
@@ -575,9 +491,8 @@ command line option. The option takes an argument of the form `pattern:syntax` w
 the absolute file path. The `syntax` part is the full name of a supported language
 (use `bat --list-languages` for an overview).

-**Note:** You probably want to use this option as [an entry in `bat`'s configuration file](#configuration-file)
-for persistence instead of passing it on the command line as a one-off. Generally
-you'd just use `-l` if you want to manually specify a language for a file.
+Note: You probably want to use this option as an entry in `bat`s configuration file instead
+of passing it on the command line (see below).

 Example: To use "INI" syntax highlighting for all files with a `.conf` file extension, use
 ```bash
@@ -602,8 +517,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`.

->[!NOTE]
-> If `PAGER` is `more` or `most`, `bat` will silently use `less` instead to ensure support for colors.
+**Note**: 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
 `PAGER`/`BAT_PAGER` variables:
@@ -614,37 +528,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).

+**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`
-to improve the experience. Specifically, `-R`/`--RAW-CONTROL-CHARS`, `-F`/`--quit-if-one-screen`,
-and under certain conditions, `-X`/`--no-init` and/or `-S`/`--chop-long-lines`.
-
->[!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.
+If you want to enable mouse-wheel scrolling on older versions of `less`, you can pass just `-R` (as
+in the example above, this will disable the quit-if-one-screen feature). For less 530 or newer,
+it should work out of the box.

 ### Indentation

@@ -671,7 +568,7 @@ alias cat="bat --theme=\$(defaults read -globalDomain AppleInterfaceStyle &> /de

 `bat` can also be customized with a configuration file. The location of the file is dependent
 on your operating system. To get the default path for your system, call
-```bash
+```
 bat --config-file
 ```

@@ -686,10 +583,6 @@ A default configuration file can be created with the `--generate-config-file` op
 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

 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.
@@ -705,7 +598,7 @@ Example configuration file:
 # Use italic text on the terminal (not supported on all terminals)
 --italic-text=always

-# Use C++ syntax for Arduino .ino files
+# Use C++ syntax for .ino files
 --map-syntax "*.ino:C++"
 ```

@@ -731,7 +624,9 @@ Windows 10 natively supports colors in both `conhost.exe` (Command Prompt) and P
 well as in newer versions of bash. On earlier versions of Windows, you can use
 [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

@@ -755,13 +650,6 @@ bat() {

 ## Troubleshooting

-### Garbled output
-
-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.
-When displaying such files it is recommended to disable both syntax highlighting and wrapping by
-passing the `--color=never --wrap=never` options to `bat`.
-
 ### Terminals & colors

 `bat` handles terminals *with* and *without* truecolor support. However, the colors in most syntax
@@ -846,7 +734,7 @@ There are a lot of alternatives, if you are looking for similar programs. See
 [this document](doc/alternatives.md) for a comparison.

 ## 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.

--- a/assets/acknowledgements.bin
+++ b/assets/acknowledgements.bin
--- a/assets/completions/_bat.ps1.in
+++ b/assets/completions/_bat.ps1.in
@@ -1,95 +0,0 @@
-
-using namespace System.Management.Automation
-using namespace System.Management.Automation.Language
-
-Register-ArgumentCompleter -Native -CommandName '{{PROJECT_EXECUTABLE}}' -ScriptBlock {
-    param($wordToComplete, $commandAst, $cursorPosition)
-
-    $commandElements = $commandAst.CommandElements
-    $command = @(
-        '{{PROJECT_EXECUTABLE}}'
-        for ($i = 1; $i -lt $commandElements.Count; $i++) {
-            $element = $commandElements[$i]
-            if ($element -isnot [StringConstantExpressionAst] -or
-                $element.StringConstantType -ne [StringConstantType]::BareWord -or
-                $element.Value.StartsWith('-')) {
-                break
-        }
-        $element.Value
-    }) -join ';'
-
-    $completions = @(switch ($command) {
-        '{{PROJECT_EXECUTABLE}}' {
-            [CompletionResult]::new('-l', 'l', [CompletionResultType]::ParameterName, 'Set the language for syntax highlighting.')
-            [CompletionResult]::new('--language', 'language', [CompletionResultType]::ParameterName, 'Set the language for syntax highlighting.')
-            [CompletionResult]::new('-H', 'H', [CompletionResultType]::ParameterName, 'Highlight lines N through M.')
-            [CompletionResult]::new('--highlight-line', 'highlight-line', [CompletionResultType]::ParameterName, 'Highlight lines N through M.')
-            [CompletionResult]::new('--file-name', 'file-name', [CompletionResultType]::ParameterName, 'Specify the name to display for a file.')
-            [CompletionResult]::new('--diff-context', 'diff-context', [CompletionResultType]::ParameterName, 'diff-context')
-            [CompletionResult]::new('--tabs', 'tabs', [CompletionResultType]::ParameterName, 'Set the tab width to T spaces.')
-            [CompletionResult]::new('--wrap', 'wrap', [CompletionResultType]::ParameterName, 'Specify the text-wrapping mode (*auto*, never, character).')
-            [CompletionResult]::new('--terminal-width', 'terminal-width', [CompletionResultType]::ParameterName, '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''.')
-            [CompletionResult]::new('--color', 'color', [CompletionResultType]::ParameterName, 'When to use colors (*auto*, never, always).')
-            [CompletionResult]::new('--italic-text', 'italic-text', [CompletionResultType]::ParameterName, 'Use italics in output (always, *never*)')
-            [CompletionResult]::new('--decorations', 'decorations', [CompletionResultType]::ParameterName, 'When to show the decorations (*auto*, never, always).')
-            [CompletionResult]::new('--paging', 'paging', [CompletionResultType]::ParameterName, 'Specify when to use the pager, or use `-P` to disable (*auto*, never, always).')
-            [CompletionResult]::new('--pager', 'pager', [CompletionResultType]::ParameterName, 'Determine which pager to use.')
-            [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('--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('-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('-A', 'A', [CompletionResultType]::ParameterName, 'Show non-printable characters (space, tab, newline, ..).')
-            [CompletionResult]::new('--show-all', 'show-all', [CompletionResultType]::ParameterName, 'Show non-printable characters (space, tab, newline, ..).')
-            [CompletionResult]::new('-p', 'p', [CompletionResultType]::ParameterName, 'Show plain style (alias for ''--style=plain'').')
-            [CompletionResult]::new('--plain', 'plain', [CompletionResultType]::ParameterName, 'Show plain style (alias for ''--style=plain'').')
-            [CompletionResult]::new('-d', 'd', [CompletionResultType]::ParameterName, 'Only show lines that have been added/removed/modified.')
-            [CompletionResult]::new('--diff', 'diff', [CompletionResultType]::ParameterName, 'Only show lines that have been added/removed/modified.')
-            [CompletionResult]::new('-n', 'n', [CompletionResultType]::ParameterName, 'Show line numbers (alias for ''--style=numbers'').')
-            [CompletionResult]::new('--number', 'number', [CompletionResultType]::ParameterName, 'Show line numbers (alias for ''--style=numbers'').')
-            [CompletionResult]::new('-f', 'f', [CompletionResultType]::ParameterName, 'f')
-            [CompletionResult]::new('--force-colorization', 'force-colorization', [CompletionResultType]::ParameterName, 'force-colorization')
-            [CompletionResult]::new('-P', 'P', [CompletionResultType]::ParameterName, 'Alias for ''--paging=never''')
-            [CompletionResult]::new('--no-paging', 'no-paging', [CompletionResultType]::ParameterName, 'Alias for ''--paging=never''')
-            [CompletionResult]::new('--list-themes', 'list-themes', [CompletionResultType]::ParameterName, 'Display all supported highlighting themes.')
-            [CompletionResult]::new('-L', 'L', [CompletionResultType]::ParameterName, 'Display all supported languages.')
-            [CompletionResult]::new('--list-languages', 'list-languages', [CompletionResultType]::ParameterName, 'Display all supported languages.')
-            [CompletionResult]::new('-u', 'u', [CompletionResultType]::ParameterName, 'u')
-            [CompletionResult]::new('--unbuffered', 'unbuffered', [CompletionResultType]::ParameterName, 'unbuffered')
-            [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('--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('--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('--cache-dir', 'cache-dir', [CompletionResultType]::ParameterName, 'Show bat''s cache directory.')
-            [CompletionResult]::new('--diagnostic', 'diagnostic', [CompletionResultType]::ParameterName, 'Show diagnostic information for bug reports.')
-            [CompletionResult]::new('-h', 'h', [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('--version', 'version', [CompletionResultType]::ParameterName, 'Show version information.')
-            ## Completion of the 'cache' command itself is removed for better UX
-            ## See https://github.com/sharkdp/bat/issues/2085#issuecomment-1271646802
-            break
-        }
-        '{{PROJECT_EXECUTABLE}};cache' {
-            [CompletionResult]::new('--source', 'source', [CompletionResultType]::ParameterName, 'Use a different directory to load syntaxes and themes from.')
-            [CompletionResult]::new('--target', 'target', [CompletionResultType]::ParameterName, 'Use a different directory to store the cached syntax and theme set.')
-            [CompletionResult]::new('-b', 'b', [CompletionResultType]::ParameterName, 'Initialize (or update) the syntax/theme cache.')
-            [CompletionResult]::new('--build', 'build', [CompletionResultType]::ParameterName, 'Initialize (or update) the syntax/theme cache.')
-            [CompletionResult]::new('-c', 'c', [CompletionResultType]::ParameterName, 'Remove the cached syntax definitions and themes.')
-            [CompletionResult]::new('--clear', 'clear', [CompletionResultType]::ParameterName, 'Remove the cached syntax definitions and themes.')
-            [CompletionResult]::new('--blank', 'blank', [CompletionResultType]::ParameterName, 'Create completely new syntax and theme sets (instead of appending to the default sets).')
-            [CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Prints help information')
-            [CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Prints help information')
-            [CompletionResult]::new('-V', 'V', [CompletionResultType]::ParameterName, 'Prints version information')
-            [CompletionResult]::new('--version', 'version', [CompletionResultType]::ParameterName, 'Prints version information')
-            break
-        }
-    })
-
-    $completions.Where{ $_.CompletionText -like "$wordToComplete*" } |
-        Sort-Object -Property ListItemText
-}
--- a/assets/completions/bat.bash.in
+++ b/assets/completions/bat.bash.in
@@ -2,43 +2,9 @@

 # Requires https://github.com/scop/bash-completion

-# Macs have bash3 for which the bash-completion package doesn't include
-# _init_completion. This is a minimal version of that function.
-__bat_init_completion()
-{
-	COMPREPLY=()
-	_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() {
-	local cur prev words split=false
-	if declare -F _init_completion >/dev/null 2>&1; then
-		_init_completion -s || return 0
-	else
-		__bat_init_completion -n "=" || return 0
-		_split_longopt && split=true
-	fi
+	local cur prev words cword split
+	_init_completion -s || return 0

 	if [[ ${words[1]-} == cache ]]; then
 		case $prev in
@@ -48,12 +14,7 @@ _bat() {
 			;;
 		esac
 		COMPREPLY=($(compgen -W "
-			--build
-			--clear
-			--source
-			--target
-			--blank
-			--help
+			--build --clear --source --target --blank --help
 		" -- "$cur"))
 		return 0
 	fi
@@ -66,27 +27,13 @@ _bat() {
 				printf "%s\n" "$lang"
 			done
 		)" -- "$cur"))
-                __bat_escape_completions
+		compopt -o filenames  # for escaping
 		return 0
 		;;
-	-H | --highlight-line | \
-	--diff-context | \
-	--tabs | \
-	--terminal-width | \
-	-m | --map-syntax | \
-	--ignored-suffix | \
-	--list-themes | \
-	--line-range | \
-	-L | --list-languages | \
-	--lessopen | \
-	--diagnostic | \
-	--acknowledgements | \
-	-h | --help | \
-	-V | --version | \
-	--cache-dir | \
-	--config-dir | \
-	--config-file | \
-	--generate-config-file)
+	-H | --highlight-line | --diff-context | --tabs | --terminal-width | \
+	-m | --map-syntax | --style | --line-range | -h | --help | -V | \
+	--version | --diagnostic | --config-file | --config-dir | \
+	--cache-dir | --generate-config-file)
 		# argument required but no completion available, or option
 		# causes an exit
 		return 0
@@ -114,79 +61,28 @@ _bat() {
 	--theme)
 		local IFS=$'\n'
 		COMPREPLY=($(compgen -W "$("$1" --list-themes)" -- "$cur"))
-                __bat_escape_completions
+		compopt -o filenames  # for escaping
 		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

 	$split && return 0

 	if [[ $cur == -* ]]; then
-		# --unbuffered excluded intentionally (no-op)
 		COMPREPLY=($(compgen -W "
-			--show-all
-			--plain
-			--language
-			--highlight-line
-			--file-name
-			--diff
-			--diff-context
-			--tabs
-			--wrap
-			--terminal-width
-			--number
-			--color
-			--italic-text
-			--decorations
-			--force-colorization
-			--paging
-			--pager
-			--map-syntax
-			--ignored-suffix
-			--theme
-			--list-themes
-			--style
-			--line-range
-			--list-languages
-			--lessopen
-			--diagnostic
-			--acknowledgements
-			--help
-			--version
-			--cache-dir
-			--config-dir
-			--config-file
+			--show-all --plain --language --highlight-line
+			--file-name --diff --diff-context --tabs --wrap
+			--terminal-width --number --color --italic-text
+			--decorations --paging --pager --map-syntax --theme
+			--list-themes --style --line-range --list-languages
+			--help --version --force-colorization --unbuffered
+			--diagnostic --config-file --config-dir --cache-dir
 			--generate-config-file
 		" -- "$cur"))
 		return 0
 	fi

 	_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}}
--- a/assets/completions/bat.fish.in
+++ b/assets/completions/bat.fish.in
@@ -1,230 +1,78 @@
 # Fish Shell Completions
-# Copy or symlink to $XDG_CONFIG_HOME/fish/completions/{{PROJECT_EXECUTABLE}}.fish
-# ($XDG_CONFIG_HOME is usually set to ~/.config)
+# Place or symlink to $XDG_CONFIG_HOME/fish/completions/{{PROJECT_EXECUTABLE}}.fish ($XDG_CONFIG_HOME is usually set to ~/.config)

-# `bat` is `batcat` on Debian and Ubuntu
-set bat {{PROJECT_EXECUTABLE}}
+# Helper function:
+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:
-
-function __bat_complete_files -a token
-    # Cheat to complete files by calling `complete -C` on a fake command name,
-    # like `__fish_complete_directories` does.
-    set -l fake_command aaabccccdeeeeefffffffffgghhhhhhiiiii
-    complete -C"$fake_command $token"
+			for (i in exts) {
+				ext=exts[i]
+				if (ext !~ /[A-Z].*/ && ext !~ /^\..*rc$/) {
+					print ext"\t"lang
+				}
+			}
+		}
+	' | sort
 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:

-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 color -x -a "$color_opts" -d "When to use colored output" -n __bat_no_excl_args
+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 config-dir -f -d "Display location of configuration directory" -n __fish_is_first_arg
+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-file -f -d "Display location of configuration file" -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 decorations -x -a "$decorations_opts" -d "When to use --style decorations" -n __bat_no_excl_args
+complete -c {{PROJECT_EXECUTABLE}} -s h -l help -d "Print help message" -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}} -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 -s d -l diff -d "Only show lines with Git changes" -n __bat_no_excl_args
+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 -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 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 generate-config-file -f -d "Generates a default configuration file" -n __fish_is_first_arg
+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 file-name -x -d "Specify the display name" -n __bat_no_excl_args
+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 -s f -l force-colorization -d "Force color and decorations" -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 h -d "Print a concise overview" -n __fish_is_first_arg
+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 -l help -f -d "Print all help information" -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 -s H -l highlight-line -x -d "Highlight line(s) N[:M]" -n __bat_no_excl_args
+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 -l ignored-suffix -x -d "Ignore extension" -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 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 -l plain -d "Only show plain style, no decorations. Alias for '--style=plain'" -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 P -d "Disable paging. Alias for '--paging=never'" -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}} -s A -l show-all -d "Show non-printable characters like space/tab/newline" -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 style -xka "auto full plain changes header grid numbers" -d "Comma-separated list of style elements or presets to display with file contents" -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 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-themes -f -d "List syntax highlighting themes" -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 -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}} -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 -l no-config -d "Do not use the configuration file"
+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-custom-assets -d "Do not load custom assets"
+complete -c {{PROJECT_EXECUTABLE}} -s V -l version -d "Show version information" -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
+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"

 # Sub-command 'cache' completions
-## Completion of the 'cache' command itself is removed for better UX
-## See https://github.com/sharkdp/bat/issues/2085#issuecomment-1271646802
+complete -c {{PROJECT_EXECUTABLE}} -a "cache" -d "Modify the syntax/language definition cache" -n "not __fish_seen_subcommand_from cache"

-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 $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
+complete -c {{PROJECT_EXECUTABLE}} -l clear -f -d "Reset syntaxes/language definitions to default settings" -n "__fish_seen_subcommand_from cache"
--- a/assets/completions/bat.zsh.in
+++ b/assets/completions/bat.zsh.in
@@ -1,20 +1,19 @@
 #compdef {{PROJECT_EXECUTABLE}}

-local curcontext="$curcontext" ret=1
-local -a state state_descr line
+local context state state_descr line
 typeset -A opt_args

 (( $+functions[_{{PROJECT_EXECUTABLE}}_cache_subcommand] )) ||
 _{{PROJECT_EXECUTABLE}}_cache_subcommand() {
    local -a args
    args=(
-        '(-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]'
-        --source='[specify directory to load syntaxes and themes from]:directory:_files -/'
-        --target='[specify directory to store the cached syntax and theme set in]:directory:_files -/'
-        --blank'[create completely new syntax and theme sets]'
-        --acknowledgements'[build acknowledgements.bin]'
-        '(: -)'{-h,--help}'[show help information]'
+        '(-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]'
+        '(--source)'--source='[Use a different directory to load syntaxes and themes from]:directory:_files -/'
+        '(--target)'--target='[Use a different directory to store the cached syntax and theme set]:directory:_files -/'
+        '(--blank)'--blank'[Create completely new syntax and theme sets]'
+        '(: -)'{-h,--help}'[Prints help information]'
+        '*: :'
    )

    _arguments -S -s $args
@@ -24,83 +23,77 @@ _{{PROJECT_EXECUTABLE}}_cache_subcommand() {
 _{{PROJECT_EXECUTABLE}}_main() {
    local -a args
    args=(
-        '(-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`)]'
-        '(-l --language)'{-l+,--language=}'[set the language for syntax highlighting]:language:->languages'
-        \*{-H+,--highlight-line=}'[highlight specified block of lines]:start\:end'
-        \*--file-name='[specify the name to display for a file]:name:_files'
-        '(-d --diff)'--diff'[only show lines that have been added/removed/modified]'
-        --diff-context='[specify lines of context around added/removed/modified lines when using `--diff`]:lines'
-        --tabs='[set the tab width]:tab width [4]'
-        --wrap='[specify the text-wrapping mode]:mode [auto]:(auto never character)'
-        '!(--wrap)'{-S,--chop-long-lines}
-        --terminal-width='[explicitly set the width of the terminal instead of determining it automatically]:width'
-        '(-n --number --diff --diff-context)'{-n,--number}'[show line numbers]'
-        --color='[specify when to use colors]:when:(auto never always)'
-        --italic-text='[use italics in output]:when:(always never)'
-        --decorations='[specify when to show the decorations]:when:(auto never always)'
-        --paging='[specify when to use the pager]:when:(auto never always)'
-        '(-m --map-syntax)'{-m+,--map-syntax=}'[map a glob pattern to an existing syntax name]: :->syntax-maps'
-        '(--theme)'--theme='[set the color theme for syntax highlighting]:theme:->themes'
-        '(: --list-themes --list-languages -L)'--list-themes'[show all supported highlighting themes]'
-        --style='[comma-separated list of style elements to display]: : _values "style [default]"
-            default auto full plain changes header header-filename header-filesize grid rule numbers snip'
-        \*{-r+,--line-range=}'[only print the specified line range]:start\:end'
-        '(* -)'{-L,--list-languages}'[display all supported languages]'
-        "--no-config[don't use the configuration file]"
-        "--no-custom-assets[don't load custom assets]"
-        '(--no-lessopen)'--lessopen'[enable the $LESSOPEN preprocessor]'
-        '(--lessopen)'--no-lessopen'[disable the $LESSOPEN preprocessor if enabled (overrides --lessopen)]'
-        '(* -)'--config-dir"[show bat's configuration directory]"
-        '(* -)'--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 }'
+        '(-A --show-all)'{-A,--show-all}'[Show non-printable characters (space, tab, newline, ..)]'
+        '*'{-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'
+        '(-H --highlight-line)'{-H,--highlight-line}'[Highlight lines N through M]:<N\:M>...'
+        '(--file-name)'--file-name'[Specify the name to display for a file]:<name>...:_files'
+        '(-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):()'
+        '(--tabs)'--tabs'[Set the tab width to T spaces]:<T> (tab width):()'
+        '(--wrap)'--wrap='[Specify the text-wrapping mode]:<when>:(auto never character)'
+        '(--terminal-width)'--terminal-width'[Explicitly set the width of the terminal instead of determining it automatically]:<width>'
+        '(-n --number)'{-n,--number}'[Show line numbers]'
+        '(--color)'--color='[When to use colors]:<when>:(auto never always)'
+        '(--italic-text)'--italic-text='[Use italics in output]:<when>:(always never)'
+        '(--decorations)'--decorations='[When to show the decorations]:<when>:(auto never always)'
+        '(--paging)'--paging='[Specify when to use the pager]:<when>:(auto never always)'
+        '(-m --map-syntax)'{-m+,--map-syntax=}'[Use the specified syntax for files matching the glob pattern]:<glob\:syntax>...'
+        '(--theme)'--theme='[Set the color theme for syntax highlighting]:<theme>:->theme'
+        '(: --list-themes --list-languages -L)'--list-themes'[Display all supported highlighting themes]'
+        '(--style)'--style='[Comma-separated list of style elements to display]:<components>:->style'
+        '(-r --line-range)'{-r+,--line-range=}'[Only print the lines from N to M]:<N\:M>...'
+        '(: --list-themes --list-languages -L)'{-L,--list-languages}'[Display all supported languages]'
+        '(: --no-config)'--no-config'[Do not use the configuration file]'
+        '(: --no-custom-assets)'--no-custom-assets'[Do not load custom assets]'
+        '(: --config-dir)'--config-dir'[Show bat'"'"'s configuration directory]'
+        '(: --config-file)'--config-file'[Show path to the configuration file]'
+        '(: --generate-config-file)'--generate-config-file'[Generates a default configuration file]'
+        '(: --cache-dir)'--cache-dir'[Show bat'"'"'s cache directory]'
+        '(: -)'{-h,--help}'[Print this help message]'
+        '(: -)'{-V,--version}'[Show version information]'
+        '*: :_files'
    )

-    _arguments -S -s $args && ret=0
+    _arguments -S -s $args

    case "$state" in
-        syntax-maps)
-          if ! compset -P '*:'; then
-            _message -e patterns 'glob pattern:language'
-            return
-          fi
-        ;& # fall-through
-
-        languages)
+        language)
            local IFS=$'\n'
            local -a languages
            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)
-            local -a themes expl
-            themes=( ${(f)"$(_call_program themes {{PROJECT_EXECUTABLE}} --list-themes)"} )
+        theme)
+            local IFS=$'\n'
+            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 grid numbers snip
        ;;
    esac
-
-    return ret
 }

-case $words[2] in
-    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
-    ;;
+# 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
+        cache)
+            _{{PROJECT_EXECUTABLE}}_cache_subcommand
+        ;;

-    *)
-        _{{PROJECT_EXECUTABLE}}_main
-    ;;
-esac
+        *)
+            _{{PROJECT_EXECUTABLE}}_main
+        ;;
+    esac
+fi
--- a/assets/create.sh
+++ b/assets/create.sh
@@ -46,7 +46,6 @@ bat cache --clear
 # - Remove the JavaDoc patch once https://github.com/trishume/syntect/issues/222 has been fixed
 # - Remove the C# patch once https://github.com/sublimehq/Packages/pull/2331 has been merged

-# Apply patches
 (
    cd "$ASSET_DIR"
    for patch in patches/*.patch; do
@@ -54,16 +53,11 @@ bat cache --clear
    done
 )

-reverse_patches() {
-    (
-        cd "$ASSET_DIR"
-        for patch in patches/*.patch; do
-            patch --strip=0 --reverse <"$patch"
-        done
-    )
-}
+bat cache --build --blank --source="$ASSET_DIR" --target="$ASSET_DIR"

-# Make sure to always reverse patches, even if the `bat cache` command fails or aborts
-trap reverse_patches EXIT
-
-bat cache --build --blank --acknowledgements --source="$ASSET_DIR" --target="$ASSET_DIR"
+(
+    cd "$ASSET_DIR"
+    for patch in patches/*.patch; do
+        patch --strip=0 --reverse < "$patch"
+    done
+)
--- a/assets/manual/bat.1.in
+++ b/assets/manual/bat.1.in
@@ -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
 control the width of the tab\-placeholders.
 .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
 .IP
 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 \fB\-\-paging\fR=\fI\,never\/\fR').
+automatic paging (alias for '\-\-style=plain \fB\-\-pager\fR=\fI\,never\/\fR').
 .HP
 \fB\-l\fR, \fB\-\-language\fR <language>
 .IP
@@ -62,8 +50,6 @@ highlights lines 30 to 40
 highlights lines 1 to 40
 .IP "\-\-highlight\-line 40:"
 highlights lines 40 to the end of the file
-.IP "\-\-highlight\-line 30:+10"
-highlights lines 30 to 40
 .RE
 .HP
 \fB\-\-file\-name\fR <name>...
@@ -130,8 +116,6 @@ which pager is used, see the '\-\-pager' option. Possible values: *auto*, never,
 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 \fB\-RF\fR"'.
-
-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. 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'. If you want to enable mouse-wheel scrolling on older versions of 'less', you can pass just '-R' (as in the example above, this will disable the quit-if-one-screen feature). For less 530 or newer, it should work out of the box.
 .HP
 \fB\-m\fR, \fB\-\-map\-syntax\fR <glob-pattern:syntax-name>...
 .IP
@@ -158,8 +142,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').
 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
-values: *default*, full, auto, plain, changes, header, header-filename, header-filesize, grid,
-rule, numbers, snip.
+values: *full*, auto, plain, changes, header, grid, rule, numbers, snip.
 .HP
 \fB\-r\fR, \fB\-\-line\-range\fR <N:M>...
 .IP
@@ -171,8 +154,6 @@ prints lines 30 to 40
 prints lines 1 to 40
 .IP "\-\-line\-range 40:"
 prints lines 40 to the end of the file
-.IP "\-\-line\-range 30:+10"
-prints lines 30 to 40
 .RE
 .HP
 \fB\-L\fR, \fB\-\-list\-languages\fR
@@ -243,23 +224,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.
 These can be installed to `\fB$({{PROJECT_EXECUTABLE}} --config-dir)/themes\fR`, and are added to the cache with
 `\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
-
-For more information, see the "INPUT PREPROCESSOR" section of less(1).  
-
 .SH "MORE INFORMATION"

 For more information and up-to-date documentation, visit the {{PROJECT_EXECUTABLE}} repo:
--- a/assets/patches/MediaWiki.sublime-syntax.patch
+++ b/assets/patches/MediaWiki.sublime-syntax.patch
@@ -1,13 +0,0 @@
-diff --git syntaxes/02_Extra/MediaWiki/MediawikiNG.sublime-syntax syntaxes/02_Extra/MediaWiki/MediawikiNG.sublime-syntax
-index f542c9e..8eaf020 100644
--- syntaxes/02_Extra/MediaWiki/MediawikiNG.sublime-syntax
-+++ syntaxes/02_Extra/MediaWiki/MediawikiNG.sublime-syntax
-@@ -1,7 +1,7 @@
- %YAML 1.2
- ---
- # http://www.sublimetext.com/docs/3/syntax.html
-name: Mediawiki NG
-+name: MediaWiki
- file_extensions: [mediawiki, wikipedia, wiki]
- scope: text.html.mediawiki
- 
--- a/assets/patches/TodoTxt.sublime-syntax.patch
+++ b/assets/patches/TodoTxt.sublime-syntax.patch
@@ -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.
--- a/assets/patches/TwoDark.tmTheme.patch
+++ b/assets/patches/TwoDark.tmTheme.patch
@@ -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>
--- a/assets/syntaxes.bin
+++ b/assets/syntaxes.bin
--- a/assets/syntaxes/02_Extra/Ada
+++ b/assets/syntaxes/02_Extra/Ada
--- a/assets/syntaxes/02_Extra/CMake
+++ b/assets/syntaxes/02_Extra/CMake
--- a/assets/syntaxes/02_Extra/Crontab
+++ b/assets/syntaxes/02_Extra/Crontab
--- a/assets/syntaxes/02_Extra/Dart
+++ b/assets/syntaxes/02_Extra/Dart
--- a/assets/syntaxes/02_Extra/Dart.sublime-syntax
+++ b/assets/syntaxes/02_Extra/Dart.sublime-syntax
@@ -1,6 +1,6 @@
 %YAML 1.2
 ---
-# http://www.sublimetext.com/docs/syntax.html
+# http://www.sublimetext.com/docs/3/syntax.html
 name: Dart
 file_extensions:
  - dart
@@ -9,7 +9,7 @@ contexts:
  main:
    - match: ^(#!.*)$
      scope: meta.preprocessor.script.dart
-    - match: ^\w*\b(library|import|part of|part|export)\b
+    - match: ^\s*\b(library|import|export|part of|part)\b
      captures:
        0: keyword.other.import.dart
      push:
@@ -19,114 +19,242 @@ contexts:
            0: punctuation.terminator.dart
          pop: true
        - include: strings
-        - include: comments
-        - match: \b(as|show|hide)\b
+        - match: \b(as|show|hide|deferred)\b
          scope: keyword.other.import.dart
    - include: comments
-    - include: punctuation
-    - include: annotations
-    - include: keywords
    - include: constants-and-special-vars
+    - include: annotations
+    - include: decl-typedef
+    - include: decl-class
+    - include: decl-enum
+    - include: decl-function
+    - include: keywords
    - include: strings
  annotations:
-    - match: '@[a-zA-Z]+'
-      scope: storage.type.annotation.dart
+    - match: '^(?:\s*)((@)([a-zA-Z0-9_]+))'
+      captures:
+        1: annotation.dart
+        2: entity.name.function.annotation.dart
+        3: support.type.dart
  comments:
    - match: /\*\*/
      scope: comment.block.empty.dart
      captures:
        0: punctuation.definition.comment.dart
-    - include: comments-doc-oldschool
-    - include: comments-doc
    - include: comments-inline
-  comments-block:
+  comments-inline:
    - match: /\*
      push:
        - meta_scope: comment.block.dart
        - match: \*/
          pop: true
-        - include: comments-block
-  comments-doc:
-    - match: ///
-      push:
-        - meta_scope: comment.block.documentation.dart
-        - match: .*
-          pop: true
-        - include: dartdoc
-  comments-doc-oldschool:
-    - match: /\*\*
-      push:
-        - meta_scope: comment.block.documentation.dart
-        - match: \*/
-          pop: true
-        - include: comments-doc-oldschool
-        - include: comments-block
-        - include: dartdoc
-  comments-inline:
-    - include: comments-block
-    - match: ((//).*)$
+        - include: scope:text.dart-doccomments
+    - match: (///)
      captures:
-        1: comment.line.double-slash.dart
+        1: marker.dart
+      push:
+        - meta_scope: comment.line.triple-slash.dart
+        - match: $
+          pop: true
+        - include: scope:text.dart-doccomments
+    - match: (//)
+      captures:
+        1: marker.dart
+      push:
+        - meta_scope: comment.line.double-slash.dart
+        - match: $
+          pop: true
+        - include: scope:text.dart-doccomments
  constants-and-special-vars:
-    - match: (?<!\$)\b(true|false|null)\b(?!\$)
+    - match: \b(true|false|null)\b
      scope: constant.language.dart
-    - match: (?<!\$)\b(this|super)\b(?!\$)
+    - match: \b(this|super)\b
      scope: variable.language.dart
-    - match: '(?<!\$)\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\.?[0-9]*)|(\.[0-9]+))((e|E)(\+|-)?[0-9]+)?)\b(?!\$)'
+    - match: '\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\.?[0-9]*)|(\.[0-9]+))((e|E)(\+|-)?[0-9]+)?)\b'
      scope: constant.numeric.dart
-    - match: '(?<![a-zA-Z0-9_$])([_$]*[A-Z][a-zA-Z0-9_$]*|bool\b|num\b|int\b|double\b|dynamic\b)'
-      scope: support.class.dart
-    - match: '([_$]*[a-z][a-zA-Z0-9_$]*)(<|\(|\s+=>)'
+  decl-class:
+    - match: \bclass\b
      captures:
-        1: entity.name.function.dart
-  dartdoc:
-    - match: '(\[.*?\])'
-      captures:
-        0: variable.name.source.dart
-    - match: '^ {4,}(?![ \*]).*'
-      captures:
-        0: variable.name.source.dart
-    - match: '```.*?$'
+        0: keyword.control.new.dart
      push:
-        - meta_content_scope: variable.other.source.dart
-        - match: '```'
+        - meta_scope: meta.declaration.class.dart
+        - match: "(?={)"
          pop: true
-    - match: (`.*?`)
+        - include: keywords
+        - match: "[A-Za-z_][A-Za-z0-9_]*"
+          scope: class.name.dart
+  decl-enum:
+    - match: \benum\b
      captures:
-        0: variable.other.source.dart
-    - match: (`.*?`)
+        0: keyword.declaration.dart
+      push:
+        - meta_scope: meta.declaration.enum.dart
+        - match: "(?={)"
+          pop: true
+        - include: keywords
+        - match: "[A-Za-z_][A-Za-z0-9_]*"
+          scope: enum.name.dart
+  decl-function:
+    - match: ^\s*(?:\b(void|bool|num|int|double|dynamic|var|String|List|Map)\b)\s+(get)\s+(\w+)\s+(?==>)
+      comment: A getter with a primitive return type.
+      scope: meta.declaration.function.dart
      captures:
-        0: variable.other.source.dart
-    - match: (\* ((    ).*))$
+        1: storage.type.primitive.dart
+        2: keyword.declaration.dart
+        3: function.name.dart
+    - match: ^\s*(?:\b(\w+)\b\s+)?(get)\s+(\w+)\s+(?==>)
+      comment: A getter with a user-defined return type or no return type.
+      scope: meta.declaration.function.dart
      captures:
-        2: variable.other.source.dart
-    - match: (\*    .*)$
+        1: type.user-defined.dart
+        2: keyword.declaration.dart
+        3: function.name.dart
+    - match: ^\s*(set)\s+(\w+)(?=\()
+      comment: A setter.
+      captures:
+        1: keyword.declaration.dart
+        2: function.name.dart
+      push:
+        - meta_scope: meta.declaration.function.dart
+        - match: \)
+          pop: true
+        - include: comments-inline
+        - include: decl-function-parameter
+        - include: strings
+        - include: keywords
+    - match: ^\s*(?:\b(void|bool|num|int|double|dynamic|var|String|List|Map)\b)\s+(\w+)(?=\()
+      comment: A function with a primitive return type.
+      captures:
+        1: storage.type.primitive.dart
+        2: function.name.dart
+      push:
+        - meta_scope: meta.declaration.function.dart
+        - match: \)
+          pop: true
+        - include: comments-inline
+        - include: decl-function-parameter
+        - include: strings
+        - include: keywords
+    - match: ^\s*(?:\b(return)\b)\s+(\w+)(?=\()
+      comment: A function invocation after 'return'
+      captures:
+        1: keyword.control.dart
+        2: function.name.dart
+      push:
+        - meta_scope: meta.invocation.function.dart
+        - match: \)
+          pop: true
+        - include: comments-inline
+        - include: decl-function-parameter
+        - include: strings
+        - include: keywords
+    - match: ^\s*\b(new)\b\s+(\w+)(?=\()
+      comment: A class instantiation after 'new'
+      captures:
+        1: keyword.declaration.dart
+        2: function.name.dart
+      push:
+        - meta_scope: meta.invocation.function.dart
+        - match: \)
+          pop: true
+        - include: comments-inline
+        - include: decl-function-parameter
+        - include: strings
+        - include: keywords
+  decl-function-parameter:
+    - include: constants-and-special-vars
+    - match: (?:\b(void|bool|num|int|double|dynamic|var|String|List|Map)\b)\s+(\w+)(?=\()
+      comment: A function with a primitive return type.
+      captures:
+        1: storage.type.primitive.dart
+        2: function.name.dart
+      push:
+        - meta_scope: meta.parameter.function.dart
+        - match: \)
+          pop: true
+        - include: decl-function-parameter
+        - include: strings
+        - include: keywords
+    - match: \b(new)\b\s+(\w+)(?=\()
+      comment: A class instantiation after 'new'
+      captures:
+        1: keyword.declaration.dart
+        2: function.name.dart
+      push:
+        - meta_scope: meta.invocation.function.dart
+        - match: \)
+          pop: true
+        - include: decl-function-parameter
+        - include: strings
+        - include: keywords
+    - match: (?:\b(\w+)\b)\s+(\w+)(?=\()
+      comment: A function with a user-defined return type.
+      captures:
+        1: type.user-defined.dart
+        2: function.name.dart
+      push:
+        - meta_scope: meta.parameter.function.dart
+        - match: \)
+          pop: true
+        - include: decl-function-parameter
+        - include: strings
+        - include: keywords
+    - match: (\w+)(?=\()
+      comment: A function with no return type.
+      captures:
+        1: function.name.dart
+      push:
+        - meta_scope: meta.parameter.function.dart
+        - match: \)
+          pop: true
+        - include: decl-function-parameter
+        - include: strings
+        - include: keywords
+  decl-typedef:
+    - match: typedef
+      captures:
+        0: keyword.control.new.dart
+      push:
+        - meta_scope: meta.declaration.typedef.dart
+        - match: ;
+          captures:
+            0: punctuation.terminator.dart
+          pop: true
+        - match: '(?:\b(void|bool|num|int|double|dynamic|var|String|List|Map)\b|([a-zA-Z_][a-zA-Z0-9_]*))\s+([a-zA-Z_][a-zA-Z0-9_]+)'
+          captures:
+            1: storage.type.primitive.dart
+            2: typedef.return.dart
+            3: typedef.name.dart
+        - match: \(
+          push:
+            - meta_scope: typedef.params.dart
+            - match: \)
+              pop: true
+            - include: keywords
  keywords:
-    - match: (?<!\$)\bas\b(?!\$)
+    - match: \bassert\b
+      scope: keyword.control.assert.dart
+    - match: \bas\b
      scope: keyword.cast.dart
-    - match: (?<!\$)\b(try|on|catch|finally|throw|rethrow)\b(?!\$)
+    - match: \b(try|catch|finally|throw|on|rethrow)\b
      scope: keyword.control.catch-exception.dart
-    - match: (?<!\$)\b(break|case|continue|default|do|else|for|if|in|return|switch|while)\b(?!\$)
+    - match: \s+\?\s+|\s+:\s+
+      scope: keyword.control.ternary.dart
+    - match: \b(break|case|continue|default|do|else|for|if|in|return|switch|while)\b
      scope: keyword.control.dart
-    - match: (?<!\$)\b(sync(\*)?|async(\*)?|await|yield(\*)?)\b(?!\$)
-      scope: keyword.control.dart
-    - match: (?<!\$)\bassert\b(?!\$)
-      scope: keyword.control.dart
-    - match: (?<!\$)\b(new)\b(?!\$)
+    - match: \b(async\*|async|await\*|await|yield)\b
+      scope: keyword.control.async.dart
+    - match: \b(new)\b
      scope: keyword.control.new.dart
-    - match: (?<!\$)\b(abstract|class|enum|extends|external|factory|implements|get|mixin|native|operator|set|typedef|with|covariant)\b(?!\$)
+    - match: \b(abstract|extends|external|factory|implements|with|interface|get|native|operator|set|typedef)\b
      scope: keyword.declaration.dart
-    - match: (?<!\$)\b(is\!?)\b(?!\$)
+    - match: \b(is\!?)\b
      scope: keyword.operator.dart
-    - match: '\?|:'
-      scope: keyword.operator.ternary.dart
    - match: (<<|>>>?|~|\^|\||&)
      scope: keyword.operator.bitwise.dart
    - match: ((&|\^|\||<<|>>>?)=)
      scope: keyword.operator.assignment.bitwise.dart
-    - match: (=>)
-      scope: keyword.operator.closure.dart
-    - match: (==|!=|<=?|>=?)
+    - match: (===?|!==?|<=?|>=?)
      scope: keyword.operator.comparison.dart
    - match: '(([+*/%-]|\~)=)'
      scope: keyword.operator.assignment.arithmetic.dart
@@ -138,22 +266,56 @@ contexts:
      scope: keyword.operator.arithmetic.dart
    - match: (!|&&|\|\|)
      scope: keyword.operator.logical.dart
-    - match: (?<!\$)\b(static|final|const)\b(?!\$)
-      scope: storage.modifier.dart
-    - match: (?<!\$)\b(?:void|var)\b(?!\$)
-      scope: storage.type.primitive.dart
-  punctuation:
-    - match: ','
-      scope: punctuation.comma.dart
    - match: ;
      scope: punctuation.terminator.dart
+    - match: \b(static|final|const)\b
+      scope: storage.modifier.dart
+    - match: \b(?:void|bool|num|int|double|dynamic|var|String|List|Map)\b
+      scope: storage.type.primitive.dart
+  regexp:
+    - match: '\\[^''"]'
+      scope: constant.character.escaped.regex.dart
+    - match: \(
+      push:
+        - meta_content_scope: meta.capture.regex.dart
+        - match: \)
+          pop: true
+        - match: \?(:|=|!)
+          scope: ignore.capture.regex.dart
+    - match: \*|\+|\?|\.|\|
+      scope: keyword.other.regex.dart
+    - match: \^|\$
+      scope: keyword.other.regex.dart
    - match: \.
-      scope: punctuation.dot.dart
-  string-interp:
-    - match: '\$((\w+)|\{([^{}]+)\})'
+      scope: constant.other.regex.dart
+    - match: '\[(\^)?'
      captures:
+        1: keyword.other.negation.regex.dart
+      push:
+        - meta_scope: constant.character.range.regex.dart
+        - match: '\]'
+          pop: true
+        - match: '\\[^"'']'
+          scope: constant.character.escaped.regex.dart
+    - match: '\{(?:\d+)?,(?:\d+)?\}'
+      scope: keyword.other.regex.dart
+  string-interp:
+    - match: '(\$)(\{)'
+      captures:
+        1: keyword.other.dart
+        2: keyword.other.dart
+      push:
+        - meta_scope: interpolation.dart
+        - meta_content_scope: source.dart
+        - match: '(\})'
+          captures:
+            1: keyword.other.dart
+          pop: true
+        - include: main
+    - match: (\$)(\w+)
+      captures:
+        1: keyword.other.dart
        2: variable.parameter.dart
-        3: variable.parameter.dart
    - match: \\.
      scope: constant.character.escape.dart
  strings:
@@ -166,7 +328,7 @@ contexts:
    - match: (?<!r)'''
      push:
        - meta_scope: string.interpolated.triple.single.dart
-        - match: '''''''(?!'')'
+        - match: "'''(?!')"
          pop: true
        - include: string-interp
    - match: r"""
@@ -177,9 +339,9 @@ contexts:
    - match: r'''
      push:
        - meta_scope: string.quoted.triple.single.dart
-        - match: '''''''(?!'')'
+        - match: "'''(?!')"
          pop: true
-    - match: (?<!\|r)"
+    - match: (?<!\\|r)"
      push:
        - meta_scope: string.interpolated.double.dart
        - match: '"'
@@ -192,20 +354,16 @@ contexts:
        - meta_scope: string.quoted.double.dart
        - match: '"'
          pop: true
-        - match: \n
-          scope: invalid.string.newline
+        - include: regexp
    - match: (?<!\|r)'
      push:
        - meta_scope: string.interpolated.single.dart
        - match: "'"
          pop: true
-        - match: \n
-          scope: invalid.string.newline
        - include: string-interp
    - match: r'
      push:
        - meta_scope: string.quoted.single.dart
        - match: "'"
          pop: true
-        - match: \n
-          scope: invalid.string.newline
+        - include: regexp
--- a/assets/syntaxes/02_Extra/Docker
+++ b/assets/syntaxes/02_Extra/Docker
--- a/assets/syntaxes/02_Extra/DotENV.sublime-syntax
+++ b/assets/syntaxes/02_Extra/DotENV.sublime-syntax
@@ -8,7 +8,6 @@ file_extensions:
  - .env.local
  - .env.sample
  - .env.example
-  - .env.template
  - .env.test
  - .env.test.local
  - .env.testing
@@ -24,10 +23,6 @@ file_extensions:
  - .env.defaults
  - .envrc
  - .flaskenv
-  - env
-  - env.example
-  - env.sample
-  - env.template
 scope: source.env
 contexts:
  main:
--- a/assets/syntaxes/02_Extra/Fish
+++ b/assets/syntaxes/02_Extra/Fish
--- a/assets/syntaxes/02_Extra/Fstab.sublime-syntax
+++ b/assets/syntaxes/02_Extra/Fstab.sublime-syntax
@@ -95,7 +95,7 @@ contexts:

  fstab_dump:
    - include: comment
-    - match: '\s*[012]\s*'
+    - match: '\s*[01]\s*'
      comment: dump field
      scope: constant.numeric
      set: fstab_pass
@@ -107,7 +107,7 @@ contexts:

  fstab_pass:
    - include: comment
-    - match: '\s*[012]\s*'
+    - match: '\s*[01]\s*'
      comment: pass field
      scope: constant.numeric
      set: expected_eol
--- a/assets/syntaxes/02_Extra/GLSL
+++ b/assets/syntaxes/02_Extra/GLSL
--- a/assets/syntaxes/02_Extra/GraphQL
+++ b/assets/syntaxes/02_Extra/GraphQL
--- a/assets/syntaxes/02_Extra/HTML
+++ b/assets/syntaxes/02_Extra/HTML
--- a/assets/syntaxes/02_Extra/INI.sublime-syntax
+++ b/assets/syntaxes/02_Extra/INI.sublime-syntax
@@ -5,8 +5,8 @@ name: INI
 file_extensions:
  - ini
  - INI
-  - "inf"
-  - "INF"
+  - inf
+  - INF
  - reg
  - REG
  - lng
@@ -16,9 +16,6 @@ file_extensions:
  - url
  - URL
  - .editorconfig
-  - .coveragerc
-  - .pylintrc
-  - .gitlint
  - .hgrc
  - hgrc
 scope: source.ini
--- a/assets/syntaxes/02_Extra/Julia
+++ b/assets/syntaxes/02_Extra/Julia
--- a/assets/syntaxes/02_Extra/LESS
+++ b/assets/syntaxes/02_Extra/LESS
--- a/assets/syntaxes/02_Extra/LiveScript
+++ b/assets/syntaxes/02_Extra/LiveScript
--- a/assets/syntaxes/02_Extra/LiveScript.sublime-syntax
+++ b/assets/syntaxes/02_Extra/LiveScript.sublime-syntax
@@ -1,400 +0,0 @@
-%YAML 1.2
---
-# http://www.sublimetext.com/docs/3/syntax.html
-name: LiveScript
-comment: "LiveScript Syntax: version 1"
-file_extensions:
-  - ls
-  - Slakefile
-  - ls.erb
-first_line_match: ^#!.*\bls
-scope: source.livescript
-contexts:
-  main:
-    - match: |-
-        (?x)
-          !?[~-]{1,2}>\*?
-          |<[~-]{1,2}!?
-          |\(\s* (?=    instanceof[\s)]|and[\s)]|or[\s)]|is[\s)]|isnt[\s)]|in[\s)]|import[\s)]|import\ all[\s)]     |\.|[-+/*%^&<>=|][\b\s)\w$]|\*\*|\%\%)
-          |      (?<=[\s(]instanceof|[\s(]and|[\s(]or|[\s(]is|[\s(]isnt|[\s(]in|[\s(]import|[\s(]import\ all|[\s(]do|\.|\*\*|\%\%|[\b\s(\w$][-+/*%^&<>=|]) \s*\)
-      scope: storage.type.function.livescript
-    - match: \/\*
-      captures:
-        0: punctuation.definition.comment.livescript
-      push:
-        - meta_scope: comment.block.livescript
-        - match: \*\/
-          captures:
-            0: punctuation.definition.comment.livescript
-          pop: true
-        - match: '@\w*'
-          scope: storage.type.annotation.livescriptscript
-    - match: '(#)(?!\{).*$\n?'
-      scope: comment.line.number-sign.livescript
-      captures:
-        1: punctuation.definition.comment.livescript
-    - match: '((?:!|~|!~|~!)?function\*?)\s+([$\w\-]*[$\w]+)'
-      captures:
-        1: storage.type.function.livescript
-        2: entity.name.function.livescript
-    - match: (new)\s+(\w+(?:\.\w*)*)
-      captures:
-        1: keyword.operator.new.livescript
-        2: entity.name.type.instance.livescript
-    - match: \b(package|private|protected|public|interface|enum|static)(?!-)\b
-      scope: keyword.illegal.livescript
-    - match: "'''"
-      captures:
-        0: punctuation.definition.string.begin.livescript
-      push:
-        - meta_scope: string.quoted.heredoc.livescript
-        - match: "'''"
-          captures:
-            0: punctuation.definition.string.end.livescript
-          pop: true
-    - match: '"""'
-      captures:
-        0: punctuation.definition.string.begin.livescript
-      push:
-        - meta_scope: string.quoted.double.heredoc.livescript
-        - match: '"""'
-          captures:
-            0: punctuation.definition.string.end.livescript
-          pop: true
-        - match: \\.
-          scope: constant.character.escape.livescript
-        - include: interpolated_livescript
-    - match: "``"
-      captures:
-        0: punctuation.definition.string.begin.livescript
-      push:
-        - meta_scope: string.quoted.script.livescript
-        - match: "``"
-          captures:
-            0: punctuation.definition.string.end.livescript
-          pop: true
-        - match: '\\(x[0-9A-Fa-f]{2}|[0-2][0-7]{0,2}|3[0-6][0-7]|37[0-7]?|[4-7][0-7]?|.)'
-          scope: constant.character.escape.livescript
-    - match: '<\['
-      push:
-        - meta_scope: string.array-literal.livescript
-        - match: '\]>'
-          pop: true
-    - match: '/{2}(?![\s=/*+{}?]).*?[^\\]/[igmy]{0,4}(?![a-zA-Z0-9])/{2}'
-      scope: string.regexp.livescript
-    - match: '/{2}\n'
-      push:
-        - meta_scope: string.regexp.livescript
-        - match: "/{2}[imgy]{0,4}"
-          pop: true
-        - include: embedded_spaced_comment
-        - include: interpolated_livescript
-    - match: "/{2}"
-      push:
-        - meta_scope: string.regexp.livescript
-        - match: "/{2}[imgy]{0,4}"
-          pop: true
-        - match: '\\(x[0-9A-Fa-f]{2}|[0-2][0-7]{0,2}|3[0-6][0-7]|37[0-7]?|[4-7][0-7]?|.)'
-          scope: constant.character.escape.livescript
-        - include: interpolated_livescript
-    - match: '/(?![\s=/*+{}?]).*?[^\\]/[igmy]{0,4}(?![a-zA-Z0-9])'
-      scope: string.regexp.livescript
-    - match: |-
-        (?x)
-          \b(?<![\.\$\-@])(
-            instanceof|new|delete|typeof|and|or|is|isnt|not
-          )(?!\-|\s*:)\b
-      scope: keyword.operator.livescript
-    - match: <\||\|>
-      scope: keyword.operator.livescript
-    - match: "=>"
-      scope: keyword.control.livescript
-    - match: |-
-        (?x)
-          \b(?<![\.\$\-@])(?:
-          return|break|continue|throw
-          |try|if|while|for|for\s+own|switch|unless|until
-          |catch|finally|else|nobreak|case|default|fallthrough|when|otherwise|then
-          |yield
-          )(?!\-|\s*:)\b
-      scope: keyword.control.livescript
-    - match: |-
-        (?x)
-          and=|or=|%|&|\^|\*|\/|(?<![a-zA-Z$_])(\-)?\-(?!\-?>)|\+\+|\+|
-          ~(?!~?>)|==|=|!=|<=|>=|<<=|>>=|
-          >>>=|<>|<(?!\[)|(?<!\])>|(?<!\w)!(?!([~\-]+)?>)|&&|\.\.(\.)?|\s\.\s|\?|\|\||\:|\*=|(?<!\()/=|%=|\+=|\-=|\.=|&=
-          |\^=
-      scope: keyword.operator.livescript
-    - match: |-
-        (?x)
-          \b(?<![\.\$\-@])(?:
-          function
-          )(?!\-|\s*:)\b
-      scope: storage.type.function.livescript
-    - match: |-
-        (?x)
-          \b(?<![\.\$\-@])(?:
-          this|throw|then|try|typeof!?|til|to
-          |continue|const|case|catch|class
-          |in|instanceof|import|import\s+all|implements|if|is
-          |default|delete|debugger|do
-          |for|for\s+own|finally|function|from|fallthrough
-          |super|switch
-          |else|nobreak|extends|export|eval
-          |and|arguments
-          |new|not
-          |unless|until
-          |while|with|when
-          |of|or|otherwise
-          |let|var|loop
-          |match
-          |by|yield
-          )(?!\-|\s*:)\b
-      scope: keyword.other.livescript
-    - match: '([a-zA-Z\$_](?:[\w$.-])*)\s*(?!\::)((:)|(=(?!>)))\s*(?!(\s*!?\s*\(.*\))?\s*(!?[~-]{1,2}>\*?))'
-      captures:
-        1: variable.assignment.livescript
-        3: punctuation.separator.key-value, keyword.operator.livescript
-        4: keyword.operator.livescript
-    - match: '(?<=\s|^)([\[\{])(?=.*?[\]\}]\s+[:=])'
-      captures:
-        0: keyword.operator.livescript
-      push:
-        - meta_scope: meta.variable.assignment.destructured.livescript
-        - match: '([\]\}]\s*[:=])'
-          captures:
-            0: keyword.operator.livescript
-          pop: true
-        - include: variable_name
-        - include: instance_variable
-        - include: single_quoted_string
-        - include: double_quoted_string
-        - include: numeric
-    - match: |-
-        (?x)
-          (\s*)
-          (?=[a-zA-Z\$_])
-          ([a-zA-Z\$_]([\w$.:-])*)\s*
-          (?=[:=](\s*!?\s*\(.*\))?\s*(!?[~-]{1,2}>\*?))
-      scope: meta.function.livescript
-      captures:
-        2: entity.name.function.livescript
-        3: entity.name.function.livescript
-        4: variable.parameter.function.livescript
-        5: storage.type.function.livescript
-    - match: \b(?<!\.)(true|on|yes)(?!\s*:)\b
-      scope: constant.language.boolean.true.livescript
-    - match: \b(?<!\.)(false|off|no)(?!\s*:)\b
-      scope: constant.language.boolean.false.livescript
-    - match: \b(?<!\.)(null|void)(?!\s*:)\b
-      scope: constant.language.null.livescript
-    - match: \b(?<!\.)(super|this|extends)(?!\s*:)\b
-      scope: variable.language.livescript
-    - match: '(class\b)\s+(@?[a-zA-Z$_][\w$.-]*)?(?:\s+(extends)\s+(@?[a-zA-Z$_][\w$.-]*))?'
-      scope: meta.class.livescript
-      captures:
-        1: storage.type.class.livescript
-        2: entity.name.type.class.livescript
-        3: keyword.control.inheritance.livescript
-        4: entity.other.inherited-class.livescript
-    - match: \b(debugger|\\)\b
-      scope: keyword.other.livescript
-    - match: |-
-        (?x)\b(
-          Array|ArrayBuffer|Blob|Boolean|Date|document|event|Function|
-          Int(8|16|32|64)Array|Math|Map|Number|
-          Object|Proxy|RegExp|Set|String|WeakMap|
-          window|Uint(8|16|32|64)Array|XMLHttpRequest
-        )\b
-      scope: support.class.livescript
-    - match: \b(console)\b
-      scope: entity.name.type.object.livescript
-    - match: \b(Infinity|NaN|undefined)\b
-      scope: constant.language.livescript
-    - match: \;
-      scope: punctuation.terminator.statement.livescript
-    - match: ',[ |\t]*'
-      scope: meta.delimiter.object.comma.livescript
-    - match: \.
-      scope: meta.delimiter.method.period.livescript
-    - match: '\{|\}'
-      scope: meta.brace.curly.livescript
-    - match: \(|\)
-      scope: meta.brace.round.livescript
-    - match: '\[|\]\s*'
-      scope: meta.brace.square.livescript
-    - include: instance_variable
-    - include: backslash_string
-    - include: single_quoted_string
-    - include: double_quoted_string
-    - include: numeric
-    - match: '()(@|@@|[$\w\-]*[$\w]+)\s*(`)'
-      captures:
-        1: keyword.operator.livescript
-        2: meta.function-call.livescript
-        3: keyword.operator.livescript
-    - match: "`"
-      scope: keyword.operator.livescript
-    - match: '()(@|@@|[$\w\-]*[$\w]+)(?:(\??\!)|[(])'
-      captures:
-        1: keyword.operator.livescript
-        2: meta.function-call.livescript
-        3: keyword.operator.livescript
-    - match: '(@|@@|[$\w\-]*[$\w]+)(\?)? (?!\s*(((by|of|and|or|with|when|unless|if|is|isnt|else|nobreak|for|from|not in|in|catch|til|to|then|import|extends|implements|instanceof)\b)|[=:.*\/+\-%\^<>][ =)]|[`}%*)]|/(?!.*?/)|&&|[.][^.]|=>|\/ +|\||\|\||\-\-|\+\+|\|>|<|\||$|\n|\#|/\*))'
-      captures:
-        1: meta.function-call.livescript
-        2: keyword.operator.livescript
-    - match: \| _
-      scope: keyword.control.livescript
-    - match: '\|(?![.])'
-      scope: keyword.control.livescript
-    - match: \|
-      scope: keyword.operator.livescript
-    - match: ((?<=console\.)(debug|warn|info|log|error|time(End|-end)|assert))\b
-      scope: support.function.console.livescript
-    - match: |-
-        (?x)\b(
-          decodeURI(Component)?|encodeURI(Component)?|eval|parse(Float|Int)|require
-        )\b
-      scope: support.function.livescript
-    - match: |-
-        (?x)(?<![.-])\b(
-          map|filter|reject|partition|find|each|head|tail|last|initial|empty|
-          values|keys|length|cons|append|join|reverse|fold(l|r)?1?|unfoldr|
-          and(List|-list)|or(List|-list)|any|all|unique|sum|product|mean|compact|
-          concat(Map|-map)?|maximum|minimum|scan(l|r)?1?|replicate|slice|apply|
-          split(At|-at)?|take(While|-while)?|drop(While|-while)?|span|first|
-          break(It|-it)|list(ToObj|-to-obj)|obj(ToFunc|-to-func)|
-          pairs(ToObj|-to-obj)|obj(ToPairs|-to-pairs|ToLists|-to-lists)|
-          zip(All|-all)?(With|-with)?|compose|curry|partial|flip|fix|
-          sort(With|-with|By|-by)?|group(By|-by)|break(List|-list|Str|-str)|
-          difference|intersection|union|average|flatten|chars|unchars|repeat|
-          lines|unlines|words|unwords|max|min|negate|abs|signum|quot|rem|div|mod|
-          recip|pi|tau|exp|sqrt|ln|pow|sin|cos|tan|asin|acos|atan|atan2|truncate|
-          round|ceiling|floor|is(It|-it)NaN|even|odd|gcd|lcm|disabled__id
-        )\b(?![.-])
-      comment: |
-        Generated by DOM query from http://gkz.github.com/prelude-ls/:
-                    [].slice
-                    .call(document.querySelectorAll(".nav-pills li a"))
-                    .map(function(_) {return _.innerText})
-                    .filter(function(_) {return _.trim() !== '})
-                    .slice(2)
-                    .join("|")
-      scope: support.function.prelude.livescript
-    - match: '(?x)(?<![.-])\b(that|it|e|_)\b'
-      scope: support.function.semireserved.livescript
-    - match: |-
-        (?x)((?<=(\.|\]|\)))(
-          apply|call|concat|every|filter|for(Each|-each)|
-          from|has(Own|-own)(Property|-property)|index(Of|-of)|
-          is(Prototype|-prototype)(Of|-of)|join|last(Index|-index)(Of|-of)|
-          map|of|pop|property(Is|-is)(Enumerable|-enumerable)|push|
-          reduce(Right|-right)?|reverse|shift|slice|some|sort|
-          splice|to(Locale|-locale)?(String|-string)|unshift|valueOf
-        ))\b(?!-)
-      scope: support.function.method.array.livescript
-    - match: |-
-        (?x)((?<=Array\.)(
-          isArray
-        ))\b
-      scope: support.function.static.array.livescript
-    - match: |-
-        (?x)((?<=Object\.)(
-          create|define(Propert|-propert)(ies|y)|freeze|
-          get(Own|-own)(Property|-property)(Descriptors?|Names)|
-          get(Property|-property)(Descriptor|Names)|getPrototypeOf|
-          is((Extensible|-extensible)|(Frozen|-frozen)|(Sealed|-sealed))?|
-          keys|prevent(Extensions|-extensions)|seal
-        ))\b
-      scope: support.function.static.object.livescript
-    - match: |-
-        (?x)((?<=Math\.)(
-          abs|acos|acosh|asin|asinh|atan|atan2|atanh|ceil|cos|cosh|exp|expm1|floor|
-          hypot|log|log10|log1p|log2|max|min|pow|random|round|sign|sin|sinh|sqrt|
-          tan|tanh|trunc
-        ))\b
-      scope: support.function.static.math.livescript
-    - match: |-
-        (?x)((?<=Number\.)(
-          is(Finite|Integer|NaN)|to(Integer|-integer)
-        ))\b
-      scope: support.function.static.number.livescript
-    - match: '[\$\w][\w-]*'
-      scope: variable.other.livescript
-  backslash_string:
-    - match: '\\([\\)\s,\};\]])?'
-      captures:
-        0: string.quoted.single.livescript
-      push:
-        - meta_content_scope: string.quoted.single.livescript
-        - match: '([\\)\s,\};\]])'
-          captures:
-            0: punctuation.definition.string.end.livescript
-          pop: true
-  constructor_variable:
-    - match: '([a-zA-Z$_][\w$-]*)(@{2})([a-zA-Z$_][\w$-]*)?'
-      scope: variable.other.readwrite.constructor.livescript
-  double_quoted_string:
-    - match: '"'
-      captures:
-        0: punctuation.definition.string.begin.livescript
-      push:
-        - meta_scope: string.quoted.double.livescript
-        - match: '"'
-          captures:
-            0: punctuation.definition.string.end.livescript
-          pop: true
-        - match: '\\(x[0-9A-Fa-f]{2}|[0-2][0-7]{0,2}|3[0-6][0-7]|37[0-7]?|[4-7][0-7]?|.)'
-          scope: constant.character.escape.livescript
-        - include: interpolated_livescript
-  embedded_comment:
-    - match: (?<!\\)(#).*$\n
-      scope: comment.line.number-sign.livescript
-      captures:
-        1: punctuation.definition.comment.livescript
-  embedded_spaced_comment:
-    - match: (?<!\\)(#\s).*$\n
-      scope: comment.line.number-sign.livescript
-      captures:
-        1: punctuation.definition.comment.livescript
-  instance_variable:
-    - match: '(?<![$\w\-])(@)'
-      scope: variable.other.readwrite.instance.livescript
-  interpolated_livescript:
-    - match: '\#\{'
-      captures:
-        0: punctuation.section.embedded.livescript
-      push:
-        - meta_scope: source.livescript.embedded.source
-        - match: '\}'
-          captures:
-            0: punctuation.section.embedded.livescript
-          pop: true
-        - include: main
-    - match: '\#'
-      push:
-        - meta_scope: source.livescript.embedded.source.simple
-        - match: ""
-          pop: true
-        - include: main
-  numeric:
-    - match: '(?<![\$@a-zA-Z_])(([0-9]+r[0-9_]+)|((16r|0[xX])[0-9a-fA-F_]+)|([0-9]+(\.[0-9]+[0-9_]*)?(e[+\-]?[0-9_]+)?)[_a-zA-Z0-9]*)'
-      scope: constant.numeric.livescript
-  single_quoted_string:
-    - match: "'"
-      captures:
-        0: punctuation.definition.string.begin.livescript
-      push:
-        - meta_scope: string.quoted.single.livescript
-        - match: "'"
-          captures:
-            0: punctuation.definition.string.end.livescript
-          pop: true
-        - match: '\\(x[0-9A-Fa-f]{2}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)'
-          scope: constant.character.escape.livescript
-  variable_name:
-    - match: '([a-zA-Z\$_][\w$-]*(\.\w+)*)(?!\-)'
-      scope: variable.assignment.livescript
-      captures:
-        1: variable.assignment.livescript
--- a/assets/syntaxes/02_Extra/Manpage.sublime-syntax
+++ b/assets/syntaxes/02_Extra/Manpage.sublime-syntax
@@ -53,16 +53,6 @@ contexts:
      embed: synopsis
      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}}'
      scope: markup.heading.other.man
      embed: options # some man pages put command line options under the description heading
@@ -85,7 +75,7 @@ contexts:

  options:
    # command-line options like --option=value, --some-flag, or -x
-    - match: '^[ ]{7}(?=-|\+)'
+    - match: '^[ ]{7}(?=-)'
      push: expect-command-line-option
    - match: '(?:[^a-zA-Z0-9_-]|^|\s){{command_line_option}}'
      captures:
@@ -106,7 +96,7 @@ contexts:
    - include: env-var

  expect-command-line-option:
-    - match: '[A-Za-z0-9-\.\?:#\$\+]+'
+    - match: '[A-Za-z0-9-]+'
      scope: entity.name.command-line-option.man
    - match: '(\[)(=)'
      captures:
@@ -132,7 +122,7 @@ contexts:
      pop: true

  expect-parameter:
-    - match: '[A-Za-z0-9-_]+'
+    - match: '[A-Za-z0-9-]+'
      scope: variable.parameter.man
    - match: (?=\s+\|)
      pop: true
@@ -145,10 +135,6 @@ contexts:
          scope: punctuation.section.brackets.end.man
          pop: true
        - include: expect-parameter
-    - match: '<'
-      scope: punctuation.definition.generic.begin.man
-    - match: '>'
-      scope: punctuation.definition.generic.end.man
    - match: '$|(?=[],]|{{command_line_option}})'
      pop: true

@@ -183,20 +169,3 @@ contexts:
    - match: \[
      scope: punctuation.section.brackets.begin.man
      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
--- a/assets/syntaxes/02_Extra/MediaWiki
+++ b/assets/syntaxes/02_Extra/MediaWiki
--- a/assets/syntaxes/02_Extra/NSIS
+++ b/assets/syntaxes/02_Extra/NSIS
--- a/assets/syntaxes/02_Extra/Nginx
+++ b/assets/syntaxes/02_Extra/Nginx
--- a/assets/syntaxes/02_Extra/Nim.sublime-syntax
+++ b/assets/syntaxes/02_Extra/Nim.sublime-syntax
@@ -5,7 +5,6 @@ name: Nim
 file_extensions:
  - nim
  - nims
-  - nimble
 scope: source.nim
 contexts:
  main:
--- a/assets/syntaxes/02_Extra/PowerShell
+++ b/assets/syntaxes/02_Extra/PowerShell
--- a/assets/syntaxes/02_Extra/PowerShell.sublime-syntax
+++ b/assets/syntaxes/02_Extra/PowerShell.sublime-syntax
@@ -24,7 +24,7 @@ contexts:
    - include: commands
    - include: commentLine
    - include: variable
-    - include: subexpression
+    - include: interpolatedStringContent
    - include: function
    - include: attribute
    - include: UsingDirective
@@ -33,38 +33,32 @@ contexts:
    - include: doubleQuotedString
    - include: scriptblock
    - include: doubleQuotedStringEscapes
-    - match: '[''\x{2018}-\x{201B}]'
+    - match: (?<!')'
      captures:
        0: punctuation.definition.string.begin.powershell
      push:
        - meta_scope: string.quoted.single.powershell
-        - match: '[''\x{2018}-\x{201B}]{2}'
-          scope: constant.character.escape.powershell
-        - match: '[''\x{2018}-\x{201B}]'
+        - match: "'(?!')"
          captures:
            0: punctuation.definition.string.end.powershell
          pop: true
-    - match: '(@["\x{201C}-\x{201E}])\s*$'
-      captures:
-        1: punctuation.definition.string.begin.powershell
+        - match: "''"
+          scope: constant.character.escape.powershell
+    - match: \@"(?=$)
      push:
        - meta_scope: string.quoted.double.heredoc.powershell
-        - match: '^["\x{201C}-\x{201E}]@'
-          captures:
-            0: punctuation.definition.string.end.powershell
+        - match: ^"@
          pop: true
        - include: variableNoProperty
        - include: doubleQuotedStringEscapes
        - include: interpolation
-    - match: '(@[''\x{2018}-\x{201B}])\s*$'
-      captures:
-        1: punctuation.definition.string.begin.powershell
+    - match: \@'(?=$)
      push:
        - meta_scope: string.quoted.single.heredoc.powershell
-        - match: '^[''\x{2018}-\x{201B}]@'
-          captures:
-            0: punctuation.definition.string.end.powershell
+        - match: ^'@
          pop: true
+        - match: "''"
+          scope: constant.character.escape.powershell
    - include: numericConstant
    - match: (@)(\()
      captures:
@@ -77,12 +71,11 @@ contexts:
            0: punctuation.section.group.end.powershell
          pop: true
        - include: main
-    - match: ((\$))(\()
+    - match: (\$)(\()
      comment: "TODO: move to repo; make recursive."
      captures:
-        1: keyword.other.substatement.powershell
-        2: punctuation.definition.subexpression.powershell
-        3: punctuation.section.group.begin.powershell
+        1: punctuation.definition.variable.powershell
+        2: punctuation.section.group.begin.powershell
      push:
        - meta_scope: meta.group.complex.subexpression.powershell
        - match: \)
@@ -92,7 +85,7 @@ contexts:
        - include: main
    - match: '(\b(([A-Za-z0-9\-_\.]+)\.(?i:exe|com|cmd|bat))\b)'
      scope: support.function.powershell
-    - match: (?<!\w|-|\.)((?i:begin|break|catch|clean|continue|data|default|define|do|dynamicparam|else|elseif|end|exit|finally|for|from|if|in|inlinescript|parallel|param|process|return|sequence|switch|throw|trap|try|until|var|while)|%|\?)(?!\w)
+    - match: (?<!\w|-|\.)((?i:begin|break|catch|continue|data|default|define|do|dynamicparam|else|elseif|end|exit|finally|for|from|if|in|inlinescript|parallel|param|process|return|sequence|switch|throw|trap|try|until|var|while)|%|\?)(?!\w)
      scope: keyword.control.powershell
    - match: '(?<!\w|-|[^\)]\.)((?i:(foreach|where)(?!-object))|%|\?)(?!\w)'
      scope: keyword.control.powershell
@@ -142,7 +135,7 @@ contexts:
        - meta_scope: meta.requires.powershell
        - match: $
          pop: true
-        - match: \-(?i:Modules|PSSnapin|RunAsAdministrator|ShellId|Version|Assembly|PSEdition)
+        - match: \-(?i:Modules|PSSnapin|RunAsAdministrator|ShellId|Version)
          scope: keyword.other.powershell
        - match: '(?<!-)\b\p{L}+|\d+(?:\.\d+)*'
          scope: variable.parameter.powershell
@@ -194,53 +187,51 @@ contexts:
      comment: Builtin cmdlets with reserved verbs
      scope: support.function.powershell
  commentEmbeddedDocs:
-    - match: (?:^|\G)(?i:\s*(\.)(COMPONENT|DESCRIPTION|EXAMPLE|FUNCTIONALITY|INPUTS|LINK|NOTES|OUTPUTS|ROLE|SYNOPSIS))\s*$
-      comment: these embedded doc keywords do not support arguments, must be the only thing on the line
+    - match: ^(?i:(?:\s?|#)+(\.)(COMPONENT|DESCRIPTION|EXAMPLE|EXTERNALHELP|FORWARDHELPCATEGORY|FORWARDHELPTARGETNAME|FUNCTIONALITY|INPUTS|LINK|NOTES|OUTPUTS|REMOTEHELPRUNSPACE|ROLE|SYNOPSIS))
      scope: comment.documentation.embedded.powershell
      captures:
        1: constant.string.documentation.powershell
        2: keyword.operator.documentation.powershell
-    - match: (?:^|\G)(?i:\s*(\.)(EXTERNALHELP|FORWARDHELP(?:CATEGORY|TARGETNAME)|PARAMETER|REMOTEHELPRUNSPACE))\s+(.+?)\s*$
-      comment: these embedded doc keywords require arguments though the type required may be inconsistent, they may not all be able to use the same argument match
+    - match: '(?i:\s?(\.)(PARAMETER|FORWARDHELPTARGETNAME|FORWARDHELPCATEGORY|REMOTEHELPRUNSPACE|EXTERNALHELP)\s+([a-z0-9-_]+))'
      scope: comment.documentation.embedded.powershell
      captures:
        1: constant.string.documentation.powershell
        2: keyword.operator.documentation.powershell
        3: keyword.operator.documentation.powershell
  commentLine:
-    - match: '(?<![`\\-])(#)#*'
+    - match: '(?<![`\\-])#'
      captures:
-        1: punctuation.definition.comment.powershell
+        0: punctuation.definition.comment.powershell
      push:
        - meta_scope: comment.line.powershell
        - match: $\n?
          captures:
-            1: punctuation.definition.comment.powershell
+            0: punctuation.definition.comment.powershell
          pop: true
        - include: commentEmbeddedDocs
        - include: RequiresDirective
  doubleQuotedString:
-    - match: '["\x{201C}-\x{201E}]'
+    - match: (?<!(?<!`)")"
      captures:
        0: punctuation.definition.string.begin.powershell
      push:
        - meta_scope: string.quoted.double.powershell
-        - match: '(?i)\b[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,64}\b'
-        - include: variableNoProperty
-        - include: doubleQuotedStringEscapes
-        - match: '["\x{201C}-\x{201E}]{2}'
-          scope: constant.character.escape.powershell
-        - include: interpolation
-        - match: '`\s*$'
-          scope: keyword.other.powershell
-        - match: '["\x{201C}-\x{201E}]'
+        - match: '"(?!")'
          captures:
            0: punctuation.definition.string.end.powershell
          pop: true
+        - match: '(?i)\b[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,64}\b'
+        - include: variableNoProperty
+        - include: doubleQuotedStringEscapes
+        - include: interpolation
+        - match: '`\s*$'
+          scope: keyword.other.powershell
  doubleQuotedStringEscapes:
-    - match: '`[`0abefnrtv''"\x{2018}-\x{201E}$]'
+    - match: '`[`0abefnrtv"''$]'
      scope: constant.character.escape.powershell
    - include: unicodeEscape
+    - match: '""'
+      scope: constant.character.escape.powershell
  function:
    - match: '^(?:\s*+)(?i)(function|filter|configuration|workflow)\s+(?:(global|local|script|private):)?((?:\p{L}|\d|_|-|\.)+)'
      captures:
@@ -272,23 +263,33 @@ contexts:
            4: keyword.operator.assignment.powershell
        - include: scriptblock
        - include: main
-  interpolation:
-    - match: (((\$)))((\())
+  interpolatedStringContent:
+    - match: \(
      captures:
-        1: keyword.other.substatement.powershell
-        2: punctuation.definition.substatement.powershell
-        3: punctuation.section.embedded.substatement.begin.powershell
-        4: punctuation.section.group.begin.powershell
-        5: punctuation.section.embedded.substatement.begin.powershell
+        0: punctuation.section.group.begin.powershell
      push:
-        - meta_scope: meta.embedded.substatement.powershell
-        - meta_content_scope: interpolated.complex.source.powershell
-        - match: (\))
+        - meta_content_scope: interpolated.simple.source.powershell
+        - match: \)
          captures:
            0: punctuation.section.group.end.powershell
-            1: punctuation.section.embedded.substatement.end.powershell
          pop: true
        - include: main
+        - include: interpolation
+        - include: interpolatedStringContent
+  interpolation:
+    - match: (\$)(\()
+      captures:
+        1: punctuation.definition.variable.powershell
+        2: punctuation.section.group.begin.powershell
+      push:
+        - meta_content_scope: interpolated.complex.source.powershell
+        - match: \)
+          captures:
+            0: punctuation.section.group.end.powershell
+          pop: true
+        - include: main
+        - include: interpolation
+        - include: interpolatedStringContent
  numericConstant:
    - match: '(?<!\w)([-+]?0(?:x|X)[0-9a-fA-F_]+(?:U|u|L|l|UL|Ul|uL|ul|LU|Lu|lU|lu)?)((?i:[kmgtp]b)?)\b'
      captures:
@@ -329,17 +330,6 @@ contexts:
            0: punctuation.section.braces.end.powershell
          pop: true
        - include: main
-  subexpression:
-    - match: \(
-      captures:
-        0: punctuation.section.group.begin.powershell
-      push:
-        - meta_scope: meta.group.simple.subexpression.powershell
-        - match: \)
-          captures:
-            0: punctuation.section.group.end.powershell
-          pop: true
-        - include: main
  type:
    - match: '\['
      captures:
--- a/assets/syntaxes/02_Extra/Racket
+++ b/assets/syntaxes/02_Extra/Racket
--- a/assets/syntaxes/02_Extra/Racket.sublime-syntax
+++ b/assets/syntaxes/02_Extra/Racket.sublime-syntax
@@ -1,52 +0,0 @@
-%YAML 1.2
---
-# http://www.sublimetext.com/docs/3/syntax.html
-name: Racket
-file_extensions:
-  - rkt
-scope: source.racket
-contexts:
-  main:
-    - match: '[^\\](\"[^\"]*\")'
-      captures:
-        1: string.quoted.double.source.racket
-    - match: '\((define)\s+([a-zA-Z0-9_\-?\+^]+)\s*'
-      scope: meta.variable.source.racket
-      captures:
-        1: keyword.source.racket
-        2: entity.name.variable.source.racket
-    - match: '\((define)\s+\(([a-zA-Z0-9_\-?\+^]+)\s*'
-      scope: meta.function.source.racket
-      captures:
-        1: keyword.source.racket
-        2: entity.name.function
-    - match: '\((struct)\s+([a-zA-Z0-9_\-?\+^]+)\s+'
-      scope: meta.struct.source.racket
-      captures:
-        1: keyword.source.racket
-        2: entity.name.type
-    - match: '[\s\(](if|lambda|cond|define|type-case|let|letrec|let!|\#lang|require|test|else|first|rest|define-type|define-type-alias|define-struct|not|local|error|lang)[\s\)]'
-      scope: meta.keywords.source.racket
-      captures:
-        1: keyword.source.racket
-    - match: '[\s\(](true|false|empty|null)[\s\)]'
-      captures:
-        1: constant.language.source.racket
-    - match: '[\s\(\[\{](#t|#true|#f|#false)[\s\)\]\}]'
-      captures:
-        1: constant.language.source.racket
-    - match: '(#\\[a-zA-Z0-9_\-?\+\.\!\"]+)'
-      captures:
-        1: constant.language.source.racket
-    - match: '\b(0|([1-9][0-9_]*))\b'
-      scope: constant.numeric.integer.source.racket
-    - match: ;
-      push:
-        - meta_scope: comment.line.documentation.source.racket
-        - match: $\n
-          pop: true
-    - match: '#\|'
-      push:
-        - meta_scope: comment.block.source.racket
-        - match: '\|#'
-          pop: true
--- a/assets/syntaxes/02_Extra/Requirementstxt.sublime-syntax
+++ b/assets/syntaxes/02_Extra/Requirementstxt.sublime-syntax
@@ -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
--- a/assets/syntaxes/02_Extra/SCSS_Sass
+++ b/assets/syntaxes/02_Extra/SCSS_Sass
--- a/assets/syntaxes/02_Extra/Stylus.sublime-syntax
+++ b/assets/syntaxes/02_Extra/Stylus.sublime-syntax
@@ -197,7 +197,7 @@ contexts:
          scope: entity.other.attribute-name.stylus
    - match: |-
        (?x)                # multi-line regex definition mode
-        (?<=^|;|{)\s*    # starts after beginning of line, '{' or ';''
+        (?<=^|;|{)\s*    # starts after begining of line, '{' or ';''
        (?=                 # lookahead for
            (
             [a-zA-Z0-9_-]  # then a letter
@@ -207,7 +207,7 @@ contexts:
             (/\*.*?\*/)    # comment
            )+

-            \s*[:\s]\s*     # value is separated by colon or space
+            \s*[:\s]\s*     # value is separted by colon or space

            (?!(\s*\{))     # if there are only spaces afterwards

--- a/assets/syntaxes/02_Extra/SublimeJQ
+++ b/assets/syntaxes/02_Extra/SublimeJQ
--- a/assets/syntaxes/02_Extra/TOML
+++ b/assets/syntaxes/02_Extra/TOML
--- a/assets/syntaxes/02_Extra/TodoTxt
+++ b/assets/syntaxes/02_Extra/TodoTxt
--- a/assets/syntaxes/02_Extra/TypeScript
+++ b/assets/syntaxes/02_Extra/TypeScript
--- a/assets/syntaxes/02_Extra/TypeScript.sublime-syntax
+++ b/assets/syntaxes/02_Extra/TypeScript.sublime-syntax
@@ -4,8 +4,6 @@
 name: TypeScript
 file_extensions:
  - ts
-  - mts
-  - cts
 scope: source.ts
 contexts:
  main:
@@ -46,7 +44,7 @@ contexts:
        - match: (?=$)
          pop: true
  access-modifier:
-    - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(abstract|declare|override|public|protected|private|readonly|static)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'
+    - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(abstract|public|protected|private|readonly|static|declare)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'
      scope: storage.modifier.ts
  after-operator-block-as-object-literal:
    - match: '(?<!\+\+|--)(?<=[:=(,\[?+!>]|^await|[^\._$[:alnum:]]await|^return|[^\._$[:alnum:]]return|^yield|[^\._$[:alnum:]]yield|^throw|[^\._$[:alnum:]]throw|^in|[^\._$[:alnum:]]in|^of|[^\._$[:alnum:]]of|^typeof|[^\._$[:alnum:]]typeof|&&|\|\||\*)\s*(\{)'
@@ -108,7 +106,7 @@ contexts:
          (?=
            # sure shot arrow functions even if => is on new line
        (
-          (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?
+          (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?
          [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*
          (
            ([)]\s*:) |                                                                                       # ():
@@ -118,9 +116,9 @@ contexts:

        # arrow function possible to detect only with => on same line
        (
-          (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?                                                                                 # typeparameters
-          \(\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\)   # parameters
-          (\s*:\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+)?                                                                        # return type
+          (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?                                                                                 # typeparameters
+          \(\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\)   # parameters
+          (\s*:\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+)?                                                                        # return type
          \s*=>                                                                                               # arrow operator
        )
          )
@@ -270,7 +268,7 @@ contexts:
        - include: decorator
        - match: (?<=:)\s*
          push:
-            - match: '(?=\s|[;),}\]:\-\+]|;|^\s*$|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))'
+            - match: '(?=\s|[;),}\]:\-\+]|;|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))'
              pop: true
            - include: expression
        - include: method-declaration
@@ -319,12 +317,7 @@ contexts:
    - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(break|continue|do|goto|while)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'
      scope: keyword.control.loop.ts
    - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(return)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'
-      captures:
-        0: keyword.control.flow.ts
-      push:
-        - match: '(?=[;}]|$|;|^\s*$|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))'
-          pop: true
-        - include: expression
+      scope: keyword.control.flow.ts
    - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(case|default|switch)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'
      scope: keyword.control.switch.ts
    - include: if-statement
@@ -769,7 +762,7 @@ contexts:
        4: keyword.control.default.ts
      push:
        - meta_scope: meta.export.default.ts
-        - match: (?=$|;|^\s*$|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))
+        - match: (?=$|;|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))
          pop: true
        - include: interface-declaration
        - include: expression
@@ -779,7 +772,7 @@ contexts:
        2: keyword.control.type.ts
      push:
        - meta_scope: meta.export.ts
-        - match: (?=$|;|^\s*$|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))
+        - match: (?=$|;|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))
          pop: true
        - include: import-export-declaration
  expression:
@@ -792,11 +785,11 @@ contexts:
    - include: string
    - include: decorator
    - include: destructuring-parameter
-    - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(override|public|protected|private|readonly)\s+(?=(override|public|protected|private|readonly)\s+)'
+    - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(public|protected|private|readonly)\s+(?=(public|protected|private|readonly)\s+)'
      captures:
        1: storage.modifier.ts
    - match: |-
-        (?x)(?:(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(override|public|private|protected|readonly)\s+)?(?:(\.\.\.)\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))\s*(\??)(?=\s*
+        (?x)(?:(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(public|private|protected|readonly)\s+)?(?:(\.\.\.)\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))\s*(\??)(?=\s*
        # function assignment |
        (=\s*(
          ((async\s+)?(
@@ -805,10 +798,10 @@ contexts:
            ([_$[:alpha:]][_$[:alnum:]]*\s*=>)
          )) |
          ((async\s*)?(
-            ((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[\(]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |
+            ((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[\(]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{[^\{\}]*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[[^\[\]]*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |
            # sure shot arrow functions even if => is on new line
        (
-          (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?
+          (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?
          [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*
          (
            ([)]\s*:) |                                                                                       # ():
@@ -818,9 +811,9 @@ contexts:

        # arrow function possible to detect only with => on same line
        (
-          (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?                                                                                 # typeparameters
-          \(\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\)   # parameters
-          (\s*:\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+)?                                                                        # return type
+          (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?                                                                                 # typeparameters
+          \(\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\)   # parameters
+          (\s*:\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+)?                                                                        # return type
          \s*=>                                                                                               # arrow operator
        )
          ))
@@ -838,18 +831,18 @@ contexts:
          ))
        )) |
        (:\s*(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))Function(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))) |
-        (:\s*((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[\(]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*))))))) |
-        (:\s*(=>|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(<[^<>]*>)|[^<>(),=])+=\s*(
+        (:\s*((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[\(]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{[^\{\}]*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[[^\[\]]*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*))))))) |
+        (:\s*(=>|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(<[^<>]*>)|[^<>(),=])+=\s*(
          ((async\s+)?(
            (function\s*[(<*]) |
            (function\s+) |
            ([_$[:alpha:]][_$[:alnum:]]*\s*=>)
          )) |
          ((async\s*)?(
-            ((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[\(]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |
+            ((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[\(]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{[^\{\}]*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[[^\[\]]*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |
            # sure shot arrow functions even if => is on new line
        (
-          (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?
+          (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?
          [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*
          (
            ([)]\s*:) |                                                                                       # ():
@@ -859,9 +852,9 @@ contexts:

        # arrow function possible to detect only with => on same line
        (
-          (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?                                                                                 # typeparameters
-          \(\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\)   # parameters
-          (\s*:\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+)?                                                                        # return type
+          (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?                                                                                 # typeparameters
+          \(\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\)   # parameters
+          (\s*:\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+)?                                                                        # return type
          \s*=>                                                                                               # arrow operator
        )
          ))
@@ -872,7 +865,7 @@ contexts:
        3: entity.name.function.ts variable.language.this.ts
        4: entity.name.function.ts
        5: keyword.operator.optional.ts
-    - match: '(?x)(?:(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(override|public|private|protected|readonly)\s+)?(?:(\.\.\.)\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))\s*(\??)(?=\s*[:,]|$)'
+    - match: '(?x)(?:(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(public|private|protected|readonly)\s+)?(?:(\.\.\.)\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))\s*(\??)(?=\s*[:,]|$)'
      captures:
        1: storage.modifier.ts
        2: keyword.operator.rest.ts
@@ -937,11 +930,10 @@ contexts:
      scope: keyword.operator.comparison.ts
    - match: <=|>=|<>|<|>
      scope: keyword.operator.relational.ts
-    - match: '(?<=[_$[:alnum:]])(\!)\s*(?:(/=)|(?:(/)(?![/*])))'
+    - match: '(?<=[_$[:alnum:]])(\!)\s*(/)(?![/*])'
      captures:
        1: keyword.operator.logical.ts
-        2: keyword.operator.assignment.compound.ts
-        3: keyword.operator.arithmetic.ts
+        2: keyword.operator.arithmetic.ts
    - match: \!|&&|\|\||\?\?
      scope: keyword.operator.logical.ts
    - match: \&|~|\^|\|
@@ -954,18 +946,16 @@ contexts:
      scope: keyword.operator.increment.ts
    - match: '%|\*|/|-|\+'
      scope: keyword.operator.arithmetic.ts
-    - match: '(?<=[_$[:alnum:])\]])\s*(?=(\/\*([^\*]|(\*[^\/]))*\*\/\s*)+(?:(/=)|(?:(/)(?![/*]))))'
+    - match: '(?<=[_$[:alnum:])\]])\s*(?=(\/\*([^\*]|(\*[^\/]))*\*\/\s*)+(/)(?![/*]))'
      push:
-        - match: '(?:(/=)|(?:(/)(?!\*([^\*]|(\*[^\/]))*\*\/)))'
+        - match: '(/)(?!\*([^\*]|(\*[^\/]))*\*\/)'
          captures:
-            1: keyword.operator.assignment.compound.ts
-            2: keyword.operator.arithmetic.ts
+            1: keyword.operator.arithmetic.ts
          pop: true
        - include: comment
-    - match: '(?<=[_$[:alnum:])\]])\s*(?:(/=)|(?:(/)(?![/*])))'
+    - match: '(?<=[_$[:alnum:])\]])\s*(/)(?![/*])'
      captures:
-        1: keyword.operator.assignment.compound.ts
-        2: keyword.operator.arithmetic.ts
+        1: keyword.operator.arithmetic.ts
  expressionPunctuations:
    - include: punctuation-comma
    - include: punctuation-accessor
@@ -1031,10 +1021,10 @@ contexts:
                ([_$[:alpha:]][_$[:alnum:]]*\s*=>)
              )) |
              ((async\s*)?(
-                ((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[\(]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |
+                ((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[\(]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{[^\{\}]*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[[^\[\]]*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |
                # sure shot arrow functions even if => is on new line
            (
-              (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?
+              (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?
              [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*
              (
                ([)]\s*:) |                                                                                       # ():
@@ -1044,9 +1034,9 @@ contexts:

            # arrow function possible to detect only with => on same line
            (
-              (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?                                                                                 # typeparameters
-              \(\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\)   # parameters
-              (\s*:\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+)?                                                                        # return type
+              (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?                                                                                 # typeparameters
+              \(\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\)   # parameters
+              (\s*:\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+)?                                                                        # return type
              \s*=>                                                                                               # arrow operator
            )
              ))
@@ -1064,18 +1054,18 @@ contexts:
              ))
            )) |
            (:\s*(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))Function(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))) |
-            (:\s*((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[\(]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*))))))) |
-            (:\s*(=>|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(<[^<>]*>)|[^<>(),=])+=\s*(
+            (:\s*((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[\(]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{[^\{\}]*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[[^\[\]]*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*))))))) |
+            (:\s*(=>|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(<[^<>]*>)|[^<>(),=])+=\s*(
              ((async\s+)?(
                (function\s*[(<*]) |
                (function\s+) |
                ([_$[:alpha:]][_$[:alnum:]]*\s*=>)
              )) |
              ((async\s*)?(
-                ((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[\(]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |
+                ((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[\(]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{[^\{\}]*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[[^\[\]]*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |
                # sure shot arrow functions even if => is on new line
            (
-              (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?
+              (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?
              [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*
              (
                ([)]\s*:) |                                                                                       # ():
@@ -1085,9 +1075,9 @@ contexts:

            # arrow function possible to detect only with => on same line
            (
-              (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?                                                                                 # typeparameters
-              \(\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\)   # parameters
-              (\s*:\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+)?                                                                        # return type
+              (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?                                                                                 # typeparameters
+              \(\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\)   # parameters
+              (\s*:\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+)?                                                                        # return type
              \s*=>                                                                                               # arrow operator
            )
              ))
@@ -1128,19 +1118,18 @@ contexts:
    - include: type-parameters
    - include: function-parameters
    - include: return-type
-    - include: type-function-return-type
    - include: decl-block
    - match: \*
      scope: keyword.generator.asterisk.ts
  function-call:
-    - match: '(?=(((([_$[:alpha:]][_$[:alnum:]]*)(\s*\??\.\s*(\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\??\.\s*\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\)]))\s*(?:(\?\.\s*)|(\!))?((<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>\(]|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))(([^<>\(]|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>\(]|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(?<==)\>)*(?<!=)\>))*(?<!=)\>)*(?<!=)>\s*)?\())'
+    - match: '(?=(((([_$[:alpha:]][_$[:alnum:]]*)(\s*\??\.\s*(\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\??\.\s*\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\)]))\s*(?:(\?\.\s*)|(\!))?((<\s*(((keyof|infer|awaited|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>\(]|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|awaited|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))(([^<>\(]|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|awaited|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>\(]|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(?<==)\>)*(?<!=)\>))*(?<!=)\>)*(?<!=)>\s*)?\())'
      push:
-        - match: '(?<=\))(?!(((([_$[:alpha:]][_$[:alnum:]]*)(\s*\??\.\s*(\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\??\.\s*\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\)]))\s*(?:(\?\.\s*)|(\!))?((<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>\(]|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))(([^<>\(]|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>\(]|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(?<==)\>)*(?<!=)\>))*(?<!=)\>)*(?<!=)>\s*)?\())'
+        - match: '(?<=\))(?!(((([_$[:alpha:]][_$[:alnum:]]*)(\s*\??\.\s*(\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\??\.\s*\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\)]))\s*(?:(\?\.\s*)|(\!))?((<\s*(((keyof|infer|awaited|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>\(]|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|awaited|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))(([^<>\(]|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|awaited|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>\(]|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(?<==)\>)*(?<!=)\>))*(?<!=)\>)*(?<!=)>\s*)?\())'
          pop: true
        - match: '(?=(([_$[:alpha:]][_$[:alnum:]]*)(\s*\??\.\s*(\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\??\.\s*\#?[_$[:alpha:]][_$[:alnum:]]*))'
          push:
            - meta_scope: meta.function-call.ts
-            - match: '(?=\s*(?:(\?\.\s*)|(\!))?((<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>\(]|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))(([^<>\(]|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>\(]|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(?<==)\>)*(?<!=)\>))*(?<!=)\>)*(?<!=)>\s*)?\())'
+            - match: '(?=\s*(?:(\?\.\s*)|(\!))?((<\s*(((keyof|infer|awaited|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>\(]|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|awaited|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))(([^<>\(]|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|awaited|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>\(]|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(?<==)\>)*(?<!=)\>))*(?<!=)\>)*(?<!=)>\s*)?\())'
              pop: true
            - include: function-call-target
        - include: comment
@@ -1180,7 +1169,7 @@ contexts:
        6: meta.definition.function.ts entity.name.function.ts
      push:
        - meta_scope: meta.function.ts
-        - match: '(?=;|^\s*$|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))|(?<=\})'
+        - match: '(?=;|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))|(?<=\})'
          pop: true
        - include: function-name
        - include: function-body
@@ -1232,10 +1221,10 @@ contexts:
            ([_$[:alpha:]][_$[:alnum:]]*\s*=>)
          )) |
          ((async\s*)?(
-            ((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[\(]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |
+            ((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[\(]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{[^\{\}]*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[[^\[\]]*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |
            # sure shot arrow functions even if => is on new line
        (
-          (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?
+          (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?
          [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*
          (
            ([)]\s*:) |                                                                                       # ():
@@ -1245,9 +1234,9 @@ contexts:

        # arrow function possible to detect only with => on same line
        (
-          (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?                                                                                 # typeparameters
-          \(\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\)   # parameters
-          (\s*:\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+)?                                                                        # return type
+          (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?                                                                                 # typeparameters
+          \(\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\)   # parameters
+          (\s*:\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+)?                                                                        # return type
          \s*=>                                                                                               # arrow operator
        )
          ))
@@ -1271,7 +1260,7 @@ contexts:
    - match: "[_$[:alpha:]][_$[:alnum:]]*"
      scope: variable.other.readwrite.ts
  if-statement:
-    - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?=\bif\s*(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))\s*(?!\{))'
+    - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?=\bif\s*(\(([^\(\)]|(\([^\(\)]*\)))*\))\s*(?!\{))'
      push:
        - match: '(?=;|$|\})'
          pop: true
@@ -1286,12 +1275,12 @@ contexts:
                0: meta.brace.round.ts
              pop: true
            - include: expression
-        - match: '(?<=\))\s*\/(?![\/*])(?=(?:[^\/\\\[]|\\.|\[([^\]\\]|\\.)*\])+\/([dgimsuy]+|(?![\/\*])|(?=\/\*))(?!\s*[a-zA-Z0-9_$]))'
+        - match: '(?<=\))\s*\/(?![\/*])(?=(?:[^\/\\\[]|\\.|\[([^\]\\]|\\.)+\])+\/([gimsuy]+|(?![\/\*])|(?=\/\*))(?!\s*[a-zA-Z0-9_$]))'
          captures:
            0: punctuation.definition.string.begin.ts
          push:
            - meta_scope: string.regexp.ts
-            - match: "(/)([dgimsuy]*)"
+            - match: "(/)([gimsuy]*)"
              captures:
                1: punctuation.definition.string.end.ts
                2: keyword.other.ts
@@ -1425,9 +1414,6 @@ contexts:
            2: keyword.operator.type.modifier.ts
            3: keyword.operator.optional.ts
          pop: true
-        - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(as)\s+'
-          captures:
-            1: keyword.control.as.ts
        - include: type
  inline-tags:
    - match: '(\[)[^\]]+(\])(?={@(?:link|linkcode|linkplain|tutorial))'
@@ -1518,27 +1504,25 @@ contexts:
    - include: this-literal
    - include: super-literal
  method-declaration:
-    - match: '(?x)(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:\b(override)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(abstract)\s+)?(?:\b(async)\s+)?\s*\b(constructor)\b(?!:)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'
+    - match: '(?x)(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:\b(public|private|protected)\s+)?(?:\b(abstract)\s+)?(?:\b(async)\s+)?\s*\b(constructor)\b(?!:)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'
      captures:
        1: storage.modifier.ts
        2: storage.modifier.ts
-        3: storage.modifier.ts
-        4: storage.modifier.async.ts
-        5: storage.type.ts
+        3: storage.modifier.async.ts
+        4: storage.type.ts
      push:
        - meta_scope: meta.method.declaration.ts
        - match: '(?=\}|;|,|$)|(?<=\})'
          pop: true
        - include: method-declaration-name
        - include: function-body
-    - match: '(?x)(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:\b(override)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(abstract)\s+)?(?:\b(async)\s+)?(?:(?:\s*\b(new)\b(?!:)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.)))|(?:(\*)\s*)?)(?=\s*((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*))?[\(])'
+    - match: '(?x)(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:\b(public|private|protected)\s+)?(?:\b(abstract)\s+)?(?:\b(async)\s+)?(?:(?:\s*\b(new)\b(?!:)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.)))|(?:(\*)\s*)?)(?=\s*((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*))?[\(])'
      captures:
        1: storage.modifier.ts
        2: storage.modifier.ts
-        3: storage.modifier.ts
-        4: storage.modifier.async.ts
-        5: keyword.operator.new.ts
-        6: keyword.generator.asterisk.ts
+        3: storage.modifier.async.ts
+        4: keyword.operator.new.ts
+        5: keyword.generator.asterisk.ts
      push:
        - meta_scope: meta.method.declaration.ts
        - match: '(?=\}|;|,|$)|(?<=\})'
@@ -1546,7 +1530,7 @@ contexts:
        - include: method-declaration-name
        - include: function-body
    - match: |-
-        (?x)(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:\b(override)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(abstract)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?:(\*)\s*)?(?=\s*(((\b(?<!\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\b(?!\$))|(\b(?<!\$)0(?:b|B)[01][01_]*(n)?\b(?!\$))|(\b(?<!\$)0(?:o|O)?[0-7][0-7_]*(n)?\b(?!\$))|((?<!\$)(?:
+        (?x)(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:\b(public|private|protected)\s+)?(?:\b(abstract)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?:(\*)\s*)?(?=\s*(((\b(?<!\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\b(?!\$))|(\b(?<!\$)0(?:b|B)[01][01_]*(n)?\b(?!\$))|(\b(?<!\$)0(?:o|O)?[0-7][0-7_]*(n)?\b(?!\$))|((?<!\$)(?:
          (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\b)| # 1.1E+3
          (?:\b[0-9][0-9_]*(\.)[eE][+-]?[0-9][0-9_]*(n)?\b)|             # 1.E+3
          (?:\B(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\b)|             # .1E+3
@@ -1555,14 +1539,13 @@ contexts:
          (?:\b[0-9][0-9_]*(\.)(n)?\B)|                                  # 1.
          (?:\B(\.)[0-9][0-9_]*(n)?\b)|                                  # .1
          (?:\b[0-9][0-9_]*(n)?\b(?!\.))                                 # 1
-        )(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`)|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??))\s*((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*))?[\(])
+        )(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`)|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??))\s*((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*))?[\(])
      captures:
        1: storage.modifier.ts
        2: storage.modifier.ts
-        3: storage.modifier.ts
-        4: storage.modifier.async.ts
-        5: storage.type.property.ts
-        6: keyword.generator.asterisk.ts
+        3: storage.modifier.async.ts
+        4: storage.type.property.ts
+        5: keyword.generator.asterisk.ts
      push:
        - meta_scope: meta.method.declaration.ts
        - match: '(?=\}|;|,|$)|(?<=\})'
@@ -1599,7 +1582,7 @@ contexts:
        3: storage.type.namespace.ts
      push:
        - meta_scope: meta.namespace.declaration.ts
-        - match: '(?<=\})|(?=;|^\s*$|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))'
+        - match: '(?<=\})|(?=;|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))'
          pop: true
        - include: comment
        - include: string
@@ -1615,7 +1598,9 @@ contexts:
        - meta_scope: new.expr.ts
        - match: '(?<=\))|(?=[;),}\]:?\-\+\>]|\|\||\&\&|\!\=\=|$|((?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))new(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.)))|((?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))function((\s+[_$[:alpha:]][_$[:alnum:]]*)|(\s*[\(]))))'
          pop: true
-        - include: expression
+        - include: paren-expression
+        - include: class-declaration
+        - include: type
  null-literal:
    - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))null(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'
      scope: constant.language.null.ts
@@ -1796,7 +1781,7 @@ contexts:
          (?:\b[0-9][0-9_]*(\.)(n)?\B)|                                  # 1.
          (?:\B(\.)[0-9][0-9_]*(n)?\b)|                                  # .1
          (?:\b[0-9][0-9_]*(n)?\b(?!\.))                                 # 1
-        )(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`)|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??))\s*((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*))?[\(])
+        )(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`)|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??))\s*((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*))?[\(])
      captures:
        1: storage.modifier.async.ts
        2: storage.type.property.ts
@@ -1817,7 +1802,7 @@ contexts:
              (?:\b[0-9][0-9_]*(\.)(n)?\B)|                                  # 1.
              (?:\B(\.)[0-9][0-9_]*(n)?\b)|                                  # .1
              (?:\b[0-9][0-9_]*(n)?\b(?!\.))                                 # 1
-            )(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`)|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??))\s*((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*))?[\(])
+            )(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`)|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??))\s*((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*))?[\(])
          captures:
            1: storage.modifier.async.ts
            2: storage.type.property.ts
@@ -1879,10 +1864,10 @@ contexts:
            ([_$[:alpha:]][_$[:alnum:]]*\s*=>)
          )) |
          ((async\s*)?(
-            ((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[\(]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |
+            ((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[\(]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{[^\{\}]*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[[^\[\]]*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |
            # sure shot arrow functions even if => is on new line
        (
-          (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?
+          (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?
          [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*
          (
            ([)]\s*:) |                                                                                       # ():
@@ -1892,9 +1877,9 @@ contexts:

        # arrow function possible to detect only with => on same line
        (
-          (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?                                                                                 # typeparameters
-          \(\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\)   # parameters
-          (\s*:\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+)?                                                                        # return type
+          (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?                                                                                 # typeparameters
+          \(\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\)   # parameters
+          (\s*:\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+)?                                                                        # return type
          \s*=>                                                                                               # arrow operator
        )
          ))
@@ -1945,7 +1930,7 @@ contexts:
        - meta_scope: meta.object.member.ts
        - match: '(?=,|\})'
          pop: true
-        - match: '(?<=:)\s*(async)?(?=\s*(<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)\(\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))'
+        - match: '(?<=:)\s*(async)?(?=\s*(<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)\(\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{[^\{\}]*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[[^\[\]]*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))'
          captures:
            1: storage.modifier.async.ts
          push:
@@ -1961,7 +1946,7 @@ contexts:
                    0: meta.brace.round.ts
                  pop: true
                - include: expression-inside-possibly-arrow-parens
-        - match: '(?<=:)\s*(async)?\s*(\()(?=\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))'
+        - match: '(?<=:)\s*(async)?\s*(\()(?=\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{[^\{\}]*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[[^\[\]]*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))'
          captures:
            1: storage.modifier.async.ts
            2: meta.brace.round.ts
@@ -1978,7 +1963,7 @@ contexts:
            - match: (?<=\>)
              pop: true
            - include: type-parameters
-        - match: '(?<=\>)\s*(\()(?=\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))'
+        - match: '(?<=\>)\s*(\()(?=\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{[^\{\}]*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[[^\[\]]*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))'
          captures:
            1: meta.brace.round.ts
          push:
@@ -2012,11 +1997,11 @@ contexts:
    - include: destructuring-parameter-rest
    - include: variable-initializer
  parameter-name:
-    - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(override|public|protected|private|readonly)\s+(?=(override|public|protected|private|readonly)\s+)'
+    - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(public|protected|private|readonly)\s+(?=(public|protected|private|readonly)\s+)'
      captures:
        1: storage.modifier.ts
    - match: |-
-        (?x)(?:(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(override|public|private|protected|readonly)\s+)?(?:(\.\.\.)\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))\s*(\??)(?=\s*
+        (?x)(?:(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(public|private|protected|readonly)\s+)?(?:(\.\.\.)\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))\s*(\??)(?=\s*
        # function assignment |
        (=\s*(
          ((async\s+)?(
@@ -2025,10 +2010,10 @@ contexts:
            ([_$[:alpha:]][_$[:alnum:]]*\s*=>)
          )) |
          ((async\s*)?(
-            ((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[\(]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |
+            ((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[\(]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{[^\{\}]*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[[^\[\]]*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |
            # sure shot arrow functions even if => is on new line
        (
-          (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?
+          (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?
          [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*
          (
            ([)]\s*:) |                                                                                       # ():
@@ -2038,9 +2023,9 @@ contexts:

        # arrow function possible to detect only with => on same line
        (
-          (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?                                                                                 # typeparameters
-          \(\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\)   # parameters
-          (\s*:\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+)?                                                                        # return type
+          (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?                                                                                 # typeparameters
+          \(\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\)   # parameters
+          (\s*:\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+)?                                                                        # return type
          \s*=>                                                                                               # arrow operator
        )
          ))
@@ -2058,18 +2043,18 @@ contexts:
          ))
        )) |
        (:\s*(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))Function(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))) |
-        (:\s*((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[\(]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*))))))) |
-        (:\s*(=>|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(<[^<>]*>)|[^<>(),=])+=\s*(
+        (:\s*((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[\(]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{[^\{\}]*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[[^\[\]]*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*))))))) |
+        (:\s*(=>|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(<[^<>]*>)|[^<>(),=])+=\s*(
          ((async\s+)?(
            (function\s*[(<*]) |
            (function\s+) |
            ([_$[:alpha:]][_$[:alnum:]]*\s*=>)
          )) |
          ((async\s*)?(
-            ((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[\(]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |
+            ((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[\(]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{[^\{\}]*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[[^\[\]]*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |
            # sure shot arrow functions even if => is on new line
        (
-          (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?
+          (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?
          [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*
          (
            ([)]\s*:) |                                                                                       # ():
@@ -2079,9 +2064,9 @@ contexts:

        # arrow function possible to detect only with => on same line
        (
-          (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?                                                                                 # typeparameters
-          \(\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\)   # parameters
-          (\s*:\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+)?                                                                        # return type
+          (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?                                                                                 # typeparameters
+          \(\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\)   # parameters
+          (\s*:\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+)?                                                                        # return type
          \s*=>                                                                                               # arrow operator
        )
          ))
@@ -2092,7 +2077,7 @@ contexts:
        3: entity.name.function.ts variable.language.this.ts
        4: entity.name.function.ts
        5: keyword.operator.optional.ts
-    - match: '(?x)(?:(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(override|public|private|protected|readonly)\s+)?(?:(\.\.\.)\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))\s*(\??)'
+    - match: '(?x)(?:(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(public|private|protected|readonly)\s+)?(?:(\.\.\.)\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))\s*(\??)'
      captures:
        1: storage.modifier.ts
        2: keyword.operator.rest.ts
@@ -2152,14 +2137,14 @@ contexts:
          pop: true
        - include: expression
  paren-expression-possibly-arrow:
-    - match: '(?<=[(=,])\s*(async)?(?=\s*((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*))?\(\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))'
+    - match: '(?<=[(=,])\s*(async)?(?=\s*((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*))?\(\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{[^\{\}]*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[[^\[\]]*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))'
      captures:
        1: storage.modifier.async.ts
      push:
        - match: (?<=\))
          pop: true
        - include: paren-expression-possibly-arrow-with-typeparameters
-    - match: '(?<=[(=,]|=>|^return|[^\._$[:alnum:]]return)\s*(async)?(?=\s*((((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*))?\()|(<))\s*$)'
+    - match: '(?<=[(=,]|=>|^return|[^\._$[:alnum:]]return)\s*(async)?(?=\s*((((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*))?\()|(<))\s*$)'
      captures:
        1: storage.modifier.async.ts
      push:
@@ -2179,7 +2164,7 @@ contexts:
          pop: true
        - include: expression-inside-possibly-arrow-parens
  possibly-arrow-return-type:
-    - match: '(?<=\)|^)\s*(:)(?=\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*=>)'
+    - match: '(?<=\)|^)\s*(:)(?=\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*=>)'
      captures:
        1: meta.arrow.ts meta.return.type.arrow.ts keyword.operator.type.annotation.ts
      push:
@@ -2226,23 +2211,23 @@ contexts:
          pop: true
        - include: string-character-escape
  regex:
-    - match: '(?<!\+\+|--|})(?<=[=(:,\[?+!]|^return|[^\._$[:alnum:]]return|^case|[^\._$[:alnum:]]case|=>|&&|\|\||\*\/)\s*(\/)(?![\/*])(?=(?:[^\/\\\[\()]|\\.|\[([^\]\\]|\\.)+\]|\(([^\)\\]|\\.)+\))+\/([dgimsuy]+|(?![\/\*])|(?=\/\*))(?!\s*[a-zA-Z0-9_$]))'
+    - match: '(?<!\+\+|--|})(?<=[=(:,\[?+!]|^return|[^\._$[:alnum:]]return|^case|[^\._$[:alnum:]]case|=>|&&|\|\||\*\/)\s*(\/)(?![\/*])(?=(?:[^\/\\\[\()]|\\.|\[([^\]\\]|\\.)+\]|\(([^\)\\]|\\.)+\))+\/([gimsuy]+|(?![\/\*])|(?=\/\*))(?!\s*[a-zA-Z0-9_$]))'
      captures:
        1: punctuation.definition.string.begin.ts
      push:
        - meta_scope: string.regexp.ts
-        - match: "(/)([dgimsuy]*)"
+        - match: "(/)([gimsuy]*)"
          captures:
            1: punctuation.definition.string.end.ts
            2: keyword.other.ts
          pop: true
        - include: regexp
-    - match: '((?<![_$[:alnum:])\]]|\+\+|--|}|\*\/)|((?<=^return|[^\._$[:alnum:]]return|^case|[^\._$[:alnum:]]case))\s*)\/(?![\/*])(?=(?:[^\/\\\[]|\\.|\[([^\]\\]|\\.)*\])+\/([dgimsuy]+|(?![\/\*])|(?=\/\*))(?!\s*[a-zA-Z0-9_$]))'
+    - match: '((?<![_$[:alnum:])\]]|\+\+|--|}|\*\/)|((?<=^return|[^\._$[:alnum:]]return|^case|[^\._$[:alnum:]]case))\s*)\/(?![\/*])(?=(?:[^\/\\\[]|\\.|\[([^\]\\]|\\.)+\])+\/([gimsuy]+|(?![\/\*])|(?=\/\*))(?!\s*[a-zA-Z0-9_$]))'
      captures:
        0: punctuation.definition.string.begin.ts
      push:
        - meta_scope: string.regexp.ts
-        - match: "(/)([dgimsuy]*)"
+        - match: "(/)([gimsuy]*)"
          captures:
            1: punctuation.definition.string.end.ts
            2: keyword.other.ts
@@ -2445,7 +2430,7 @@ contexts:
        4: support.variable.property.target.ts
    - match: |-
        (?x) (?:(\.)|(\?\.(?!\s*[[:digit:]]))) \s* (?:
-        (?:(constructor|length|prototype|__proto__)\b(?!\$|\s*(<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?\())
+        (?:(constructor|length|prototype|__proto__)\b(?!\$|\s*(<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?\())
        |
        (?:(EPSILON|MAX_SAFE_INTEGER|MAX_VALUE|MIN_SAFE_INTEGER|MIN_VALUE|NEGATIVE_INFINITY|POSITIVE_INFINITY)\b(?!\$)))
      captures:
@@ -2551,7 +2536,7 @@ contexts:
        |siblingBelow|size|source|specified|standby|start|status|statusbar|statusText|style|styleSheets|suffixes|summary
        |systemId|systemLanguage|tagName|tags|target|tBodies|text|textAlign|textDecoration|textIndent|textTransform|tFoot|tHead
        |title|toolbar|top|type|undefined|uniqueID|updateInterval|URL|URLUnencoded|useMap|userAgent|userLanguage|userProfile
-        |vAlign|value|valueType|vendor|vendorSub|version|visibility|vspace|whiteSpace|width|X[MS]LDocument|zIndex))\b(?!\$|\s*(<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?\()
+        |vAlign|value|valueType|vendor|vendorSub|version|visibility|vspace|whiteSpace|width|X[MS]LDocument|zIndex))\b(?!\$|\s*(<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?\()
      captures:
        1: punctuation.accessor.ts
        2: punctuation.accessor.optional.ts
@@ -2718,7 +2703,27 @@ contexts:
                0: case-clause.expr.ts punctuation.definition.section.case-statement.ts
            - include: statements
  template:
-    - include: template-call
+    - match: '(?=(([_$[:alpha:]][_$[:alnum:]]*\s*\??\.\s*)*|(\??\.\s*)?)([_$[:alpha:]][_$[:alnum:]]*)(<\s*(((keyof|infer|awaited|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>\(]|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|awaited|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))(([^<>\(]|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|awaited|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>\(]|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(?<==)\>)*(?<!=)\>))*(?<!=)\>)*(?<!=)>\s*)?`)'
+      push:
+        - meta_scope: string.template.ts
+        - match: (?=`)
+          pop: true
+        - match: '(?=(([_$[:alpha:]][_$[:alnum:]]*\s*\??\.\s*)*|(\??\.\s*)?)([_$[:alpha:]][_$[:alnum:]]*))'
+          push:
+            - match: '(?=(<\s*(((keyof|infer|awaited|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>\(]|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|awaited|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))(([^<>\(]|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|awaited|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>\(]|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(?<==)\>)*(?<!=)\>))*(?<!=)\>)*(?<!=)>\s*)?`)'
+              pop: true
+            - include: support-function-call-identifiers
+            - match: "([_$[:alpha:]][_$[:alnum:]]*)"
+              scope: entity.name.function.tagged-template.ts
+        - include: type-arguments
+    - match: '([_$[:alpha:]][_$[:alnum:]]*)\s*(?=(<\s*(((keyof|infer|awaited|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>\(]|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|awaited|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))(([^<>\(]|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|awaited|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>\(]|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(?<==)\>)*(?<!=)\>))*(?<!=)\>)*(?<!=)>\s*)`)'
+      captures:
+        1: entity.name.function.tagged-template.ts
+      push:
+        - meta_scope: string.template.ts
+        - match: (?=`)
+          pop: true
+        - include: type-arguments
    - match: "([_$[:alpha:]][_$[:alnum:]]*)?(`)"
      captures:
        1: entity.name.function.tagged-template.ts
@@ -2731,28 +2736,6 @@ contexts:
          pop: true
        - include: template-substitution-element
        - include: string-character-escape
-  template-call:
-    - match: '(?=(([_$[:alpha:]][_$[:alnum:]]*\s*\??\.\s*)*|(\??\.\s*)?)([_$[:alpha:]][_$[:alnum:]]*)(<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>\(]|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))(([^<>\(]|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>\(]|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(?<==)\>)*(?<!=)\>))*(?<!=)\>)*(?<!=)>\s*)?`)'
-      push:
-        - meta_scope: string.template.ts
-        - match: (?=`)
-          pop: true
-        - match: '(?=(([_$[:alpha:]][_$[:alnum:]]*\s*\??\.\s*)*|(\??\.\s*)?)([_$[:alpha:]][_$[:alnum:]]*))'
-          push:
-            - match: '(?=(<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>\(]|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))(([^<>\(]|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>\(]|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(?<==)\>)*(?<!=)\>))*(?<!=)\>)*(?<!=)>\s*)?`)'
-              pop: true
-            - include: support-function-call-identifiers
-            - match: "([_$[:alpha:]][_$[:alnum:]]*)"
-              scope: entity.name.function.tagged-template.ts
-        - include: type-arguments
-    - match: '([_$[:alpha:]][_$[:alnum:]]*)?\s*(?=(<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>\(]|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))(([^<>\(]|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>\(]|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(?<==)\>)*(?<!=)\>))*(?<!=)\>)*(?<!=)>\s*)`)'
-      captures:
-        1: entity.name.function.tagged-template.ts
-      push:
-        - meta_scope: string.template.ts
-        - match: (?=`)
-          pop: true
-        - include: type-arguments
  template-substitution-element:
    - match: '\$\{'
      captures:
@@ -2765,32 +2748,6 @@ contexts:
            0: punctuation.definition.template-expression.end.ts
          pop: true
        - include: expression
-  template-type:
-    - include: template-call
-    - match: "([_$[:alpha:]][_$[:alnum:]]*)?(`)"
-      captures:
-        1: entity.name.function.tagged-template.ts
-        2: punctuation.definition.string.template.begin.ts
-      push:
-        - meta_scope: string.template.ts
-        - match: "`"
-          captures:
-            0: punctuation.definition.string.template.end.ts
-          pop: true
-        - include: template-type-substitution-element
-        - include: string-character-escape
-  template-type-substitution-element:
-    - match: '\$\{'
-      captures:
-        0: punctuation.definition.template-expression.begin.ts
-      push:
-        - meta_scope: meta.template.expression.ts
-        - meta_content_scope: meta.embedded.line.ts
-        - match: '\}'
-          captures:
-            0: punctuation.definition.template-expression.end.ts
-          pop: true
-        - include: type
  ternary-expression:
    - match: '(?!\?\.\s*[^[:digit:]])(\?)(?!\?)'
      captures:
@@ -2806,7 +2763,7 @@ contexts:
      scope: variable.language.this.ts
  type:
    - include: comment
-    - include: type-string
+    - include: string
    - include: numeric-literal
    - include: type-primitive
    - include: type-builtin-literals
@@ -2831,23 +2788,15 @@ contexts:
        4: entity.name.type.alias.ts
      push:
        - meta_scope: meta.type.declaration.ts
-        - match: '(?=\}|;|^\s*$|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))'
+        - match: '(?=\}|;|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))'
          pop: true
        - include: comment
        - include: type-parameters
-        - match: '(=)\s*(intrinsic)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'
-          captures:
-            1: keyword.operator.assignment.ts
-            2: keyword.control.intrinsic.ts
-          push:
-            - match: '(?=\}|;|^\s*$|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))'
-              pop: true
-            - include: type
        - match: (=)\s*
          captures:
            1: keyword.operator.assignment.ts
          push:
-            - match: '(?=\}|;|^\s*$|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))'
+            - match: '(?=\}|;|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))'
              pop: true
            - include: type
  type-annotation:
@@ -2905,19 +2854,17 @@ contexts:
            - include: type
        - include: type
  type-fn-type-parameters:
-    - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(abstract)\s+)?(new)\b(?=\s*\<)'
+    - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(new)\b(?=\s*\<)'
      captures:
-        1: meta.type.constructor.ts storage.modifier.ts
-        2: meta.type.constructor.ts keyword.control.new.ts
+        1: meta.type.constructor.ts keyword.control.new.ts
      push:
        - match: (?<=>)
          pop: true
        - include: comment
        - include: type-parameters
-    - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(abstract)\s+)?(new)\b\s*(?=\()'
+    - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(new)\b\s*(?=\()'
      captures:
-        1: storage.modifier.ts
-        2: keyword.control.new.ts
+        1: keyword.control.new.ts
      push:
        - meta_scope: meta.type.constructor.ts
        - match: (?<=\))
@@ -3046,6 +2993,8 @@ contexts:
      scope: keyword.operator.ternary.ts
    - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))infer(?=\s+[_$[:alpha:]])'
      scope: keyword.operator.expression.infer.ts
+    - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))awaited(?=\s+[_$[:alpha:]])'
+      scope: keyword.operator.expression.awaited.ts
    - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))import(?=\s*\()'
      scope: keyword.operator.expression.import.ts
  type-parameters:
@@ -3088,7 +3037,7 @@ contexts:
              ))
            )) |
            (:\s*(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))Function(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))) |
-            (:\s*((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[\(]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*))))))))
+            (:\s*((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[\(]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{[^\{\}]*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[[^\[\]]*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*))))))))
          captures:
            1: storage.modifier.ts
            2: keyword.operator.rest.ts
@@ -3125,10 +3074,6 @@ contexts:
  type-primitive:
    - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(string|number|bigint|boolean|symbol|any|void|never|unknown)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'
      scope: support.type.primitive.ts
-  type-string:
-    - include: qstring-single
-    - include: qstring-double
-    - include: template-type
  type-tuple:
    - match: '\['
      captures:
@@ -3150,12 +3095,7 @@ contexts:
        - include: punctuation-comma
  typeof-operator:
    - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))typeof(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'
-      captures:
-        0: keyword.operator.expression.typeof.ts
-      push:
-        - match: '(?=[,);}\]=>:&|{\?]|$|;|^\s*$|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))'
-          pop: true
-        - include: expression
+      scope: keyword.operator.expression.typeof.ts
  undefined-literal:
    - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))undefined(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'
      scope: constant.language.undefined.ts
@@ -3163,7 +3103,7 @@ contexts:
    - match: '(?=(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(\bexport)\s+)?(?:(\bdeclare)\s+)?\b(var|let)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.)))'
      push:
        - meta_scope: meta.var.expr.ts
-        - match: '(?!(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(\bexport)\s+)?(?:(\bdeclare)\s+)?\b(var|let)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.)))((?=;|}|((?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(of|in)\s+)|;|^\s*$|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))|((?<!^let|[^\._$[:alnum:]]let|^var|[^\._$[:alnum:]]var)(?=\s*$)))'
+        - match: '(?!(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(\bexport)\s+)?(?:(\bdeclare)\s+)?\b(var|let)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.)))((?=;|}|((?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(of|in)\s+)|^\s*$|;|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))|((?<!^let|[^\._$[:alnum:]]let|^var|[^\._$[:alnum:]]var)(?=\s*$)))'
          pop: true
        - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(\bexport)\s+)?(?:(\bdeclare)\s+)?\b(var|let)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))\s*'
          captures:
@@ -3196,7 +3136,7 @@ contexts:
        3: storage.type.ts
      push:
        - meta_scope: meta.var.expr.ts
-        - match: '(?!(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(\bexport)\s+)?(?:(\bdeclare)\s+)?\b(const(?!\s+enum\b))(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.)))((?=;|}|((?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(of|in)\s+)|;|^\s*$|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))|((?<!^const|[^\._$[:alnum:]]const)(?=\s*$)))'
+        - match: '(?!(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(\bexport)\s+)?(?:(\bdeclare)\s+)?\b(const(?!\s+enum\b))(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.)))((?=;|}|((?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(of|in)\s+)|^\s*$|;|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))|((?<!^const|[^\._$[:alnum:]]const)(?=\s*$)))'
          pop: true
        - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(\bexport)\s+)?(?:(\bdeclare)\s+)?\b(const(?!\s+enum\b))(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))\s*'
          captures:
@@ -3233,10 +3173,10 @@ contexts:
            ([_$[:alpha:]][_$[:alnum:]]*\s*=>)
          )) |
          ((async\s*)?(
-            ((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[\(]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |
+            ((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[\(]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{[^\{\}]*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[[^\[\]]*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |
            # sure shot arrow functions even if => is on new line
        (
-          (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?
+          (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?
          [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*
          (
            ([)]\s*:) |                                                                                       # ():
@@ -3246,9 +3186,9 @@ contexts:

        # arrow function possible to detect only with => on same line
        (
-          (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?                                                                                 # typeparameters
-          \(\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\)   # parameters
-          (\s*:\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+)?                                                                        # return type
+          (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?                                                                                 # typeparameters
+          \(\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\)   # parameters
+          (\s*:\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+)?                                                                        # return type
          \s*=>                                                                                               # arrow operator
        )
          ))
@@ -3266,18 +3206,18 @@ contexts:
          ))
        )) |
        (:\s*(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))Function(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))) |
-        (:\s*((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[\(]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*))))))) |
-        (:\s*(=>|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(<[^<>]*>)|[^<>(),=])+=\s*(
+        (:\s*((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[\(]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{[^\{\}]*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[[^\[\]]*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*))))))) |
+        (:\s*(=>|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(<[^<>]*>)|[^<>(),=])+=\s*(
          ((async\s+)?(
            (function\s*[(<*]) |
            (function\s+) |
            ([_$[:alpha:]][_$[:alnum:]]*\s*=>)
          )) |
          ((async\s*)?(
-            ((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[\(]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |
+            ((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[\(]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{[^\{\}]*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[[^\[\]]*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |
            # sure shot arrow functions even if => is on new line
        (
-          (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?
+          (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?
          [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*
          (
            ([)]\s*:) |                                                                                       # ():
@@ -3287,9 +3227,9 @@ contexts:

        # arrow function possible to detect only with => on same line
        (
-          (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?                                                                                 # typeparameters
-          \(\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\)   # parameters
-          (\s*:\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+)?                                                                        # return type
+          (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?                                                                                 # typeparameters
+          \(\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\)   # parameters
+          (\s*:\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+)?                                                                        # return type
          \s*=>                                                                                               # arrow operator
        )
          ))
@@ -3320,10 +3260,10 @@ contexts:
            ([_$[:alpha:]][_$[:alnum:]]*\s*=>)
          )) |
          ((async\s*)?(
-            ((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[\(]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |
+            ((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[\(]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{[^\{\}]*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[[^\[\]]*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |
            # sure shot arrow functions even if => is on new line
        (
-          (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?
+          (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?
          [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*
          (
            ([)]\s*:) |                                                                                       # ():
@@ -3333,9 +3273,9 @@ contexts:

        # arrow function possible to detect only with => on same line
        (
-          (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?                                                                                 # typeparameters
-          \(\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\)   # parameters
-          (\s*:\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+)?                                                                        # return type
+          (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?                                                                                 # typeparameters
+          \(\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\)   # parameters
+          (\s*:\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+)?                                                                        # return type
          \s*=>                                                                                               # arrow operator
        )
          ))
@@ -3353,18 +3293,18 @@ contexts:
          ))
        )) |
        (:\s*(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))Function(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))) |
-        (:\s*((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[\(]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*))))))) |
-        (:\s*(=>|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(<[^<>]*>)|[^<>(),=])+=\s*(
+        (:\s*((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[\(]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{[^\{\}]*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[[^\[\]]*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*))))))) |
+        (:\s*(=>|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(<[^<>]*>)|[^<>(),=])+=\s*(
          ((async\s+)?(
            (function\s*[(<*]) |
            (function\s+) |
            ([_$[:alpha:]][_$[:alnum:]]*\s*=>)
          )) |
          ((async\s*)?(
-            ((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[\(]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |
+            ((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[\(]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{[^\{\}]*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[[^\[\]]*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |
            # sure shot arrow functions even if => is on new line
        (
-          (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?
+          (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?
          [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*
          (
            ([)]\s*:) |                                                                                       # ():
@@ -3374,9 +3314,9 @@ contexts:

        # arrow function possible to detect only with => on same line
        (
-          (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?                                                                                 # typeparameters
-          \(\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\)   # parameters
-          (\s*:\s*([^<>\(\)\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+)?                                                                        # return type
+          (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?                                                                                 # typeparameters
+          \(\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\(\)]|(\([^\(\)]*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\)   # parameters
+          (\s*:\s*([^<>\(\)\{\}]|\<([^<>]|\<[^<>]+\>)+\>|\([^\(\)]+\)|\{[^\{\}]+\})+)?                                                                        # return type
          \s*=>                                                                                               # arrow operator
        )
          ))
--- a/assets/syntaxes/02_Extra/TypsecriptReact.sublime-syntax
+++ b/assets/syntaxes/02_Extra/TypsecriptReact.sublime-syntax
--- a/assets/syntaxes/02_Extra/VimHelp.sublime-syntax
+++ b/assets/syntaxes/02_Extra/VimHelp.sublime-syntax
@@ -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
--- a/assets/syntaxes/02_Extra/VimL
+++ b/assets/syntaxes/02_Extra/VimL
--- a/assets/syntaxes/02_Extra/Zig
+++ b/assets/syntaxes/02_Extra/Zig
--- a/assets/syntaxes/02_Extra/cmd-help
+++ b/assets/syntaxes/02_Extra/cmd-help
--- a/assets/syntaxes/02_Extra/log.sublime-syntax
+++ b/assets/syntaxes/02_Extra/log.sublime-syntax
@@ -6,16 +6,8 @@ file_extensions:
 scope: text.log
 variables:
  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:
  main:
-    - include: log_level_lines
-    - include: main_without_log_level_line
-  main_without_log_level_line:
    - match: (\w+)(=)
      captures:
        1: variable.parameter.log
@@ -25,85 +17,31 @@ contexts:
      captures:
        1: punctuation.definition.string.begin.log
        3: punctuation.definition.string.end.log
-    - match: \"
+    - match: (")([^"]*)(")
+      scope: string.quoted.double.log
      captures:
        1: punctuation.definition.string.begin.log
-      push: double_quoted_string
+        3: punctuation.definition.string.end.log
    - include: dates
    - include: ip_addresses
    - 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
    - match: \b\w+:/{2,3}
      scope: markup.underline.link.scheme.log
      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:
-    - 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
-      push: maybe_date_time_separator
-    - 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
-      push: maybe_date_time_separator
-    - match: \b(?={{hours_minutes_seconds}})
-      push: time
-  time:
-    - match: (?:{{hours_minutes_seconds}})(?:(\.)\d{3})?\b
+    - match: \b(?:[01]\d|2[0-3]):(?:[0-5]\d):(?:[0-5]\d)(?:(\.)\d{3})?\b
      scope: meta.time.log meta.number.integer.decimal.log constant.numeric.value.log
      captures:
        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:
    - match: \b(?=(?:{{ipv4_part}}\.){3}{{ipv4_part}}\b)
      push:
@@ -112,7 +50,8 @@ contexts:
          scope: constant.numeric.value.log
        - match: \.
          scope: punctuation.separator.sequence.log
-        - include: immediately_pop
+        - match: ''
+          pop: true
    - match: (?=(?:\h{0,4}:){2,6}\h{1,4}\b)
      push:
        - meta_scope: meta.ipaddress.v6.log meta.number.integer.hexadecimal.log
@@ -120,7 +59,8 @@ contexts:
          scope: constant.numeric.value.log
        - match: ':'
          scope: punctuation.separator.sequence.log
-        - include: immediately_pop
+        - match: ''
+          pop: true
  numbers:
    - match: \b(0x)(\h+)(?:(\.)(\h+))?\b
      scope: meta.number.float.hexadecimal.log
@@ -172,13 +112,5 @@ contexts:
      pop: true
    - match: '[^?!.,:*_~\s<&()%]+|\S'
      scope: markup.underline.link.path.log
-    - include: immediately_pop
-  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
+    - match: ''
      pop: true
--- a/assets/syntaxes/02_Extra/requirementstxt
+++ b/assets/syntaxes/02_Extra/requirementstxt
--- a/assets/syntaxes/02_Extra/requirementstxt.sublime-syntax
+++ b/assets/syntaxes/02_Extra/requirementstxt.sublime-syntax
@@ -0,0 +1,19 @@
+%YAML 1.2
+---
+# http://www.sublimetext.com/docs/3/syntax.html
+name: requirements.txt
+file_extensions:
+  - requirements.txt
+scope: source.requirementstxt
+contexts:
+  main:
+    - match: (#).*$\n?
+      scope: comment.line.requirementstxt
+      captures:
+        1: punctuation.definition.comment.requirementstxt
+    - match: '(?i)^[a-z0-9_\-\.]+'
+      scope: string.package_name.requirementstxt
+    - match: (?i)==|<|<=|>=|>
+      scope: keyword.operator.logical.punctuation.requirementstxt
+    - match: '(?i)\d+\.[\da-z\-_\.]*'
+      scope: constant.numeric.verions.requirementstxt
--- a/assets/syntaxes/02_Extra/ssh-config
+++ b/assets/syntaxes/02_Extra/ssh-config
--- a/assets/syntaxes/02_Extra/syntax_test_helphelp.txt
+++ b/assets/syntaxes/02_Extra/syntax_test_helphelp.txt
@@ -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
--- a/assets/syntaxes/02_Extra/syntax_test_man.man
+++ b/assets/syntaxes/02_Extra/syntax_test_man.man
@@ -157,108 +157,6 @@ ENVIRONMENT
           systemd reads the log level from this environment variable. This
           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
       The systemd Homepage[11], systemd-system.conf(5), locale.conf(5)
 #                                ^^^^^^^^^^^^^^^^^^^ entity.name.function
--- a/assets/syntaxes/02_Extra/syntax_test_requirements.txt
+++ b/assets/syntaxes/02_Extra/syntax_test_requirements.txt
@@ -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
--- a/assets/syntaxes/02_Extra/vscode-wgsl
+++ b/assets/syntaxes/02_Extra/vscode-wgsl
--- a/assets/syntaxes/02_Extra/wgsl.sublime-syntax
+++ b/assets/syntaxes/02_Extra/wgsl.sublime-syntax
@@ -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
--- a/assets/themes.bin
+++ b/assets/themes.bin
--- a/assets/themes/zenburn
+++ b/assets/themes/zenburn
--- a/build.rs
+++ b/build.rs
@@ -0,0 +1,101 @@
+// 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.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);
+// }
--- a/build/application.rs
+++ b/build/application.rs
@@ -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(())
-}
--- a/build/main.rs
+++ b/build/main.rs
@@ -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(())
-}
--- a/build/syntax_mapping.rs
+++ b/build/syntax_mapping.rs
@@ -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(())
-}
--- a/build/util.rs
+++ b/build/util.rs
@@ -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(())
-}
--- a/doc/README-ja.md
+++ b/doc/README-ja.md
@@ -1,6 +1,7 @@
 <p align="center">
  <img src="logo-header.svg" alt="bat - a cat clone with wings"><br>
-  <a href="https://github.com/sharkdp/bat/actions?query=workflow%3ACICD"><img src="https://github.com/sharkdp/bat/workflows/CICD/badge.svg" alt="Build Status"></a>
+  <a href="https://travis-ci.org/sharkdp/bat"><img src="https://travis-ci.org/sharkdp/bat.svg?branch=master" alt="Build Status"></a>
+  <a href="https://ci.appveyor.com/project/sharkdp/bat"><img src="https://ci.appveyor.com/api/projects/status/cptsmtbiwbnr2vhf?svg=true"></a>
  <img src="https://img.shields.io/crates/l/bat.svg" alt="license">
  <a href="https://crates.io/crates/bat"><img src="https://img.shields.io/crates/v/bat.svg?colorB=319e8c" alt="Version info"></a><br>
  シンタックスハイライトとGitとの連携機能付きの <i>cat(1)</i> クローン。
@@ -11,12 +12,8 @@
  <a href="#使い方">使い方</a> •
  <a href="#インストール">インストール</a> •
  <a href="#カスタマイズ">カスタマイズ</a> •
-  <a href="#プロジェクトの目標と既存の類似したOSS">プロジェクトの目標と既存の類似したOSS</a><br>
-  [<a href="../README.md">English</a>]
-  [<a href="README-zh.md">中文</a>]
-  [日本語]
-  [<a href="README-ko.md">한국어</a>]
-  [<a href="README-ru.md">Русский</a>]
+  <a href="#プロジェクトの目標と既存の類似したOSS">プロジェクトの目標と既存の類似したOSS</a> •
+  翻訳 [<a href="https://github.com/chinanf-boy/bat-zh">中文</a>][<a href="README-ja.md">日本語</a>][<a href="README-ko.md">한국어</a>]
 </p>

 ### シンタックスハイライト
@@ -181,12 +178,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.svg)](https://repology.org/project/bat/versions)

 ###  On Ubuntu (`apt` を使用)
 *... や他の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
 apt install bat
@@ -205,7 +202,7 @@ ln -s /usr/bin/batcat ~/.local/bin/bat
 batの最新リリースを実行する場合、または Ubuntu/Debian の古いバージョンを使用している場合は、[release page](https://github.com/sharkdp/bat/releases) から最新の `.deb` パッケージをダウンロードし、
 次の方法でインストールします:
 ```bash
-sudo dpkg -i bat_0.18.3_amd64.deb  # adapt version number and architecture
+sudo dpkg -i bat_0.18.2_amd64.deb  # adapt version number and architecture
 ```

 ### On Alpine Linux
@@ -219,7 +216,7 @@ apk add bat

 ###  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
@@ -366,7 +363,7 @@ ansible-galaxy install aeimer.install_bat
 ### From source


-`bat` をソースからビルドしたいならば、Rust 1.70.0 以上の環境が必要です。
+`bat` をソースからビルドしたいならば、Rust 1.36 以上の環境が必要です。
 `cargo` を使用してビルドすることができます:

 ```bash
@@ -525,7 +522,7 @@ export BAT_CONFIG_PATH="/path/to/bat.conf"
 # Use italic text on the terminal (not supported on all terminals)
 --italic-text=always

-# Use C++ syntax for Arduino .ino files
+# Use C++ syntax for .ino files
 --map-syntax "*.ino:C++"

 # Use ".gitignore"-style highlighting for ".ignore" files
--- a/doc/README-ko.md
+++ b/doc/README-ko.md
@@ -1,5 +1,5 @@
 <p align="center">
-  <img src="logo-header.svg" alt="bat - a cat clone with wings"><br>
+  <img src="../doc/logo-header.svg" alt="bat - a cat clone with wings"><br>
  <a href="https://github.com/sharkdp/bat/actions?query=workflow%3ACICD"><img src="https://github.com/sharkdp/bat/workflows/CICD/badge.svg" alt="Build Status"></a>
  <img src="https://img.shields.io/crates/l/bat.svg" alt="license">
  <a href="https://crates.io/crates/bat"><img src="https://img.shields.io/crates/v/bat.svg?colorB=319e8c" alt="Version info"></a><br>
@@ -11,12 +11,8 @@
  <a href="#사용법">사용법</a> •
  <a href="#설치">설치</a> •
  <a href="#사용자화">사용자화</a> •
-  <a href="#프로젝트-목표와-대안들">프로젝트 목표와 대안들</a><br>
-  [<a href="../README.md">English</a>]
-  [<a href="README-zh.md">中文</a>]
-  [<a href="README-ja.md">日本語</a>]
-  [한국어]
-  [<a href="README-ru.md">Русский</a>]
+  <a href="#프로젝트-목표와-대안들">프로젝트 목표와 대안들</a> •
+  [<a href="https://github.com/chinanf-boy/bat-zh">中文</a>] [<a href="../doc/README-ja.md">日本語</a>] [<a href="../doc/README-ko.md">한국어</a>] [<a href="../doc/README-ru.md">Русский</a>]
 </p>

 ### 문법 강조
@@ -214,7 +210,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` 사용)
 *... 그리고 다른 Debian 기반의 Linux 배포판들에서.*
@@ -222,7 +218,7 @@ man 2 select
 `bat`은 [Ubuntu](https://packages.ubuntu.com/eoan/bat)와
 [Debian](https://packages.debian.org/sid/bat) 패키지 배포 과정에 도입되는 중이며,
 Eoan 19.10 버전의 Ubuntu에서부터 제공됩니다.
-현재 Debian에서는 불안정한 "Sid" 브랜치에서만 `bat`이 제공됩니다.
+현재 Debain에서는 불안정한 "Sid" 브랜치에서만 `bat`이 제공됩니다.

 만약 충분히 최신 버전의 Ubuntu/Debian이 설치되어 있다면 간단히 다음을 실행하세요:

@@ -248,7 +244,7 @@ ln -s /usr/bin/batcat ~/.local/bin/bat
 다음과 같이 `.deb` 패키지를 받아 설치하세요:

 ```bash
-sudo dpkg -i bat_0.18.3_amd64.deb  # adapt version number and architecture
+sudo dpkg -i bat_0.18.2_amd64.deb  # adapt version number and architecture
 ```

 ### Alpine Linux에서
@@ -264,7 +260,7 @@ apk add bat
 ### Arch Linux에서

 공식 소스를 통해
-[`bat` 패키지](https://www.archlinux.org/packages/extra/x86_64/bat/)를
+[`bat` 패키지](https://www.archlinux.org/packages/community/x86_64/bat/)를
 설치할 수 있습니다:

 ```bash
@@ -283,14 +279,6 @@ pacman -S bat
 dnf install bat
 ```

-### Funtoo Linux에서
-
-dev-kit을 통해 [`bat` 패키지](https://github.com/funtoo/dev-kit/tree/1.4-release/sys-apps/bat)를 설치할 수 있습니다: 
-
-```bash
-emerge sys-apps/bat
-```
-
 ### Gentoo Linux에서

 공식 소스를 통해
@@ -416,7 +404,7 @@ scoop install bat

 ### 소스에서

-`bat`의 소스를 빌드하기 위해서는, Rust 1.70.0 이상이 필요합니다.
+`bat`의 소스를 빌드하기 위해서는, Rust 1.45 이상이 필요합니다.
 `cargo`를 이용해 전부 빌드할 수 있습니다:

 ```bash
@@ -675,7 +663,7 @@ bat --generate-config-file
 # 터미널에서 이탤릭체 쓰기 (일부 터미널에서 미지원)
 --italic-text=always

-# Arduino .ino 파일에 C++ 문법 쓰기
+# .ino 파일에 C++ 문법 쓰기
 --map-syntax "*.ino:C++"
 ```

@@ -809,10 +797,6 @@ cargo install --locked --force
 - [keith-hall](https://github.com/keith-hall)
 - [Enselic](https://github.com/Enselic)

-## 보안 취약점
-
-만약 `bat`의 취약점을 발견하였다면, [David Peter](https://david-peter.de/)에게 메일로 연락주시기 바랍니다. 
-
 ## 프로젝트 목표와 대안들

 `bat`은 다음과 같은 목표를 달성하려고 합니다:
--- a/doc/README-ru.md
+++ b/doc/README-ru.md
@@ -1,6 +1,7 @@
 <p align="center">
-  <img src="logo-header.svg" alt="bat - a cat clone with wings"><br>
-  <a href="https://github.com/sharkdp/bat/actions?query=workflow%3ACICD"><img src="https://github.com/sharkdp/bat/workflows/CICD/badge.svg" alt="Build Status"></a>
+  <img src="doc/logo-header.svg" alt="bat - a cat clone with wings"><br>
+  <a href="https://travis-ci.org/sharkdp/bat"><img src="https://travis-ci.org/sharkdp/bat.svg?branch=master" alt="Build Status"></a>
+  <a href="https://ci.appveyor.com/project/sharkdp/bat"><img src="https://ci.appveyor.com/api/projects/status/cptsmtbiwbnr2vhf/branch/master?svg=true"></a>
  <img src="https://img.shields.io/crates/l/bat.svg" alt="license">
  <a href="https://crates.io/crates/bat"><img src="https://img.shields.io/crates/v/bat.svg?colorB=319e8c" alt="Version info"></a><br>
  Клон утилиты <i>cat(1)</i> с поддержкой выделения синтаксиса и Git
@@ -11,12 +12,8 @@
  <a href="#как-использовать">Использование</a> •
  <a href="#установка">Установка</a> •
  <a href="#кастомизация">Кастомизация</a> •
-  <a href="#цели-и-альтернативы">Цели и альтернативы </a><br>
-  [<a href="../README.md">English</a>]
-  [<a href="README-zh.md">中文</a>]
-  [<a href="README-ja.md">日本語</a>]
-  [<a href="README-ko.md">한국어</a>]
-  [Русский]
+  <a href="#цели-и-альтернативы">Цели и альтернативы </a> •
+  Перевод [<a href="https://github.com/chinanf-boy/bat-zh">中文</a>][<a href="doc/README-ja.md">日本語</a>][<a href="doc/README-ko.md">한국어</a>][<a href="doc/README-ru.md">Русский</a>]
 </p>

 ### Выделение синтаксиса
@@ -130,8 +127,8 @@ git show v0.6.0:src/main.rs | bat -l rs

 #### `xclip`

-Нумерация строк и отображение изменений затрудняет копирование содержимого файлов в буфер обмена.
-Чтобы справиться с этим, используйте флаг `-p`/`--plain` или просто перенаправьте стандартный вывод в `xclip`:
+Нумерация стро и отображение изменений затрудняет копирование содержимого файлов в буфер обмена.
+Чтобы спроваиться с этим, используйте флаг `-p`/`--plain` или просто перенаправьте стандартный вывод в `xclip`:
 ```bash
 bat main.cpp | xclip
 ```
@@ -160,7 +157,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.svg)](https://repology.org/project/bat/versions)

 ### Ubuntu (с помощью `apt`)
 *... и другие дистрибутивы основанные на Debian.*
@@ -188,7 +185,7 @@ ln -s /usr/bin/batcat ~/.local/bin/bat
 [release page](https://github.com/sharkdp/bat/releases) и установить так:

 ```bash
-sudo dpkg -i bat_0.18.3_amd64.deb  # измените архитектуру и версию
+sudo dpkg -i bat_0.18.2_amd64.deb  # измените архитектуру и версию
 ```

 ### Alpine Linux
@@ -201,7 +198,7 @@ apk add bat

 ### Arch Linux

-Вы можете установить [`bat`](https://www.archlinux.org/packages/extra/x86_64/bat/) из официального источника:
+Вы можете установить [`bat`](https://www.archlinux.org/packages/community/x86_64/bat/) из официального источника:

 ```bash
 pacman -S bat
@@ -344,7 +341,7 @@ ansible-galaxy install aeimer.install_bat

 ### Из исходников

-Если вы желаете установить `bat` из исходников, вам понадобится Rust 1.70.0 или выше. После этого используйте `cargo`, чтобы все скомпилировать:
+Если вы желаете установить `bat` из исходников, вам понадобится Rust 1.45 или выше. После этого используйте `cargo`, чтобы все скомпилировать:

 ```bash
 cargo install --locked bat
@@ -484,10 +481,10 @@ bat --generate-config-file
 # Использовать курсив (поддерживается не всеми терминалами)
 --italic-text=always

-# Использовать синтаксис C++ для всех Arduino .ino файлов
+# Использовать синтаксис C++ для всех .ino файлов
 --map-syntax "*.ino:C++"

-# Использовать синтаксис Git Ignore для всех файлов .ignore
+# Использовать синтаксик Git Ignore для всех файлов .ignore
 --map-syntax ".ignore:Git Ignore"
 ```

@@ -535,7 +532,7 @@ bat() {
 `bat` поддерживает терминалы *с* и *без* поддержки truecolor. Однако подсветка синтаксиса не оптимизирована для терминалов с 8-битными цветами, и рекомендуется использовать терминалы с поддержкой 24-битных цветов (`terminator`, `konsole`, `iTerm2`, ...).
 Смотрите [эту статью](https://gist.github.com/XVilka/8346728) для полного списка терминалов.

-Удостоверьтесь, что переменная `COLORTERM` равна `truecolor` или
+Удостовертесь, что переменная `COLORTERM` равна `truecolor` или
 `24bit`. Иначе `bat` не сможет определить поддержку 24-битных цветов (и будет использовать 8-битные).

 ### Текст и номера строк плохо видны
@@ -550,7 +547,7 @@ bat() {
 ``` bash
 iconv -f ISO-8859-1 -t UTF-8 my-file.php | bat
 ```
-Внимание: вам может понадобиться флаг `-l`/`--language`, если `bat` не сможет автоматически определить синтаксис.
+Внимание: вам может понадобится флаг `-l`/`--language`, если `bat` не сможет автоматически определить синтаксис.

 ## Разработка

@@ -568,7 +565,7 @@ cargo test
 # Установка (релизная версия)
 cargo install --locked

-# Компилирование исполняемого файла bat с другим синтаксисом и темами
+# Компилирование исполняего файла bat с другим синтаксисом и темами
 bash assets/create.sh
 cargo install --locked --force
 ```
@@ -592,6 +589,6 @@ cargo install --locked --force
 ## Лицензия
 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) для более подробного ознакомления.
--- a/doc/README-zh.md
+++ b/doc/README-zh.md
@@ -1,678 +0,0 @@
-<p align="center">
-  <img src="logo-header.svg" alt="bat - a cat clone with wings"><br>
-  <a href="https://github.com/sharkdp/bat/actions?query=workflow%3ACICD"><img src="https://github.com/sharkdp/bat/workflows/CICD/badge.svg" alt="Build Status"></a>
-  <img src="https://img.shields.io/crates/l/bat.svg" alt="license">
-  <a href="https://crates.io/crates/bat"><img src="https://img.shields.io/crates/v/bat.svg?colorB=319e8c" alt="Version info"></a><br>
-  类似 <i>cat(1)</i>，但带有 git 集成和语法高亮.
-</p>
-
-<p align="center">
-  <a href="#语法高亮">主要功能</a> •
-  <a href="#如何使用">使用方法</a> •
-  <a href="#安装">安装</a> •
-  <a href="#自定义">自定义</a> •
-  <a href="#project-goals-and-alternatives">项目目标和替代方案</a><br>
-  [<a href="../README.md">English</a>]
-  [中文]
-  [<a href="README-ja.md">日本語</a>]
-  [<a href="README-ko.md">한국어</a>]
-  [<a href="README-ru.md">Русский</a>]
-</p>
-
-### 语法高亮
-
-`bat` 对大部分编程语言和标记语言提供语法高亮：
-
-![Syntax highlighting example](https://imgur.com/rGsdnDe.png)
-
-### Git 集成
-
-`bat` 能从 git 中获取文件的修改并展示在边栏（见下图）：
-
-![Git integration example](https://i.imgur.com/2lSW4RE.png)
-
-### 不可打印(non-printable)字符可视化
-
-添加`-A`/`--show-all`参数可以文件文件中的不可打印字符:
-
-![Non-printable character example](https://i.imgur.com/WndGp9H.png)
-
-### 自动分页
-
-`bat`会在一般情况下将大于屏幕可显示范围的内容输出到分页器(pager, e.g. `less`)。
-
-你可以在调用时添加`--paging=never`参数来使`bat`不使用分页器（就像`cat`一样）。如果你想要用为`cat`使用`bat`别名，可以在 shell 配置文件（shell configuration）中添加`alias cat='bat --paging=never'`。
-
-#### 智能输出
-
-`bat`能够在设置了分页器选项的同时进行管道:wink:。
-当`bat`检测到当前环境为非可交互终端或管道时（例如使用`bat`并将内容用管道输出到文件），`bat`会像`cat`一样，一次输出文件内容为纯文本且无视`--paging`参数。
-
-## 如何使用
-
-在终端中查看一个文件
-
-```bash
-> bat README.md
-```
-
-一次性展示多个文件
-
-```bash
-> bat src/*.rs
-```
-
-从`stdin`读入流，自动为内容添加语法高亮（前提是输入内容的语言可以被正确识别，通常根据内容第一行的 shebang 标记，形如`#!bin/sh`）
-
-```bash
-> curl -s https://sh.rustup.rs | bat
-```
-
-显式指定`stdin`输入的语言
-
-```bash
-> yaml2json .travis.yml | json_pp | bat -l json
-```
-
-显示不可打印字符
-
-```bash
-> bat -A /etc/hosts
-```
-
-与`cat`的兼容性
-
-```bash
-bat > note.md  # 创建一个空文件
-
-bat header.md content.md footer.md > document.md
-
-bat -n main.rs  # 只显示行号
-
-bat f - g  # 输出 f，接着是标准输入流，最后 g
-```
-
-### 第三方工具交互
-
-#### `fzf`
-
-你可以使用`bat`作为`fzf`的预览器。这需要在`bat`后添加`--color=always`选项，以及`--line-range` 选项来限制大文件的加载次数。
-
-```bash
-fzf --preview 'bat --color=always --style=numbers --line-range=:500 {}'
-```
-
-更多信息请参阅[`fzf`的说明](https://github.com/junegunn/fzf#preview-window)。
-
-#### `find` 或 `fd`
-
-你可以使用`find`的`-exec`选项来用`bat`预览搜索结果：
-
-```bash
-find … -exec bat {} +
-```
-
-亦或者在用`fd`时添加`-X`/`--exec-batch`选项：
-
-```bash
-fd … -X bat
-```
-
-#### `ripgrep`
-
-`bat`也能用`batgrep`来显示`ripgrep`的搜索结果。
-
-```bash
-batgrep needle src/
-```
-
-#### `tail -f`
-
-当与`tail -f`一起使用，`bat`可以持续监视文件内容并为其添加语法高亮。
-
-```bash
-tail -f /var/log/pacman.log | bat --paging=never -l log
-```
-
-注意：这项功能需要在关闭分页时使用，同时要手动指定输入的内容语法（通过`-l log`）。
-
-#### `git`
-
-`bat`也能直接接受来自`git show`的输出并为其添加语法高亮（当然也需要手动指定语法）：
-
-```bash
-git show v0.6.0:src/main.rs | bat -l rs
-```
-
-#### `git diff`
-
-`bat`也可以和`git diff`一起使用：
-
-```bash
-batdiff() {
-    git diff --name-only --diff-filter=d | xargs bat --diff
-}
-```
-
-该功能也作为一个独立工具提供，你可以在[`bat-extras`](https://github.com/eth-p/bat-extras)中找到`batdiff`。
-
-如果你想了解更多 git 和 diff 的信息，参阅[`delta`](https://github.com/dandavison/delta)。
-
-#### `xclip`
-
-当需要拷贝文件内容时，行号以及 git 标记会影响输出，此时可以使用`-p`/`--plain`参数来把纯文本传递给`xclip`。
-
-```bash
-bat main.cpp | xclip
-```
-
-`bat`会检测输出是否是管道重定向来决定是否使用纯文本输出。
-
-#### `man`
-
-`bat`也能给`man`的输出上色。这需要设置`MANPAGER`环境变量：
-
-```bash
-export MANPAGER="sh -c 'col -bx | bat -l man -p'"
-man 2 select
-```
-
-（如果你使用的是 Debian 或者 Ubuntu，使用`batcat`替换`bat`）
-
-如果你遇到格式化问题，设置`MANROFFOPT="-c"`也许会有帮助。
-
-`batman`能提供类似功能——作为一个独立的命令。
-
-注意：[man page 语法](assets/syntaxes/02_Extra/Manpage.sublime-syntax) 还需要完善。在使用特定的`man`实现时该功能[无法正常工作](https://github.com/sharkdp/bat/issues/1145)。
-
-#### `prettier` / `shfmt` / `rustfmt`
-
-`prettybat`脚本能够格式化代码并用`bat`输出。
-
-## 安装
-
-[![Packaging status](https://repology.org/badge/vertical-allrepos/bat-cat.svg?columns=3&exclude_unsupported=1)](https://repology.org/project/bat-cat/versions)
-
-### Ubuntu (使用 `apt`)
-
-*... 以及其他基于 Debian的发行版.*
-
-`bat` 要求的版本： [Ubuntu 高于 20.04 ("Focal")](https://packages.ubuntu.com/search?keywords=bat&exact=1) 和 [Debian 高于 August 2021 (Debian 11 - "Bullseye")](https://packages.debian.org/bullseye/bat).
-
-当你的发行版满足条件那么直接在终端运执行：
-
-```bash
-sudo apt install bat
-```
-
-重要：如果你通过这种方法安装`bat`，请留意你所安装的可执行文件是否为`batcat`（由[其他包的可执行文件名冲突](https://github.com/sharkdp/bat/issues/982)造成）。你可以创建一个`bat -> batcat`的符号链接(symlink)或别名来避免因为可执行文件不同带来的问题并与其他发行版保持一致性。
-
-```bash
-mkdir -p ~/.local/bin
-ln -s /usr/bin/batcat ~/.local/bin/bat
-```
-
-### Ubuntu (使用`.deb`包)
-
-*... 以及其他基于 Debian的发行版.*
-
-如果你无法使用上一种方法安装，或需要用最新版的`bat`，你可以从[release 页面](https://github.com/sharkdp/bat/releases)下载最新的`.deb`包并通过下述方法安装：
-
-```bash
-sudo dpkg -i bat_0.18.3_amd64.deb  # adapt version number and architecture
-```
-
-### Alpine Linux
-
-你可以用下面下列命令从官方源中安装[`bat 包`](https://pkgs.alpinelinux.org/packages?name=bat)：
-
-```bash
-apk add bat
-```
-
-### Arch Linux
-
-你可以用下面下列命令从官方源中安装[`bat`包](https://www.archlinux.org/packages/extra/x86_64/bat/)：
-
-```bash
-pacman -S bat
-```
-
-### Fedora
-
-你可以使用下列命令从官方[Fedora Modular](https://docs.fedoraproject.org/en-US/modularity/using-modules/)仓库安装[`bat` 包](https://koji.fedoraproject.org/koji/packageinfo?packageID=27506)：
-
-```bash
-dnf install bat
-```
-
-### Funtoo Linux
-
-你可以从 dev-kit 中安装[`bat` 包](https://github.com/funtoo/dev-kit/tree/1.4-release/sys-apps/bat)：
-
-```bash
-emerge sys-apps/bat
-```
-
-### Gentoo Linux
-
-你可以使用下列命令从官方源中安装 [`bat` 包](https://packages.gentoo.org/packages/sys-apps/bat)：
-
-
-```bash
-emerge sys-apps/bat
-```
-
-### Void Linux
-
-你可以用 xbps-install 安装`bat`：
-
-```bash
-xbps-install -S bat
-```
-
-### Termux:
-
-你可以用 pkg 安装`bat：
-
-```bash
-pkg install bat
-```
-
-### FreeBSD
-
-你可以用 pkg 来安装一份预编译的[`bat` 包](https://www.freshports.org/textproc/bat)：
-
-```bash
-pkg install bat
-```
-
-或从 FreeBSD ports 自己编译一份：
-
-```bash
-cd /usr/ports/textproc/bat
-make install
-```
-
-### OpenBSD
-
-你可以用`pkg——add`安装`bat`包
-
-```bash
-pkg_add bat
-```
-
-### 通过 nix
-
-你可以用[nix 包管理器](https://nixos.org/nix)安装`bat`：
-
-```bash
-nix-env -i bat
-```
-
-### openSUSE
-
-你可以用 zypper 安装`bat`：
-
-```bash
-zypper install bat
-```
-
-### 通过 snap
-
-目前还没有推荐的 snap 包可用。可以使用其他现存的包但不会受到官方支持且可能会遇到[问题](https://github.com/sharkdp/bat/issues/1519)。
-
-### macOS (或 Linux) 通过 Homebrew
-
-你可以用 [Homebrew on MacOS](https://formulae.brew.sh/formula/bat) 或者 [Homebrew on Linux](https://formulae.brew.sh/formula-linux/bat) 安装`bat`：
-
-```bash
-brew install bat
-```
-
-### macOS 通过 MacPorts
-
-或用 [MacPorts](https://ports.macports.org/port/bat/summary) 安装`bat`：
-
-```bash
-port install bat
-```
-
-### Windows
-
-在 Windows 上具有多种安装`bat`的方法。若你已完成安装，记得看看 ["在 Windows 上使用`bat`"](#在-Windows-中使用-bat) 。
-
-#### 前置条件
-
-你必须已安装 [Visual C++ Redistributable](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads) 包。
-
-#### 使用 Chocolatey
-
-你可以用[Chocolatey](https://chocolatey.org/packages/Bat) 安装`bat`：
-
-```bash
-choco install bat
-```
-
-#### 使用 Scoop
-
-你可以用 [scoop](https://scoop.sh/) 安装`bat`：
-
-```bash
-scoop install bat
-```
-
-#### 使用预编译二进制版本
-
-直接从 [Release 发布页](https://github.com/sharkdp/bat/releases) 下载已经编译好的二进制包，前提是你安装了 [Visual C++ Redistributable](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads) 包。
-
-### 使用二进制版本
-
-在 [Release 发布页](https://github.com/sharkdp/bat/releases) 中可以找到为多种架构构建的`bat`版本和静态编译的二进制文件（文件名带有`musl`）。
-
-### 从源码编译
-
-如果你想要自己构建`bat`，那么你需要安装有高于1.70.0版本的 Rust。
-
-使用以下命令编译。
-
-```bash
-cargo install --locked bat
-```
-
-注意：man page或 shell 自动补全所需要的额外文件无法通过该方法安装。但你可以在`cargo`的生成目录找到这些文件（`build`目录下）。
-
-## 自定义
-
-### 语法高亮主题
-
-使用 `bat --list-themes` 一份语法高亮主题的清单，然后用`--theme=TwoDark`来指定主题为`TwoDark`，也可以通过设置`BAT_THEME`环境变量来选定主题。把`export BAT_THEME="TwoDark"`添加到 shell 的启动脚本（shell startup file）来取得永久效果。或者使用`bat`的[配置文件](#c配置文件)
-
-若想要查看所有主题在一个文件上的显示效果可以用一下命令（需要安装`fzf`）：
-
-```bash
-bat --list-themes | fzf --preview="bat --theme={} --color=always /path/to/file"
-```
-
-`bat`在默认情况下能够在黑色主题背景下获得较好的效果，如果你的终端使用亮色背景，可以试试`GitHub`或`OneHalfLight`。想要添加自定义主题可以参考[添加主题](#添加主题)。
-
-### 8-bit 主题
-
-`bat` 自带三个 [8-bit 色彩](https://en.wikipedia.org/wiki/ANSI_escape_code#Colors) 主题：
-
- `ansi` 适应于大部分终端。它使用 3-bit 色彩：黑红绿黄蓝洋红靛青白。
- `base16`专为 [base16](https://github.com/chriskempson/base16) 终端设计。它使用 4-bit 色彩（带有亮度的 3-bit 色彩）。根据 [base16 styling guidelines](https://github.com/chriskempson/base16/blob/master/styling.md) 制作。
- `base16-25`专为 [base16-shell](https://github.com/chriskempson/base16-shell) 设计。它把部分亮色替换为 8-bit 色彩。请不要直接使用该主题，除非你清楚你的256色终端是否使用 base16-shell。
-
-尽管这些主题具有诸多限制，但具有一些 truecolor 主题不具有的三个优点：
-
- 享有最佳兼容性。并不是所有终端工具都支持高于 3-bit 的色彩。
- 适应终端主题。
- 视觉上和其他的终端工具更协调。
-
-### 输出样式
-
-你可以用`--style`参数来控制`bat`输出的样式。使用`--style=numbers,chanegs`可以只开启 Git 修改和行号显示而不添加其他内容。`BAT_STYLE`环境变量具有相同功能。
-
-### 添加新的语言和语法
-
-当现有的`bat`不支持某个语言或语法时你可以自己添加。
-
-`bat`使用`syntect`库来支持语法高亮，该库使用 [Sublime Text `.sublime-syntax` 语法文件](https://www.sublimetext.com/docs/3/syntax.html)和主题。而后者中的大部分可以在 [Package Control](https://packagecontrol.io/) 找到。
-
-当你找到一份语法文件，按照下列方法：
-
-1. 创建包含语法描述文件的目录：
-   
-   ```bash
-   mkdir -p "$(bat --config-dir)/syntaxes"
-   cd "$(bat --config-dir)/syntaxes"
-   
-   # Put new '.sublime-syntax' language definition files
-   # in this folder (or its subdirectories), for example:
-   git clone https://github.com/tellnobody1/sublime-purescript-syntax
-   ```
-
-2. 调用下面指令把文件转换为二进制缓存：
-   
-   ```bash
-   bat cache --build
-   ```
-
-3. 最后用`bat --list-languages`来检查新的语法是否被成功导入。如果想要回滚到最初状态，执行：
-   
-   ```bash
-   bat cache --clear
-   ```
-
-4. 如果你觉得`bat`有必要自带该语法支持，请在阅读[指导](doc/assets.md)后向仓库提交 [Syntax Request](https://github.com/sharkdp/bat/issues/new?labels=syntax-request&template=syntax_request.md)。
-
-### 添加主题
-
-类似添加语法支持，第一步也是创建一个带有语法高亮的目录
-
-```bash
-mkdir -p "$(bat --config-dir)/themes"
-cd "$(bat --config-dir)/themes"
-
-# 下载一个主题
-git clone https://github.com/greggb/sublime-snazzy
-
-# 更新二进制缓存
-bat cache --build
-```
-
-然后用`bat --list-themes`检查添加是否成功。
-
-### 添加或修改文件关联
-
-你可以用`--map-syntax`参数添加或修改文件名模板。它需要一个类似`pattern:syntax`的参数来指定，其中`pattern`是 glob 文件匹配模板，`syntax`则是支持的语法的完整名（使用`bat --list-languages`来查看获取一份清单）。
-
-注意：方便起见，你可能需要把参数添加到配置文件，而不是每次都在命令行中传递该参数。
-
-以下展示了把“INI”关联到具有`.conf`扩展名的文件
-
-```bash
--map-syntax='*.conf:INI'
-```
-
-把`.ignore`文件与“Git Ignore”关联
-
-```bash
--map-syntax='.ignore:Git Ignore'
-```
-
-把`/etc/apache2`内的`.conf`文件关联到“Apache Conf”语法（`bat`已默认绑定）
-
-```bash
--map-syntax='/etc/apache2/**/*.conf:Apache Conf'
-```
-
-### 使用自定义分页器
-
-`bat`默认使用`PAGER`环境变量定义的分页器，如果没有定义则使用`less`。`bat`提供了`BAT_PAGER`环境变量来专为`bat`选择分页器（优先级高于`PAGER`）。
-
-注意：当`PAGER`设置为`more`或`most`时，`bat`会使用`less`来代替以确保能提供色彩支持。
-
-```bash
-export BAT_PAGER="less -RF"
-```
-
-除了使用环境变量来改变`bat`使用的的分页器，也可以在配置文件中提供`--pager`参数。
-
-注意：`bat`会把部分命令行参数直接传递给分页器：`-R`/`--RAW-CONTROL-CHARS`,`-F`/`--quit-if-one-screen`以及`-X`/`--no-init`（该参数仅适用于高于530版本的`less`）。其中`-R` 参数需要在解释 ANSI 标准颜色时起作用。`-F`则指示`less`在输出内容的垂直尺寸小于终端尺寸时立即退出。当文件内容可以在一个屏幕里完全显示时，就不需要按`q`键退出阅读模式，很方便就是了。`-X`则能修复`-F`在`less`的老版本中的一些bug（代价是不支持鼠标滚轮，但可以用`-R`来取消`quit-if-one-screen`功能。）。
-
-### 缩进
-
-`bat` 使用四个空格宽的制表符，而不受分页器影响，同时也可以用`--tabs`参数来自定义。
-
-注意：通过其他方法针对分页器的制表符设置不会生效（例如通过`bat`的`--pager`参数传递或`less`使用的`LESS`环境变量）。因为在输出提交给分页器之前，内容中的制表符就已经被`bat`替换为了特定长度的空格以避免由于边栏导致的缩进问题。你可以用给`bat`传递`--tabs=0`参数来取消该设定并让分页器自己处理制表符。
-
-### 暗色模式
-
-如果你用的 macOS 处于暗色模式，你可以为`bat`启用基于系统主题的主题。如下所示操作会让`bat`在系统处于亮色模式时加载`GitHub`主题和暗色模式时加载`default`主题。
-
-```bash
-alias cat="bat --theme=\$(defaults read -globalDomain AppleInterfaceStyle &> /dev/null && echo default || echo GitHub)"
-```
-
-## 配置文件
-
-```bash
-bat --config-file
-```
-
-你也可以用`BAT_CONFIG_PATH`来为`bat`指定自定义位置的配置文件：
-
-```bash
-export BAT_CONFIG_PATH="/path/to/bat.conf"
-```
-
-使用`--generate-config-file`参数调用`bat`会在指定位置生成一份默认的`bat`配置文件：
-
-```bash
-bat --generate-config-file
-```
-
-### 格式
-
-配置文件其实是一份按行分割的命令行参数列表。你可以用`bat --help`来查看所有可用的参数和适用的值。配置文件中`#`打头的行会被视为注释而不生效。
-
-以下是一份示例：
-
-```bash
-# 设置主题为 TwoDark
--theme="TwoDark"
-
-# 显示行号和 Git 修改信息， 但没有边框
--style="numbers,changes,header"
-
-# 在终端中以斜体输出文本（不是所有终端都支持）
--italic-text=always
-
-# 使用 C++ 语法来给 Arduino 的 .ino 文件提供高亮
--map-syntax "*.ino:C++"
-```
-
-## 在 Windows 中使用 `bat`
-
-`bat` 在 Windows 上开箱即用，除了部分功能需要额外配置。
-
-### 前置条件
-
-你需要先安装 [Visual C++ Redistributable](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads) 包。
-
-### 分页
-
-Windows 只有一个提供有限功能的分页器，你可以从[这里下载](http://www.greenwoodsoftware.com/less/download.html)或用 [Chocolatey 安装](https://chocolatey.org/packages/Less) Windows 版本的`less`。第一种方法需要你把它所在目录加入`PATH`环境变量或[定义分页器变量](#使用自定义分页器)
-
-### 色彩
-
-Windows 10 从 [v1511](https://en.wikipedia.org/wiki/Windows_10_version_history#Version_1511_(November_Update)) 开始 shell（`conhost.exe`，命令提示符或 Powershell）原生支持色彩。在早些版本的 Windows 中你可以用第三方终端如 [Cmder](http://cmder.net/) （使用[ConEmu](https://conemu.github.io/)）。
-
-注意：Git 和 MSYS 版本的 `less` 没法正确在 Windows 表达色彩。如果你没有安装其他分页器，你可以直接用`--paging=never`或设置`BAT_PAGER`为空字符串来关闭分页功能。
-
-### Cygwin
-
-Windows 上的`bat`原生不支持 Cygwin' unix-style 路径（`/cygdrive/*`）。当传递一个绝对 cygwin 路径作为参数值时，`bat`会产生`The system cannot find the path specified. (os error 3)`的错误。你可以`.bash_profile`文件中添加以下函数来解决这个问题。
-
-```bash
-bat() {
-    local index
-    local args=("$@")
-    for index in $(seq 0 ${#args[@]}) ; do
-        case "${args[index]}" in
-        -*) continue;;
-        *)  [ -e "${args[index]}" ] && args[index]="$(cygpath --windows "${args[index]}")";;
-        esac
-    done
-    command bat "${args[@]}"
-}
-```
-
-## 疑难解答
-
-### 输出内容含糊不清
-
-当输入文件包含颜色代码和其他 ANSI 转义符号时，`bat`会产生错误的语法高亮和文本，导致输出看起来令人无法理解。当你需要输出该文件时，请使用`--color=never --wrap=never`参数来关闭上色和文字包裹。
-
-### 终端与色彩
-
-`bat`会区分支持 truecolor 和不支持 truecolor 的终端。但是大部分语法高亮主题都是用了没有为 8-bit 色彩支持的颜色，因此强烈推荐使用一个支持 24-bit 色彩的终端（`terminator`，`konsole`，`iTerm2`...），或使用一个 [8-bit 主题](#8-bit-主题)来限制一些颜色。查看[这篇文章使用自定义分页器](https://gist.github.com/XVilka/8346728)了解更多支持 truecolor 的终端。你需要定义`COLORTERM`变量为`truecolor`或`24bit`来确保`bat`能够识别终端的对颜色的支持，否则会使用 8 bit 模式。
-
-### 行号和边框很难看清
-
-试试其他主题，说不定能有所改善（用`bat --list-themes`查看主题列表）。
-
-### 文件编码
-
-`bat`原生支持 UTF-8 和 UTF-16。至于其他文件你可能需要在使用`bat`之前先把编码转换到UTF-8。
-
-这里展示了使用`iconv`来把 Latin-1(ISO-8859-1) 编码的 PHP 文件转换到 UTF-8：
-
-```bash
-iconv -f ISO-8859-1 -t UTF-8 my-file.php | bat
-```
-
-注意： 当`bat`无法识别语言时你可能会需要`-l`/`--language`参数。
-
-## Development
-
-```bash
-# Recursive clone to retrieve all submodules
-git clone --recursive https://github.com/sharkdp/bat
-
-# Build (debug version)
-cd bat
-cargo build --bins
-
-# Run unit tests and integration tests
-cargo test
-
-# Install (release version)
-cargo install --path . --locked
-
-# Build a bat binary with modified syntaxes and themes
-bash assets/create.sh
-cargo install --path . --locked --force
-```
-
-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
-
-Take a look at the [`CONTRIBUTING.md`](CONTRIBUTING.md) guide.
-
-## Maintainers
-
- [sharkdp](https://github.com/sharkdp)
- [eth-p](https://github.com/eth-p)
- [keith-hall](https://github.com/keith-hall)
- [Enselic](https://github.com/Enselic)
-
-## Security vulnerabilities
-
-Please contact [David Peter](https://david-peter.de/) via email if you want to report a vulnerability in `bat`.
-
-## Project goals and alternatives
-
-`bat` tries to achieve the following goals:
-
- Provide beautiful, advanced syntax highlighting
- Integrate with Git to show file modifications
- Be a drop-in replacement for (POSIX) `cat`
- Offer a user-friendly command-line interface
-
-There are a lot of alternatives, if you are looking for similar programs. See
-[this document](doc/alternatives.md) for a comparison.
-
-## License
-
-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.
-
-See the [LICENSE-APACHE](LICENSE-APACHE) and [LICENSE-MIT](LICENSE-MIT) files for license details.
--- a/doc/alternatives.md
+++ b/doc/alternatives.md
@@ -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
 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)      |
-|----------------------------------------------|---------------------------------------------------------------------|----------------------------------|---------------------------------------------------------------------|------------------------------------------|----------------------------------------------------------------|-----------------------------------------------------|-----------------------------------------------------|-----------------------------------------------------|-----------------------------------------------------|
-| 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:                                                                 |
-| Git integration                              | :heavy_check_mark:                                                  | :x:                              | :x:                                                                 | :x:                                      | :x:                                                            | :x:                                                 | :x:                                                 | :x:                                                 | :x:                                                                 |
-| Automatic paging                             | :heavy_check_mark:                                                  | :x:                              | :x:                                                                 | :x:                                      | :x:                                                            | :heavy_check_mark:                                  | :x:                                                 | :x:                                                 | :x:                                                                 |
-| Languages (circa)                            | 150                                                                 | 300                              | 200                                                                 | 7                                        | 80                                                             | 130                                                 | 30                                                  | 130                                                 | 150                                                 |
-| Extensible (languages, themes)               | :heavy_check_mark:                                                  | (:heavy_check_mark:)             | (:heavy_check_mark:)                                                | :x:                                      | (:heavy_check_mark:)                                           | :x:                                                 | :x:                                                 | :x:                                                 | :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:                                  | :heavy_check_mark:                                  |
-| Execution time [ms] (`jquery-3.3.1.js`)      | 422                                                                 | 455                              | 299                                                                 | 39                                       | 208                                                            | 287                                                 | 128                                                 | 740                                                 | 22                                          |
-| Execution time [ms] (`miniz.c`)              | 27                                                                  | 169                              | 19                                                                  | 4                                        | 36                                                             | 131                                                 | 58                                                  | 231                                                 | 4                                          |
-| Execution time [ms] (957 kB XML file)        | 215                                                                 | 296                              | 236                                                                 | 165                                      | 83                                                            | 412                                                 | 135                                                 | 386                                                 | 127                                          |
+|                                              | 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:                                                 |
+| 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:                                                 |
+| 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:                                                 |
+| 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`)      | 624                                                                 | 789                              | 400                                                                 | 80                                       | 300                                                            | 316                                                 | 157                                                 | 695                                                 |
+| Execution time [ms] (`miniz.c`)              | 66                                                                  | 656                              | 26                                                                  | 8                                        | 53                                                             | 141                                                 | 75                                                  | 254                                                 |
+| 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
 request.
@@ -22,44 +22,3 @@ request.
 Some other alternatives that are also related, but not yet included in the table:
 - [lesspipe](https://github.com/wofr06/lesspipe)
 - [vimpager](https://github.com/rkitover/vimpager)
-
-## Benchmarks
-
-The benchmarks above have been created with this script:
-```bash
-#!/usr/bin/env bash
-
-cd "$(dirname "${BASH_SOURCE[0]}")" || exit
-
-if ! command -v hyperfine > /dev/null 2>&1; then
-    echo "'hyperfine' does not seem to be installed."
-    echo "You can get it here: https://github.com/sharkdp/hyperfine"
-    exit 1
-fi
-
-SRC="test-src/jquery-3.3.1.js"
-
-
-cmd_bat="bat --style=full --color=always --paging=never '$SRC'"
-cmd_bat_simple="bat --plain --wrap=never --tabs=0 --color=always --paging=never '$SRC'"
-cmd_pygmentize="pygmentize -g '$SRC'"
-cmd_highlight="highlight -O truecolor '$SRC'"
-cmd_ccat="ccat --color=always '$SRC'"
-cmd_source_highlight="source-highlight --failsafe --infer-lang -f esc -i '$SRC'"
-cmd_hicat="hicat '$SRC'"
-cmd_coderay="coderay '$SRC'"
-cmd_rouge="rougify '$SRC'"
-cmd_clp="clp '$SRC'"
-
-hyperfine --warmup 3 \
-    "$cmd_bat" \
-    "$cmd_bat_simple" \
-    "$cmd_pygmentize" \
-    "$cmd_highlight" \
-    "$cmd_ccat" \
-    "$cmd_source_highlight" \
-    "$cmd_hicat" \
-    "$cmd_coderay" \
-    "$cmd_rouge" \
-    "$cmd_clp" \
-```
--- a/doc/assets.md
+++ b/doc/assets.md
@@ -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
   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.
-   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
   `.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:

-* `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.
-* `DotENV.sublime-syntax` => added `.env.template`, `env` and `env.*` file types ([upstream PR](https://github.com/zaynali53/DotENV/pull/17)).
-* `INI.sublime-syntax` => added `.coveragerc`, `.pylintrc`, `.gitlint`, `.hgrc`, `hgrc`, and `desktop` file types and support for comments after section headers.
+* `INI.sublime-syntax` => added `.hgrc`, `hgrc`, and `desktop` file types and support for comments after section headers
 * `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.
-* `wgsl.sublime-syntax` => added `wgsl` file extension.
+* `Robot.sublime_syntax` => changed name to "Robot Framework", added `.resource` extension

 ### Non-submodule additions

--- a/doc/long-help.txt
+++ b/doc/long-help.txt
@@ -1,179 +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.
-
-      --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="..").
-          
-          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
--- a/doc/release-checklist.md
+++ b/doc/release-checklist.md
@@ -1,53 +1,52 @@
 # Release checklist

+## Dependencies
+
+See this page for a good overview: https://deps.rs/repo/github/sharkdp/bat
+
+- [ ] Optional: update dependencies with `cargo update`. This is also done by
+      dependabot, so it is not strictly necessary.
+- [ ] Check for outdated dependencies (`cargo outdated`) and decide for each of
+      them whether we want to (manually) upgrade. This will require changes to
+      `Cargo.toml`.
+
 ## Version bump

 - [ ] Update version in `Cargo.toml`. Run `cargo build` to update `Cargo.lock`.
      Make sure to `git add` the `Cargo.lock` changes as well.
 - [ ] 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
-      `doc/README-*.md`. Check with
-      `git grep -i -e 'rust.*1\.' -e '1\..*rust' | grep README | grep -v tests/`.
-
-## 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.
+      `doc/README-*.md`.
+- [ ] Update `CHANGELOG.md`. Introduce a section for the new release and
+      prepare a new (empty) "unreleased" section at the top.

 ## 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 install -f --path .`) and make
      sure that it is available on the `PATH` (`bat --version` should show the
      new version).
 - [ ] Run `assets/create.sh` and check in the binary asset files.

 ## Documentation

- [ ] Review [`-h`](./short-help.txt), [`--help`](./long-help.txt), and the `man` page. The `man` page is shown in
-      the output of the CI job called *Documentation*, so look there.
-      The CI workflow corresponding to the tip of the master branch is a good place to look.
+- [ ] Review the `-h` and `--help` texts
+- [ ] Review the `man` page

 ## Pre-release checks

 - [ ] Push all changes and wait for CI to succeed (before continuing with the
      next section).
 - [ ] 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 synaxes
      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).

 ## 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 to the remote `git tag vX.Y.Z; git push --tags`.
      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
      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
@@ -57,28 +56,3 @@
      appear when the CI run for the Git tag has finished).
 - [ ] Publish to crates.io by running `cargo publish` in a *clean* repository.
      The safest way to do this is to clone a fresh copy.
-
-## Post-release
-
- [ ] Prepare a new "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
--- a/doc/short-help.txt
+++ b/doc/short-help.txt
@@ -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
--- a/doc/sponsors.md
+++ b/doc/sponsors.md
@@ -1,14 +0,0 @@
-## Sponsors
-
-`bat` development is sponsored by many individuals and companies. Thank you very much!
-
-Please note, that being sponsored does not affect the individuality of the `bat`
-project or affect the maintainers' actions in any way.
-We remain impartial and continue to assess pull requests solely on merit - the
-features added, bugs solved, and effect on the overall complexity of the code.
-No issue will have a different priority based on sponsorship status of the
-reporter.
-
-Contributions from anybody are most welcomed, please see our [`CONTRIBUTING.md`](../CONTRIBUTING.md) guide.
-
-If you want to see our biggest sponsors, check the top of [`README.md`](../README.md#sponsors).
--- a/doc/sponsors/warp-logo.png
+++ b/doc/sponsors/warp-logo.png
--- a/doc/sponsors/workos-logo-white-bg.svg
+++ b/doc/sponsors/workos-logo-white-bg.svg
@@ -1,11 +0,0 @@
-<svg width="1354" height="420" viewBox="0 0 1354 420" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="1354" height="420" rx="20" fill="white"/>
-<path d="M434.751 133.122H466.637L489.595 227.729C493.852 245.585 494.697 256.219 494.697 256.219H495.128C495.128 256.219 496.61 245.808 500.867 227.729L522.757 133.122H558.9L582.066 227.729C586.53 246.223 587.598 256.219 587.598 256.219H588.236C588.236 256.219 588.666 246.223 592.907 227.729L615.02 133.122H646.907L606.523 288.313H571.017L546.576 194.344C541.474 173.936 541.044 164.801 541.044 164.801H540.614C540.614 164.801 540.183 173.936 535.512 194.344L512.553 288.313H475.996L434.751 133.122Z" fill="black"/>
-<path d="M641.583 231.934C641.583 196.428 664.541 173.47 699.202 173.47C733.639 173.47 756.597 196.428 756.597 231.934C756.597 267.647 733.639 290.828 699.202 290.828C664.557 290.812 641.583 267.647 641.583 231.934ZM726.832 231.934C726.832 208.976 715.783 195.998 699.202 195.998C681.346 195.998 671.349 210.458 671.349 231.934C671.349 255.323 682.398 268.284 699.202 268.284C717.058 268.284 726.832 253.824 726.832 231.934Z" fill="black"/>
-<path d="M770.836 175.21H799.103V196.048H799.741C804.635 185.207 816.322 174.365 836.299 174.365C839.695 174.365 841.831 174.796 843.314 175.21V203.478H842.469C842.469 203.478 839.918 202.633 832.903 202.633C811.013 202.633 799.103 215.594 799.103 239.828V288.295H770.836V175.21Z" fill="black"/>
-<path d="M856.5 133.122H884.767V182.865C884.767 212.2 884.336 217.509 884.336 217.509H884.767L926.857 175.212H962.139L912.843 224.11L970.031 288.313H936.646L895.401 241.536L884.767 251.946V288.297H856.5V133.122Z" fill="black"/>
-<path d="M970.444 211.285C970.444 163.455 1000.21 131.569 1044.85 131.569C1089.49 131.569 1119.26 163.455 1119.26 211.285C1119.26 259.114 1089.49 291.001 1044.85 291.001C1000.21 291.001 970.444 259.114 970.444 211.285ZM1088.42 211.285C1088.42 178.761 1071 156.855 1044.84 156.855C1018.67 156.855 1001.26 178.761 1001.26 211.285C1001.26 243.809 1018.69 265.715 1044.84 265.715C1070.98 265.715 1088.42 243.809 1088.42 211.285Z" fill="black"/>
-<path d="M1130.08 236.656H1162.4C1162.4 254.943 1174.95 265.146 1194.08 265.146C1210.23 265.146 1221.29 257.063 1221.29 245.584C1221.29 232.622 1212.79 229.21 1185.79 223.901C1161.12 219.007 1134.98 210.716 1134.98 178.399C1134.98 151.408 1157.93 131 1193.01 131C1229.57 131 1252.11 150.132 1252.11 179.037H1219.79C1219.79 165.007 1208.95 156.286 1193.01 156.286C1176.86 156.286 1166.86 164.146 1166.86 175.625C1166.86 187.742 1173.88 192.413 1195.56 196.878C1227.65 203.685 1254.02 207.288 1254.02 243.001C1254.02 271.3 1229.36 290.432 1193.01 290.432C1156.02 290.432 1130.08 268.957 1130.08 236.656Z" fill="black"/>
-<path d="M100 210C100 214.824 101.269 219.647 103.723 223.793L148.231 300.878C152.8 308.747 159.739 315.178 168.369 318.055C185.377 323.724 202.977 316.447 211.354 301.893L222.1 283.278L179.708 210L224.47 132.408L235.216 113.792C238.431 108.208 242.747 103.638 247.824 100H243.17H178.777C166.677 100 155.508 106.431 149.5 116.923L103.723 196.208C101.269 200.354 100 205.177 100 210Z" fill="#6363F1"/>
-<path d="M353.847 210C353.847 205.177 352.578 200.353 350.124 196.207L305.024 118.107C296.647 103.638 279.047 96.3608 262.039 101.945C253.409 104.822 246.47 111.253 241.901 119.122L231.747 136.638L274.139 210L229.378 287.592L218.632 306.208C215.416 311.708 211.101 316.362 206.024 320H210.678H275.07C287.17 320 298.34 313.569 304.347 303.077L350.124 223.792C352.578 219.646 353.847 214.823 353.847 210Z" fill="#6363F1"/>
-</svg>
--- a/examples/buffer.rs
+++ b/examples/buffer.rs
@@ -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}");
-}
--- a/examples/list_syntaxes_and_themes.rs
+++ b/examples/list_syntaxes_and_themes.rs
@@ -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;

 fn main() {
@@ -13,6 +13,6 @@ fn main() {

    println!("Themes:");
    for theme in printer.themes() {
-        println!("- {theme}");
+        println!("- {}", theme);
    }
 }
--- a/examples/yaml.rs
+++ b/examples/yaml.rs
@@ -23,8 +23,7 @@ fn main() {
        }],
    };

-    let mut bytes = Vec::with_capacity(128);
-    serde_yaml::to_writer(&mut bytes, &person).unwrap();
+    let bytes = serde_yaml::to_vec(&person).unwrap();
    PrettyPrinter::new()
        .language("yaml")
        .line_numbers(true)
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -1 +0,0 @@
-# Defaults are used
--- a/src/assets.rs
+++ b/src/assets.rs
@@ -1,39 +1,25 @@
 use std::ffi::OsStr;
 use std::fs;
-use std::path::Path;
+use std::path::{Path, PathBuf};

-use once_cell::unsync::OnceCell;
+use lazycell::LazyCell;

-use syntect::highlighting::Theme;
+use syntect::dumps::{from_binary, from_reader};
+use syntect::highlighting::{Theme, ThemeSet};
 use syntect::parsing::{SyntaxReference, SyntaxSet};

 use path_abs::PathAbs;

+use crate::bat_warning;
 use crate::error::*;
-use crate::input::{InputReader, OpenedInput};
-use crate::syntax_mapping::ignored_suffixes::IgnoredSuffixes;
-use crate::syntax_mapping::MappingTarget;
-use crate::{bat_warning, SyntaxMapping};
-
-use lazy_theme_set::LazyThemeSet;
-
-use serialized_syntax_set::*;
-
-#[cfg(feature = "build-assets")]
-pub use crate::assets::build_assets::*;
-
-pub(crate) mod assets_metadata;
-#[cfg(feature = "build-assets")]
-mod build_assets;
-mod lazy_theme_set;
-mod serialized_syntax_set;
+use crate::input::{InputReader, OpenedInput, OpenedInputKind};
+use crate::syntax_mapping::{MappingTarget, SyntaxMapping};

 #[derive(Debug)]
 pub struct HighlightingAssets {
-    syntax_set_cell: OnceCell<SyntaxSet>,
-    serialized_syntax_set: SerializedSyntaxSet,
-
-    theme_set: LazyThemeSet,
+    syntax_set_cell: LazyCell<SyntaxSet>,
+    serialized_syntax_set: Option<SerializedSyntaxSet>,
+    theme_set: ThemeSet,
    fallback_theme: Option<&'static str>,
 }

@@ -43,105 +29,169 @@ pub struct SyntaxReferenceInSet<'a> {
    pub syntax_set: &'a SyntaxSet,
 }

-/// Lazy-loaded syntaxes are already compressed, and we don't want to compress
-/// already compressed data.
-pub(crate) const COMPRESS_SYNTAXES: bool = false;
-
-/// We don't want to compress our [LazyThemeSet] since the lazy-loaded themes
-/// within it are already compressed, and compressing another time just makes
-/// performance suffer
-pub(crate) const COMPRESS_THEMES: bool = false;
-
-/// Compress for size of ~40 kB instead of ~200 kB without much difference in
-/// performance due to lazy-loading
-pub(crate) const COMPRESS_LAZY_THEMES: bool = true;
-
-/// Compress for size of ~10 kB instead of ~120 kB
-pub(crate) const COMPRESS_ACKNOWLEDGEMENTS: bool = true;
+const IGNORED_SUFFIXES: [&str; 10] = [
+    // Editor etc backups
+    "~",
+    ".bak",
+    ".old",
+    ".orig",
+    // Debian and derivatives apt/dpkg backups
+    ".dpkg-dist",
+    ".dpkg-old",
+    // Red Hat and derivatives rpm backups
+    ".rpmnew",
+    ".rpmorig",
+    ".rpmsave",
+    // Build system input/template files
+    ".in",
+];

 impl HighlightingAssets {
-    fn new(serialized_syntax_set: SerializedSyntaxSet, theme_set: LazyThemeSet) -> Self {
+    fn new(
+        syntax_set: Option<SyntaxSet>,
+        serialized_syntax_set: Option<SerializedSyntaxSet>,
+        theme_set: ThemeSet,
+    ) -> Self {
+        assert!(syntax_set.is_some() || serialized_syntax_set.is_some());
+
+        let syntax_set_cell = LazyCell::new();
+        if let Some(syntax_set) = syntax_set {
+            syntax_set_cell.fill(syntax_set).expect("can never fail");
+        }
+
        HighlightingAssets {
-            syntax_set_cell: OnceCell::new(),
+            syntax_set_cell,
            serialized_syntax_set,
            theme_set,
            fallback_theme: None,
        }
    }

-    /// 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 {
-        #[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"
    }

-    /**
-     * The default theme that looks good on a light background.
-     */
-    #[cfg(target_os = "macos")]
-    fn default_light_theme() -> &'static str {
-        "Monokai Extended Light"
+    #[cfg(feature = "build-assets")]
+    pub fn from_files(source_dir: &Path, include_integrated_assets: bool) -> Result<Self> {
+        let mut theme_set = if include_integrated_assets {
+            get_integrated_themeset()
+        } else {
+            ThemeSet::new()
+        };
+
+        let theme_dir = source_dir.join("themes");
+        if theme_dir.exists() {
+            let res = theme_set.add_from_folder(&theme_dir);
+            if let Err(err) = res {
+                println!(
+                    "Failed to load one or more themes from '{}' (reason: '{}')",
+                    theme_dir.to_string_lossy(),
+                    err,
+                );
+            }
+        } else {
+            println!(
+                "No themes were found in '{}', using the default set",
+                theme_dir.to_string_lossy()
+            );
+        }
+
+        let mut syntax_set_builder = if !include_integrated_assets {
+            let mut builder = syntect::parsing::SyntaxSetBuilder::new();
+            builder.add_plain_text_syntax();
+            builder
+        } else {
+            from_binary::<SyntaxSet>(get_serialized_integrated_syntaxset()).into_builder()
+        };
+
+        let syntax_dir = source_dir.join("syntaxes");
+        if syntax_dir.exists() {
+            syntax_set_builder.add_from_folder(syntax_dir, true)?;
+        } else {
+            println!(
+                "No syntaxes were found in '{}', using the default set.",
+                syntax_dir.to_string_lossy()
+            );
+        }
+
+        if std::env::var("BAT_PRINT_SYNTAX_DEPENDENCIES").is_ok() {
+            // To trigger this code, run:
+            // BAT_PRINT_SYNTAX_DEPENDENCIES=1 cargo run -- cache --build --source assets --blank --target /tmp
+            crate::syntax_dependencies::print_syntax_dependencies(&syntax_set_builder);
+        }
+
+        let syntax_set = syntax_set_builder.build();
+        let missing_contexts = syntax_set.find_unlinked_contexts();
+        if !missing_contexts.is_empty() {
+            println!("Some referenced contexts could not be found!");
+            for context in missing_contexts {
+                println!("- {}", context);
+            }
+        }
+
+        Ok(HighlightingAssets::new(Some(syntax_set), None, theme_set))
    }

    pub fn from_cache(cache_path: &Path) -> Result<Self> {
        Ok(HighlightingAssets::new(
-            SerializedSyntaxSet::FromFile(cache_path.join("syntaxes.bin")),
-            asset_from_cache(&cache_path.join("themes.bin"), "theme set", COMPRESS_THEMES)?,
+            None,
+            Some(SerializedSyntaxSet::FromFile(
+                cache_path.join("syntaxes.bin"),
+            )),
+            asset_from_cache(&cache_path.join("themes.bin"), "theme set")?,
        ))
    }

    pub fn from_binary() -> Self {
        HighlightingAssets::new(
-            SerializedSyntaxSet::FromBinary(get_serialized_integrated_syntaxset()),
+            None,
+            Some(SerializedSyntaxSet::FromBinary(
+                get_serialized_integrated_syntaxset(),
+            )),
            get_integrated_themeset(),
        )
    }

+    #[cfg(feature = "build-assets")]
+    pub fn save_to_cache(&self, target_dir: &Path, current_version: &str) -> Result<()> {
+        let _ = fs::create_dir_all(target_dir);
+        asset_to_cache(
+            self.get_theme_set(),
+            &target_dir.join("themes.bin"),
+            "theme set",
+        )?;
+        asset_to_cache(
+            self.get_syntax_set()?,
+            &target_dir.join("syntaxes.bin"),
+            "syntax set",
+        )?;
+
+        print!(
+            "Writing metadata to folder {} ... ",
+            target_dir.to_string_lossy()
+        );
+        crate::assets_metadata::AssetsMetadata::new(current_version).save_to_folder(target_dir)?;
+        println!("okay");
+
+        Ok(())
+    }
+
    pub fn set_fallback_theme(&mut self, theme: &'static str) {
        self.fallback_theme = Some(theme);
    }

-    /// Return the collection of syntect syntax definitions.
-    pub fn get_syntax_set(&self) -> Result<&SyntaxSet> {
-        self.syntax_set_cell
-            .get_or_try_init(|| self.serialized_syntax_set.deserialize())
+    pub(crate) fn get_syntax_set(&self) -> Result<&SyntaxSet> {
+        if !self.syntax_set_cell.filled() {
+            self.syntax_set_cell.fill(
+                self.serialized_syntax_set
+                .as_ref()
+                .expect("a dev forgot to setup serialized_syntax_set, please report to https://github.com/sharkdp/bat/issues")
+                .deserialize()?
+             ).unwrap();
+        }
+
+        // It is safe to .unwrap() because we just made sure it was .filled()
+        Ok(self.syntax_set_cell.borrow().unwrap())
    }

    /// Use [Self::get_syntaxes] instead
@@ -156,88 +206,48 @@ impl HighlightingAssets {
        Ok(self.get_syntax_set()?.syntaxes())
    }

-    fn get_theme_set(&self) -> &LazyThemeSet {
+    fn get_theme_set(&self) -> &ThemeSet {
        &self.theme_set
    }

    pub fn themes(&self) -> impl Iterator<Item = &str> {
-        self.get_theme_set().themes()
+        self.get_theme_set().themes.keys().map(|s| s.as_ref())
    }

-    /// Use [Self::get_syntax_for_path] instead
+    /// Use [Self::get_syntax_for_file_name] instead
    #[deprecated]
    pub fn syntax_for_file_name(
        &self,
        file_name: impl AsRef<Path>,
        mapping: &SyntaxMapping,
    ) -> Option<&SyntaxReference> {
-        self.get_syntax_for_path(file_name, mapping)
-            .ok()
+        self.get_syntax_for_file_name(file_name, mapping)
+            .expect(
+                ".syntax_for_file_name() is deprecated, use .get_syntax_for_file_name() instead",
+            )
            .map(|syntax_in_set| syntax_in_set.syntax)
    }

-    /// Detect the syntax based on, in order:
-    ///  1. Syntax mappings with [MappingTarget::MapTo] and [MappingTarget::MapToUnknown]
-    ///     (e.g. `/etc/profile` -> `Bourne Again Shell (bash)`)
-    ///  2. The file name (e.g. `Dockerfile`)
-    ///  3. Syntax mappings with [MappingTarget::MapExtensionToUnknown]
-    ///     (e.g. `*.conf`)
-    ///  4. The file name extension (e.g. `.rs`)
-    ///
-    /// When detecting syntax based on syntax mappings, the full path is taken
-    /// into account. When detecting syntax based on file name, no regard is
-    /// taken to the path of the file. Only the file name itself matters. When
-    /// detecting syntax based on file name extension, only the file name
-    /// extension itself matters.
-    ///
-    /// Returns [Error::UndetectedSyntax] if it was not possible detect syntax
-    /// based on path/file name/extension (or if the path was mapped to
-    /// [MappingTarget::MapToUnknown] or [MappingTarget::MapExtensionToUnknown]).
-    /// In this case it is appropriate to fall back to other methods to detect
-    /// syntax. Such as using the contents of the first line of the file.
-    ///
-    /// Returns [Error::UnknownSyntax] if a syntax mapping exist, but the mapped
-    /// syntax does not exist.
-    pub fn get_syntax_for_path(
+    pub fn get_syntax_for_file_name(
        &self,
-        path: impl AsRef<Path>,
+        file_name: impl AsRef<Path>,
        mapping: &SyntaxMapping,
-    ) -> Result<SyntaxReferenceInSet> {
-        let path = path.as_ref();
-
-        let syntax_match = mapping.get_syntax_for(path);
-
-        if let Some(MappingTarget::MapToUnknown) = syntax_match {
-            return Err(Error::UndetectedSyntax(path.to_string_lossy().into()));
-        }
-
-        if let Some(MappingTarget::MapTo(syntax_name)) = syntax_match {
-            return self
-                .find_syntax_by_name(syntax_name)?
-                .ok_or_else(|| Error::UnknownSyntax(syntax_name.to_owned()));
-        }
-
-        let file_name = path.file_name().unwrap_or_default();
-
-        match (
-            self.get_syntax_for_file_name(file_name, &mapping.ignored_suffixes)?,
-            syntax_match,
-        ) {
-            (Some(syntax), _) => Ok(syntax),
-
-            (_, Some(MappingTarget::MapExtensionToUnknown)) => {
-                Err(Error::UndetectedSyntax(path.to_string_lossy().into()))
+    ) -> Result<Option<SyntaxReferenceInSet>> {
+        let file_name = file_name.as_ref();
+        Ok(match mapping.get_syntax_for(file_name) {
+            Some(MappingTarget::MapToUnknown) => None,
+            Some(MappingTarget::MapTo(syntax_name)) => {
+                let syntax_set = self.get_syntax_set()?;
+                syntax_set
+                    .find_syntax_by_name(syntax_name)
+                    .map(|syntax| SyntaxReferenceInSet { syntax, syntax_set })
            }
-
-            _ => self
-                .get_syntax_for_file_extension(file_name, &mapping.ignored_suffixes)?
-                .ok_or_else(|| Error::UndetectedSyntax(path.to_string_lossy().into())),
-        }
+            None => self.get_extension_syntax(file_name.as_os_str())?,
+        })
    }

-    /// Look up a syntect theme by name.
-    pub fn get_theme(&self, theme: &str) -> &Theme {
-        match self.get_theme_set().get(theme) {
+    pub(crate) fn get_theme(&self, theme: &str) -> &Theme {
+        match self.get_theme_set().themes.get(theme) {
            Some(theme) => theme,
            None => {
                if theme == "ansi-light" || theme == "ansi-dark" {
@@ -247,9 +257,8 @@ impl HighlightingAssets {
                if !theme.is_empty() {
                    bat_warning!("Unknown theme '{}', using default.", theme)
                }
-                self.get_theme_set()
-                    .get(self.fallback_theme.unwrap_or_else(Self::default_theme))
-                    .expect("something is very wrong if the default theme is missing")
+                &self.get_theme_set().themes
+                    [self.fallback_theme.unwrap_or_else(|| Self::default_theme())]
            }
        }
    }
@@ -262,78 +271,112 @@ impl HighlightingAssets {
    ) -> Result<SyntaxReferenceInSet> {
        if let Some(language) = language {
            let syntax_set = self.get_syntax_set()?;
-            return syntax_set
+            syntax_set
                .find_syntax_by_token(language)
                .map(|syntax| SyntaxReferenceInSet { syntax, syntax_set })
-                .ok_or_else(|| Error::UnknownSyntax(language.to_owned()));
-        }
-
-        let path = input.path();
-        let path_syntax = if let Some(path) = path {
-            self.get_syntax_for_path(
-                PathAbs::new(path).map_or_else(|_| path.to_owned(), |p| p.as_path().to_path_buf()),
-                mapping,
-            )
+                .ok_or_else(|| ErrorKind::UnknownSyntax(language.to_owned()).into())
        } else {
-            Err(Error::UndetectedSyntax("[unknown]".into()))
-        };
+            let line_syntax = self.get_first_line_syntax(&mut input.reader)?;

-        match path_syntax {
-            // If a path wasn't provided, or if path based syntax detection
-            // above failed, we fall back to first-line syntax detection.
-            Err(Error::UndetectedSyntax(path)) => self
-                .get_first_line_syntax(&mut input.reader)?
-                .ok_or(Error::UndetectedSyntax(path)),
-            _ => path_syntax,
+            // Get the path of the file:
+            // If this was set by the metadata, that will take priority.
+            // If it wasn't, it will use the real file path (if available).
+            let path_str =
+                input
+                    .metadata
+                    .user_provided_name
+                    .as_ref()
+                    .or_else(|| match input.kind {
+                        OpenedInputKind::OrdinaryFile(ref path) => Some(path),
+                        _ => None,
+                    });
+
+            if let Some(path_str) = path_str {
+                // If a path was provided, we try and detect the syntax based on extension mappings.
+                let path = Path::new(path_str);
+                let absolute_path = PathAbs::new(path)
+                    .ok()
+                    .map(|p| p.as_path().to_path_buf())
+                    .unwrap_or_else(|| path.to_owned());
+
+                match mapping.get_syntax_for(absolute_path) {
+                    Some(MappingTarget::MapToUnknown) => line_syntax.ok_or_else(|| {
+                        ErrorKind::UndetectedSyntax(path.to_string_lossy().into()).into()
+                    }),
+
+                    Some(MappingTarget::MapTo(syntax_name)) => {
+                        let syntax_set = self.get_syntax_set()?;
+                        syntax_set
+                            .find_syntax_by_name(syntax_name)
+                            .map(|syntax| SyntaxReferenceInSet { syntax, syntax_set })
+                            .ok_or_else(|| ErrorKind::UnknownSyntax(syntax_name.to_owned()).into())
+                    }
+
+                    None => {
+                        let file_name = path.file_name().unwrap_or_default();
+                        self.get_extension_syntax(file_name)?
+                            .or(line_syntax)
+                            .ok_or_else(|| {
+                                ErrorKind::UndetectedSyntax(path.to_string_lossy().into()).into()
+                            })
+                    }
+                }
+            } else {
+                // If a path wasn't provided, we fall back to the detect first-line syntax.
+                line_syntax.ok_or_else(|| ErrorKind::UndetectedSyntax("[unknown]".into()).into())
+            }
        }
    }

-    pub(crate) fn find_syntax_by_name(
-        &self,
-        syntax_name: &str,
-    ) -> Result<Option<SyntaxReferenceInSet>> {
-        let syntax_set = self.get_syntax_set()?;
-        Ok(syntax_set
-            .find_syntax_by_name(syntax_name)
-            .map(|syntax| SyntaxReferenceInSet { syntax, syntax_set }))
-    }
-
-    fn find_syntax_by_extension(&self, e: Option<&OsStr>) -> Result<Option<SyntaxReferenceInSet>> {
-        let syntax_set = self.get_syntax_set()?;
-        let extension = e.and_then(|x| x.to_str()).unwrap_or_default();
-        Ok(syntax_set
-            .find_syntax_by_extension(extension)
-            .map(|syntax| SyntaxReferenceInSet { syntax, syntax_set }))
-    }
-
-    fn get_syntax_for_file_name(
-        &self,
-        file_name: &OsStr,
-        ignored_suffixes: &IgnoredSuffixes,
-    ) -> Result<Option<SyntaxReferenceInSet>> {
-        let mut syntax = self.find_syntax_by_extension(Some(file_name))?;
+    fn get_extension_syntax(&self, file_name: &OsStr) -> Result<Option<SyntaxReferenceInSet>> {
+        let mut syntax = self.find_syntax_by_file_name(file_name)?;
        if syntax.is_none() {
-            syntax =
-                ignored_suffixes.try_with_stripped_suffix(file_name, |stripped_file_name| {
-                    // Note: recursion
-                    self.get_syntax_for_file_name(stripped_file_name, ignored_suffixes)
-                })?;
+            syntax = self.find_syntax_by_file_name_extension(file_name)?;
+        }
+        if syntax.is_none() {
+            syntax = self.get_extension_syntax_with_stripped_suffix(file_name)?;
        }
        Ok(syntax)
    }

-    fn get_syntax_for_file_extension(
+    fn find_syntax_by_file_name(&self, file_name: &OsStr) -> Result<Option<SyntaxReferenceInSet>> {
+        let syntax_set = self.get_syntax_set()?;
+        Ok(syntax_set
+            .find_syntax_by_extension(file_name.to_str().unwrap_or_default())
+            .map(|syntax| SyntaxReferenceInSet { syntax, syntax_set }))
+    }
+
+    fn find_syntax_by_file_name_extension(
        &self,
        file_name: &OsStr,
-        ignored_suffixes: &IgnoredSuffixes,
    ) -> Result<Option<SyntaxReferenceInSet>> {
-        let mut syntax = self.find_syntax_by_extension(Path::new(file_name).extension())?;
-        if syntax.is_none() {
-            syntax =
-                ignored_suffixes.try_with_stripped_suffix(file_name, |stripped_file_name| {
-                    // Note: recursion
-                    self.get_syntax_for_file_extension(stripped_file_name, ignored_suffixes)
-                })?;
+        let file_path = Path::new(file_name);
+        let syntax_set = self.get_syntax_set()?;
+        Ok(syntax_set
+            .find_syntax_by_extension(
+                file_path
+                    .extension()
+                    .and_then(|x| x.to_str())
+                    .unwrap_or_default(),
+            )
+            .map(|syntax| SyntaxReferenceInSet { syntax, syntax_set }))
+    }
+
+    /// If we find an ignored suffix on the file name, e.g. '~', we strip it and
+    /// then try again to find a syntax without it. Note that we do this recursively.
+    fn get_extension_syntax_with_stripped_suffix(
+        &self,
+        file_name: &OsStr,
+    ) -> Result<Option<SyntaxReferenceInSet>> {
+        let file_path = Path::new(file_name);
+        let mut syntax = None;
+        if let Some(file_str) = file_path.to_str() {
+            for suffix in IGNORED_SUFFIXES.iter() {
+                if let Some(stripped_filename) = file_str.strip_suffix(suffix) {
+                    syntax = self.get_extension_syntax(OsStr::new(stripped_filename))?;
+                    break;
+                }
+            }
        }
        Ok(syntax)
    }
@@ -350,73 +393,57 @@ impl HighlightingAssets {
    }
 }

-pub(crate) fn get_serialized_integrated_syntaxset() -> &'static [u8] {
+/// A SyntaxSet in serialized form, i.e. bincoded and flate2 compressed.
+/// We keep it in this format since we want to load it lazily.
+#[derive(Debug)]
+enum SerializedSyntaxSet {
+    /// The data comes from a user-generated cache file.
+    FromFile(PathBuf),
+
+    /// The data to use is embedded into the bat binary.
+    FromBinary(&'static [u8]),
+}
+
+impl SerializedSyntaxSet {
+    fn deserialize(&self) -> Result<SyntaxSet> {
+        match self {
+            SerializedSyntaxSet::FromBinary(data) => Ok(from_binary(data)),
+            SerializedSyntaxSet::FromFile(ref path) => asset_from_cache(path, "syntax set"),
+        }
+    }
+}
+
+fn get_serialized_integrated_syntaxset() -> &'static [u8] {
    include_bytes!("../assets/syntaxes.bin")
 }

-pub(crate) fn get_integrated_themeset() -> LazyThemeSet {
-    from_binary(include_bytes!("../assets/themes.bin"), COMPRESS_THEMES)
+fn get_integrated_themeset() -> ThemeSet {
+    from_binary(include_bytes!("../assets/themes.bin"))
 }

-pub fn get_acknowledgements() -> String {
-    from_binary(
-        include_bytes!("../assets/acknowledgements.bin"),
-        COMPRESS_ACKNOWLEDGEMENTS,
-    )
+#[cfg(feature = "build-assets")]
+fn asset_to_cache<T: serde::Serialize>(asset: &T, path: &Path, description: &str) -> Result<()> {
+    print!("Writing {} to {} ... ", description, path.to_string_lossy());
+    syntect::dumps::dump_to_file(asset, &path).chain_err(|| {
+        format!(
+            "Could not save {} to {}",
+            description,
+            path.to_string_lossy()
+        )
+    })?;
+    println!("okay");
+    Ok(())
 }

-pub(crate) fn from_binary<T: serde::de::DeserializeOwned>(v: &[u8], compressed: bool) -> T {
-    asset_from_contents(v, "n/a", compressed)
-        .expect("data integrated in binary is never faulty, but make sure `compressed` is in sync!")
-}
-
-fn asset_from_contents<T: serde::de::DeserializeOwned>(
-    contents: &[u8],
-    description: &str,
-    compressed: bool,
-) -> Result<T> {
-    if compressed {
-        bincode::deserialize_from(flate2::read::ZlibDecoder::new(contents))
-    } else {
-        bincode::deserialize_from(contents)
-    }
-    .map_err(|_| format!("Could not parse {description}").into())
-}
-
-fn asset_from_cache<T: serde::de::DeserializeOwned>(
-    path: &Path,
-    description: &str,
-    compressed: bool,
-) -> Result<T> {
-    let contents = fs::read(path).map_err(|_| {
+fn asset_from_cache<T: serde::de::DeserializeOwned>(path: &Path, description: &str) -> Result<T> {
+    let contents = fs::read(path).chain_err(|| {
        format!(
            "Could not load cached {} '{}'",
            description,
            path.to_string_lossy()
        )
    })?;
-    asset_from_contents(&contents[..], description, compressed)
-        .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,
-    }
+    from_reader(&contents[..]).chain_err(|| format!("Could not parse cached {}", description))
 }

 #[cfg(test)]
@@ -441,7 +468,7 @@ mod tests {
        fn new() -> Self {
            SyntaxDetectionTest {
                assets: HighlightingAssets::from_binary(),
-                syntax_mapping: SyntaxMapping::new(),
+                syntax_mapping: SyntaxMapping::builtin(),
                temp_dir: TempDir::new().expect("creation of temporary directory"),
            }
        }
@@ -466,7 +493,7 @@ mod tests {
            let file_path = self.temp_dir.path().join(file_name);
            {
                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);
@@ -514,7 +541,8 @@ mod tests {

            if !consistent {
                eprintln!(
-                    "Inconsistent syntax detection:\nFor File: {as_file}\nFor Reader: {as_reader}"
+                    "Inconsistent syntax detection:\nFor File: {}\nFor Reader: {}",
+                    as_file, as_reader
                )
            }

@@ -612,58 +640,13 @@ mod tests {
    }

    #[test]
-    fn syntax_detection_with_extension_mapping_to_unknown() {
+    fn syntax_detection_is_case_sensitive() {
        let mut test = SyntaxDetectionTest::new();

-        // Normally, a CMakeLists.txt file shall use the CMake syntax, even if it is
-        // a bash script in disguise
-        assert_eq!(
-            test.syntax_for_file_with_content("CMakeLists.txt", "#!/bin/bash"),
-            "CMake"
-        );
-
-        // Other .txt files shall use the Plain Text syntax
-        assert_eq!(
-            test.syntax_for_file_with_content("some-other.txt", "#!/bin/bash"),
-            "Plain Text"
-        );
-
-        // If we setup MapExtensionToUnknown on *.txt, the match on the full
-        // file name of "CMakeLists.txt" shall have higher prio, and CMake shall
-        // still be used for it
-        test.syntax_mapping
-            .insert("*.txt", MappingTarget::MapExtensionToUnknown)
-            .ok();
-        assert_eq!(
-            test.syntax_for_file_with_content("CMakeLists.txt", "#!/bin/bash"),
-            "CMake"
-        );
-
-        // However, for *other* files with a .txt extension, first-line fallback
-        // shall now be used
-        assert_eq!(
-            test.syntax_for_file_with_content("some-other.txt", "#!/bin/bash"),
-            "Bourne Again Shell (bash)"
-        );
-    }
-
-    #[test]
-    fn syntax_detection_is_case_insensitive() {
-        let mut test = SyntaxDetectionTest::new();
-
-        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");
-
-        // Adding a mapping for "MD" in addition to "md" should not break the mapping
+        assert_ne!(test.syntax_for_file("README.MD"), "Markdown");
        test.syntax_mapping
            .insert("*.MD", MappingTarget::MapTo("Markdown"))
            .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");
    }

--- a/src/assets/build_assets.rs
+++ b/src/assets/build_assets.rs
@@ -1,176 +0,0 @@
-use std::convert::TryInto;
-use std::path::Path;
-
-use syntect::highlighting::ThemeSet;
-use syntect::parsing::{SyntaxSet, SyntaxSetBuilder};
-
-use crate::assets::*;
-use acknowledgements::build_acknowledgements;
-
-mod acknowledgements;
-
-pub fn build(
-    source_dir: &Path,
-    include_integrated_assets: bool,
-    include_acknowledgements: bool,
-    target_dir: &Path,
-    current_version: &str,
-) -> Result<()> {
-    let theme_set = build_theme_set(source_dir, include_integrated_assets)?;
-
-    let syntax_set_builder = build_syntax_set_builder(source_dir, include_integrated_assets)?;
-
-    let syntax_set = syntax_set_builder.build();
-
-    let acknowledgements = build_acknowledgements(source_dir, include_acknowledgements)?;
-
-    print_unlinked_contexts(&syntax_set);
-
-    write_assets(
-        &theme_set,
-        &syntax_set,
-        &acknowledgements,
-        target_dir,
-        current_version,
-    )
-}
-
-fn build_theme_set(source_dir: &Path, include_integrated_assets: bool) -> Result<LazyThemeSet> {
-    let mut theme_set = if include_integrated_assets {
-        crate::assets::get_integrated_themeset().try_into()?
-    } else {
-        ThemeSet::new()
-    };
-
-    let theme_dir = source_dir.join("themes");
-    if theme_dir.exists() {
-        let res = theme_set.add_from_folder(&theme_dir);
-        if let Err(err) = res {
-            println!(
-                "Failed to load one or more themes from '{}' (reason: '{}')",
-                theme_dir.to_string_lossy(),
-                err,
-            );
-        }
-    } else {
-        println!(
-            "No themes were found in '{}', using the default set",
-            theme_dir.to_string_lossy()
-        );
-    }
-
-    theme_set.try_into()
-}
-
-fn build_syntax_set_builder(
-    source_dir: &Path,
-    include_integrated_assets: bool,
-) -> Result<SyntaxSetBuilder> {
-    let mut syntax_set_builder = if !include_integrated_assets {
-        let mut builder = syntect::parsing::SyntaxSetBuilder::new();
-        builder.add_plain_text_syntax();
-        builder
-    } else {
-        from_binary::<SyntaxSet>(get_serialized_integrated_syntaxset(), COMPRESS_SYNTAXES)
-            .into_builder()
-    };
-
-    let syntax_dir = source_dir.join("syntaxes");
-    if syntax_dir.exists() {
-        syntax_set_builder.add_from_folder(syntax_dir, true)?;
-    } else {
-        println!(
-            "No syntaxes were found in '{}', using the default set.",
-            syntax_dir.to_string_lossy()
-        );
-    }
-
-    Ok(syntax_set_builder)
-}
-
-fn print_unlinked_contexts(syntax_set: &SyntaxSet) {
-    let missing_contexts = syntax_set.find_unlinked_contexts();
-    if !missing_contexts.is_empty() {
-        println!("Some referenced contexts could not be found!");
-        for context in missing_contexts {
-            println!("- {context}");
-        }
-    }
-}
-
-fn write_assets(
-    theme_set: &LazyThemeSet,
-    syntax_set: &SyntaxSet,
-    acknowledgements: &Option<String>,
-    target_dir: &Path,
-    current_version: &str,
-) -> Result<()> {
-    let _ = std::fs::create_dir_all(target_dir);
-    asset_to_cache(
-        theme_set,
-        &target_dir.join("themes.bin"),
-        "theme set",
-        COMPRESS_THEMES,
-    )?;
-    asset_to_cache(
-        syntax_set,
-        &target_dir.join("syntaxes.bin"),
-        "syntax set",
-        COMPRESS_SYNTAXES,
-    )?;
-
-    if let Some(acknowledgements) = acknowledgements {
-        asset_to_cache(
-            acknowledgements,
-            &target_dir.join("acknowledgements.bin"),
-            "acknowledgements",
-            COMPRESS_ACKNOWLEDGEMENTS,
-        )?;
-    }
-
-    print!(
-        "Writing metadata to folder {} ... ",
-        target_dir.to_string_lossy()
-    );
-    crate::assets_metadata::AssetsMetadata::new(current_version).save_to_folder(target_dir)?;
-    println!("okay");
-
-    Ok(())
-}
-
-pub(crate) fn asset_to_contents<T: serde::Serialize>(
-    asset: &T,
-    description: &str,
-    compressed: bool,
-) -> Result<Vec<u8>> {
-    let mut contents = vec![];
-    if compressed {
-        bincode::serialize_into(
-            flate2::write::ZlibEncoder::new(&mut contents, flate2::Compression::best()),
-            asset,
-        )
-    } else {
-        bincode::serialize_into(&mut contents, asset)
-    }
-    .map_err(|_| format!("Could not serialize {description}"))?;
-    Ok(contents)
-}
-
-fn asset_to_cache<T: serde::Serialize>(
-    asset: &T,
-    path: &Path,
-    description: &str,
-    compressed: bool,
-) -> Result<()> {
-    print!("Writing {} to {} ... ", description, path.to_string_lossy());
-    let contents = asset_to_contents(asset, description, compressed)?;
-    std::fs::write(path, &contents[..]).map_err(|_| {
-        format!(
-            "Could not save {} to {}",
-            description,
-            path.to_string_lossy()
-        )
-    })?;
-    println!("okay");
-    Ok(())
-}
--- a/src/assets/build_assets/acknowledgements.rs
+++ b/src/assets/build_assets/acknowledgements.rs
@@ -1,223 +0,0 @@
-use std::fmt::Write;
-use std::fs::read_to_string;
-use std::path::{Path, PathBuf};
-
-use walkdir::DirEntry;
-
-use crate::error::*;
-
-struct PathAndStem {
-    path: PathBuf,
-    stem: String,
-    relative_path: String,
-}
-
-/// Looks for LICENSE and NOTICE files in `source_dir`, does some rudimentary
-/// analysis, and compiles them together in a single string that is meant to be
-/// used in the output to `--acknowledgements`
-pub fn build_acknowledgements(
-    source_dir: &Path,
-    include_acknowledgements: bool,
-) -> Result<Option<String>> {
-    if !include_acknowledgements {
-        return Ok(None);
-    }
-
-    let mut acknowledgements = format!("{}\n\n", include_str!("../../../NOTICE"));
-
-    // Sort entries so the order is stable over time
-    let entries = walkdir::WalkDir::new(source_dir).sort_by(|a, b| a.path().cmp(b.path()));
-    for path_and_stem in entries
-        .into_iter()
-        .flatten()
-        .flat_map(|entry| to_path_and_stem(source_dir, entry))
-    {
-        if let Some(license_text) = handle_file(&path_and_stem)? {
-            append_to_acknowledgements(
-                &mut acknowledgements,
-                &path_and_stem.relative_path,
-                &license_text,
-            )
-        }
-    }
-
-    Ok(Some(acknowledgements))
-}
-
-fn to_path_and_stem(source_dir: &Path, entry: DirEntry) -> Option<PathAndStem> {
-    let path = entry.path();
-
-    Some(PathAndStem {
-        path: path.to_owned(),
-        stem: path.file_stem().map(|s| s.to_string_lossy().to_string())?,
-        relative_path: path
-            .strip_prefix(source_dir)
-            .map(|p| p.to_string_lossy().to_string())
-            .ok()?,
-    })
-}
-
-fn handle_file(path_and_stem: &PathAndStem) -> Result<Option<String>> {
-    if path_and_stem.stem == "NOTICE" {
-        handle_notice(&path_and_stem.path)
-    } else if path_and_stem.stem.to_ascii_uppercase() == "LICENSE" {
-        handle_license(&path_and_stem.path)
-    } else {
-        Ok(None)
-    }
-}
-
-fn handle_notice(path: &Path) -> Result<Option<String>> {
-    // Assume NOTICE as defined by Apache License 2.0. These must be part of acknowledgements.
-    Ok(Some(read_to_string(path)?))
-}
-
-fn handle_license(path: &Path) -> Result<Option<String>> {
-    let license_text = read_to_string(path)?;
-
-    if include_license_in_acknowledgments(&license_text) {
-        Ok(Some(license_text))
-    } else if license_not_needed_in_acknowledgements(&license_text) {
-        Ok(None)
-    } else {
-        Err(format!("ERROR: License is of unknown type: {path:?}").into())
-    }
-}
-
-fn include_license_in_acknowledgments(license_text: &str) -> bool {
-    let markers = vec![
-        // MIT
-        "The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.",
-
-        // BSD
-        "Redistributions in binary form must reproduce the above copyright notice,",
-
-        // Apache 2.0
-        "Apache License Version 2.0, January 2004 http://www.apache.org/licenses/",
-        "Licensed under the Apache License, Version 2.0 (the \"License\");",
-    ];
-
-    license_contains_marker(license_text, &markers)
-}
-
-fn license_not_needed_in_acknowledgements(license_text: &str) -> bool {
-    let markers = vec![
-        // Public domain
-        "This is free and unencumbered software released into the public domain.",
-
-        // Public domain with stronger wording than above
-        "DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE",
-
-        // Special license of assets/syntaxes/01_Packages/LICENSE
-        "Permission to copy, use, modify, sell and distribute this software is granted. This software is provided \"as is\" without express or implied warranty, and with no claim as to its suitability for any purpose."
-    ];
-
-    license_contains_marker(license_text, &markers)
-}
-
-fn license_contains_marker(license_text: &str, markers: &[&str]) -> bool {
-    let normalized_license_text = normalize_license_text(license_text);
-    markers.iter().any(|m| normalized_license_text.contains(m))
-}
-
-fn append_to_acknowledgements(
-    acknowledgements: &mut String,
-    relative_path: &str,
-    license_text: &str,
-) {
-    write!(acknowledgements, "## {relative_path}\n\n{license_text}").ok();
-
-    // Make sure the last char is a newline to not mess up formatting later
-    if acknowledgements
-        .chars()
-        .last()
-        .expect("acknowledgements is not the empty string")
-        != '\n'
-    {
-        acknowledgements.push('\n');
-    }
-
-    // Add two more newlines to make it easy to distinguish where this text ends
-    // and the next starts
-    acknowledgements.push_str("\n\n");
-}
-
-/// Replaces newlines with a space character, and replaces multiple spaces with one space.
-/// This makes the text easier to analyze.
-fn normalize_license_text(license_text: &str) -> String {
-    use regex::Regex;
-
-    let whitespace_and_newlines = Regex::new(r"\s").unwrap();
-    let as_single_line = whitespace_and_newlines.replace_all(license_text, " ");
-
-    let many_spaces = Regex::new(" +").unwrap();
-    many_spaces.replace_all(&as_single_line, " ").to_string()
-}
-
-#[cfg(test)]
-mod tests {
-    #[cfg(test)]
-    use super::*;
-
-    #[test]
-    fn test_normalize_license_text() {
-        let license_text = "This is a license text with these terms:
- * Complicated multi-line
-   term with indentation";
-
-        assert_eq!(
-            "This is a license text with these terms: * Complicated multi-line term with indentation".to_owned(),
-            normalize_license_text(license_text),
-        );
-    }
-
-    #[test]
-    fn test_normalize_license_text_with_windows_line_endings() {
-        let license_text = "This license text includes windows line endings\r
-and we need to handle that.";
-
-        assert_eq!(
-            "This license text includes windows line endings and we need to handle that."
-                .to_owned(),
-            normalize_license_text(license_text),
-        );
-    }
-
-    #[test]
-    fn test_append_to_acknowledgements_adds_newline_if_missing() {
-        let mut acknowledgements = "preamble\n\n\n".to_owned();
-
-        append_to_acknowledgements(&mut acknowledgements, "some/path", "line without newline");
-        assert_eq!(
-            "preamble
-
-
-## some/path
-
-line without newline
-
-
-",
-            acknowledgements
-        );
-
-        append_to_acknowledgements(&mut acknowledgements, "another/path", "line with newline\n");
-        assert_eq!(
-            "preamble
-
-
-## some/path
-
-line without newline
-
-
-## another/path
-
-line with newline
-
-
-",
-            acknowledgements
-        );
-    }
-}
--- a/src/assets/lazy_theme_set.rs
+++ b/src/assets/lazy_theme_set.rs
@@ -1,103 +0,0 @@
-use super::*;
-
-use std::collections::BTreeMap;
-use std::convert::TryFrom;
-
-use serde_derive::{Deserialize, Serialize};
-
-use once_cell::unsync::OnceCell;
-
-use syntect::highlighting::{Theme, ThemeSet};
-
-/// Same structure as a [`syntect::highlighting::ThemeSet`] but with themes
-/// stored in raw serialized form, and deserialized on demand.
-#[derive(Debug, Default, Serialize, Deserialize)]
-pub struct LazyThemeSet {
-    /// This is a [`BTreeMap`] because that's what [`syntect::highlighting::ThemeSet`] uses
-    themes: BTreeMap<String, LazyTheme>,
-}
-
-/// Stores raw serialized data for a theme with methods to lazily deserialize
-/// (load) the theme.
-#[derive(Debug, Serialize, Deserialize)]
-struct LazyTheme {
-    serialized: Vec<u8>,
-
-    #[serde(skip, default = "OnceCell::new")]
-    deserialized: OnceCell<syntect::highlighting::Theme>,
-}
-
-impl LazyThemeSet {
-    /// Lazily load the given theme
-    pub fn get(&self, name: &str) -> Option<&Theme> {
-        self.themes.get(name).and_then(|lazy_theme| {
-            lazy_theme
-                .deserialized
-                .get_or_try_init(|| lazy_theme.deserialize())
-                .ok()
-        })
-    }
-
-    /// Returns the name of all themes.
-    pub fn themes(&self) -> impl Iterator<Item = &str> {
-        self.themes.keys().map(|name| name.as_ref())
-    }
-}
-
-impl LazyTheme {
-    fn deserialize(&self) -> Result<Theme> {
-        asset_from_contents(
-            &self.serialized[..],
-            "lazy-loaded theme",
-            COMPRESS_LAZY_THEMES,
-        )
-    }
-}
-
-impl TryFrom<LazyThemeSet> for ThemeSet {
-    type Error = Error;
-
-    /// Since the user might want to add custom themes to bat, we need a way to
-    /// convert from a `LazyThemeSet` to a regular [`ThemeSet`] so that more
-    /// themes can be added. This function does that pretty straight-forward
-    /// conversion.
-    fn try_from(lazy_theme_set: LazyThemeSet) -> Result<Self> {
-        let mut theme_set = ThemeSet::default();
-
-        for (name, lazy_theme) in lazy_theme_set.themes {
-            theme_set.themes.insert(name, lazy_theme.deserialize()?);
-        }
-
-        Ok(theme_set)
-    }
-}
-
-#[cfg(feature = "build-assets")]
-impl TryFrom<ThemeSet> for LazyThemeSet {
-    type Error = Error;
-
-    /// To collect themes, a [`ThemeSet`] is needed. Once all desired themes
-    /// have been added, we need a way to convert that into [`LazyThemeSet`] so
-    /// that themes can be lazy-loaded later. This function does that
-    /// conversion.
-    fn try_from(theme_set: ThemeSet) -> Result<Self> {
-        let mut lazy_theme_set = LazyThemeSet::default();
-
-        for (name, theme) in theme_set.themes {
-            // All we have to do is to serialize the theme
-            let lazy_theme = LazyTheme {
-                serialized: crate::assets::build_assets::asset_to_contents(
-                    &theme,
-                    &format!("theme {name}"),
-                    COMPRESS_LAZY_THEMES,
-                )?,
-                deserialized: OnceCell::new(),
-            };
-
-            // Ok done, now we can add it
-            lazy_theme_set.themes.insert(name, lazy_theme);
-        }
-
-        Ok(lazy_theme_set)
-    }
-}
--- a/Show More
+++ b/Show More