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.

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: [sharkdp, keith-hall, Enselic]

.github/ISSUE_TEMPLATE/config.yml

@@ -1,2 +1 @@
 blank_issues_enabled: true
-

.github/ISSUE_TEMPLATE/feature_request.md

@@ -7,4 +7,3 @@ assignees: ''
 
 ---
 
-

.github/ISSUE_TEMPLATE/question.md

@@ -7,4 +7,3 @@ assignees: ''
 
 ---
 
-

.github/workflows/CICD.yml

@@ -16,30 +16,37 @@ on:
 jobs:
   min_version:
     name: Minimum supported rust version
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
-    - name: Git checkout
+    - name: Checkout source code
       uses: actions/checkout@v2
+
     - name: Install rust toolchain (v${{ env.MIN_SUPPORTED_RUST_VERSION }})
       uses: actions-rs/toolchain@v1
       with:
         toolchain: ${{ env.MIN_SUPPORTED_RUST_VERSION }}
         default: true
         profile: minimal # minimal component installation (ie, no documentation)
-        components: clippy
+        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)
       uses: actions-rs/cargo@v1
       with:
         command: clippy
-        args: --all-targets --all-features
+        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-18.04
+    runs-on: ubuntu-20.04
     steps:
     - name: Git checkout
       uses: actions/checkout@v2
@@ -67,12 +74,12 @@ jobs:
       uses: actions-rs/cargo@v1
       with:
         command: test
-        args: --release
+        args: --locked --release
     - name: Run ignored-by-default unit tests with new syntaxes and themes
       uses: actions-rs/cargo@v1
       with:
         command: test
-        args: --release -- --ignored
+        args: --locked --release -- --ignored
     - name: Syntax highlighting regression test
       run: tests/syntax-tests/regression_test.sh
     - name: List of languages
@@ -85,7 +92,7 @@ jobs:
       uses: actions-rs/cargo@v1
       with:
         command: doc
-        args: --no-deps --document-private-items --all-features
+        args: --locked --no-deps --document-private-items --all-features
 
   build:
     name: ${{ matrix.job.os }} (${{ matrix.job.target }})
@@ -94,17 +101,18 @@ jobs:
       fail-fast: false
       matrix:
         job:
-          - { os: ubuntu-18.04 , target: arm-unknown-linux-gnueabihf , use-cross: true }
-          - { os: ubuntu-18.04 , target: aarch64-unknown-linux-gnu   , use-cross: true }
-          - { os: ubuntu-18.04 , target: i686-unknown-linux-gnu      , use-cross: true }
-          - { os: ubuntu-18.04 , target: i686-unknown-linux-musl     , use-cross: true }
-          - { os: ubuntu-18.04 , target: x86_64-unknown-linux-gnu    }
-          - { os: ubuntu-18.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      }
+          - { 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@v2
@@ -113,14 +121,14 @@ jobs:
       shell: bash
       run: |
         case ${{ matrix.job.target }} in
-          arm-unknown-linux-gnueabihf) sudo apt-get -y update ; sudo apt-get -y install gcc-arm-linux-gnueabihf ;;
+          arm-unknown-linux-*) sudo apt-get -y update ; sudo apt-get -y install gcc-arm-linux-gnueabihf ;;
           aarch64-unknown-linux-gnu) sudo apt-get -y update ; sudo apt-get -y install gcc-aarch64-linux-gnu ;;
         esac
 
     - name: Extract crate information
       shell: bash
       run: |
-        echo "PROJECT_NAME=$(sed -n 's/^name = "\(.*\)"/\1/p' Cargo.toml)" >> $GITHUB_ENV
+        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
@@ -148,7 +156,7 @@ jobs:
       with:
         use-cross: ${{ matrix.job.use-cross }}
         command: build
-        args: --release --target=${{ matrix.job.target }}
+        args: --locked --release --target=${{ matrix.job.target }}
 
     - name: Strip debug information from executable
       id: strip
@@ -163,7 +171,7 @@ jobs:
         # Figure out what strip tool to use if any
         STRIP="strip"
         case ${{ matrix.job.target }} in
-          arm-unknown-linux-gnueabihf) STRIP="arm-linux-gnueabihf-strip" ;;
+          arm-unknown-linux-*) STRIP="arm-linux-gnueabihf-strip" ;;
           aarch64-unknown-linux-gnu) STRIP="aarch64-linux-gnu-strip" ;;
           *-pc-windows-msvc) STRIP="" ;;
         esac;
@@ -186,63 +194,61 @@ jobs:
         echo ::set-output name=BIN_PATH::${BIN_PATH}
         echo ::set-output name=BIN_NAME::${BIN_NAME}
 
-    - 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 ${PROJECT_NAME}" ;; esac;
-        echo ::set-output name=CARGO_TEST_OPTIONS::${CARGO_TEST_OPTIONS}
-
     - name: Run tests
       uses: actions-rs/cargo@v1
       with:
         use-cross: ${{ matrix.job.use-cross }}
         command: test
-        args: --target=${{ matrix.job.target }} ${{ steps.test-options.outputs.CARGO_TEST_OPTIONS}}
+        args: --locked --target=${{ matrix.job.target }}
 
     - name: Run bat
       uses: actions-rs/cargo@v1
       with:
         use-cross: ${{ matrix.job.use-cross }}
         command: run
-        args: --target=${{ matrix.job.target }} -- --paging=never --color=always --theme=ansi Cargo.toml src/config.rs
+        args: --locked --target=${{ matrix.job.target }} -- --paging=never --color=always --theme=ansi Cargo.toml src/config.rs
 
     - name: Show diagnostics (bat --diagnostic)
       uses: actions-rs/cargo@v1
       with:
         use-cross: ${{ matrix.job.use-cross }}
         command: run
-        args: --target=${{ matrix.job.target }} -- --paging=never --color=always --theme=ansi Cargo.toml src/config.rs --diagnostic
+        args: --locked --target=${{ matrix.job.target }} -- --paging=never --color=always --theme=ansi Cargo.toml src/config.rs --diagnostic
 
     - name: "Feature check: regex-onig"
       uses: actions-rs/cargo@v1
       with:
         use-cross: ${{ matrix.job.use-cross }}
         command: check
-        args: --target=${{ matrix.job.target }} --verbose --lib --no-default-features --features regex-onig
+        args: --locked --target=${{ matrix.job.target }} --verbose --lib --no-default-features --features regex-onig
 
     - name: "Feature check: regex-onig,git"
       uses: actions-rs/cargo@v1
       with:
         use-cross: ${{ matrix.job.use-cross }}
         command: check
-        args: --target=${{ matrix.job.target }} --verbose --lib --no-default-features --features regex-onig,git
+        args: --locked --target=${{ matrix.job.target }} --verbose --lib --no-default-features --features regex-onig,git
 
     - name: "Feature check: regex-onig,paging"
       uses: actions-rs/cargo@v1
       with:
         use-cross: ${{ matrix.job.use-cross }}
         command: check
-        args: --target=${{ matrix.job.target }} --verbose --lib --no-default-features --features regex-onig,paging
+        args: --locked --target=${{ matrix.job.target }} --verbose --lib --no-default-features --features regex-onig,paging
 
     - name: "Feature check: regex-onig,git,paging"
       uses: actions-rs/cargo@v1
       with:
         use-cross: ${{ matrix.job.use-cross }}
         command: check
-        args: --target=${{ matrix.job.target }} --verbose --lib --no-default-features --features regex-onig,git,paging
+        args: --locked --target=${{ matrix.job.target }} --verbose --lib --no-default-features --features regex-onig,git,paging
+
+    - name: "Feature check: 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
@@ -268,6 +274,7 @@ jobs:
         cp "README.md" "LICENSE-MIT" "LICENSE-APACHE" "CHANGELOG.md" "$ARCHIVE_DIR"
 
         # Autocompletion files
+        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"
 

.gitignore

@@ -2,6 +2,7 @@
 **/*.rs.bk
 
 # Generated files
+/assets/completions/bat.bash
 /assets/completions/bat.fish
 /assets/completions/bat.zsh
 /assets/manual/bat.1

.gitmodules

@@ -217,4 +217,16 @@
 	url = https://github.com/vidann1/visual-studio-dark-plus.git
 [submodule "assets/syntaxes/02_Extra/SublimeEthereum"]
 	path = assets/syntaxes/02_Extra/SublimeEthereum
-	url = https://github.com/davidhq/SublimeEthereum.git
+	url = https://github.com/davidhq/SublimeEthereum.git
+[submodule "assets/syntaxes/02_Extra/Groff"]
+	path = assets/syntaxes/02_Extra/Groff
+	url = https://github.com/carsonoid/sublime_man_page_support
+[submodule "assets/syntaxes/02_Extra/http-request-response"]
+	path = assets/syntaxes/02_Extra/http-request-response
+	url = https://github.com/keith-hall/http-request-response-syntax.git
+[submodule "assets/syntaxes/02_Extra/LLVM"]
+	path = assets/syntaxes/02_Extra/LLVM
+	url = https://github.com/ioncodes/LLVM.tmBundle
+[submodule "assets/syntaxes/02_Extra/Slim"]
+	path = assets/syntaxes/02_Extra/Slim
+	url = https://github.com/slim-template/ruby-slim.tmbundle.git

CHANGELOG.md

@@ -2,24 +2,60 @@
 
 ## Features
 
+- `$BAT_CONFIG_DIR` is now a recognized environment variable. It has precedence over `$XDG_CONFIG_HOME`, see #1727 (@billrisher)
 
 ## Bugfixes
 
+- Python syntax highlighting no longer suffers from abysmal performance in specific scenarios. See #1688 (@keith-hall)
 
 ## Other
 
+- 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
 
+- Groff, see #1685 (@scop)
+- HTTP Requests and Responses, see #1748 (@keith-hall)
+- LLVM, see #1777 (@ioncodes)
+- Highlight for `vimrc` and `gvimrc` files, see #1763 (@SuperSandro2000)
+- Syslog highlighting improvements, see #1793 (@scop)
+- Added support for `slim` syntax, see #1693 (@mfinelli)
 
 ## New themes
 
 
 ## `bat` as a library
 
+- 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.2
+
+## Features
+
+- Ignore known backup/template filename suffixes when selecting the syntax, see #1687 (@scop)
+
+## Bugfixes
+
+- Fix for a security vulnerability on Windows. Prior to this release, `bat` would execute programs called `less`/`less.exe` from the current working directory (instead of the one from `PATH`) with priority. An attacker might be able to use this by placing a malicious program in a shared directory where the user would execute `bat`. `bat` users on Windows are advised to upgrade to this version. See #1724 and #1472 (@Ry0taK).
+
+## Other
+
+- Add bash completion, see #1678 (@scop)
+- Fix Clippy lints, see #1661 (@mohamed-abdelnour)
+- Add syntax highlighting test files, see #1213 and #1668 (@mohamed-abdelnour)
+
+## Syntaxes
+
+- Upgraded Julia syntax to fix a highlighting bug, see #1692
+- Added support for `dash` syntax, see #1654 (@mohamed-abdelnour)
+- Added support for `XAML` syntax, see #1590 and #1655 (@mohamed-abdelnour)
+- Apply `DotENV` syntax also for `.env.default` and `.env.defaults` files, see #1669
+
+
 # v0.18.1
 
 ## Bugfixes
@@ -535,7 +571,7 @@ You can see the API documentation here: https://docs.rs/bat/
 
 - Added `BAT_CONFIG_PATH` environment variable to set a non-default path for `bat`s configuration file, see #375 (@deg4uss3r)
 
-- Allow for multiple occurences of `--style` to allow for the configuration
+- Allow for multiple occurrences of `--style` to allow for the configuration
   of styles from the config file, see #367 (@sindreij)
 
 - Allow for multiple `--line-range` arguments, see #23

Cargo.lock

@@ -1,5 +1,7 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+version = 3
+
 [[package]]
 name = "adler"
 version = "1.0.2"
@@ -17,9 +19,9 @@ dependencies = [
 
 [[package]]
 name = "ansi_colours"
-version = "1.0.2"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52cb663b84aea8670b4a40368360e29485c11b03d14ff6283261aeccd69d5ce1"
+checksum = "60e2fb6138a49ad9f1cb3c6d8f8ccbdd5e62b4dab317c1b435a47ecd7da1d28f"
 dependencies = [
  "cc",
 ]
@@ -44,9 +46,9 @@ dependencies = [
 
 [[package]]
 name = "assert_cmd"
-version = "1.0.3"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2475b58cd94eb4f70159f4fd8844ba3b807532fe3131b3373fae060bbe30396"
+checksum = "c98233c6673d8601ab23e77eb38f999c51100d46c5703b17288c57fddf3a1ffe"
 dependencies = [
  "bstr",
  "doc-comment",
@@ -81,7 +83,7 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
 
 [[package]]
 name = "bat"
-version = "0.18.1"
+version = "0.18.2"
 dependencies = [
  "ansi_colours",
  "ansi_term 0.12.1",
@@ -97,7 +99,9 @@ dependencies = [
  "error-chain",
  "git2",
  "globset",
+ "grep-cli",
  "lazy_static",
+ "lazycell",
  "nix",
  "path_abs",
  "predicates",
@@ -156,9 +160,9 @@ dependencies = [
 
 [[package]]
 name = "bugreport"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0e97e538864a7c95d33accbf64c8d354018ba3b6e032502fd0fe7259cf1aa3d"
+checksum = "0014b4b2b4f63bfe69c3838470121290cc437fdc79785d408a761a21e8b2404c"
 dependencies = [
  "git-version",
  "shell-escape",
@@ -258,10 +262,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "difference"
-version = "2.0.0"
+name = "difflib"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198"
+checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"
 
 [[package]]
 name = "dirs-next"
@@ -296,6 +300,12 @@ version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0"
 
+[[package]]
+name = "either"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
+
 [[package]]
 name = "encode_unicode"
 version = "0.3.6"
@@ -377,9 +387,9 @@ dependencies = [
 
 [[package]]
 name = "fancy-regex"
-version = "0.3.5"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae91abf6555234338687bb47913978d275539235fcb77ba9863b779090b42b14"
+checksum = "9d6b8560a05112eb52f04b00e5d3790c0dd75d9d980eb8a122fb23b92a623ccf"
 dependencies = [
  "bit-set",
  "regex",
@@ -399,9 +409,9 @@ dependencies = [
 
 [[package]]
 name = "float-cmp"
-version = "0.8.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1267f4ac4f343772758f7b1bdcbe767c218bbab93bb432acbf5162bbf85a6c4"
+checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4"
 dependencies = [
  "num-traits",
 ]
@@ -457,9 +467,9 @@ dependencies = [
 
 [[package]]
 name = "git2"
-version = "0.13.19"
+version = "0.13.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17929de7239dea9f68aa14f94b2ab4974e7b24c1314275ffcc12a7758172fa18"
+checksum = "d9831e983241f8c5591ed53f17d874833e2fa82cac2625f3888c50cbfe136cba"
 dependencies = [
  "bitflags",
  "libc",
@@ -476,9 +486,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
 
 [[package]]
 name = "globset"
-version = "0.4.6"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c152169ef1e421390738366d2f796655fec62621dabbd0fd476f905934061e4a"
+checksum = "10463d9ff00a2a068db14231982f5132edebad0d7660cd956a1c30292dbcbfbd"
 dependencies = [
  "aho-corasick",
  "bstr",
@@ -487,6 +497,23 @@ dependencies = [
  "regex",
 ]
 
+[[package]]
+name = "grep-cli"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dd110c34bb4460d0de5062413b773e385cbf8a85a63fc535590110a09e79e8a"
+dependencies = [
+ "atty",
+ "bstr",
+ "globset",
+ "lazy_static",
+ "log",
+ "regex",
+ "same-file",
+ "termcolor",
+ "winapi-util",
+]
+
 [[package]]
 name = "hashbrown"
 version = "0.9.1"
@@ -532,6 +559,15 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "itertools"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itoa"
 version = "0.4.7"
@@ -561,15 +597,15 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.94"
+version = "0.2.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e"
+checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790"
 
 [[package]]
 name = "libgit2-sys"
-version = "0.12.20+1.1.0"
+version = "0.12.21+1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e2f09917e00b9ad194ae72072bb5ada2cca16d8171a43e91ddba2afbb02664b"
+checksum = "86271bacd72b2b9e854c3dcfb82efd538f15f870e4c11af66900effb462f6825"
 dependencies = [
  "cc",
  "libc",
@@ -634,6 +670,15 @@ version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc"
 
+[[package]]
+name = "memoffset"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9"
+dependencies = [
+ "autocfg",
+]
+
 [[package]]
 name = "miniz_oxide"
 version = "0.4.4"
@@ -646,14 +691,15 @@ dependencies = [
 
 [[package]]
 name = "nix"
-version = "0.20.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a"
+checksum = "cf1e25ee6b412c2a1e3fcb6a4499a5c1bfe7f43e014bdce9a6b6666e5aa2d187"
 dependencies = [
  "bitflags",
  "cc",
  "cfg-if",
  "libc",
+ "memoffset",
 ]
 
 [[package]]
@@ -743,15 +789,6 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
 
-[[package]]
-name = "pest"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53"
-dependencies = [
- "ucd-trie",
-]
-
 [[package]]
 name = "pkg-config"
 version = "0.3.19"
@@ -780,12 +817,13 @@ checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
 
 [[package]]
 name = "predicates"
-version = "1.0.8"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f49cfaf7fdaa3bfacc6fa3e7054e65148878354a5cfddcf661df4c851f8021df"
+checksum = "bc3d91237f5de3bcd9d927e24d03b495adb6135097b001cea7403e2d573d00a9"
 dependencies = [
- "difference",
+ "difflib",
  "float-cmp",
+ "itertools",
  "normalize-line-endings",
  "predicates-core",
  "regex",
@@ -954,36 +992,24 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
 [[package]]
 name = "semver"
-version = "0.11.0"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"
-dependencies = [
- "semver-parser",
-]
-
-[[package]]
-name = "semver-parser"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7"
-dependencies = [
- "pest",
-]
+checksum = "568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012"
 
 [[package]]
 name = "serde"
-version = "1.0.126"
+version = "1.0.127"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03"
+checksum = "f03b9878abf6d14e6779d3f24f07b2cfa90352cfec4acc5aab8f1ac7f146fae8"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.126"
+version = "1.0.127"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43"
+checksum = "a024926d3432516606328597e0f224a51355a493b49fdd67e9209187cbe55ecc"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1078,9 +1104,9 @@ dependencies = [
 
 [[package]]
 name = "syntect"
-version = "4.5.0"
+version = "4.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bfac2b23b4d049dc9a89353b4e06bbc85a8f42020cccbe5409a115cf19031e5"
+checksum = "8b20815bbe80ee0be06e6957450a841185fcf690fe0178f14d77a05ce2caa031"
 dependencies = [
  "bincode",
  "bitflags",
@@ -1133,6 +1159,15 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "termcolor"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
+dependencies = [
+ "winapi-util",
+]
+
 [[package]]
 name = "terminal_size"
 version = "0.1.16"
@@ -1174,12 +1209,6 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41"
 
-[[package]]
-name = "ucd-trie"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
-
 [[package]]
 name = "unicode-bidi"
 version = "0.3.5"

Cargo.toml

@@ -6,7 +6,7 @@ homepage = "https://github.com/sharkdp/bat"
 license = "MIT/Apache-2.0"
 name = "bat"
 repository = "https://github.com/sharkdp/bat"
-version = "0.18.1"
+version = "0.18.2"
 exclude = ["assets/syntaxes/*", "assets/themes/*"]
 build = "build.rs"
 edition = '2018'
@@ -16,17 +16,26 @@ default = ["application"]
 # Feature required for bat the application. Should be disabled when depending on
 # bat as a library.
 application = [
+    "bugreport",
+    "build-assets",
+    "git",
+    "minimal-application",
+]
+# Mainly for developers that want to iterate quickly
+# Be aware that the included features might change in the future
+minimal-application = [
     "atty",
     "clap",
     "dirs-next",
-    "git",
     "lazy_static",
     "paging",
-    "wild",
     "regex-onig",
+    "wild",
 ]
 git = ["git2"] # Support indicating git modifications
 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
@@ -38,6 +47,7 @@ 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"
 encoding = "0.2"
@@ -46,11 +56,12 @@ unicode-width = "0.1.8"
 globset = "0.4"
 serde = { version = "1.0", features = ["derive"] }
 serde_yaml = "0.8"
-semver = "0.11"
+semver = "1.0"
 path_abs = { version = "0.5", default-features = false }
 clircle = "0.3"
-bugreport = "0.4"
+bugreport = { version = "0.4", optional = true }
 dirs-next = { version = "2.0.0", optional = true }
+grep-cli = "0.1.6"
 
 [dependencies.git2]
 version = "0.13"
@@ -58,9 +69,9 @@ optional = true
 default-features = false
 
 [dependencies.syntect]
-version = "4.5.0"
+version = "4.6.0"
 default-features = false
-features = ["parsing", "yaml-load", "dump-load", "dump-create"]
+features = ["parsing", "dump-load"]
 
 [dependencies.clap]
 version = "2.33"
@@ -73,14 +84,14 @@ version = "0.12"
 default-features = false
 
 [dev-dependencies]
-assert_cmd = "1.0.2"
+assert_cmd = "1.0.8"
 serial_test = "0.5.1"
-predicates = "1.0.7"
+predicates = "2.0.1"
 wait-timeout = "0.2.0"
 tempfile = "3.2.0"
 
 [target.'cfg(unix)'.dev-dependencies]
-nix = "0.20.0"
+nix = "0.22.0"
 
 [build-dependencies]
 clap = { version = "2.33", optional = true }

README.md

@@ -197,9 +197,9 @@ The [`prettybat`](https://github.com/eth-p/bat-extras/blob/master/doc/prettybat.
 *... and other Debian-based Linux distributions.*
 
 `bat` is making its way through the [Ubuntu](https://packages.ubuntu.com/eoan/bat) and
-[Debian](https://packages.debian.org/sid/bat) package release process, and is available
-for Ubuntu as of Eoan 19.10. On Debian `bat` is currently only available on the unstable
-"Sid" branch.
+[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:
 
@@ -222,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.1_amd64.deb  # adapt version number and architecture
+sudo dpkg -i bat_0.18.2_amd64.deb  # adapt version number and architecture
 ```
 
 ### On Alpine Linux
@@ -409,10 +409,11 @@ even when truecolor support is available:
   It replaces certain bright colors with 8-bit colors from 16 to 21. **Do not** use this simply
   because you have a 256-color terminal but are not using base16-shell.
 
-Although these themes are more restricted, they have two advantages over truecolor themes:
+Although these themes are more restricted, they have three advantages over truecolor themes. They:
 
-- They harmonize better with other terminal software using 3-bit or 4-bit colors.
-- When you change your terminal theme, `bat` output already on the screen will update to match.
+- Enjoy maximum compatibility. Some terminal utilities do not support more than 3-bit colors.
+- Adapt to terminal theme changes. Even for already printed output.
+- Visually harmonize better with other terminal software.
 
 ### Output style
 
@@ -516,6 +517,8 @@ 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.
+
 If you want to pass command-line arguments to the pager, you can also set them via the
 `PAGER`/`BAT_PAGER` variables:
 
@@ -714,6 +717,10 @@ Take a look at the [`CONTRIBUTING.md`](CONTRIBUTING.md) guide.
 - [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:

assets/completions/bat.bash.in

@@ -0,0 +1,88 @@
+# shellcheck disable=SC2207
+
+# Requires https://github.com/scop/bash-completion
+
+_bat() {
+	local cur prev words cword split
+	_init_completion -s || return 0
+
+	if [[ ${words[1]-} == cache ]]; then
+		case $prev in
+		--source | --target)
+			_filedir -d
+			return 0
+			;;
+		esac
+		COMPREPLY=($(compgen -W "
+			--build --clear --source --target --blank --help
+		" -- "$cur"))
+		return 0
+	fi
+
+	case $prev in
+	-l | --language)
+		local IFS=$'\n'
+		COMPREPLY=($(compgen -W "$(
+			"$1" --list-languages | while IFS=: read -r lang _; do
+				printf "%s\n" "$lang"
+			done
+		)" -- "$cur"))
+		compopt -o filenames  # for escaping
+		return 0
+		;;
+	-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
+		;;
+	--file-name)
+		_filedir
+		return 0
+		;;
+	--wrap)
+		COMPREPLY=($(compgen -W "auto never character" -- "$cur"))
+		return 0
+		;;
+	--color | --decorations | --paging)
+		COMPREPLY=($(compgen -W "auto never always" -- "$cur"))
+		return 0
+		;;
+	--italic-text)
+		COMPREPLY=($(compgen -W "always never" -- "$cur"))
+		return 0
+		;;
+	--pager)
+		COMPREPLY=($(compgen -c -- "$cur"))
+		return 0
+		;;
+	--theme)
+		local IFS=$'\n'
+		COMPREPLY=($(compgen -W "$("$1" --list-themes)" -- "$cur"))
+		compopt -o filenames  # for escaping
+		return 0
+		;;
+	esac
+
+	$split && return 0
+
+	if [[ $cur == -* ]]; then
+		COMPREPLY=($(compgen -W "
+			--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"))
+
+} && complete -F _bat {{PROJECT_EXECUTABLE}}

assets/completions/bat.fish.in

@@ -34,7 +34,7 @@ complete -c {{PROJECT_EXECUTABLE}} -s H -l highlight-line -x -d "<N> Highlight t
 
 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 {{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 {{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 {{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"
 

assets/completions/bat.zsh.in

@@ -44,6 +44,12 @@ _{{PROJECT_EXECUTABLE}}_main() {
         '(--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'

assets/create.sh

@@ -5,7 +5,7 @@ ASSET_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 REPO_DIR="$ASSET_DIR/.."
 
 # Ensure submodules are initialized.
-function update_submodules() {
+update_submodules() {
 	local submodule
 	local submodule_prompt=unspecified
 	local submodule_path

assets/manual/bat.1.in

@@ -142,7 +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: *auto*, full, plain, changes, header, 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
@@ -189,6 +189,10 @@ is dependent on your operating system. To get the default path for your system,
 
 Alternatively, you can use the BAT_CONFIG_PATH environment variable to point {{PROJECT_EXECUTABLE}} to a non-default
 location of the configuration file.
+
+To generate a default configuration file, call:
+
+\fB{{PROJECT_EXECUTABLE}} --generate-config-file\fR
 .SH "ADDING CUSTOM LANGUAGES"
 {{PROJECT_EXECUTABLE}} supports Sublime Text \fB.sublime-syntax\fR language files, and can be
 customized to add additional languages to your local installation. To do this, add the \fB.sublime-syntax\fR language
@@ -214,7 +218,7 @@ git clone https://github.com/tellnobody1/sublime-purescript-syntax
 
 Once the cache is built, the new language will be visible in `\fB{{PROJECT_EXECUTABLE}} --list-languages\fR`.
 .br
-If you ever want to remove the custom languages, you can clear the cache with `\fB{{PROJECT_EXECUTABLE}} cache --clear\fR`. 
+If you ever want to remove the custom languages, you can clear the cache with `\fB{{PROJECT_EXECUTABLE}} cache --clear\fR`.
 
 .SH "ADDING CUSTOM THEMES"
 Similarly to custom languages, {{PROJECT_EXECUTABLE}} supports Sublime Text \fB.tmTheme\fR themes.

assets/patches/Groff.sublime-syntax.patch

@@ -0,0 +1,16 @@
+diff --git syntaxes/02_Extra/Groff/Man Page/Man Page.sublime-syntax syntaxes/02_Extra/Groff/Man Page/Man Page.sublime-syntax
+index 57834af..6648664 100644
+--- syntaxes/02_Extra/Groff/Man Page/Man Page.sublime-syntax	
++++ syntaxes/02_Extra/Groff/Man Page/Man Page.sublime-syntax	
+@@ -4,9 +4,9 @@
+ #   - man-pages(7)
+ #   - groff(7)
+ ---
+-name: Man Page (groff/troff)
++name: Groff/troff
+ scope: text.groff
+-file_extensions: [man, groff, troff, '1', '2', '3', '4', '5', '6', '7']
++file_extensions: [groff, troff, '1', '2', '3', '4', '5', '6', '7', '8', '9']
+ 
+ contexts:
+   main:

assets/patches/Markdown.sublime-syntax.patch

@@ -1,5 +1,5 @@
 diff --git syntaxes/01_Packages/Markdown/Markdown.sublime-syntax syntaxes/01_Packages/Markdown/Markdown.sublime-syntax
-index 19dc685d..6afd87ae 100644
+index 19dc685d..44440c7f 100644
 --- syntaxes/01_Packages/Markdown/Markdown.sublime-syntax
 +++ syntaxes/01_Packages/Markdown/Markdown.sublime-syntax
 @@ -24,7 +24,6 @@ variables:
@@ -166,3 +166,12 @@ index 19dc685d..6afd87ae 100644
      - match: ^\s*$\n?
        scope: invalid.illegal.non-terminated.bold-italic.markdown
        pop: true
+@@ -1152,7 +1110,7 @@ contexts:
+     - match: |-
+          (?x)
+           {{fenced_code_block_start}}
+-          ((?i:rust))
++          ((?i:rust|rs))
+           {{fenced_code_block_trailing_infostring_characters}}
+       captures:
+         0: meta.code-fence.definition.begin.rust.markdown-gfm

assets/patches/Python.sublime-syntax.patch

@@ -0,0 +1,15 @@
+diff --git syntaxes/01_Packages/Python/Python.sublime-syntax syntaxes/01_Packages/Python/Python.sublime-syntax
+index 2acd86d8..86257f7b 100644
+--- syntaxes/01_Packages/Python/Python.sublime-syntax
++++ syntaxes/01_Packages/Python/Python.sublime-syntax
+@@ -988,10 +988,6 @@ contexts:
+         - match: \}
+           scope: punctuation.section.mapping-or-set.end.python
+           set: after-expression
+-        - match: (?={{simple_expression}}:|\s*\*\*)
+-          set: inside-dictionary
+-        - match: (?={{simple_expression}}[,}]|\s*\*)
+-          set: inside-set
+         - match: ','
+           scope: punctuation.separator.set.python
+           set: inside-set

assets/patches/ShellScript.sublime-syntax.patch

@@ -1,8 +1,8 @@
 diff --git syntaxes/01_Packages/ShellScript/Bash.sublime-syntax syntaxes/01_Packages/ShellScript/Bash.sublime-syntax
-index e973e319..a703cef8 100644
+index e973e319..07c170a7 100644
 --- syntaxes/01_Packages/ShellScript/Bash.sublime-syntax
 +++ syntaxes/01_Packages/ShellScript/Bash.sublime-syntax
-@@ -30,8 +30,8 @@ file_extensions:
+@@ -30,12 +30,12 @@ file_extensions:
    - .zshenv
    - .zshrc
    - PKGBUILD  # https://jlk.fjfi.cvut.cz/arch/manpages/man/PKGBUILD.5
@@ -13,3 +13,8 @@ index e973e319..a703cef8 100644
  
  first_line_match: |
    (?x)
+-    ^\#! .* \b(bash|zsh|sh|tcsh|ash)\b
++    ^\#! .* \b(bash|zsh|sh|tcsh|ash|dash)\b
+   | ^\# \s* -\*- [^*]* mode: \s* shell-script [^*]* -\*-
+ 
+ #-------------------------------------------------------------------------------

assets/patches/XML.sublime-syntax.patch

@@ -0,0 +1,12 @@
+diff --git syntaxes/01_Packages/XML/XML.sublime-syntax syntaxes/01_Packages/XML/XML.sublime-syntax
+index ad7d9c87..af4a00f0 100644
+--- syntaxes/01_Packages/XML/XML.sublime-syntax
++++ syntaxes/01_Packages/XML/XML.sublime-syntax
+@@ -12,6 +12,7 @@ file_extensions:
+   - rss
+   - opml
+   - svg
++  - xaml
+ first_line_match: |-
+     (?x:
+       ^(?:

assets/syntaxes/02_Extra/DotENV.sublime-syntax

@@ -4,7 +4,6 @@
 name: DotENV
 file_extensions:
   - .env
-  - .envrc
   - .env.dist
   - .env.local
   - .env.sample
@@ -19,8 +18,11 @@ file_extensions:
   - .env.production
   - .env.production.local
   - .env.dusk.local
-  - .flaskenv
   - .env.staging
+  - .env.default
+  - .env.defaults
+  - .envrc
+  - .flaskenv
 scope: source.env
 contexts:
   main:

assets/syntaxes/02_Extra/Fstab.sublime-syntax

@@ -5,6 +5,7 @@ name: fstab
 file_extensions:
   - fstab
   - crypttab
+  - mtab
 scope: source.fstab
 
 contexts:

assets/syntaxes/02_Extra/Slim.sublime-syntax

@@ -0,0 +1,306 @@
+%YAML 1.2
+---
+# http://www.sublimetext.com/docs/syntax.html
+name: Ruby Slim
+file_extensions:
+  - slim
+  - skim
+scope: text.slim
+contexts:
+  main:
+    - match: ^(\s*)(ruby):$
+      captures:
+        2: constant.language.name.ruby.filter.slim
+      push:
+        - meta_scope: text.ruby.filter.slim
+        - match: ^(?!(\1\s)|\s*$)
+          pop: true
+        - include: scope:source.ruby
+    - match: ^(\s*)(javascript):$
+      captures:
+        2: constant.language.name.javascript.filter.slim
+      push:
+        - meta_scope: source.js.filter.slim
+        - match: ^(?!(\1\s)|\s*$)
+          pop: true
+        - include: scope:source.js
+    - match: ^(---)\s*\n
+      captures:
+        1: storage.frontmatter.slim
+      push:
+        - meta_scope: source.yaml.meta.slim
+        - match: ^(---)\s*\n
+          captures:
+            1: storage.frontmatter.slim
+          pop: true
+        - include: scope:source.yaml
+    - match: ^(\s*)(coffee):$
+      captures:
+        2: constant.language.name.coffeescript.filter.slim
+      push:
+        - meta_scope: text.coffeescript.filter.slim
+        - match: ^(?!(\1\s)|\s*$)
+          pop: true
+        - include: scope:source.coffee
+    - match: ^(\s*)(markdown):$
+      captures:
+        2: constant.language.name.markdown.filter.slim
+      push:
+        - meta_scope: text.markdown.filter.slim
+        - match: ^(?!(\1\s)|\s*$)
+          pop: true
+        - include: scope:text.html.markdown
+    - match: ^(\s*)(css):$
+      captures:
+        2: constant.language.name.css.filter.slim
+      push:
+        - meta_scope: text.css.filter.slim
+        - match: ^(?!(\1\s)|\s*$)
+          pop: true
+        - include: scope:source.css
+    - match: ^(\s*)(sass):$
+      captures:
+        2: constant.language.name.sass.filter.slim
+      push:
+        - meta_scope: text.sass.filter.slim
+        - match: ^(?!(\1\s)|\s*$)
+          pop: true
+        - include: scope:source.sass
+    - match: ^(\s*)(scss):$
+      captures:
+        2: constant.language.name.scss.filter.slim
+      push:
+        - meta_scope: text.scss.filter.slim
+        - match: ^(?!(\1\s)|\s*$)
+          pop: true
+        - include: scope:source.scss
+    - match: ^(\s*)(less):$
+      captures:
+        2: constant.language.name.less.filter.slim
+      push:
+        - meta_scope: text.less.filter.slim
+        - match: ^(?!(\1\s)|\s*$)
+          pop: true
+        - include: scope:source.less
+    - match: ^(\s*)(erb):$
+      captures:
+        2: constant.language.name.erb.filter.slim
+      push:
+        - meta_scope: text.erb.filter.slim
+        - match: ^(?!(\1\s)|\s*$)
+          pop: true
+        - include: scope:source.erb
+    - match: ^(! )($|\s.*)
+      scope: meta.prolog.slim
+      captures:
+        1: punctuation.definition.prolog.slim
+    - match: ^(\s*)(/)\s*.*$
+      captures:
+        2: comment.line.slash.slim
+      push:
+        - meta_scope: comment.block.slim
+        - match: ^(?!(\1\s)|\s*$)
+          pop: true
+    - match: ^\s*(?=-)
+      push:
+        - match: $
+          pop: true
+        - include: rubyline
+    - match: (?==+|~)
+      push:
+        - match: $
+          pop: true
+        - include: rubyline
+    - include: tag-attribute
+    - include: embedded-ruby
+    - match: ^(\s*)(\||')\s*
+      comment: Verbatim text (can include HTML tags and copied lines)
+      push:
+        - match: ^(?!(\1\s)|\s*$)
+          pop: true
+        - include: scope:text.html.basic
+        - include: embedded-ruby
+    - match: '^\s*(\.|#|[-a-zA-Z0-9]+)([\w-]+)?'
+      comment: '1 - dot OR hash OR any combination of word, number; 2 - OPTIONAL any combination of word, number, dash or underscore (following a . or'
+      captures:
+        1: entity.name.tag.slim
+        2: entity.other.attribute-name.event.slim
+      push:
+        - meta_scope: meta.tag
+        - match: '$|(?!\.|#|:|-|~|/|\}|\]|\*|\s?[\*\{])'
+          captures:
+            1: entity.name.tag.slim
+            2: entity.other.attribute-name.event.slim
+          pop: true
+        - match: '(:[\w\d]+)+'
+          comment: XML
+          push:
+            - meta_scope: entity.name.tag.slim
+            - match: $|\s
+              pop: true
+        - match: '(:\s)(\.|#|[a-zA-Z0-9]+)([\w-]+)?'
+          comment: Inline HTML / 1 - colon; 2 - dot OR hash OR any combination of word, number; 3 - OPTIONAL any combination of word, number, dash or underscore (following a . or
+          captures:
+            1: punctuation.definition.tag.end.slim
+            2: entity.name.tag.slim
+            3: entity.other.attribute-name.event.slim
+          push:
+            - match: '$|(?!\.|#|=|-|~|/|\}|\]|\*|\s?[\*\{])'
+              captures:
+                1: punctuation.definition.tag.end.slim
+                2: entity.name.tag.slim
+                3: entity.other.attribute-name.event.slim
+              pop: true
+            - include: root-class-id-tag
+            - include: tag-attribute
+        - match: '(\*\{)(?=.*\}|.*\|\s*$)'
+          comment: Splat attributes
+          captures:
+            1: punctuation.section.embedded.ruby
+          push:
+            - meta_scope: source.ruby.embedded.slim
+            - match: '(\})|$|^(?!.*\|\s*$)'
+              captures:
+                1: punctuation.section.embedded.ruby
+              pop: true
+            - include: embedded-ruby
+        - include: root-class-id-tag
+        - include: rubyline
+        - match: /
+          scope: punctuation.terminator.tag.slim
+    - match: ^\s*(\\.)
+      captures:
+        1: meta.escape.slim
+    - match: ^\s*(?=\||')
+      push:
+        - match: $
+          pop: true
+        - include: embedded-ruby
+        - include: scope:text.html.basic
+    - match: '(?=<[\w\d\:]+)'
+      comment: Inline and root-level HTML tags
+      push:
+        - match: $|\/\>
+          pop: true
+        - include: scope:text.html.basic
+  continuation:
+    - match: '([\\,])\s*\n'
+      captures:
+        1: punctuation.separator.continuation.slim
+  delimited-ruby-a:
+    - match: '=\('
+      push:
+        - meta_scope: source.ruby.embedded.slim
+        - match: \)(?=( \w|$))
+          pop: true
+        - include: scope:source.ruby.rails
+  delimited-ruby-b:
+    - match: '=\['
+      push:
+        - meta_scope: source.ruby.embedded.slim
+        - match: '\](?=( \w|$))'
+          pop: true
+        - include: scope:source.ruby.rails
+  delimited-ruby-c:
+    - match: '=\{'
+      push:
+        - meta_scope: source.ruby.embedded.slim
+        - match: '\}(?=( \w|$))'
+          pop: true
+        - include: scope:source.ruby.rails
+  embedded-ruby:
+    - match: '(?<!\\)#\{{1,2}'
+      captures:
+        0: punctuation.section.embedded.ruby
+      push:
+        - meta_scope: source.ruby.embedded.html
+        - match: '\}{1,2}'
+          captures:
+            0: punctuation.section.embedded.ruby
+          pop: true
+        - include: scope:source.ruby.rails
+  entities:
+    - match: '(&)([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(;)'
+      scope: constant.character.entity.html
+      captures:
+        1: punctuation.definition.entity.html
+        3: punctuation.definition.entity.html
+    - match: '&'
+      scope: invalid.illegal.bad-ampersand.html
+  interpolated-ruby:
+    - match: '=(?=\b)'
+      push:
+        - meta_scope: source.ruby.embedded.html
+        - match: \s|\w$
+          pop: true
+  root-class-id-tag:
+    - match: '(\.|#)([\w\d\-]+)'
+      captures:
+        1: punctuation.separator.key-value.html
+        2: entity.other.attribute-name.html
+  rubyline:
+    - match: (==|=)(<>|><|<'|'<|<|>)?|-
+      comment: Hack to thwart Sublime's Ruby highlighter. It thinks do without a variable continues the next line (this can be muted with a / at the end of the line). For things like yields, do is unnecessary without an argument, so this hack will suffice
+      push:
+        - meta_scope: meta.line.ruby.slim
+        - meta_content_scope: source.ruby.embedded.slim
+        - match: (do\s*\n$)|(?<!\\|,|,\n|\\\n)$
+          captures:
+            1: keyword.control.start-block.ruby
+          pop: true
+        - match: '#.*$'
+          comment: Hack to let ruby comments work in this context properly
+          scope: comment.line.number-sign.ruby
+        - include: continuation
+        - include: scope:source.ruby.rails
+  string-double-quoted:
+    - match: (")(?=.*")
+      captures:
+        0: punctuation.definition.string.begin.html
+      push:
+        - meta_scope: string.quoted.double.html
+        - meta_content_scope: meta.toc-list.id.html
+        - match: '"'
+          captures:
+            0: punctuation.definition.string.end.html
+          pop: true
+        - include: embedded-ruby
+        - include: entities
+  string-single-quoted:
+    - match: (')(?=.*')
+      captures:
+        0: punctuation.definition.string.begin.html
+      push:
+        - meta_scope: string.quoted.single.html
+        - meta_content_scope: meta.toc-list.id.html
+        - match: "'"
+          captures:
+            0: punctuation.definition.string.end.html
+          pop: true
+        - include: embedded-ruby
+        - include: entities
+  tag-attribute:
+    - match: '([\w.#_-]+)(=)(?!\s)(true|false|nil)?(\s*\(|\{)?'
+      captures:
+        1: entity.other.attribute-name.event.slim
+        2: punctuation.separator.key-value.html
+        3: constant.language.slim
+      push:
+        - meta_scope: meta.attribute-with-value.slim
+        - match: '\}|\)|$'
+          captures:
+            1: entity.other.attribute-name.event.slim
+            2: punctuation.separator.key-value.html
+            3: constant.language.slim
+          pop: true
+        - include: tag-stuff
+        - include: string-double-quoted
+        - include: string-single-quoted
+  tag-stuff:
+    - include: tag-attribute
+    - include: interpolated-ruby
+    - include: delimited-ruby-a
+    - include: delimited-ruby-b
+    - include: delimited-ruby-c
+    - include: rubyline
+    - include: embedded-ruby

assets/syntaxes/02_Extra/syslog.sublime-syntax

@@ -16,11 +16,11 @@ contexts:
     - match: ^
       push: text
   loghost:
-    - match: '[\w-]+'
+    - match: '[\w:.-]+'
       scope: entity.other.attribute-name.loghost.syslog
       set: process
   process:
-    - match: ([\w-]+)(?:(\[)(\d+)(\]))?(:)
+    - match: ([\w.-]+)(?:(\[)(\d+)(\]))?([ :])
       captures:
         1: support.function.process.syslog
         2: punctuation.separator.pid.begin.syslog

build.rs

@@ -54,6 +54,11 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         "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",

doc/README-ja.md

@@ -95,6 +95,17 @@ bat f - g  # output 'f', then stdin, then 'g'.
 
 ### 他のツールとの統合
 
+#### `fzf`
+
+[`fzf`](https://github.com/junegunn/fzf) のプレビューウィンドウに `bat` を使用できます。
+その場合、`bat` の `--color=always` オプションを用いてカラー出力を強制しなければなりません。
+また、`--line-range` オプションを用いることで巨大なファイルの読み込み時間を制限できます:
+```bash
+fzf --preview 'bat --color=always --style=numbers --line-range=:500 {}'
+```
+
+詳しくは [`fzf` の `README`](https://github.com/junegunn/fzf#preview-window) を参照してください。
+
 #### `find` or `fd`
 
 `find` の `-exec` オプションを使用して、`bat` ですべての検索結果をプレビューできます:
@@ -191,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.1_amd64.deb  # adapt version number and architecture
+sudo dpkg -i bat_0.18.2_amd64.deb  # adapt version number and architecture
 ```
 
 ### On Alpine Linux
@@ -393,7 +404,7 @@ bat --list-themes | fzf --preview="bat --theme={} --color=always /path/to/file"
 
 ### 新しい構文の追加 / 言語の定義
 
-`bat` はシンタックスハイライトのための [`syntext`](https://github.com/trishume/syntect/)
+`bat` はシンタックスハイライトのための [`syntect`](https://github.com/trishume/syntect/)
 という素晴らしいライブラリを使用しています。`syntect` は、
 [Sublime Text の `.sublime-syntax` ファイル](https://www.sublimetext.com/docs/3/syntax.html)
 とテーマを読み取ることができます。新しい構文を定義するために以下の手順を行います。

doc/README-ko.md

@@ -1,75 +1,86 @@
 <p align="center">
   <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>
+  <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 통합 기능의 <i>cat(1)</i> 클론
 </p>
 
 <p align="center">
   <a href="#문법-강조">주요 기능들</a> •
   <a href="#사용법">사용법</a> •
   <a href="#설치">설치</a> •
-  <a href="#커스터마이즈">커스터마이즈</a> •
+  <a href="#사용자화">사용자화</a> •
   <a href="#프로젝트-목표와-대안들">프로젝트 목표와 대안들</a> •
-  번역 [<a href="https://github.com/chinanf-boy/bat-zh">中文</a>][<a href="../doc/README-ja.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>
 
 ### 문법 강조
 
-`bat`은 다양한 프로그래밍 언어와 마크업 언어에 대해 문법 강조(Syntax highlighting)기능을 지원하고 있습니다: 
+`bat`은 다양한 프로그래밍 및 마크업 언어의 문법 강조(syntax highlighting) 기능을
+지원합니다:
 
 ![Syntax highlighting example](https://imgur.com/rGsdnDe.png)
 
 ### Git 통합
 
-`bat`은 `git`을 통해 인덱스와 함께 변경분을 표시합니다 (왼쪽 바를 확인하세요):
+`bat`은 `git`을 통해 인덱스와 함께 변경분을 표시합니다
+(왼쪽 사이드바를 확인하세요):
 
 ![Git integration example](https://i.imgur.com/2lSW4RE.png)
 
-### 표시할 수 없는 문자 처리
+### 비인쇄 문자 처리
 
-`-A`/`--show-all` 옵션을 사용하여 표시할수 없는 문자를 시각화 해줍니다: 
+`-A`/`--show-all` 옵션을 사용하여 비인쇄 문자를 표시 및 강조할 수 있습니다:
 
 ![Non-printable character example](https://i.imgur.com/WndGp9H.png)
 
-### 자동 페이징 
+### 자동 페이징
 
-하나의 화면에 비해 출력이 너무 큰 경우, `less` 를 이용해 출력들을 연결할 수 있습니다.
+`bat`은 기본적으로 한 화면에 비해 출력이 큰 경우 `less`와 같은 페이저(pager)로
+출력을 연결(pipe)합니다.
+만약 `bat`을 언제나 `cat`처럼 작동하게 하려면 (출력을 페이지하지 않기),
+`--paging=never` 옵션을 커맨드 라인이나 설정 파일에 넣을 수 있습니다.
+셸(shell) 설정에서 `cat`을 `bat`의 alias로 사용하려면,
+`alias cat='bat --paging=never'`를 써서 기본 행동을 유지할 수 있습니다.
 
-### 파일 연결
+### 파일 연결(concatenation)
 
-이 뿐만 아니라 파일을 연결할 때도 사용 할 수 있습니다. :wink: `bat`가 인터렉티브 하지 않은(non-interactive)가 감지하면 (예를 들어,다른 프로세스 혹은 파일과 파이프라인을 연결 한 경우) `bat`은 `cat`을 대신하여 동작하며 일반 파일 내용을 표기해줍니다. 
+페이저(pager)를 사용하더라도 `bat`은 파일들을 연결(concatenate)할 수 있습니다
+:wink:.
+`bat`이 비대화형(non-interactive) 터미널(예를 들어, 다른 프로세스나 파일에
+연결(pipe)한 경우)을 감지하면, `bat`은 `--pager` 옵션의 값과 상관없이 `cat`과
+동일하게 파일 내용을 그대로 출력합니다.
 
 ## 사용법
 
-터미널에서 하나의 파일 표시하기
+터미널에 하나의 파일 표시하기
 
 ```bash
 > bat README.md
 ```
 
-여러 파일 한번에 보여주기 
+여러 파일 한 번에 보여주기
 
 ```bash
 > bat src/*.rs
 ```
 
-stdin에서 읽고, 자동으로 맞는 문법 강조 적용하기 
+stdin에서 읽고, 자동으로 맞는 문법 결정하기 (참고로, 문법 강조는 파일의 첫
+줄만으로 문법이 결정될 수 있을 때만 작동합니다.
+이는 보통 `#!/bin/sh`와 같은 셔뱅(shebang)으로 판단합니다.)
 
 ```bash
 > curl -s https://sh.rustup.rs | bat
 ```
 
-stdin에서 읽고, 명시적으로 언어 지정하여 적용하기 
+stdin에서 읽고, 명시적으로 언어 지정하기
 
 ```bash
 > yaml2json .travis.yml | json_pp | bat -l json
 ```
 
-표시할 수 없는 문자 처리하기 
+비인쇄 문자 표시 및 강조하기
 ```bash
 > bat -A /etc/hosts
 ```
@@ -86,23 +97,38 @@ bat -n main.rs  # show line numbers (only)
 bat f - g  # output 'f', then stdin, then 'g'.
 ```
 
-### 다른 툴과의 통합
+### 다른 도구들과 통합하기
 
-#### `find` 와 `fd`
+#### `fzf`
 
-`find`의 `-exec` 옵션을 사용하여 `bat`의 모든 검색 결과를 미리 볼 수 있습니다: 
+`bat`을 [`fzf`](https://github.com/junegunn/fzf)의 프리뷰로 쓸 수 있습니다.
+이를 위해서는 `bat`의 `--color=always` 옵션으로 항상 컬러 출력이 나오게 해야
+합니다.
+또한 `--line-range` 옵션으로 긴 파일의 로드 시간을 제한할 수 있습니다:
+```bash
+fzf --preview 'bat --color=always --style=numbers --line-range=:500 {}'
+```
+더 많은 정보는
+[`fzf`의 `README`](https://github.com/junegunn/fzf#preview-window)를 참고하세요.
+
+#### `find`와 `fd`
+
+`find`의 `-exec` 옵션을 사용하여 모든 검색 결과를 `bat`로 미리 볼 수 있습니다: 
 ```bash
 find … -exec bat {} +
 ```
 
-[`fd`](https://github.com/sharkdp/fd)를 사용하고 있는 경우, `-X`/`--exec-batch` 옵션을 이용하여 동일하게 사용할 수 있습니다:
+[`fd`](https://github.com/sharkdp/fd)를 사용하는 경우, `-X`/`--exec-batch`
+옵션을 이용하여 동일하게 사용할 수 있습니다:
 ```bash
 fd … -X bat
 ```
 
 #### `ripgrep`
 
-[`batgrep`](https://github.com/eth-p/bat-extras/blob/master/doc/batgrep.md)과 함께, [`ripgrep`](https://github.com/BurntSushi/ripgrep)의 검색 결과를 `bat`을 이용하여 볼 수 있습니다. 
+[`batgrep`](https://github.com/eth-p/bat-extras/blob/master/doc/batgrep.md)을
+통해 `bat`로 [`ripgrep`](https://github.com/BurntSushi/ripgrep)의 검색 결과를
+출력할 수 있습니다.
 
 ```bash
 batgrep needle src/
@@ -110,279 +136,393 @@ batgrep needle src/
 
 #### `tail -f`
 
-`bat` 과 `tail -f`를 함께 사용하여, 특정 파일을 문법 강조하며 지속적으로 모니터링 할 수 있습니다. 
+`bat`와 `tail -f`를 함께 사용하여 주어진 파일을 문법 강조하며 지속적으로
+모니터할 수 있습니다.
 ```bash
 tail -f /var/log/pacman.log | bat --paging=never -l log
 ```
-이 작업을 하려면 페이징 기능을 꺼야합니다. 또, 자동 감지가 되지 않기 때문에, 적용되어야할 문법을 명시적(`-l log`)으로 지정해야 합니다.
+참고로 이 작업을 하려면 페이징 기능을 꺼야 합니다.
+또한 이 경우 문법을 자동 감지할 수 없기 때문에, 적용할 문법을 직접 지정해야
+합니다 (`-l log`).
 
 #### `git`
 
-`bat`과 `git show`를 함께 사용하여 주어진 파일의 이전 기록을 문법 강조와 함께 볼 수 있습니다:
+`bat`과 `git show`를 함께 사용하여 주어진 파일의 이전 버전을 올바른 문법 강조로
+볼 수 있습니다:
 ```bash
 git show v0.6.0:src/main.rs | bat -l rs
 ```
 
-diffs 내에서 문법 강조 표시는 현재 지원되지 않습니다. 이 기능은 [`delta`](https://github.com/dandavison/delta)에서 찾아 볼 수 있습니다. 
+#### `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`
 
-`bat` 출력에서 라인 넘버와 Git 수정 내역이 같이 있어 파일 내용을 복사하기가 어려울 수도 있습니다. 이 경우에는 `-p`/`--plain` 옵션을 사용 하거나 출력 시 파이프라인으로 `xclip`을 사용하면 됩니다: 
+`bat` 출력에 줄 번호와 Git 수정 내역이 포함되어서 파일의 내용을 복사하기
+어려울 수 있습니다.
+이 경우에는 `bat`의 `-p`/`--plain` 옵션을 사용하거나 간단히 `xclip`으로 출력을
+연결(pipe)하면 됩니다:
 ```bash
 bat main.cpp | xclip
 ```
-`bat` 에서는 리다이렉트된 것으로 감지하여, 파일 내용만 출력합니다. 
+`bat`는 출력이 우회되고 있다는 것을 감지하여 파일 내용 그대로를 출력합니다.
 
 #### `man`
 
-`bat`은 `MANPAGER` 환경 변수 설정을 통해 `man`에 대하여 컬러 페이져를 사용할 수 있습니다: 
+`MANPAGER` 환경 변수 설정을 통해 `bat`을 `man`의 컬러 페이저(pager)로 쓸 수
+있습니다.
 
 ```bash
 export MANPAGER="sh -c 'col -bx | bat -l man -p'"
 man 2 select
 ```
+(Debian이나 Ubuntu를 사용한다면 `bat`을 `batcat`으로 치환하세요.)
 
-포매팅 문제가 발생한다면, `MANROFFOPT="-c"` 설정 해야 할 수도 있습니다 .
+포팻 문제가 발생한다면, `MANROFFOPT="-c"`을 써야 할 수 있습니다.
 
-새 커맨드에서 이 번들을 사용하려면, [`batman`](https://github.com/eth-p/bat-extras/blob/master/doc/batman.md)을 이용 할 수 있습니다. 
+이 기능을 포함한 새로운 명령어를 선호한다면,
+[`batman`](https://github.com/eth-p/bat-extras/blob/master/doc/batman.md)을 쓸
+수도 있습니다. 
 
+참고로 [Manpage 문법](../assets/syntaxes/Manpage.sublime-syntax)은 본 저장소에서
+개발 중에 있으며, 아직 더 손봐야 합니다.
 
-참고 : [Manpage syntax](../assets/syntaxes/Manpage.sublime-syntax)는 이 저장소에서 개발되고 있으며, 아직 작업 중 입니다. 
+또한, 이는 Mandoc의 `man` 구현에서
+[작동하지 않습니다](https://github.com/sharkdp/bat/issues/1145).
 
 #### `prettier` / `shfmt` / `rustfmt`
 
-[`prettybat`](https://github.com/eth-p/bat-extras/blob/master/doc/prettybat.md) 스크립트는 코드를 포맷팅하고 `bat`으로 출력해주는 랩퍼(wrapper) 입니다. 
+[`prettybat`](https://github.com/eth-p/bat-extras/blob/master/doc/prettybat.md)
+스크립트는 코드를 포맷하고 `bat`으로 출력하는 래퍼(wrapper)입니다.
 
 
 ## 설치
 
-[![Packaging status](https://repology.org/badge/vertical-allrepos/bat.svg)](https://repology.org/project/bat/versions)
+[![Packaging status](https://repology.org/badge/vertical-allrepos/bat-cat.svg)](https://repology.org/project/bat-cat/versions)
 
-### On Ubuntu
-*... 그리고 기타 Debian 기반의 Linux 배포판들.*
+### Ubuntu에서 (`apt` 사용)
+*... 그리고 다른 Debian 기반의 Linux 배포판들에서.*
 
-Ubuntu Eoan 19.10 혹은 Debian unstable sid 이후 버전 부터는 [Ubuntu용 `bat` 패키지](https://packages.ubuntu.com/eoan/bat)나 [Debian용 `bat` 패키지](https://packages.debian.org/sid/bat) 를 설치 할 수 있습니다. 
+`bat`은 [Ubuntu](https://packages.ubuntu.com/eoan/bat)와
+[Debian](https://packages.debian.org/sid/bat) 패키지 배포 과정에 도입되는 중이며,
+Eoan 19.10 버전의 Ubuntu에서부터 제공됩니다.
+현재 Debain에서는 불안정한 "Sid" 브랜치에서만 `bat`이 제공됩니다.
+
+만약 충분히 최신 버전의 Ubuntu/Debian이 설치되어 있다면 간단히 다음을 실행하세요:
 
 ```bash
 apt install bat
 ```
 
-만약 최근 릴리즈된 bat을 사용을 원하거나 buntu/Debian 예전 버전을 사용하는 경우, [릴리즈 페이지](https://github.com/sharkdp/bat/releases)에서 다음과 같이 `.deb` 패키지를 받아 설치 할 수도 있습니다:
-
-```bash
-sudo dpkg -i bat_0.18.1_amd64.deb  # adapt version number and architecture
+**중요**: 만약 `bat`을 이와 같이 설치한다면, ([다른 패키지와의 이름
+충돌](https://github.com/sharkdp/bat/issues/982)로 인하여) `bat` 대신에
+`batcat`이라는 이름의 실행 파일로 설치될 수 있음을 참고하세요.
+이에 따른 문제들과 다른 배포판들과의 일관성을 위하여 `bat -> batcat` symlink
+혹은 alias를 설정할 수 있습니다:
+``` bash
+mkdir -p ~/.local/bin
+ln -s /usr/bin/batcat ~/.local/bin/bat
 ```
 
-### On Alpine Linux
+### Ubuntu에서 (가장 최신 `.deb` 패키지들 사용)
+*... 그리고 다른 Debian 기반의 Linux 배포판들에서.*
 
-공식 소스를 통해 [`bat` 패키지](https://pkgs.alpinelinux.org/packages?name=bat) 를 설치 할 수 있습니다:
+만약 여러분이 설치한 Ubuntu/Debian에 패키지가 배포되지 않거나 가장 최신 릴리즈된
+`bat`을 원한다면, [릴리즈 페이지](https://github.com/sharkdp/bat/releases)에서
+다음과 같이 `.deb` 패키지를 받아 설치하세요:
+
+```bash
+sudo dpkg -i bat_0.18.2_amd64.deb  # adapt version number and architecture
+```
+
+### Alpine Linux에서
+
+적절한 저장소가 활성화되어 있다면, 공식 소스를 통해
+[`bat` 패키지](https://pkgs.alpinelinux.org/packages?name=bat)를 설치할 수
+있습니다:
 
 ```bash
 apk add bat
 ```
 
-### On Arch Linux
+### Arch Linux에서
 
-공식 소스를 통해 [`bat` 패키지](https://www.archlinux.org/packages/community/x86_64/bat/)를 설치할 수 있습니다:
+공식 소스를 통해
+[`bat` 패키지](https://www.archlinux.org/packages/community/x86_64/bat/)를
+설치할 수 있습니다:
 
 ```bash
 pacman -S bat
 ```
 
-### On Fedora
+### Fedora에서
 
-[공식 Fedora 모듈 저장소](https://docs.fedoraproject.org/en-US/modularity/using-modules/)에서 [`bat` 패키지](https://koji.fedoraproject.org/koji/packageinfo?packageID=27506)을 설치할 수 있습니다:
+공식
+[Fedora 모듈](https://docs.fedoraproject.org/en-US/modularity/using-modules/)
+저장소에서
+[`bat` 패키지](https://koji.fedoraproject.org/koji/packageinfo?packageID=27506)를
+설치할 수 있습니다:
 
 ```bash
 dnf install bat
 ```
 
-### On Gentoo Linux
+### Gentoo Linux에서
 
-공식 소스를 통해 [`bat` 패키지](https://packages.gentoo.org/packages/sys-apps/bat)를 설치할 수 있습니다. 
+공식 소스를 통해
+[`bat` 패키지](https://packages.gentoo.org/packages/sys-apps/bat)를 설치할 수
+있습니다:
 
 ```bash
 emerge sys-apps/bat
 ```
 
-### On Void Linux
+### Void Linux에서
 
-xbps-install를 이용해 `bat`을 설치할 수 있습니다: 
+xbps-install을 이용해 `bat`을 설치할 수 있습니다:
 ```bash
 xbps-install -S bat
 ```
 
-### On FreeBSD
+### Termux에서
 
-pkg를 이용하여 미리 컴파일된 [`bat` 패키지](https://www.freshports.org/textproc/bat)를 설치할 수 있습니다:
+pkg를 이용해 `bat`을 설치할 수 있습니다:
+```bash
+pkg install bat
+```
+
+### FreeBSD에서
+
+pkg를 이용하여 미리 컴파일된
+[`bat` 패키지](https://www.freshports.org/textproc/bat)를 설치할 수 있습니다:
 
 ```bash
 pkg install bat
 ```
 
-또는 FreeBSD 포트에서 직접 빌드할 수도 있습니다: 
+또는 FreeBSD 포트에서 직접 빌드할 수도 있습니다:
 
 ```bash
 cd /usr/ports/textproc/bat
 make install
 ```
 
-### Via nix
+### nix를 써서
 
-[nix package manager](https://nixos.org/nix)를 이용해 `bat`을 설치할 수 있습니다:
+[nix package manager](https://nixos.org/nix)를 이용해 `bat`을 설치할 수
+있습니다:
 
 ```bash
 nix-env -i bat
 ```
 
-### On openSUSE
+### openSUSE에서
 
-zypper을 이용해 `bat`을 설치할 수 있습니다:
+zypper를 이용해 `bat`을 설치할 수 있습니다:
 
 ```bash
 zypper install bat
 ```
 
-### On macOS
+### snap 패키지를 써서
 
-[Homebrew](http://braumeister.org/formula/bat)를 이용해 `bat`을 설치할 수 있습니다: 
+지금으로서는 추천하는 snap 패키지가 없습니다.
+제공되는 패키지들이 존재할 수는 있지만, 공식적으로 지원되지 않으며
+[문제](https://github.com/sharkdp/bat/issues/1519)가 있을 수 있습니다.
+
+
+### macOS (또는 Linux)에서 Homebrew를 써서
+
+[macOS의 Homebrew](https://formulae.brew.sh/formula/bat) 또는
+[Linux의 Homebrew](https://formulae.brew.sh/formula-linux/bat)를 이용하여
+`bat`을 설치할 수 있습니다.
 
 ```bash
 brew install bat
 ```
 
-또는 [MacPorts](https://ports.macports.org/port/bat/summary)를 사용할 수도 있습니다: 
+### macOS에서 MacPorts를 써서
+
+[MacPorts](https://ports.macports.org/port/bat/summary)를 이용하여 `bat`을
+설치할 수 있습니다:
 
 ```bash
 port install bat
 ```
 
-### On Windows
+### Windows에서
 
-Windows에서 `bat`을 설치할 수 있는 몇 가지 옵션들이 있습니다. 먼저 `bat`을 설치 한 후, ["Windows에서 사용하기"](#Windows에서-사용하기) 참고하시기 바랍니다.  
+Windows에서 `bat`을 설치할 수 있는 몇 가지 옵션들이 있습니다.
+먼저 `bat`을 설치한 후,
+["Windows에서 `bat` 사용하기"](#windows에서-bat-사용하기) 섹션을 살펴보세요.
 
-#### With Chocolatey
+#### 전제 조건
 
-[Chocolatey](https://chocolatey.org/packages/Bat)를 이용해 `bat`을 설치할 수 있습니다: 
+[Visual C++ 재배포 가능](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
 ```
 
-#### With Scoop
+#### Scoop을 써서
 
 [scoop](https://scoop.sh/)을 이용해 `bat`을 설치할 수 있습니다:
 ```bash
 scoop install bat
 ```
-[Visual C++ Redistributable 패키지](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads)를 같이 설치해 주어야 합니다. 
 
-#### From prebuilt binaries:
+#### 사전 빌드된 바이너리들로
 
-[릴리즈 페이지](https://github.com/sharkdp/bat/releases)에서 빌드된 바이너리를 다운받을 수 있습니다. 
+[릴리즈 페이지](https://github.com/sharkdp/bat/releases)에서 사전 빌드된
+바이너리를 다운받을 수 있습니다.
 
-[Visual C++ Redistributable 패키지](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads)를 같이 설치해 주어야 합니다. 
+[Visual C++ 재배포 가능](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads)
+패키지를 설치해야 합니다.
 
-### Via Docker
+### 바이너리들로
 
-컨테이너에서 `bat`을 사용할 수 있는 [Docker image](https://hub.docker.com/r/danlynn/bat/)가 있습니다.: 
-```bash
-docker pull danlynn/bat
-alias bat='docker run -it --rm -e BAT_THEME -e BAT_STYLE -e BAT_TABS -v "$(pwd):/myapp" danlynn/bat'
-```
+[릴리즈 페이지](https://github.com/sharkdp/bat/releases)에서 다양한 아키텍처를
+위해 사전 빌드된 버전들을 확인할 수 있습니다.
+정적 링크 바이너리들은 파일 이름에 `musl` 이 포함된 아카이브들을 확인하세요.
 
-### Via Ansible
+### 소스에서
 
-[Ansible](https://www.ansible.com/)을 사용해 `bat`을 설치할 수 있습니다:
-
-```bash
-# Install role on local machine
-ansible-galaxy install aeimer.install_bat
-```
-
-```yaml
----
-# Playbook to install bat
-- host: all
-  roles:
-    - aeimer.install_bat
-```
-
-- [Ansible Galaxy](https://galaxy.ansible.com/aeimer/install_bat)
-- [GitHub](https://github.com/aeimer/ansible-install-bat)
-
-다음 배포판들에서 동작합니다: 
-- Debian/Ubuntu
-- ARM (eg. Raspberry PI)
-- Arch Linux
-- Void Linux
-- FreeBSD
-- MacOS
-
-### From binaries
-
-[릴리즈 페이지](https://github.com/sharkdp/bat/releases)에서 다양한 환경을 위해 빌드된 버전들을 확인 할 수 있습니다. 정적 링크 바이너리들은 아카이브에서 파일 이름에 `musl` 이 포함 파일로 확인 할 수 있습니다. 
-
-### From source
-
-`bat`의 소스를 직접 빌드하기 위해서는, Rust 1.36 이상이 필요하며 `cargo`를 이용해 빌드할 수 있습니다. 
+`bat`의 소스를 빌드하기 위해서는, Rust 1.45 이상이 필요합니다.
+`cargo`를 이용해 전부 빌드할 수 있습니다:
 
 ```bash
 cargo install --locked bat
 ```
 
-일부 플랫폼에서는 `llvm` 그리고/또는 `libclang-dev` 설치가 필요할 수도 있습니다. 
+참고로 man 페이지나 셸 자동 완성 파일과 같은 부가 파일들은 이 방법으로 설치될 수
+없습니다.
+이것들은 `cargo`에 의해 생성이 되고 (`build` 밑의) cargo 타켓 폴더에서 찾을 수
+있습니다.
 
-## 커스터마이즈
+## 사용자화
 
-### 문법 강조 테마 
+### 문법 강조 테마
 
-`bat --list-themes`을 사용하면, 현재 사용 가능한 문법 강조 테마들을 확인할 수 있습니다. `TwoDark` 테마 선택하는 경우,  `--theme=TwoDark` 옵션과 함께 `bat`을 사용하거나 환경변수에서 `BAT_THEME`를 `TwoDark`로 세팅해주면 됩니다. 쉘 시작 파일에 `export BAT_THEME="TwoDark"` 를 정의해 계속 사용도 가능합니다. 이 밖에 `bat`의 [설정 파일](#설정-파일)을 이용할 수도 있습니다. 
+`bat --list-themes`을 사용하여 사용 가능한 문법 강조 테마들의 목록을 확인할 수
+있습니다.
+`TwoDark` 테마를 선택하려면, `--theme=TwoDark` 옵션과 함께 `bat`을 사용하거나
+`BAT_THEME` 환경 변수를 `TwoDark`로 설정하세요.
+셸 시작 파일에 `export BAT_THEME="TwoDark"` 를 정의해 영구적으로 설정할 수
+있습니다.
+이 밖에 `bat`의 [설정 파일](#설정-파일)을 이용할 수 있습니다.
 
-다른 테마를 미리 보고 싶은경우 다음 명령어와 같이 사용할 수 있습니다.(이 경우 [`fzf`](https://github.com/junegunn/fzf)가 필요합니다.)
+만약 다른 테마들을 사용하여 특정 파일을 보고 싶다면, 다음 명령어를 쓸 수
+있습니다(이 경우 [`fzf`](https://github.com/junegunn/fzf)가 필요합니다.)
 
 ```bash
 bat --list-themes | fzf --preview="bat --theme={} --color=always /path/to/file"
 ```
-`bat`의 기본 테마는 어두운 배경색 터미널에 적합합니다. 만일 밝은 배경색을 사용할 경우에는  `GitHub` 이나 `OneHalfLight` 과 같은 테마가 더 잘 어울립니다. 아래 [새로운 테마 추가하기](#새로운-테마-추가하기)에 따라 커스텀 테마를 사용할수도 있습니다.
+
+`bat`은 기본적으로 어두운 배경에 적합합니다.
+그러나 밝은 배경의 터미널을 사용한다면 `GitHub`이나 `OneHalfLight`과 같은 테마가
+더 잘 어울립니다.
+아래 [새로운 테마 추가하기](#새로운-테마-추가하기) 섹션에 따라 커스텀 테마를
+사용할 수도 있습니다.
+
+### 8비트 테마
+
+`bat`은 트루컬러 지원이 되더라도 항상
+[8비트 색상](https://en.wikipedia.org/wiki/ANSI_escape_code#Colors)을 사용하는
+세 개의 테마가 있습니다.
+
+- `ansi`는 어떤 터미널에서도 무난하게 보입니다. 이는 3비트 색상을 사용합니다:
+  검정, 빨강, 녹색, 노랑, 파랑, 마젠타, 시안, 하양.
+- `base16`은 [base16](https://github.com/chriskempson/base16) 터미널 테마를 위해
+  디자인되었습니다.
+  이는 [base16 스타일 가이드라인](https://github.com/chriskempson/base16/blob/master/styling.md)에
+  따라 4비트 색상(3비트 색상에 밝은 변형 추가)을 사용합니다.
+- `base16-256`는 [base16-shell](https://github.com/chriskempson/base16-shell)을
+  위해 디자인되었습니다.
+  이는 16부터 21의 일부 밝은 색상을 8비트 색상으로 대치합니다.
+  단지 256-색상 터미널을 쓰지만 base16-shell을 쓰지 않는다고 해서 이것을
+  사용하지 **마십시오**.
+
+이들 테마는 더 제한적이지만, 트루컬러 테마에 비해 두 장점이 있습니다:
+
+- 이들은 3비트 혹은 4비트 색상을 쓰는 다른 터미널 소프트웨어와 더 잘
+  어울립니다.
+- 만약 터미널 테마를 바꾼다면, 이미 화면 상의 `bat`의 출력도 이에 맞추어
+  업데이트됩니다.
 
 ### 출력 스타일
 
-`--style` 옵션을 이용하여 `bat`의 출력 스타일을 변경 할 수 있습니다. 예를 들어,  `--style=numbers,changes`는 Git 변경분과 라인 넘버에 대해서만 출력하며 눈금과 파일 헤더가 표시되지 않습니다. `BAT_STYLE` 환경 변수로 정의하여 계속해서 사용하거나`bat`의 [설정 파일](#설정-파일)을 사용할 수도 있습니다.
+`--style` 옵션을 이용하면 `bat`의 출력 모양을 조절할 수 있습니다.
+예를 들어, `--style=numbers,changes`를 통해 Git 변경분과 줄 번호는 출력하지만
+격자와 파일 헤더는 출력하지 않을 수 있습니다.
+`BAT_STYLE` 환경 변수를 정의하여 이러한 수정을 영구적으로 하거나 `bat`의
+[설정 파일](#설정-파일)을 사용하세요.
 
-### 새로운 문법 강조 / 언어 추가하기
+### 새로운 문법 / 언어 정의 추가하기
 
-`bat`은 문법 강조를 위해 [`syntect`](https://github.com/trishume/syntect/) 라이브러리를 사용하고 있습니다.  `syntect`는 [Sublime Text의 `.sublime-syntax` 파일](https://www.sublimetext.com/docs/3/syntax.html)과 테마를 읽을 수 있습니다. 새로운 문법 강조를 추가하는 방법은 다음과 같습니다. 
+만약 `bat`에서 특정 문법이 지원되지 않을 경우, 다음의 절차를 통해 현재 `bat`
+설치본에 새로운 문법을 쉽게 추가할 수 있습니다.
 
-우선 문법 정의 파일을 넣을 폴더를 만듭니다:
+`bat`은 문법 강조를 위해 훌륭한
+[`syntect`](https://github.com/trishume/syntect/) 라이브러리를 사용합니다.
+`syntect`는 임의의 [Sublime Text의 `.sublime-syntax`
+파일](https://www.sublimetext.com/docs/3/syntax.html)과 테마를 읽을 수 있습니다.
 
-```bash
-mkdir -p "$(bat --config-dir)/syntaxes"
-cd "$(bat --config-dir)/syntaxes"
+[Package Control](https://packagecontrol.io/)에 Sublime 문법 패키지를 찾는
+방법이 잘 정리되어 있습니다.
+일단 문법을 찾았다면:
 
-# Put new '.sublime-syntax' language definition files
-# in this folder (or its subdirectories), for example:
-git clone https://github.com/tellnobody1/sublime-purescript-syntax
-```
+1. 문법 정의 파일들을 넣을 폴더를 만듭니다:
 
-다음 명령어를 통해 파일을 바이너리 캐시로 파싱합니다. 
+  ```bash
+  mkdir -p "$(bat --config-dir)/syntaxes"
+  cd "$(bat --config-dir)/syntaxes"
 
-```bash
-bat cache --build
-```
+  # Put new '.sublime-syntax' language definition files
+  # in this folder (or its subdirectories), for example:
+  git clone https://github.com/tellnobody1/sublime-purescript-syntax
+  ```
 
-마지막으로 `bat --list-languages`을 통해 새로운 언어가 사용 가능한지 확인합니다. 
+2. 이제 다음 명령어를 통해 파일들을 파싱(parse)하여 바이너리 캐시를 만듭니다.
 
-기본 설정으로 돌아가려면, 다음 명령어를 이용합니다.:
+  ```bash
+  bat cache --build
+  ```
 
-```bash
-bat cache --clear
-```
+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"
@@ -394,32 +534,93 @@ git clone https://github.com/greggb/sublime-snazzy
 bat cache --build
 ```
 
-마지막으로 `bat --list-themes`을 통해 새로운 테마가 사용 가능한지 확인합니다.  
+마지막으로 `bat --list-themes`을 통해 새로 추가한 테마들이 사용 가능한지
+확인합니다.
 
-### 다른 페이져 사용하기
+### 파일 타입 설정을 추가하거나 변경하기
 
-`bat`은 환경변수 `PAGER`로 사용할 페이져를 명시합니다. 만약 이 변수가 정의되어있지 않다면 `less`가 기본입니다. 만약 다른 페이져를 사용하고 싶다면 `PAGER` 변수를 수정하거나 `BAT_PAGER` 환경 변수로 `PAGER` 대신 정의 할 수도 있습니다. 
+새로운 파일 이름 패턴을 추가하려면 (혹은 이미 존재하는 것을 변경하려면)
+`--map-syntax` 커맨드 라인 옵션을 사용하세요.
+이 옵션은 `pattern:syntax` 꼴의 인자를 받습니다.
+이때 `pattern`은 파일 이름과 절대 파일 경로를 매치할 글로브(glob) 패턴입니다.
+`syntax` 부분은 지원되는 언어의 전체 이름입니다
+(`bat --list-languages`를 통해 개요를 확인하세요).
 
-만약 커맨드라인 인수로 넘기려면, `PAGER`/`BAT_PAGER` 변수를 정의를 통해 사용 할 수 있습니다. :
+참고: 이 옵션은 커맨드 라인에 넘겨 주는 것보다는 `bat`의 설정 파일에 넣는 것이
+좋을 것입니다 (아래를 보세요).
+
+예시: "INI" 문법 강조를 `.conf` 파일 확장자의 모든 파일에 적용하려면, 다음을
+사용하세요:
+```bash
+--map-syntax='*.conf:INI'
+```
+
+예시: `.ignore`(완전 일치)이라는 이름의 모든 파일을 "Git Ignore" 문법으로
+열려면, 다음을 사용하세요:
+```bash
+--map-syntax='.ignore:Git Ignore'
+```
+
+예시: `/etc/apache2`의 하위 폴더들에 있는 모든 `.conf` 파일들을 "Apache Conf"
+문법으로 열려면, 다음을 사용하세요 (이 대응(mapping)은 이미 내장되어 있습니다):
+```bash
+--map-syntax='/etc/apache2/**/*.conf:Apache Conf'
+```
+
+### 다른 페이저 사용하기
+
+`bat`은 환경 변수 `PAGER`에 명시된 페이저를 사용합니다.
+이 변수가 정의되어 있지 않다면, `less`가 기본으로 사용됩니다.
+만약 다른 페이저를 사용하고 싶다면, `PAGER` 변수를 수정하거나 `BAT_PAGER` 환경
+변수를 설정하여 `PAGER`의 설정을 오버라이드(override)할 수 있습니다.
+
+만약 커맨드라인 인수들을 페이저에게 넘겨 주려면, `PAGER`/`BAT_PAGER` 변수로
+설정할 수 있습니다:
 
 ```bash
 export BAT_PAGER="less -RF"
 ```
 
-환경 변수 대신, `bat`의 [설정 파일](#설정-파일)에서 페이져를 설정 할 수도 있습니다.(`--pager` 옵션)
+환경 변수를 사용하는 대신, `bat`의 [설정 파일](#설정-파일)로 페이저를 설정할
+수도 있습니다 (`--pager` 옵션).
 
-**참고**: 기본적으로 페이져가 `less`로 설정 되어있다면, `bat`은 다음 옵션들을 받을 수 있습니다: `-R`/`--RAW-CONTROL-CHARS`,
-`-F`/`--quit-if-one-screen` 그리고 `-X`/`--no-init`. 마지막 옵션(`-X`)은 530 이전 버전에서만 사용됩니다. 
+**참고**: 기본적으로, 페이저가 `less`로 설정되어 있다면 (그리고 커맨드 라인
+옵션이 지정되어 있지 않다면), `bat`은 다음 옵션들을 페이저로 넘겨줍니다:
+`-R`/`--RAW-CONTROL-CHARS`, `-F`/`--quit-if-one-screen` 그리고 `-X`/`--no-init`.
+마지막 옵션(`-X`)은 530 이전 버전의 `less`에만 사용됩니다.
 
-`-R` 옵션은 ANSI 컬러를 올바르게 해석하기 위해 필요합니다. 두번째 옵션 (`-F`)은 출력 크기가 터미널의 세로 크기보다 작을 경우 즉시 종료되도록 합니다. 
-페이져를 종료하기 위해 `q`를 누를 필요 없기 때문에 작은 파일을 다룰 때 용이합니다. 세번째 옵션(`-X`)는 `less` 이전 버전의 `--quit-if-one-screen` 기능과 함께 버그를 잡을 때 필요합니다. 안타깝게도, `less`의 마우스 휠 지원은 종료합니다. 
+`-R` 옵션은 ANSI 색상을 올바르게 해석하기 위해 필요합니다.
+두 번째 옵션(`-F`)은 출력 크기가 터미널의 세로 크기보다 작을 경우 less가 즉시
+종료되도록 합니다.
+이는 작은 파일을 다룰 때 페이저를 종료하기 위해 `q`를 누를 필요 없어서
+편리합니다.
+세 번째 옵션(`-X`)는 예전 버전의 `less`에 있는 `--quit-if-one-screen` 기능의
+버그를 고치기 위해 필요합니다.
+안타깝게도, 이는 `less`의 마우스 휠 지원과 호환되지 않습니다.
 
-`less` 예전 버전에서 마우스 휠 기능을 활성화 시키려면, `-R` 옵션을 사용하면 됩니다. (위의 예제처럼, 이 옵션은 quit-if-one-screen  기능을 비활성화 시킵니다.)
-530 이하 버전에서는 그대로 사용할 수 있습니다. 
+`less`의 예전 버전에서 마우스 휠 기능을 활성화하려면, `-R` 옵션을 넘겨주세요
+(위의 예제처럼, 이 옵션은 quit-if-one-screen 기능을 비활성화합니다).
+less 530과 이후 버전에서는 그대로 사용할 수 있습니다.
+
+### 들여쓰기
+
+`bat`은 페이저에 의존하지 않고 탭을 4 스페이스로 확장합니다.
+이를 변경하려면 간단히 `--tabs` 인자에 표시되기를 원하는 스페이스 개수를
+추가하세요.
+
+**참고**: (`bat`의 `--pager` 인자 혹은 `less`의 `LESS` 환경 변수를 통해)
+페이저의 탭 길이를 지정하는 것은 효과가 없을 것인데, 이는 페이저가 이미
+스페이스로 확장된 탭을 받기 때문입니다.
+이 기능은 사이드바에 의한 들여쓰기 문제를 회피하기 위해 추가되었습니다.
+`bat`을 `--tabs=0`과 함께 호출하면 이를 오버라이드하여 페이저가 탭을 처리하게
+합니다.
 
 ### 다크 모드
 
-macOS에서 다크 모드를 사용하고 있다면, OS 테마에 따라 다른 테마를 사용하도록 `bat`의 구성할 수 있습니다. 아래 코드는 라이트 모드에서는 `default` 테마를 다크모드에서는 `Github` 테마를 사용하는 방법입니다. 
+macOS에서 다크 모드를 사용하고 있다면, `bat`가 OS 테마에 따라 다른 테마를
+사용하도록 구성할 수 있습니다.
+아래 스니펫은 _다크 모드_에서는 `default` 테마를, _라이트 모드_에서는 `GitHub`
+테마를 사용하는 방법입니다.
 
 ```bash
 alias cat="bat --theme=\$(defaults read -globalDomain AppleInterfaceStyle &> /dev/null && echo default || echo GitHub)"
@@ -427,57 +628,89 @@ alias cat="bat --theme=\$(defaults read -globalDomain AppleInterfaceStyle &> /de
 
 ## 설정 파일
 
-`bat` 설정 파일로 커스터마이즈 할 수 있습니다. 파일의 위치는 운영 체제에 따라 다릅니다. 아래 커맨드를 통해 시스템의 기본 경로를 알 수 있습니다. 
+`bat`는 설정 파일로도 사용자화 할 수 있습니다.
+설정 파일의 위치는 운영 체제에 따라 다릅니다.
+아래 커맨드를 통해 시스템의 기본 경로를 확인할 수 있습니다.
 ```
 bat --config-file
 ```
 
-또는, `BAT_CONFIG_PATH` 환경 변수를 사용하여 `bat`의 설정 파일 위치를 지정할 수 있습니다. 
+또는, `BAT_CONFIG_PATH` 환경 변수를 사용하여 `bat`가 설정 파일의 기본 경로
+이외의 위치를 사용하도록 할 수 있습니다.
 ```bash
 export BAT_CONFIG_PATH="/path/to/bat.conf"
 ```
 
-### 포맷
-
-설정 파일은 명령어 인수들의 리스트 입니다. `bat --help`를 이용하여 가능한 옵션들과 값들을 확인해 볼 수 있습니다. 또, `#` 으로 주석을 추가할수도 있습니다. 
-
-설정 파일의 예:
+기본 설정 파일은 `--generate-config-file` 옵션으로 생성할 수 있습니다.
 ```bash
-# Set the theme to "TwoDark"
---theme="TwoDark"
-
-# Show line numbers, Git modifications and file header (but no grid)
---style="numbers,changes,header"
-
-# Use italic text on the terminal (not supported on all terminals)
---italic-text=always
-
-# Use C++ syntax for .ino files
---map-syntax "*.ino:C++"
-
-# Use ".gitignore"-style highlighting for ".ignore" files
---map-syntax ".ignore:Git Ignore"
+bat --generate-config-file
 ```
 
-##  Windows에서 사용하기
+### 포맷
 
-`bat` 대부분의 경우 Windows에서 기본적으로 잘 작동하지만, 일부 기능에는 추가 적인 구성이 필요할 수 있습니다.
+설정 파일은 단순히 커맨드 라인 인자들의 리스트입니다.
+`bat --help`로 가능한 모든 옵션과 값들을 확인하세요.
+추가적으로, 줄 앞에 `#` 문자를 추가해 주석을 넣을 수 있습니다.
 
-### 페이징 
+설정 파일 예시:
+```bash
+# "TwoDark" 테마 설정하기
+--theme="TwoDark"
 
-Windows는 `more` 형식의 매우 제한된 페이저만이 포함되어있습니다. `less`용 Windows 바이너리는 [이 홈페이지](http://www.greenwoodsoftware.com/less/download.html)나  [Chocolatey](https://chocolatey.org/packages/Less)에서 다운로드 받을 수 있습니다. 이를 사용하려면 바이너리를 `PATH` 디렉토리에 배치하거나 [환경 변수로 정의](#using-a-different-pager) 하세요. [Chocolatey 패키지](#on-windows)로 `less`를 자동으로 설치할 수 있습니다. 
+# 줄 번호, Git 변경 내용, 파일 헤더 보이기 (격자 없이)
+--style="numbers,changes,header"
+
+# 터미널에서 이탤릭체 쓰기 (일부 터미널에서 미지원)
+--italic-text=always
+
+# .ino 파일에 C++ 문법 쓰기
+--map-syntax "*.ino:C++"
+```
+
+## Windows에서 `bat` 사용하기
+
+`bat`는 대부분의 경우 Windows에서 기본적으로 잘 작동하지만, 일부 기능은 추가적인
+구성이 필요할 수 있습니다.
+
+#### 전제 조건
+
+[Visual C++ 재배포 가능](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads)
+패키지를 설치해야 합니다.
+
+### 페이징
+
+Windows는 `more` 형식의 매우 제한된 페이저만 포함합니다.
+Windows용 `less` 바이너리는
+[공식 홈페이지](http://www.greenwoodsoftware.com/less/download.html)나
+[Chocolatey](https://chocolatey.org/packages/Less)를 통해 다운로드 받을 수
+있습니다.
+이를 사용하려면 디렉터리 안의 바이너리를 `PATH`에 넣거나
+[환경 변수로 정의](#using-a-different-pager)하세요.
+[Chocolatey 패키지](#on-windows)는 `less`를 자동으로 설치합니다.
 
 ### 색상
 
-Windows 10은 기본 내장기능으로 [v1511](https://en.wikipedia.org/wiki/Windows_10_version_history#Version_1511_(November_Update)) 이후의  `conhost.exe`(Command Prompt) 와 PowerShell, 그리고 최신 버전의 bash에서 색상을 지원합니다. 이전 버전의 Windows에서는, [ConEmu](https://conemu.github.io/)가 포함 된 [Cmder](http://cmder.net/)를 사용할 수 있습니다 .
+Windows 10은
+[v1511](https://en.wikipedia.org/wiki/Windows_10_version_history#Version_1511_(November_Update))부터
+기본적으로 `conhost.exe`(Command Prompt)와 PowerShell에서 색상을 지원하며,
+최신 버전의 bash에서도 색상을 지원합니다.
+이전 버전의 Windows에서는, [ConEmu](https://conemu.github.io/)가 포함된
+[Cmder](http://cmder.net/)를 사용할 수 있습니다.
 
-**참고:**  `less`의 Git과 MSYS 버전은 Windows에서 색상을 올바르게 해석하지 않습니다. 다른 페이져가 설치되어 있지 않은 경우, `--paging=never` 하거나 `BAT_PAGER`를 빈 문자열로 설정하여 페이징을 완전히 비활성화 할 수 있습니다 .
+**참고:** Git과 MSYS 버전의 `less`는 Windows에서 색상을 올바르게 해석하지
+않습니다.
+다른 페이저가 설치되어 있지 않은 경우, `--paging=never`을 넘겨주거나
+`BAT_PAGER`을 빈 문자열로 설정하여 페이징을 완전히 비활성화 할 수 있습니다.
 
 ### Cygwin
 
-Windows에서의 `bat`은 기본적으로 Cygwin의 unix 스타일의 경로(`/cygdrive/*`)를 지원하지 않습니다. cygwin 절대경로를 인자로 받았을 때, `bat`은 다음과 같이 오류를 반환합니다. `:The system cannot find the path specified. (os error 3)`
+Windows에서의 `bat`은 기본적으로 Cygwin의 unix 스타일 경로(`/cygdrive/*`)를
+지원하지 않습니다.
+Cygwin 절대 경로를 인자로 받았을 때, `bat`은 다음과 같은 오류를 반환합니다:
+`The system cannot find the path specified. (os error 3)`
 
-이 경우,  wrapper를 만들거나 다음 함수를 `.bash_profile`추가하여 문제를 해결하실 수 있습니다 :
+이는 wrapper를 만들거나 다음 함수를 `.bash_profile`에 추가하여 해결할 수
+있습니다:
 
 ```bash
 bat() {
@@ -493,68 +726,94 @@ bat() {
 }
 ```
 
-## 트러블슈팅
+## 문제 해결
 
 ### 터미널과 색상
 
-`bat`은 터미널 트루컬러 지원 여부와 상관없이 동작합니다. 하지만, 문법 강조 테마의 색상이 8-bit 컬러에는 최적화 되어 있지 않고 있으며, 24-bit 트루컬러 지원하는 터미널 사용하는 것을 적극 권장합니다.(`terminator`, `konsole`, `iTerm2`, ...). [이 글](https://gist.github.com/XVilka/8346728)에서 24-bit 트루컬러 지원하는 터미널들을 찾아보실 수 있습니다. 
+`bat`은 터미널의 트루컬러 지원 여부와 상관 없이 동작합니다.
+그러나 대부분 문법 강조 테마의 색상은 8비트 색상에 최적화되어 있지 않습니다.
+따라서 24비트 트루컬러 지원이 되는 터미널(`terminator`, `konsole`, `iTerm2`,
+...)을 사용하는 것을 적극 권장합니다.
+트루컬러를 지원하는 터미널들과 더 자세한 정보는
+[이 글](https://gist.github.com/XVilka/8346728)에서 찾아보실 수 있습니다.
 
-사용하고 있는 터미널에서 `COLORTERM`을 `truecolor` 혹은
-`24bit`으로 설정 되어있는지 확인하세요. 만약 아니라면, `bat`은 24-bit escape sequence를 지원되는지 여부를 판단 할 수 없습니다. (그리고 8-bit 색상으로 돌아갑니다.) 
+사용하고 있는 트루컬러 터미널에서 `COLORTERM` 변수를 `truecolor` 혹은
+`24bit`로 설정되어 있는지 확인하세요.
+그렇지 않을 경우, `bat`은 24비트 확장열(escape sequence)이 지원되는지 여부를
+판단할 수 없습니다 (그리고 8비트 색상을 사용합니다).
 
-### 라인 숫자와 눈금이 잘 보이지 않는 경우
+### 줄 번호와 격자가 잘 보이지 않는 경우
 
-다른 테마를 사용해 보세요. (`bat --list-themes`에서 테마들을 확인해 볼 수 있습니다.) `OneHalfDark` 과 `OneHalfLight` 테마는 눈금과 선의 색을 밝게 합니다. 
+다른 테마를 사용해 보세요 (`bat --list-themes`에서 목록을 볼 수 있습니다).
+`OneHalfDark`와 `OneHalfLight` 테마는 더 밝은 눈금과 선의 색상을 사용합니다.
 
 ### 파일 인코딩
 
-`bat`은 기본적으로 UTF-8과 UTF-8을 제공합니다. 다른 파일 인코딩의 경우, 자동 감지 되지 않으므로 UTF-8로 먼저 변환해 주어야 합니다. 이렇게 할 때, `iconv`를 사용 할 수 있습니다. 예를 들어,  Latin-1 (ISO-8859-1)로 인코딩된 PHP파일이라면 다음과 같이 사용할 수 있습니다.: 
+`bat`은 기본적으로 UTF-8과 UTF-16을 지원합니다.
+다른 모든 종류의 파일 인코딩에 대해서는, 일반적으로 인코딩을 자동으로 판별하는
+방법이 없기 때문에 먼저 UTF-8으로 변환해야 할 수 있습니다.
+이를 위해 `iconv`를 사용할 수 있습니다.
+예시: Latin-1(ISO-8859-1)로 인코딩된 PHP 파일은 다음과 같이 처리할 수 있습니다:
 ``` bash
 iconv -f ISO-8859-1 -t UTF-8 my-file.php | bat
 ```
-참고: `bat`으로 자동 감지가 되지 않는 경우에는 `-l`/`--language` 옵션을 사용할 수도 있습니다. 
+참고: `bat`으로 문법 자동 감지가 되지 않는 경우에는 `-l`/`--language` 옵션을
+사용할 수 있습니다.
 
-## 배포
+## 개발
 
 ```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 --locked
 
-# Build a bat binary with modified syntaxes and themes
+# 수정된 문법과 테마가 적용된 bat 바이너리 빌드
 bash assets/create.sh
 cargo install --locked --force
 ```
 
+`bat`의 pretty-printing 기능을 라이브러리로 사용하는 애플리케이션을 만들고
+싶다면, [API 문서](https://docs.rs/bat/)를 살펴보세요.
+참고로 `bat`에 라이브러리로써 의존한다면, `regex-onig`나 `regex-fancy`를
+기능으로 사용해야 합니다.
+
+## 기여하기
+
+[`CONTRIBUTING.md`](../CONTRIBUTING.md) 가이드를 살펴보세요.
+
 ## 메인테이너들
 
 - [sharkdp](https://github.com/sharkdp)
 - [eth-p](https://github.com/eth-p)
+- [keith-hall](https://github.com/keith-hall)
+- [Enselic](https://github.com/Enselic)
 
 ## 프로젝트 목표와 대안들
 
-`bat`은 아래와 같은 목표를 달성하려고 합니다: 
+`bat`은 다음과 같은 목표를 달성하려고 합니다:
 
-- 아름답고 발전된 문법 강조 기능 
-- Git 연동을 통한 파일 수정 내역 확인 
-- (POSIX)`cat`의 대체제 
-- 사용자 친화적인 CLI 제공
+- 아름답고 발전된 문법 강조 기능 제공
+- Git과의 연동을 통한 파일 변경 내용 확인
+- (POSIX) `cat`의 대체제
+- 사용자 친화적인 커맨드 라인 인터페이스 제공
 
-
-비슷한 프로그램들을 찾고 있다면, 많은 대안들이 있습니다. 비교는 [이 문서]((doc/alternatives.md))를 참조해주세요. 
+비슷한 프로그램들을 찾고 있다면 많은 대안들이 있습니다.
+비교는 [이 문서](../doc/alternatives.md)를 참조해 주세요.
 
 ## 라이센스
 Copyright (c) 2018-2021 [bat-developers](https://github.com/sharkdp/bat).
 
-`bat`는 MIT 라이센스 및 Apache 라이센스 2.0의 조건에 따라 배포됩니다.  
+`bat`는 여러분의 선택에 따라 MIT 라이센스 또는 Apache 라이센스 2.0의 조건에 따라
+배포됩니다.
 
-라이센스 세부사항은 [LICENSE-APACHE](LICENSE-APACHE)와 [LICENSE-MIT](LICENSE-MIT)를 참조하세요. 
+라이센스의 세부사항은 [LICENSE-APACHE](../LICENSE-APACHE)와
+[LICENSE-MIT](../LICENSE-MIT)를 참조하세요.

doc/README-ru.md

@@ -185,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.1_amd64.deb  # измените архитектуру и версию
+sudo dpkg -i bat_0.18.2_amd64.deb  # измените архитектуру и версию
 ```
 
 ### Alpine Linux
@@ -434,11 +434,11 @@ export BAT_PAGER="less -RF"
  `-R`/`--RAW-CONTROL-CHARS`,
 `-F`/`--quit-if-one-screen` и `-X`/`--no-init`. Последний флаг(`-X`) используется только для `less`, чья версия раньше 530.
 
-Флаг `-R` нужен чтобы корректно воспроизвести ANSI цвета. Второй флаг (`-F`) говорит 
+Флаг `-R` нужен чтобы корректно воспроизвести ANSI цвета. Второй флаг (`-F`) говорит
 `less` чтобы тот сразу же завершился, если размер вывода меньше чем вертикальный размер терминала.
 Это удобно для небольших файлов, так как вам не надо каждый раз нажимать `q`, чтобы выйти из пейджера. Третий флаг (`-X`) нужен для того, чтобы исправить баг с `--quit-if-one-screen` в старых версиях `less`. К сожалению, это блокирует возможность использования колеса мышки.
 
-Если вы хотите все же его включить, вы можете добавить флаг `-R`. 
+Если вы хотите все же его включить, вы можете добавить флаг `-R`.
 Для `less` новее чем 530 оно должно работать из коробки.
 
 ### Темная тема
@@ -499,7 +499,7 @@ Windows поддерживает только очень простой пейд
 ### Цвета
 
 Windows 10 поддерживает цвета и в `conhost.exe` (Command Prompt), и в PowerShell начиная с версии Windows
-[v1511](https://ru.wikipedia.org/wiki/Windows_10#Обновления и поддержка), так же как и в bash. На ранних версиях Windows вы можете использовать 
+[v1511](https://ru.wikipedia.org/wiki/Windows_10#Обновления и поддержка), так же как и в bash. На ранних версиях Windows вы можете использовать
 [Cmder](http://cmder.net/), в котором есть [ConEmu](https://conemu.github.io/).
 
 **Внимание:** Версия `less` в Git и MSYS2 воспроизводит цвета некорректно. Если у вас нет других пейджеров, мы можете отключить использование пейджеров с помощью флага `--paging=never`

doc/assets.md

@@ -9,7 +9,9 @@ in the `.sublime-syntax` format.
 **Important:** Before proceeding, verify that the syntax you wish to add meets the [criteria for inclusion](#Criteria-for-inclusion-of-new-syntaxes).
 
 1. Find a Sublime Text syntax for the given language, preferably in a separate Git repository
-   which can be included as a submodule (under `assets/syntaxes`).
+   which can be included as a submodule (under `assets/syntaxes`) using
+   `git submodule add <https github link> ./assets/syntaxes/02_Extra/<repo name>`, replacing
+   the contents of the angle brackets as appropriate.
 
 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* ->
@@ -26,7 +28,8 @@ in the `.sublime-syntax` format.
 6. Add a syntax test for the new language. See [below](#Syntax-tests) for details.
 
 7. If you send a pull request with your changes, please do *not* include the changed `syntaxes.bin`
-   file. A new binary cache file will be created once before every new release of `bat`.
+   file. A new binary cache file will be created once before every new release of `bat`. This
+   avoids bloating the repository size unnecessarily.
 
 ### Syntax tests
 
@@ -68,7 +71,7 @@ themes (`bat cache --clear`).
 
 ## Criteria for inclusion of new syntaxes
 
-* More than 10,000 downloads on packagecontrol.io/
+* More than 10,000 downloads at [Package Control](https://packagecontrol.io)
 
 ### Manual modifications
 

doc/release-checklist.md

@@ -0,0 +1,58 @@
+# 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
+      `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`.
+- [ ] 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 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 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 synaxes
+      and themes).
+- [ ] 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 to the remote `git tag vX.Y.Z; git push --tags`.
+      This will trigger the deployment via GitHub Actions.
+- [ ] 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
+      possibly add additional remarks for package maintainers.
+      Publish the release.
+- [ ] Check if the binary deployment works (archives and Debian packages should
+      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.

src/assets.rs

@@ -1,16 +1,15 @@
-use std::collections::BTreeMap;
 use std::ffi::OsStr;
-use std::fs::{self, File};
-use std::io::BufReader;
-use std::path::Path;
+use std::fs;
+use std::path::{Path, PathBuf};
 
-use syntect::dumps::{dump_to_file, from_binary, from_reader};
+use lazycell::LazyCell;
+
+use syntect::dumps::{from_binary, from_reader};
 use syntect::highlighting::{Theme, ThemeSet};
-use syntect::parsing::{SyntaxReference, SyntaxSet, SyntaxSetBuilder};
+use syntect::parsing::{SyntaxReference, SyntaxSet};
 
 use path_abs::PathAbs;
 
-use crate::assets_metadata::AssetsMetadata;
 use crate::bat_warning;
 use crate::error::*;
 use crate::input::{InputReader, OpenedInput, OpenedInputKind};
@@ -18,23 +17,66 @@ use crate::syntax_mapping::{MappingTarget, SyntaxMapping};
 
 #[derive(Debug)]
 pub struct HighlightingAssets {
-    pub(crate) syntax_set: SyntaxSet,
-    pub(crate) theme_set: ThemeSet,
+    syntax_set_cell: LazyCell<SyntaxSet>,
+    serialized_syntax_set: Option<SerializedSyntaxSet>,
+    theme_set: ThemeSet,
     fallback_theme: Option<&'static str>,
 }
 
+#[derive(Debug)]
+pub struct SyntaxReferenceInSet<'a> {
+    pub syntax: &'a SyntaxReference,
+    pub syntax_set: &'a SyntaxSet,
+}
+
+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(
+        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,
+            serialized_syntax_set,
+            theme_set,
+            fallback_theme: None,
+        }
+    }
+
     pub fn default_theme() -> &'static str {
         "Monokai Extended"
     }
 
+    #[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 {
-            Self::get_integrated_themeset()
+            get_integrated_themeset()
         } else {
-            ThemeSet {
-                themes: BTreeMap::new(),
-            }
+            ThemeSet::new()
         };
 
         let theme_dir = source_dir.join("themes");
@@ -55,11 +97,11 @@ impl HighlightingAssets {
         }
 
         let mut syntax_set_builder = if !include_integrated_assets {
-            let mut builder = SyntaxSetBuilder::new();
+            let mut builder = syntect::parsing::SyntaxSetBuilder::new();
             builder.add_plain_text_syntax();
             builder
         } else {
-            Self::get_integrated_syntaxset().into_builder()
+            from_binary::<SyntaxSet>(get_serialized_integrated_syntaxset()).into_builder()
         };
 
         let syntax_dir = source_dir.join("syntaxes");
@@ -72,95 +114,63 @@ impl HighlightingAssets {
             );
         }
 
-        Ok(HighlightingAssets {
-            syntax_set: syntax_set_builder.build(),
-            theme_set,
-            fallback_theme: None,
-        })
+        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> {
-        let syntax_set_path = cache_path.join("syntaxes.bin");
-        let theme_set_path = cache_path.join("themes.bin");
-
-        let syntax_set_file = File::open(&syntax_set_path).chain_err(|| {
-            format!(
-                "Could not load cached syntax set '{}'",
-                syntax_set_path.to_string_lossy()
-            )
-        })?;
-        let syntax_set: SyntaxSet = from_reader(BufReader::new(syntax_set_file))
-            .chain_err(|| "Could not parse cached syntax set")?;
-
-        let theme_set_file = File::open(&theme_set_path).chain_err(|| {
-            format!(
-                "Could not load cached theme set '{}'",
-                theme_set_path.to_string_lossy()
-            )
-        })?;
-        let theme_set: ThemeSet = from_reader(BufReader::new(theme_set_file))
-            .chain_err(|| "Could not parse cached theme set")?;
-
-        Ok(HighlightingAssets {
-            syntax_set,
-            theme_set,
-            fallback_theme: None,
-        })
-    }
-
-    fn get_integrated_syntaxset() -> SyntaxSet {
-        from_binary(include_bytes!("../assets/syntaxes.bin"))
-    }
-
-    fn get_integrated_themeset() -> ThemeSet {
-        from_binary(include_bytes!("../assets/themes.bin"))
+        Ok(HighlightingAssets::new(
+            None,
+            Some(SerializedSyntaxSet::FromFile(
+                cache_path.join("syntaxes.bin"),
+            )),
+            asset_from_cache(&cache_path.join("themes.bin"), "theme set")?,
+        ))
     }
 
     pub fn from_binary() -> Self {
-        let syntax_set = Self::get_integrated_syntaxset();
-        let theme_set = Self::get_integrated_themeset();
-
-        HighlightingAssets {
-            syntax_set,
-            theme_set,
-            fallback_theme: None,
-        }
+        HighlightingAssets::new(
+            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);
-        let theme_set_path = target_dir.join("themes.bin");
-        let syntax_set_path = target_dir.join("syntaxes.bin");
-
-        print!(
-            "Writing theme set to {} ... ",
-            theme_set_path.to_string_lossy()
-        );
-        dump_to_file(&self.theme_set, &theme_set_path).chain_err(|| {
-            format!(
-                "Could not save theme set to {}",
-                theme_set_path.to_string_lossy()
-            )
-        })?;
-        println!("okay");
-
-        print!(
-            "Writing syntax set to {} ... ",
-            syntax_set_path.to_string_lossy()
-        );
-        dump_to_file(&self.syntax_set, &syntax_set_path).chain_err(|| {
-            format!(
-                "Could not save syntax set to {}",
-                syntax_set_path.to_string_lossy()
-            )
-        })?;
-        println!("okay");
+        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()
         );
-        AssetsMetadata::new(current_version).save_to_folder(target_dir)?;
+        crate::assets_metadata::AssetsMetadata::new(current_version).save_to_folder(target_dir)?;
         println!("okay");
 
         Ok(())
@@ -170,41 +180,85 @@ impl HighlightingAssets {
         self.fallback_theme = Some(theme);
     }
 
+    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
+    #[deprecated]
     pub fn syntaxes(&self) -> &[SyntaxReference] {
-        self.syntax_set.syntaxes()
+        self.get_syntax_set()
+            .expect(".syntaxes() is deprecated, use .get_syntaxes() instead")
+            .syntaxes()
+    }
+
+    pub fn get_syntaxes(&self) -> Result<&[SyntaxReference]> {
+        Ok(self.get_syntax_set()?.syntaxes())
+    }
+
+    fn get_theme_set(&self) -> &ThemeSet {
+        &self.theme_set
     }
 
     pub fn themes(&self) -> impl Iterator<Item = &str> {
-        self.theme_set.themes.keys().map(|s| s.as_ref())
+        self.get_theme_set().themes.keys().map(|s| s.as_ref())
     }
 
+    /// 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_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)
+    }
+
+    pub fn get_syntax_for_file_name(
+        &self,
+        file_name: impl AsRef<Path>,
+        mapping: &SyntaxMapping,
+    ) -> Result<Option<SyntaxReferenceInSet>> {
         let file_name = file_name.as_ref();
-        match mapping.get_syntax_for(file_name) {
+        Ok(match mapping.get_syntax_for(file_name) {
             Some(MappingTarget::MapToUnknown) => None,
             Some(MappingTarget::MapTo(syntax_name)) => {
-                self.syntax_set.find_syntax_by_name(syntax_name)
+                let syntax_set = self.get_syntax_set()?;
+                syntax_set
+                    .find_syntax_by_name(syntax_name)
+                    .map(|syntax| SyntaxReferenceInSet { syntax, syntax_set })
             }
-            None => self.get_extension_syntax(file_name.as_os_str()),
-        }
+            None => self.get_extension_syntax(file_name.as_os_str())?,
+        })
     }
 
     pub(crate) fn get_theme(&self, theme: &str) -> &Theme {
-        match self.theme_set.themes.get(theme) {
+        match self.get_theme_set().themes.get(theme) {
             Some(theme) => theme,
             None => {
                 if theme == "ansi-light" || theme == "ansi-dark" {
                     bat_warning!("Theme '{}' is deprecated, using 'ansi' instead.", theme);
                     return self.get_theme("ansi");
                 }
-                if theme != "" {
+                if !theme.is_empty() {
                     bat_warning!("Unknown theme '{}', using default.", theme)
                 }
-                &self.theme_set.themes[self.fallback_theme.unwrap_or_else(|| Self::default_theme())]
+                &self.get_theme_set().themes
+                    [self.fallback_theme.unwrap_or_else(|| Self::default_theme())]
             }
         }
     }
@@ -214,13 +268,15 @@ impl HighlightingAssets {
         language: Option<&str>,
         input: &mut OpenedInput,
         mapping: &SyntaxMapping,
-    ) -> Result<&SyntaxReference> {
+    ) -> Result<SyntaxReferenceInSet> {
         if let Some(language) = language {
-            self.syntax_set
+            let syntax_set = self.get_syntax_set()?;
+            syntax_set
                 .find_syntax_by_token(language)
+                .map(|syntax| SyntaxReferenceInSet { syntax, syntax_set })
                 .ok_or_else(|| ErrorKind::UnknownSyntax(language.to_owned()).into())
         } else {
-            let line_syntax = self.get_first_line_syntax(&mut input.reader);
+            let line_syntax = self.get_first_line_syntax(&mut input.reader)?;
 
             // Get the path of the file:
             // If this was set by the metadata, that will take priority.
@@ -248,14 +304,17 @@ impl HighlightingAssets {
                         ErrorKind::UndetectedSyntax(path.to_string_lossy().into()).into()
                     }),
 
-                    Some(MappingTarget::MapTo(syntax_name)) => self
-                        .syntax_set
-                        .find_syntax_by_name(syntax_name)
-                        .ok_or_else(|| ErrorKind::UnknownSyntax(syntax_name.to_owned()).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)
+                        self.get_extension_syntax(file_name)?
                             .or(line_syntax)
                             .ok_or_else(|| {
                                 ErrorKind::UndetectedSyntax(path.to_string_lossy().into()).into()
@@ -269,24 +328,122 @@ impl HighlightingAssets {
         }
     }
 
-    fn get_extension_syntax(&self, file_name: &OsStr) -> Option<&SyntaxReference> {
-        self.syntax_set
-            .find_syntax_by_extension(file_name.to_str().unwrap_or_default())
-            .or_else(|| {
-                self.syntax_set.find_syntax_by_extension(
-                    Path::new(file_name)
-                        .extension()
-                        .and_then(|x| x.to_str())
-                        .unwrap_or_default(),
-                )
-            })
+    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 = 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_first_line_syntax(&self, reader: &mut InputReader) -> Option<&SyntaxReference> {
-        String::from_utf8(reader.first_line.clone())
-            .ok()
-            .and_then(|l| self.syntax_set.find_syntax_by_first_line(&l))
+    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,
+    ) -> Result<Option<SyntaxReferenceInSet>> {
+        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)
+    }
+
+    fn get_first_line_syntax(
+        &self,
+        reader: &mut InputReader,
+    ) -> Result<Option<SyntaxReferenceInSet>> {
+        let syntax_set = self.get_syntax_set()?;
+        Ok(String::from_utf8(reader.first_line.clone())
+            .ok()
+            .and_then(|l| syntax_set.find_syntax_by_first_line(&l))
+            .map(|syntax| SyntaxReferenceInSet { syntax, syntax_set }))
+    }
+}
+
+/// 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")
+}
+
+fn get_integrated_themeset() -> ThemeSet {
+    from_binary(include_bytes!("../assets/themes.bin"))
+}
+
+#[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(())
+}
+
+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()
+        )
+    })?;
+    from_reader(&contents[..]).chain_err(|| format!("Could not parse cached {}", description))
 }
 
 #[cfg(test)]
@@ -296,7 +453,7 @@ mod tests {
     use std::ffi::OsStr;
 
     use std::fs::File;
-    use std::io::Write;
+    use std::io::{BufReader, Write};
     use tempfile::TempDir;
 
     use crate::input::Input;
@@ -316,6 +473,18 @@ mod tests {
             }
         }
 
+        fn get_syntax_name(
+            &self,
+            language: Option<&str>,
+            input: &mut OpenedInput,
+            mapping: &SyntaxMapping,
+        ) -> String {
+            self.assets
+                .get_syntax(language, input, mapping)
+                .map(|syntax_in_set| syntax_in_set.syntax.name.clone())
+                .unwrap_or_else(|_| "!no syntax!".to_owned())
+        }
+
         fn syntax_for_real_file_with_content_os(
             &self,
             file_name: &OsStr,
@@ -331,11 +500,7 @@ mod tests {
             let dummy_stdin: &[u8] = &[];
             let mut opened_input = input.open(dummy_stdin, None).unwrap();
 
-            self.assets
-                .get_syntax(None, &mut opened_input, &self.syntax_mapping)
-                .unwrap_or_else(|_| self.assets.syntax_set.find_syntax_plain_text())
-                .name
-                .clone()
+            self.get_syntax_name(None, &mut opened_input, &self.syntax_mapping)
         }
 
         fn syntax_for_file_with_content_os(&self, file_name: &OsStr, first_line: &str) -> String {
@@ -345,11 +510,7 @@ mod tests {
             let dummy_stdin: &[u8] = &[];
             let mut opened_input = input.open(dummy_stdin, None).unwrap();
 
-            self.assets
-                .get_syntax(None, &mut opened_input, &self.syntax_mapping)
-                .unwrap_or_else(|_| self.assets.syntax_set.find_syntax_plain_text())
-                .name
-                .clone()
+            self.get_syntax_name(None, &mut opened_input, &self.syntax_mapping)
         }
 
         #[cfg(unix)]
@@ -369,11 +530,7 @@ mod tests {
             let input = Input::stdin().with_name(Some(file_name));
             let mut opened_input = input.open(content, None).unwrap();
 
-            self.assets
-                .get_syntax(None, &mut opened_input, &self.syntax_mapping)
-                .unwrap_or_else(|_| self.assets.syntax_set.find_syntax_plain_text())
-                .name
-                .clone()
+            self.get_syntax_name(None, &mut opened_input, &self.syntax_mapping)
         }
 
         fn syntax_is_same_for_inputkinds(&self, file_name: &str, content: &str) -> bool {
@@ -527,10 +684,7 @@ mod tests {
         let mut opened_input = input.open(dummy_stdin, None).unwrap();
 
         assert_eq!(
-            test.assets
-                .get_syntax(None, &mut opened_input, &test.syntax_mapping)
-                .unwrap_or_else(|_| test.assets.syntax_set.find_syntax_plain_text())
-                .name,
+            test.get_syntax_name(None, &mut opened_input, &test.syntax_mapping),
             "SSH Config"
         );
     }

src/assets_metadata.rs

@@ -16,6 +16,7 @@ pub struct AssetsMetadata {
 const FILENAME: &str = "metadata.yaml";
 
 impl AssetsMetadata {
+    #[cfg(feature = "build-assets")]
     pub(crate) fn new(current_version: &str) -> AssetsMetadata {
         AssetsMetadata {
             bat_version: Some(current_version.to_owned()),
@@ -23,6 +24,7 @@ impl AssetsMetadata {
         }
     }
 
+    #[cfg(feature = "build-assets")]
     pub(crate) fn save_to_folder(&self, path: &Path) -> Result<()> {
         let file = File::create(path.join(FILENAME))?;
         serde_yaml::to_writer(file, self)?;

src/bin/bat/app.rs

@@ -158,7 +158,7 @@ impl App {
                             WrappingMode::Character
                         }
                     }
-                    _ => unreachable!("other values for --paging are not allowed"),
+                    _ => unreachable!("other values for --wrap are not allowed"),
                 }
             } else {
                 // We don't have the tty width when piping to another program.
@@ -234,6 +234,7 @@ impl App {
                 .map(LineRanges::from)
                 .map(HighlightedLineRanges)
                 .unwrap_or_default(),
+            use_custom_assets: !self.matches.is_present("no-custom-assets"),
         })
     }
 
@@ -300,7 +301,7 @@ impl App {
                     .map(|style_str| {
                         style_str
                             .split(',')
-                            .map(|x| StyleComponent::from_str(&x))
+                            .map(|x| StyleComponent::from_str(x))
                             .collect::<Result<Vec<StyleComponent>>>()
                     })
                     .transpose()?;

src/bin/bat/assets.rs

@@ -18,26 +18,14 @@ pub fn cache_dir() -> Cow<'static, str> {
 }
 
 pub fn clear_assets() {
-    let theme_set_path = PROJECT_DIRS.cache_dir().join("themes.bin");
-    let syntax_set_path = PROJECT_DIRS.cache_dir().join("syntaxes.bin");
-    let metadata_file = PROJECT_DIRS.cache_dir().join("metadata.yaml");
-
-    print!("Clearing theme set cache ... ");
-    fs::remove_file(theme_set_path).ok();
-    println!("okay");
-
-    print!("Clearing syntax set cache ... ");
-    fs::remove_file(syntax_set_path).ok();
-    println!("okay");
-
-    print!("Clearing metadata file ... ");
-    fs::remove_file(metadata_file).ok();
-    println!("okay");
+    clear_asset("themes.bin", "theme set cache");
+    clear_asset("syntaxes.bin", "syntax set cache");
+    clear_asset("metadata.yaml", "metadata file");
 }
 
-pub fn assets_from_cache_or_binary() -> Result<HighlightingAssets> {
+pub fn assets_from_cache_or_binary(use_custom_assets: bool) -> Result<HighlightingAssets> {
     let cache_dir = PROJECT_DIRS.cache_dir();
-    if let Some(metadata) = AssetsMetadata::load_from_folder(&cache_dir)? {
+    if let Some(metadata) = AssetsMetadata::load_from_folder(cache_dir)? {
         if !metadata.is_compatible_with(crate_version!()) {
             return Err(format!(
                 "The binary caches for the user-customized syntaxes and themes \
@@ -53,6 +41,16 @@ pub fn assets_from_cache_or_binary() -> Result<HighlightingAssets> {
         }
     }
 
-    Ok(HighlightingAssets::from_cache(&cache_dir)
-        .unwrap_or_else(|_| HighlightingAssets::from_binary()))
+    let custom_assets = if use_custom_assets {
+        HighlightingAssets::from_cache(cache_dir).ok()
+    } else {
+        None
+    };
+    Ok(custom_assets.unwrap_or_else(HighlightingAssets::from_binary))
+}
+
+fn clear_asset(filename: &str, description: &str) {
+    print!("Clearing {} ... ", description);
+    fs::remove_file(PROJECT_DIRS.cache_dir().join(filename)).ok();
+    println!("okay");
 }

src/bin/bat/clap_app.rs

@@ -294,6 +294,7 @@ pub fn build_app(interactive_output: bool) -> ClapApp<'static, 'static> {
         .arg(
             Arg::with_name("no-paging")
                 .short("P")
+                .long("no-paging")
                 .alias("no-pager")
                 .overrides_with("no-paging")
                 .hidden(true)
@@ -394,8 +395,8 @@ pub fn build_app(interactive_output: bool) -> ClapApp<'static, 'static> {
                      '--style=\"..\"' option to the configuration file or export the \
                      BAT_STYLE environment variable (e.g.: export BAT_STYLE=\"..\").\n\n\
                      Possible values:\n\n  \
-                     * full: enables all available components.\n  \
-                     * auto: same as 'full', unless the output is piped (default).\n  \
+                     * full: enables all available components (default).\n  \
+                     * auto: same as 'full', unless the output is piped.\n  \
                      * plain: disables all available components.\n  \
                      * changes: show Git modification markers.\n  \
                      * header: show filenames before the content.\n  \
@@ -450,6 +451,12 @@ pub fn build_app(interactive_output: bool) -> ClapApp<'static, 'static> {
                 .hidden(true)
                 .help("Do not use the configuration file"),
         )
+        .arg(
+            Arg::with_name("no-custom-assets")
+                .long("no-custom-assets")
+                .hidden(true)
+                .help("Do not load custom assets"),
+        )
         .arg(
             Arg::with_name("config-file")
                 .long("config-file")

src/bin/bat/directories.rs

@@ -4,8 +4,9 @@ use std::path::{Path, PathBuf};
 use lazy_static::lazy_static;
 
 /// Wrapper for 'dirs' that treats MacOS more like Linux, by following the XDG specification.
-/// This means that the `XDG_CACHE_HOME` and `XDG_CONFIG_HOME` environment variables are
-/// checked first. The fallback directories are `~/.cache/bat` and `~/.config/bat`, respectively.
+/// The `XDG_CACHE_HOME` environment variable is checked first. `BAT_CONFIG_DIR`
+///  is then checked before the `XDG_CONFIG_HOME` environment variable.
+///  The fallback directories are `~/.cache/bat` and `~/.config/bat`, respectively.
 pub struct BatProjectDirs {
     cache_dir: PathBuf,
     config_dir: PathBuf,
@@ -15,16 +16,23 @@ impl BatProjectDirs {
     fn new() -> Option<BatProjectDirs> {
         let cache_dir = BatProjectDirs::get_cache_dir()?;
 
-        #[cfg(target_os = "macos")]
-        let config_dir_op = env::var_os("XDG_CONFIG_HOME")
-            .map(PathBuf::from)
-            .filter(|p| p.is_absolute())
-            .or_else(|| dirs_next::home_dir().map(|d| d.join(".config")));
+        // Checks whether or not $BAT_CONFIG_DIR exists. If it doesn't, set our config dir
+        // to our system's default configuration home.
+        let config_dir =
+            if let Some(config_dir_op) = env::var_os("BAT_CONFIG_DIR").map(PathBuf::from) {
+                config_dir_op
+            } else {
+                #[cfg(target_os = "macos")]
+                let config_dir_op = env::var_os("XDG_CONFIG_HOME")
+                    .map(PathBuf::from)
+                    .filter(|p| p.is_absolute())
+                    .or_else(|| dirs_next::home_dir().map(|d| d.join(".config")));
 
-        #[cfg(not(target_os = "macos"))]
-        let config_dir_op = dirs_next::config_dir();
+                #[cfg(not(target_os = "macos"))]
+                let config_dir_op = dirs_next::config_dir();
 
-        let config_dir = config_dir_op.map(|d| d.join("bat"))?;
+                config_dir_op.map(|d| d.join("bat"))?
+            };
 
         Some(BatProjectDirs {
             cache_dir,

src/bin/bat/main.rs

@@ -23,12 +23,10 @@ use crate::{
 };
 
 use assets::{assets_from_cache_or_binary, cache_dir, clear_assets, config_dir};
-use clap::crate_version;
 use directories::PROJECT_DIRS;
 use globset::GlobMatcher;
 
 use bat::{
-    assets::HighlightingAssets,
     config::Config,
     controller::Controller,
     error::*,
@@ -39,21 +37,29 @@ use bat::{
 
 const THEME_PREVIEW_DATA: &[u8] = include_bytes!("../../../assets/theme_preview.rs");
 
+#[cfg(feature = "build-assets")]
+fn build_assets(matches: &clap::ArgMatches) -> Result<()> {
+    let source_dir = matches
+        .value_of("source")
+        .map(Path::new)
+        .unwrap_or_else(|| PROJECT_DIRS.config_dir());
+    let target_dir = matches
+        .value_of("target")
+        .map(Path::new)
+        .unwrap_or_else(|| PROJECT_DIRS.cache_dir());
+
+    let blank = matches.is_present("blank");
+
+    let assets = bat::assets::HighlightingAssets::from_files(source_dir, !blank)?;
+    assets.save_to_cache(target_dir, clap::crate_version!())
+}
+
 fn run_cache_subcommand(matches: &clap::ArgMatches) -> Result<()> {
     if matches.is_present("build") {
-        let source_dir = matches
-            .value_of("source")
-            .map(Path::new)
-            .unwrap_or_else(|| PROJECT_DIRS.config_dir());
-        let target_dir = matches
-            .value_of("target")
-            .map(Path::new)
-            .unwrap_or_else(|| PROJECT_DIRS.cache_dir());
-
-        let blank = matches.is_present("blank");
-
-        let assets = HighlightingAssets::from_files(source_dir, !blank)?;
-        assets.save_to_cache(target_dir, crate_version!())?;
+        #[cfg(feature = "build-assets")]
+        build_assets(matches)?;
+        #[cfg(not(feature = "build-assets"))]
+        println!("bat has been built without the 'build-assets' feature. The 'cache --build' option is not available.");
     } else if matches.is_present("clear") {
         clear_assets();
     }
@@ -80,9 +86,9 @@ fn get_syntax_mapping_to_paths<'a>(
 pub fn get_languages(config: &Config) -> Result<String> {
     let mut result: String = String::new();
 
-    let assets = assets_from_cache_or_binary()?;
+    let assets = assets_from_cache_or_binary(config.use_custom_assets)?;
     let mut languages = assets
-        .syntaxes()
+        .get_syntaxes()?
         .iter()
         .filter(|syntax| !syntax.hidden && !syntax.file_extensions.is_empty())
         .cloned()
@@ -101,8 +107,11 @@ pub fn get_languages(config: &Config) -> Result<String> {
                 true
             } else {
                 let test_file = Path::new("test").with_extension(extension);
-                match assets.syntax_for_file_name(test_file, &config.syntax_mapping) {
-                    Some(syntax) => syntax.name == lang_name,
+                let syntax_in_set = assets
+                    .get_syntax_for_file_name(test_file, &config.syntax_mapping)
+                    .unwrap(); // safe since .get_syntaxes() above worked
+                match syntax_in_set {
+                    Some(syntax_in_set) => syntax_in_set.syntax.name == lang_name,
                     None => false,
                 }
             }
@@ -175,7 +184,7 @@ fn theme_preview_file<'a>() -> Input<'a> {
 }
 
 pub fn list_themes(cfg: &Config) -> Result<()> {
-    let assets = assets_from_cache_or_binary()?;
+    let assets = assets_from_cache_or_binary(cfg.use_custom_assets)?;
     let mut config = cfg.clone();
     let mut style = HashSet::new();
     style.insert(StyleComponent::Plain);
@@ -216,47 +225,64 @@ pub fn list_themes(cfg: &Config) -> Result<()> {
 }
 
 fn run_controller(inputs: Vec<Input>, config: &Config) -> Result<bool> {
-    let assets = assets_from_cache_or_binary()?;
-    let controller = Controller::new(&config, &assets);
+    let assets = assets_from_cache_or_binary(config.use_custom_assets)?;
+    let controller = Controller::new(config, &assets);
     controller.run(inputs)
 }
 
+#[cfg(feature = "bugreport")]
+fn invoke_bugreport(app: &App) {
+    use bugreport::{bugreport, collector::*, format::Markdown};
+    let pager = bat::config::get_pager_executable(app.matches.value_of("pager"))
+        .unwrap_or_else(|| "less".to_owned()); // FIXME: Avoid non-canonical path to "less".
+
+    let report = bugreport!()
+        .info(SoftwareVersion::default())
+        .info(OperatingSystem::default())
+        .info(CommandLine::default())
+        .info(EnvironmentVariables::list(&[
+            "SHELL",
+            "PAGER",
+            "LESS",
+            "BAT_PAGER",
+            "BAT_CACHE_PATH",
+            "BAT_CONFIG_PATH",
+            "BAT_OPTS",
+            "BAT_STYLE",
+            "BAT_TABS",
+            "BAT_THEME",
+            "XDG_CONFIG_HOME",
+            "XDG_CACHE_HOME",
+            "COLORTERM",
+            "NO_COLOR",
+            "MANPAGER",
+        ]))
+        .info(FileContent::new("Config file", config_file()))
+        .info(CompileTimeInformation::default());
+
+    let mut report = if let Ok(resolved_path) = grep_cli::resolve_binary(pager) {
+        report.info(CommandOutput::new(
+            "Less version",
+            resolved_path,
+            &["--version"],
+        ))
+    } else {
+        report
+    };
+
+    report.print::<Markdown>();
+}
+
 /// Returns `Err(..)` upon fatal errors. Otherwise, returns `Ok(true)` on full success and
 /// `Ok(false)` if any intermediate errors occurred (were printed).
 fn run() -> Result<bool> {
     let app = App::new()?;
 
     if app.matches.is_present("diagnostic") {
-        use bugreport::{bugreport, collector::*, format::Markdown};
-        let pager = bat::config::get_pager_executable(app.matches.value_of("pager"))
-            .unwrap_or_else(|| "less".to_owned()); // FIXME: Avoid non-canonical path to "less".
-
-        bugreport!()
-            .info(SoftwareVersion::default())
-            .info(OperatingSystem::default())
-            .info(CommandLine::default())
-            .info(EnvironmentVariables::list(&[
-                "SHELL",
-                "PAGER",
-                "LESS",
-                "BAT_PAGER",
-                "BAT_CACHE_PATH",
-                "BAT_CONFIG_PATH",
-                "BAT_OPTS",
-                "BAT_STYLE",
-                "BAT_TABS",
-                "BAT_THEME",
-                "XDG_CONFIG_HOME",
-                "XDG_CACHE_HOME",
-                "COLORTERM",
-                "NO_COLOR",
-                "MANPAGER",
-            ]))
-            .info(FileContent::new("Config file", config_file()))
-            .info(CompileTimeInformation::default())
-            .info(CommandOutput::new("Less version", pager, &["--version"]))
-            .print::<Markdown>();
-
+        #[cfg(feature = "bugreport")]
+        invoke_bugreport(&app);
+        #[cfg(not(feature = "bugreport"))]
+        println!("bat has been built without the 'bugreport' feature. The '--diagnostic' option is not available.");
         return Ok(true);
     }
 

src/config.rs

@@ -82,9 +82,13 @@ pub struct Config<'a> {
 
     /// Ranges of lines which should be highlighted with a special background color
     pub highlighted_lines: HighlightedLineRanges,
+
+    /// Whether or not to allow custom assets. If this is false or if custom assets (a.k.a.
+    /// cached assets) are not available, assets from the binary will be used instead.
+    pub use_custom_assets: bool,
 }
 
-#[cfg(all(feature = "application", feature = "paging"))]
+#[cfg(all(feature = "minimal-application", feature = "paging"))]
 pub fn get_pager_executable(config_pager: Option<&str>) -> Option<String> {
     if let Ok(Some(pager)) = crate::pager::get_pager(config_pager) {
         Some(pager.bin)

src/controller.rs

@@ -45,7 +45,7 @@ impl<'b> Controller<'b> {
             // Do not launch the pager if NONE of the input files exist
             let mut paging_mode = self.config.paging_mode;
             if self.config.paging_mode != PagingMode::Never {
-                let call_pager = inputs.iter().any(|ref input| {
+                let call_pager = inputs.iter().any(|input| {
                     if let InputKind::OrdinaryFile(ref path) = input.kind {
                         Path::new(path).exists()
                     } else {
@@ -124,11 +124,11 @@ impl<'b> Controller<'b> {
                     };
 
                     let mut printer: Box<dyn Printer> = if self.config.loop_through {
-                        Box::new(SimplePrinter::new(&self.config))
+                        Box::new(SimplePrinter::new(self.config))
                     } else {
                         Box::new(InteractivePrinter::new(
-                            &self.config,
-                            &self.assets,
+                            self.config,
+                            self.assets,
                             &mut opened_input,
                             #[cfg(feature = "git")]
                             &line_changes,

src/error.rs

@@ -3,7 +3,7 @@ use std::io::Write;
 
 error_chain! {
     foreign_links {
-        Clap(::clap::Error) #[cfg(feature = "application")];
+        Clap(::clap::Error) #[cfg(feature = "minimal-application")];
         Io(::std::io::Error);
         SyntectError(::syntect::LoadingError);
         ParseIntError(::std::num::ParseIntError);

src/input.rs

@@ -51,7 +51,7 @@ impl InputDescription {
 
     pub fn title(&self) -> &String {
         match self.title.as_ref() {
-            Some(ref title) => title,
+            Some(title) => title,
             None => &self.name,
         }
     }
@@ -211,7 +211,7 @@ impl<'a> Input<'a> {
                             )
                             .into());
                         }
-                        file = input_identifier.into_inner().expect("The file was lost in the clircle::Identifier, this should not have happended...");
+                        file = input_identifier.into_inner().expect("The file was lost in the clircle::Identifier, this should not have happened...");
                     }
 
                     InputReader::new(BufReader::new(file))
@@ -282,21 +282,21 @@ fn basic() {
 
     let res = reader.read_line(&mut buffer);
     assert!(res.is_ok());
-    assert_eq!(true, res.unwrap());
+    assert!(res.unwrap());
     assert_eq!(b"#!/bin/bash\n", &buffer[..]);
 
     buffer.clear();
 
     let res = reader.read_line(&mut buffer);
     assert!(res.is_ok());
-    assert_eq!(true, res.unwrap());
+    assert!(res.unwrap());
     assert_eq!(b"echo hello", &buffer[..]);
 
     buffer.clear();
 
     let res = reader.read_line(&mut buffer);
     assert!(res.is_ok());
-    assert_eq!(false, res.unwrap());
+    assert!(!res.unwrap());
     assert!(buffer.is_empty());
 }
 
@@ -311,20 +311,20 @@ fn utf16le() {
 
     let res = reader.read_line(&mut buffer);
     assert!(res.is_ok());
-    assert_eq!(true, res.unwrap());
+    assert!(res.unwrap());
     assert_eq!(b"\xFF\xFE\x73\x00\x0A\x00", &buffer[..]);
 
     buffer.clear();
 
     let res = reader.read_line(&mut buffer);
     assert!(res.is_ok());
-    assert_eq!(true, res.unwrap());
+    assert!(res.unwrap());
     assert_eq!(b"\x64\x00", &buffer[..]);
 
     buffer.clear();
 
     let res = reader.read_line(&mut buffer);
     assert!(res.is_ok());
-    assert_eq!(false, res.unwrap());
+    assert!(!res.unwrap());
     assert!(buffer.is_empty());
 }

src/less.rs

@@ -4,7 +4,9 @@ use std::ffi::OsStr;
 use std::process::Command;
 
 pub fn retrieve_less_version(less_path: &dyn AsRef<OsStr>) -> Option<usize> {
-    let cmd = Command::new(less_path).arg("--version").output().ok()?;
+    let resolved_path = grep_cli::resolve_binary(less_path.as_ref()).ok()?;
+
+    let cmd = Command::new(resolved_path).arg("--version").output().ok()?;
     parse_less_version(&cmd.stdout)
 }
 

src/lib.rs

@@ -40,6 +40,8 @@ mod preprocessor;
 mod pretty_printer;
 pub(crate) mod printer;
 pub mod style;
+#[cfg(feature = "build-assets")]
+mod syntax_dependencies;
 pub(crate) mod syntax_mapping;
 mod terminal;
 pub(crate) mod wrapping;

src/output.rs

@@ -63,7 +63,14 @@ impl OutputType {
             return Err(ErrorKind::InvalidPagerValueBat.into());
         }
 
-        let mut p = Command::new(&pager.bin);
+        let resolved_path = match grep_cli::resolve_binary(&pager.bin) {
+            Ok(path) => path,
+            Err(_) => {
+                return Ok(OutputType::stdout());
+            }
+        };
+
+        let mut p = Command::new(resolved_path);
         let args = pager.args;
 
         if pager.kind == PagerKind::Less {

src/pager.rs

@@ -98,17 +98,17 @@ pub(crate) fn get_pager(config_pager: Option<&str>) -> Result<Option<Pager>, Par
         Some((bin, args)) => {
             let kind = PagerKind::from_bin(bin);
 
-            let use_less_instead = match (&source, &kind) {
-                // 'more' and 'most' do not supports colors; automatically use 'less' instead
-                // if the problematic pager came from the generic PAGER env var
-                (PagerSource::EnvVarPager, PagerKind::More) => true,
-                (PagerSource::EnvVarPager, PagerKind::Most) => true,
-
-                // If PAGER=bat, silently use 'less' instead to prevent recursion ...
-                (PagerSource::EnvVarPager, PagerKind::Bat) => true,
-
-                // Never silently use less if BAT_PAGER or --pager has been specified
-                _ => false,
+            let use_less_instead = if source == PagerSource::EnvVarPager {
+                // 'more' and 'most' do not supports colors; automatically use
+                // 'less' instead if the problematic pager came from the
+                // generic PAGER env var.
+                // If PAGER=bat, silently use 'less' instead to prevent
+                // recursion.
+                // Never silently use 'less' if BAT_PAGER or --pager has been
+                // specified.
+                matches!(kind, PagerKind::More | PagerKind::Most | PagerKind::Bat)
+            } else {
+                false
             };
 
             Ok(Some(if use_less_instead {

src/pretty_printer.rs

@@ -40,10 +40,11 @@ pub struct PrettyPrinter<'a> {
 
 impl<'a> PrettyPrinter<'a> {
     pub fn new() -> Self {
-        let mut config = Config::default();
-
-        config.colored_output = true;
-        config.true_color = true;
+        let config = Config {
+            colored_output: true,
+            true_color: true,
+            ..Default::default()
+        };
 
         PrettyPrinter {
             inputs: vec![],
@@ -234,7 +235,9 @@ impl<'a> PrettyPrinter<'a> {
     }
 
     pub fn syntaxes(&self) -> impl Iterator<Item = &SyntaxReference> {
-        self.assets.syntaxes().iter()
+        // We always use assets from the binary, which are guaranteed to always
+        // be valid, so get_syntaxes() can never fail here
+        self.assets.get_syntaxes().unwrap().iter()
     }
 
     /// Pretty-print all specified inputs. This method will "use" all stored inputs.
@@ -327,7 +330,7 @@ impl<'a> Input<'a> {
         self
     }
 
-    /// The title for the input (e.g. "http://example.com/example.txt")
+    /// The title for the input (e.g. "Descriptive title")
     /// This defaults to the file name.
     pub fn title(mut self, title: impl Into<String>) -> Self {
         self.input.description_mut().set_title(Some(title.into()));
@@ -335,14 +338,14 @@ impl<'a> Input<'a> {
     }
 }
 
-impl<'a> Into<Input<'a>> for input::Input<'a> {
-    fn into(self) -> Input<'a> {
-        Input { input: self }
+impl<'a> From<input::Input<'a>> for Input<'a> {
+    fn from(input: input::Input<'a>) -> Self {
+        Self { input }
     }
 }
 
-impl<'a> Into<input::Input<'a>> for Input<'a> {
-    fn into(self) -> input::Input<'a> {
-        self.input
+impl<'a> From<Input<'a>> for input::Input<'a> {
+    fn from(Input { input }: Input<'a>) -> Self {
+        input
     }
 }

src/printer.rs

@@ -18,7 +18,7 @@ use encoding::{DecoderTrap, Encoding};
 
 use unicode_width::UnicodeWidthChar;
 
-use crate::assets::HighlightingAssets;
+use crate::assets::{HighlightingAssets, SyntaxReferenceInSet};
 use crate::config::Config;
 #[cfg(feature = "git")]
 use crate::decorations::LineChangesDecoration;
@@ -163,23 +163,29 @@ impl<'a> InteractivePrinter<'a> {
             panel_width = 0;
         }
 
-        let highlighter = if input
+        let (highlighter, syntax_set) = if input
             .reader
             .content_type
             .map_or(false, |c| c.is_binary() && !config.show_nonprintable)
         {
-            None
+            (None, assets.get_syntax_set()?)
         } else {
             // Determine the type of syntax for highlighting
-            let syntax = match assets.get_syntax(config.language, input, &config.syntax_mapping) {
-                Ok(syntax) => syntax,
-                Err(Error(ErrorKind::UndetectedSyntax(_), _)) => {
-                    assets.syntax_set.find_syntax_plain_text()
-                }
-                Err(e) => return Err(e),
-            };
+            let syntax_in_set =
+                match assets.get_syntax(config.language, input, &config.syntax_mapping) {
+                    Ok(syntax_in_set) => syntax_in_set,
+                    Err(Error(ErrorKind::UndetectedSyntax(_), _)) => {
+                        let syntax_set = assets.get_syntax_set()?;
+                        let syntax = syntax_set.find_syntax_plain_text();
+                        SyntaxReferenceInSet { syntax, syntax_set }
+                    }
+                    Err(e) => return Err(e),
+                };
 
-            Some(HighlightLines::new(syntax, theme))
+            (
+                Some(HighlightLines::new(syntax_in_set.syntax, theme)),
+                syntax_in_set.syntax_set,
+            )
         };
 
         Ok(InteractivePrinter {
@@ -192,7 +198,7 @@ impl<'a> InteractivePrinter<'a> {
             #[cfg(feature = "git")]
             line_changes,
             highlighter,
-            syntax_set: &assets.syntax_set,
+            syntax_set,
             background_color_highlight,
         })
     }
@@ -366,19 +372,19 @@ impl<'a> Printer for InteractivePrinter<'a> {
         line_buffer: &[u8],
     ) -> Result<()> {
         let line = if self.config.show_nonprintable {
-            replace_nonprintable(&line_buffer, self.config.tab_width)
+            replace_nonprintable(line_buffer, self.config.tab_width)
         } else {
             match self.content_type {
                 Some(ContentType::BINARY) | None => {
                     return Ok(());
                 }
                 Some(ContentType::UTF_16LE) => UTF_16LE
-                    .decode(&line_buffer, DecoderTrap::Replace)
+                    .decode(line_buffer, DecoderTrap::Replace)
                     .map_err(|_| "Invalid UTF-16LE")?,
                 Some(ContentType::UTF_16BE) => UTF_16BE
-                    .decode(&line_buffer, DecoderTrap::Replace)
+                    .decode(line_buffer, DecoderTrap::Replace)
                     .map_err(|_| "Invalid UTF-16BE")?,
-                _ => String::from_utf8_lossy(&line_buffer).to_string(),
+                _ => String::from_utf8_lossy(line_buffer).to_string(),
             }
         };
 
@@ -414,7 +420,7 @@ impl<'a> Printer for InteractivePrinter<'a> {
             let decorations = self
                 .decorations
                 .iter()
-                .map(|ref d| d.generate(line_number, false, self))
+                .map(|d| d.generate(line_number, false, self))
                 .collect::<Vec<_>>();
 
             for deco in decorations {
@@ -447,8 +453,10 @@ impl<'a> Printer for InteractivePrinter<'a> {
 
                 if text.len() != text_trimmed.len() {
                     if let Some(background_color) = background_color {
-                        let mut ansi_style = Style::default();
-                        ansi_style.background = to_ansi_color(background_color, true_color);
+                        let ansi_style = Style {
+                            background: to_ansi_color(background_color, true_color),
+                            ..Default::default()
+                        };
                         let width = if cursor_total <= cursor_max {
                             cursor_max - cursor_total + 1
                         } else {
@@ -523,7 +531,7 @@ impl<'a> Printer for InteractivePrinter<'a> {
                                                 "{} ",
                                                 self.decorations
                                                     .iter()
-                                                    .map(|ref d| d
+                                                    .map(|d| d
                                                         .generate(line_number, true, self)
                                                         .text)
                                                     .collect::<Vec<String>>()
@@ -588,8 +596,10 @@ impl<'a> Printer for InteractivePrinter<'a> {
             }
 
             if let Some(background_color) = background_color {
-                let mut ansi_style = Style::default();
-                ansi_style.background = to_ansi_color(background_color, self.config.true_color);
+                let ansi_style = Style {
+                    background: to_ansi_color(background_color, self.config.true_color),
+                    ..Default::default()
+                };
 
                 write!(
                     handle,

src/syntax_dependencies.rs

@@ -0,0 +1,184 @@
+use std::collections::HashMap;
+use syntect::parsing::syntax_definition::{
+    ContextReference, MatchOperation, MatchPattern, Pattern, SyntaxDefinition,
+};
+use syntect::parsing::{Scope, SyntaxSet, SyntaxSetBuilder};
+
+type SyntaxName = String;
+
+/// Used to look up what dependencies a given [SyntaxDefinition] has
+type SyntaxToDependencies = HashMap<SyntaxName, Vec<Dependency>>;
+
+/// Used to look up which [SyntaxDefinition] corresponds to a given [Dependency]
+type DependencyToSyntax<'a> = HashMap<Dependency, &'a SyntaxDefinition>;
+
+/// Represents a dependency on an external `.sublime-syntax` file.
+#[derive(Debug, Eq, PartialEq, Clone, Hash)]
+enum Dependency {
+    /// By name. Example YAML: `include: C.sublime-syntax`
+    ByName(String),
+
+    /// By scope. Example YAML: `embed: scope:source.c`
+    ByScope(Scope),
+}
+
+/// Generates independent [SyntaxSet]s after analyzing dependencies between syntaxes
+/// in a [SyntaxSetBuilder], and then prints the reults.
+pub(crate) fn print_syntax_dependencies(syntax_set_builder: &SyntaxSetBuilder) {
+    println!("Constructing independent SyntaxSets...");
+    let independent_syntax_sets = build_independent_syntax_sets(syntax_set_builder);
+
+    println!("Independent SyntaxSets:");
+    for syntax_set in independent_syntax_sets {
+        let names = syntax_set
+            .syntaxes()
+            .iter()
+            .map(|syntax| &syntax.name)
+            .collect::<Vec<_>>();
+        println!("{:?}", names);
+    }
+}
+
+/// Analyzes dependencies between syntaxes in a [SyntaxSetBuilder].
+/// From that, it builds independent [SyntaxSet]s.
+fn build_independent_syntax_sets(
+    syntax_set_builder: &'_ SyntaxSetBuilder,
+) -> impl Iterator<Item = SyntaxSet> + '_ {
+    let syntaxes = syntax_set_builder.syntaxes();
+
+    // Build the data structures we need for dependency resolution
+    let (syntax_to_dependencies, dependency_to_syntax) = generate_maps(syntaxes);
+
+    // Create one independent SyntaxSet from each (non-hidden) SyntaxDefinition
+    syntaxes.iter().filter_map(move |syntax| {
+        if syntax.hidden {
+            return None;
+        }
+
+        let mut builder = SyntaxSetDependencyBuilder::new();
+        builder.add_with_dependencies(syntax, &syntax_to_dependencies, &dependency_to_syntax);
+        Some(builder.build())
+    })
+}
+
+/// In order to analyze dependencies, we need two key pieces of data.
+/// First, when we have a [Dependency], we need to know what [SyntaxDefinition] that
+/// corresponds to. Second, when we have a [SyntaxDefinition], we need to know
+/// what dependencies it has. This functions generates that data for each syntax.
+fn generate_maps(syntaxes: &[SyntaxDefinition]) -> (SyntaxToDependencies, DependencyToSyntax) {
+    let mut syntax_to_dependencies = HashMap::new();
+    let mut dependency_to_syntax = HashMap::new();
+
+    for syntax in syntaxes {
+        syntax_to_dependencies.insert(syntax.name.clone(), dependencies_for_syntax(syntax));
+
+        dependency_to_syntax.insert(Dependency::ByName(syntax.name.clone()), syntax);
+        dependency_to_syntax.insert(Dependency::ByScope(syntax.scope), syntax);
+    }
+
+    (syntax_to_dependencies, dependency_to_syntax)
+}
+
+/// Gets what external dependencies a given [SyntaxDefinition] has.
+/// An external dependency is another `.sublime-syntax` file.
+/// It does that by looking for variants of the following YAML patterns:
+/// - `include: C.sublime-syntax`
+/// - `embed: scope:source.c`
+fn dependencies_for_syntax(syntax: &SyntaxDefinition) -> Vec<Dependency> {
+    let mut dependencies: Vec<Dependency> = syntax
+        .contexts
+        .values()
+        .flat_map(|context| &context.patterns)
+        .flat_map(dependencies_from_pattern)
+        .collect();
+
+    // No need to track a dependency more than once
+    dependencies.dedup();
+
+    dependencies
+}
+
+fn dependencies_from_pattern(pattern: &Pattern) -> Vec<Dependency> {
+    match *pattern {
+        Pattern::Match(MatchPattern {
+            operation: MatchOperation::Push(ref context_references),
+            ..
+        }) => context_references
+            .iter()
+            .map(dependency_from_context_reference)
+            .collect(),
+        Pattern::Include(ref context_reference) => {
+            vec![dependency_from_context_reference(context_reference)]
+        }
+        _ => vec![],
+    }
+    .into_iter()
+    .flatten()
+    .collect()
+}
+
+fn dependency_from_context_reference(context_reference: &ContextReference) -> Option<Dependency> {
+    match &context_reference {
+        ContextReference::File { ref name, .. } => Some(Dependency::ByName(name.clone())),
+        ContextReference::ByScope { ref scope, .. } => Some(Dependency::ByScope(*scope)),
+        _ => None,
+    }
+}
+
+/// Helper to construct a [SyntaxSetBuilder] that contains only [SyntaxDefinition]s
+/// that have dependencies among them.
+struct SyntaxSetDependencyBuilder {
+    syntax_set_builder: SyntaxSetBuilder,
+}
+
+impl SyntaxSetDependencyBuilder {
+    fn new() -> Self {
+        SyntaxSetDependencyBuilder {
+            syntax_set_builder: SyntaxSetBuilder::new(),
+        }
+    }
+
+    /// Add a [SyntaxDefinition] to the underlying [SyntaxSetBuilder].
+    /// Also resolve any dependencies it has and add those [SyntaxDefinition]s too.
+    /// This is a recursive process.
+    fn add_with_dependencies(
+        &mut self,
+        syntax: &SyntaxDefinition,
+        syntax_to_dependencies: &SyntaxToDependencies,
+        dependency_to_syntax: &DependencyToSyntax,
+    ) {
+        let name = &syntax.name;
+        if self.is_syntax_already_added(name) {
+            return;
+        }
+
+        self.syntax_set_builder.add(syntax.clone());
+
+        let dependencies = syntax_to_dependencies.get(name);
+        if dependencies.is_none() {
+            eprintln!("ERROR: Unknown dependencies for {}", name);
+            return;
+        }
+
+        for dependency in dependencies.unwrap() {
+            if let Some(syntax_definition_dependency) = dependency_to_syntax.get(dependency) {
+                self.add_with_dependencies(
+                    syntax_definition_dependency,
+                    syntax_to_dependencies,
+                    dependency_to_syntax,
+                )
+            }
+        }
+    }
+
+    fn is_syntax_already_added(&self, name: &str) -> bool {
+        self.syntax_set_builder
+            .syntaxes()
+            .iter()
+            .any(|syntax| syntax.name == name)
+    }
+
+    fn build(self) -> SyntaxSet {
+        self.syntax_set_builder.build()
+    }
+}

tests/.gitattributes

@@ -4,9 +4,9 @@ snapshots/** text=auto eol=lf
 syntax-tests/source/** text=auto eol=lf
 syntax-tests/highlighted/** text=auto eol=lf
 
-examples/* linguist-vendored
-snapshots/* linguist-vendored
-benchmarks/* linguist-vendored
-benchmarks/test-src/* linguist-vendored
-scripts/* linguist-vendored
-syntax-tests/* linguist-vendored
+# Linguist overrides
+benchmarks/** linguist-vendored
+examples/** linguist-vendored
+snapshots/** linguist-vendored
+syntax-tests/highlighted/** linguist-vendored
+syntax-tests/source/** linguist-vendored

tests/benchmarks/run-benchmarks.sh

@@ -3,9 +3,9 @@ cd "$(dirname "${BASH_SOURCE[0]}")" || exit
 
 # Check that Hyperfine is installed.
 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
+	echo "'hyperfine' does not seem to be installed."
+	echo "You can get it here: https://github.com/sharkdp/hyperfine"
+	exit 1
 fi
 
 # Determine the target directories.
@@ -15,7 +15,7 @@ get_target_dir() {
 			| sed 's/^[[:space:]]*target-dir[[:space:]]*=//; s/^[[:space:]]*"//; s/"[[:space:]]*$//' \
 			&& return 0
 	fi
-	
+
 	echo "../../target"
 }
 
@@ -68,5 +68,5 @@ echo "### Time to syntax-highlight large files"
 echo
 
 for SRC in test-src/*; do
-    hyperfine --warmup 3 "$(printf "%q" "$BAT") --style=full --color=always --paging=never $(printf "%q" "$SRC")"
+	hyperfine --warmup 3 "$(printf "%q" "$BAT") --style=full --color=always --paging=never $(printf "%q" "$SRC")"
 done

tests/integration_tests.rs

@@ -40,6 +40,7 @@ fn bat_raw_command_with_config() -> Command {
     cmd.env_remove("BAT_STYLE");
     cmd.env_remove("BAT_THEME");
     cmd.env_remove("BAT_TABS");
+    cmd.env_remove("BAT_CONFIG_DIR");
     cmd
 }
 
@@ -700,6 +701,16 @@ fn pager_failed_to_parse() {
         .stderr(predicate::str::contains("Could not parse pager command"));
 }
 
+#[test]
+fn diagnostic_sanity_check() {
+    bat()
+        .arg("--diagnostic")
+        .assert()
+        .success()
+        .stdout(predicate::str::contains("BAT_PAGER="))
+        .stderr("");
+}
+
 #[test]
 fn config_location_test() {
     bat_with_config()
@@ -737,6 +748,16 @@ fn config_location_when_generating() {
     assert!(tmp_config_path.exists());
 }
 
+#[test]
+fn config_location_from_bat_config_dir_variable() {
+    bat_with_config()
+        .env("BAT_CONFIG_DIR", "conf/")
+        .arg("--config-file")
+        .assert()
+        .success()
+        .stdout(predicate::str::is_match("conf/config\n").unwrap());
+}
+
 #[test]
 fn config_read_arguments_from_file() {
     bat_with_config()
@@ -795,6 +816,17 @@ fn does_not_print_unwanted_file_named_cache() {
     bat_with_config().arg("cach").assert().failure();
 }
 
+#[test]
+fn accepts_no_custom_assets_arg() {
+    // Just make sure --no-custom-assets is considered a valid arg
+    // Don't bother to actually verify that it works
+    bat()
+        .arg("--no-custom-assets")
+        .arg("test.txt")
+        .assert()
+        .success();
+}
+
 #[test]
 fn unicode_wrap() {
     bat_with_config()
@@ -1101,6 +1133,42 @@ fn show_all_mode() {
         .stderr("");
 }
 
+#[test]
+fn no_paging_arg() {
+    bat()
+        .arg("--no-paging")
+        .arg("--color=never")
+        .arg("--decorations=never")
+        .arg("single-line.txt")
+        .assert()
+        .success()
+        .stdout("Single Line");
+}
+
+#[test]
+fn no_paging_short_arg() {
+    bat()
+        .arg("-P")
+        .arg("--color=never")
+        .arg("--decorations=never")
+        .arg("single-line.txt")
+        .assert()
+        .success()
+        .stdout("Single Line");
+}
+
+#[test]
+fn no_pager_arg() {
+    bat()
+        .arg("--no-pager")
+        .arg("--color=never")
+        .arg("--decorations=never")
+        .arg("single-line.txt")
+        .assert()
+        .success()
+        .stdout("Single Line");
+}
+
 #[test]
 fn plain_mode_does_not_add_nonexisting_newline() {
     bat()

tests/no_duplicate_extensions.rs

@@ -26,7 +26,7 @@ fn no_duplicate_extensions() {
 
     let mut extensions = HashSet::new();
 
-    for syntax in assets.syntaxes() {
+    for syntax in assets.get_syntaxes().expect("this is a #[test]") {
         for extension in &syntax.file_extensions {
             assert!(
                 KNOWN_EXCEPTIONS.contains(&extension.as_str()) || extensions.insert(extension),

tests/scripts/find-slow-to-highlight-files.py

@@ -1,7 +1,7 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # This script goes through all languages that are supported by 'bat'. For each
-# language, it loops over the correspoinding file extensions and searches a
+# language, it loops over the corresponding file extensions and searches a
 # given folder for matching files. It calls 'bat' for each of these files and
 # measures the highlighting speed (number of characters per second). The script
 # reports files which lead to slow highlighting speeds or errors during the

tests/syntax-tests/create_highlighted_versions.py

@@ -18,6 +18,7 @@ BAT_OPTIONS = [
 
 SKIP_FILENAMES = [
     "LICENSE.md",
+    "NOTICE",
     "README.md",
     "bat_options",
 ]

tests/syntax-tests/highlighted/Cabal/semantic.cabal

@@ -0,0 +1,247 @@
+cabal-version:       2.4
+
+name:                semantic
+version:             0.11.0.1
+synopsis:            Framework and executable for analyzing and diffing untrusted code.
+description:         Semantic is a library for parsing, analyzing, and comparing source code across many languages.
+homepage:            http://github.com/github/semantic#readme
+bug-reports:         https://github.com/github/semantic/issues
+license:             MIT
+license-file:        LICENSE
+author:              The Semantic authors
+maintainer:          opensource+semantic@github.com
+copyright:           (c) 2015-2020 GitHub, Inc.
+category:            Language
+build-type:          Simple
+stability:           alpha
+extra-source-files:  README.md
+
+tested-with:         GHC == 8.10.1
+
+flag release
+  description: Build with optimizations on (for CI or deployment builds)
+  default:     False
+
+-- GHC extensions shared between targets
+common haskell
+  default-language:    Haskell2010
+  default-extensions:  StrictData
+  ghc-options:
+    -Weverything
+    -Wno-missing-local-signatures
+    -Wno-missing-import-lists
+    -Wno-implicit-prelude
+    -Wno-safe
+    -Wno-unsafe
+    -Wno-name-shadowing
+    -Wno-monomorphism-restriction
+    -Wno-missed-specialisations
+    -Wno-all-missed-specialisations
+    -Wno-star-is-type
+  cpp-options:
+    -DBAZEL_BUILD=0
+  if (impl(ghc >= 8.8))
+    ghc-options: -Wno-missing-deriving-strategies
+  if (impl(ghc >= 8.10))
+    ghc-options:
+      -Wno-missing-safe-haskell-mode
+      -Wno-prepositive-qualified-module
+
+common executable-flags
+  ghc-options:         -threaded -rtsopts "-with-rtsopts=-N -A4m -n2m"
+
+library
+  import:              haskell
+  hs-source-dirs:      src
+  exposed-modules:     Control.Carrier.Parse.Measured
+                     , Control.Carrier.Parse.Simple
+                     -- Effects
+                     , Control.Effect.Parse
+                     , Control.Effect.Sum.Project
+                     , Control.Effect.Timeout
+                     -- General datatype definitions & generic algorithms
+                     , Data.Blob
+                     , Data.Blob.IO
+                     , Data.Duration
+                     , Data.Edit
+                     , Data.Error
+                     , Data.Flag
+                     , Data.Graph.Algebraic
+                     , Data.Handle
+                     , Data.Maybe.Exts
+                     , Data.Semigroup.App
+                     -- Parser glue
+                     , Parsing.Parser
+                     , Parsing.TreeSitter
+                     -- API
+                     , Semantic.Api
+                     , Semantic.Api.Bridge
+                     , Semantic.Api.StackGraph
+                     , Semantic.Api.Symbols
+                     , Semantic.Api.Terms
+                     , Semantic.CLI
+                     , Semantic.Config
+                     , Semantic.Env
+                     , Semantic.IO
+                     , Semantic.Task
+                     , Semantic.Task.Files
+                     , Semantic.Telemetry
+                     , Semantic.Telemetry.AsyncQueue
+                     , Semantic.Telemetry.Error
+                     , Semantic.Telemetry.Log
+                     , Semantic.Telemetry.Stat
+                     , Semantic.Util
+                     , Semantic.Util.Pretty
+                     , Semantic.Version
+                     -- Serialization
+                     , Serializing.Format
+                     , Serializing.SExpression.Precise
+                     -- Custom Prelude
+  autogen-modules:     Paths_semantic
+  other-modules:       Paths_semantic
+  -- Except in case of vendored dependencies, these deps should be expressed
+  -- as caret-operator bounds relative to a version in Stackage.
+  -- These are currently pinned to lts-13.13.
+  build-depends:
+    , aeson ^>= 1.4.2.0
+    , algebraic-graphs ^>= 0.3
+    , ansi-terminal >= 0.8.2 && <1
+    , async ^>= 2.2.1
+    , base >= 4.13 && < 5
+    , bytestring ^>= 0.10.8.2
+    , containers ^>= 0.6.0.1
+    , directory-tree ^>= 0.12.1
+    , filepath ^>= 1.4.2.1
+    , fused-effects ^>= 1.1
+    , ghc-prim >= 0.5 && < 0.7
+    , hostname ^>= 1.0
+    , hscolour ^>= 1.24.4
+    , lens >= 4.17 && < 4.20
+    , network ^>= 2.8.0.0
+    , network-uri ^>= 2.6.1.0
+    , optparse-applicative >= 0.14.3 && < 0.16
+    , pathtype ^>= 0.8.1
+    , pretty-show ^>= 1.9.5
+    , proto-lens >= 0.5 && < 0.8
+    , semantic-analysis ^>= 0
+    , semantic-ast
+    , semantic-codeql ^>= 0
+    , semantic-go ^>= 0
+    , semantic-java ^>= 0
+    , semantic-json ^>= 0
+    , semantic-php ^>= 0
+    , semantic-proto ^>= 0
+    , semantic-python ^>= 0
+    , semantic-ruby ^>= 0
+    , semantic-scope-graph ^>= 0
+    , semantic-source ^>= 0.1.0.1
+    , semantic-tags ^>= 0
+    , semantic-tsx ^>= 0
+    , semantic-typescript ^>= 0
+    , semilattices ^>= 0.0.0.3
+    , split ^>= 0.2.3.3
+    , stm-chans ^>= 3.0.0.4
+    , text ^>= 1.2.3.2
+    , time >= 1.8.0.2 && < 1.10
+    , tree-sitter ^>= 0.9.0.1
+    , tree-sitter-go ^>= 0.5.0.0
+    , tree-sitter-java ^>= 0.7.0.0
+    , tree-sitter-json ^>= 0.7.0.0
+    , tree-sitter-php ^>= 0.5.0.0
+    , tree-sitter-python ^>= 0.9.0.1
+    , tree-sitter-ql ^>= 0.1.0.1
+    , tree-sitter-ruby ^>= 0.5.0.0
+    , tree-sitter-tsx ^>= 0.5.0.0
+    , tree-sitter-typescript ^>= 0.5.0.0
+    , unix ^>= 2.7.2.2
+
+executable semantic
+  import:              haskell, executable-flags
+  hs-source-dirs:      app
+  main-is:             Main.hs
+  build-depends:
+    , base
+    , semantic
+
+test-suite test
+  import:              haskell, executable-flags
+  type:                exitcode-stdio-1.0
+  hs-source-dirs:      test
+  main-is:             Spec.hs
+  other-modules:       Data.Graph.Spec
+                     , Data.Language.Spec
+                     , Data.Semigroup.App.Spec
+                     , Integration.Spec
+                     , Semantic.Spec
+                     , Semantic.CLI.Spec
+                     , Semantic.IO.Spec
+                     , Semantic.Stat.Spec
+                     , Tags.Spec
+                     , SpecHelpers
+                     , Generators
+                     , Properties
+  build-depends:
+    , algebraic-graphs ^>= 0.3
+    , base >= 4.13 && < 5
+    , bytestring ^>= 0.10.8.2
+    , fused-effects
+    , Glob ^>= 0.10.0
+    , hedgehog ^>= 1
+    , hspec >= 2.6 && <3
+    , hspec-expectations ^>= 0.8.2
+    , network ^>= 2.8.0.0
+    , pathtype ^>= 0.8.1
+    , semantic
+    , semantic-analysis
+    , semantic-ast
+    , semantic-proto
+    , semantic-source ^>= 0.1.0.1
+    , semantic-tags
+    , semilattices
+    , tasty ^>= 1.2.3
+    , tasty-golden ^>= 2.3.2
+    , tasty-hedgehog ^>= 1.0.0.1
+    , tasty-hspec ^>= 1.1.5.1
+    , tasty-hunit ^>= 0.10.0.2
+
+test-suite parse-examples
+  import:              haskell, executable-flags
+  type:                exitcode-stdio-1.0
+  hs-source-dirs:      test
+  main-is:             Examples.hs
+  build-depends:
+    , async ^>= 2.2.1
+    , base
+    , fused-effects ^>= 1.1
+    , Glob
+    , lens >= 4.17 && < 4.20
+    , pathtype ^>= 0.8.1
+    , process ^>= 1.6.3.0
+    , semantic
+    , semantic-analysis ^>= 0
+    , semantic-ast
+    , semantic-proto ^>= 0
+    , tasty
+    , tasty-hunit
+    , text ^>= 1.2.3.2
+
+benchmark benchmarks
+  import:              haskell, executable-flags
+  hs-source-dirs:      bench
+  type:                exitcode-stdio-1.0
+  main-is:             Main.hs
+  other-modules:       Tagging
+  ghc-options:         -static
+  build-depends:
+    , base
+    , fused-effects ^>= 1.1
+    , gauge ^>= 0.2.5
+    , Glob
+    , pathtype ^>= 0.8.1
+    , semantic
+    , semantic-analysis ^>= 0
+    , semantic-proto
+
+source-repository head
+  type:     git
+  location: https://github.com/github/semantic

tests/syntax-tests/highlighted/CoffeeScript/coffeescript.coffee

@@ -0,0 +1,391 @@
+# CoffeeScript can be used both on the server, as a command-line compiler based
+# on Node.js/V8, or to run CoffeeScript directly in the browser. This module
+# contains the main entry functions for tokenizing, parsing, and compiling
+# source CoffeeScript into JavaScript.
+
+{Lexer}       = require './lexer'
+{parser}      = require './parser'
+helpers       = require './helpers'
+SourceMap     = require './sourcemap'
+# Require `package.json`, which is two levels above this file, as this file is
+# evaluated from `lib/coffeescript`.
+packageJson   = require '../../package.json'
+
+# The current CoffeeScript version number.
+exports.VERSION = packageJson.version
+
+exports.FILE_EXTENSIONS = FILE_EXTENSIONS = ['.coffee', '.litcoffee', '.coffee.md']
+
+# Expose helpers for testing.
+exports.helpers = helpers
+
+# Function that allows for btoa in both nodejs and the browser.
+base64encode = (src) -> switch
+  when typeof Buffer is 'function'
+    Buffer.from(src).toString('base64')
+  when typeof btoa is 'function'
+    # The contents of a `<script>` block are encoded via UTF-16, so if any extended
+    # characters are used in the block, btoa will fail as it maxes out at UTF-8.
+    # See https://developer.mozilla.org/en-US/docs/Web/API/WindowBase64/Base64_encoding_and_decoding#The_Unicode_Problem
+    # for the gory details, and for the solution implemented here.
+    btoa encodeURIComponent(src).replace /%([0-9A-F]{2})/g, (match, p1) ->
+      String.fromCharCode '0x' + p1
+  else
+    throw new Error('Unable to base64 encode inline sourcemap.')
+
+# Function wrapper to add source file information to SyntaxErrors thrown by the
+# lexer/parser/compiler.
+withPrettyErrors = (fn) ->
+  (code, options = {}) ->
+    try
+      fn.call @, code, options
+    catch err
+      throw err if typeof code isnt 'string' # Support `CoffeeScript.nodes(tokens)`.
+      throw helpers.updateSyntaxError err, code, options.filename
+
+# For each compiled file, save its source in memory in case we need to
+# recompile it later. We might need to recompile if the first compilation
+# didn’t create a source map (faster) but something went wrong and we need
+# a stack trace. Assuming that most of the time, code isn’t throwing
+# exceptions, it’s probably more efficient to compile twice only when we
+# need a stack trace, rather than always generating a source map even when
+# it’s not likely to be used. Save in form of `filename`: [`(source)`]
+sources = {}
+# Also save source maps if generated, in form of `(source)`: [`(source map)`].
+sourceMaps = {}
+
+# This is exported to enable an external module to implement caching of
+# compilation results. When the compiled js source is loaded from cache, the
+# original coffee code should be added with this method in order to enable the
+# Error.prepareStackTrace below to correctly adjust the stack trace for the
+# corresponding file (the source map will be generated on demand).
+exports.registerCompiled = registerCompiled = (filename, source, sourcemap) ->
+
+  sources[filename] ?= []
+  sources[filename].push source
+
+  if sourcemap?
+    sourceMaps[filename] ?= []
+    sourceMaps[filename].push sourcemap
+
+# Compile CoffeeScript code to JavaScript, using the Coffee/Jison compiler.
+#
+# If `options.sourceMap` is specified, then `options.filename` must also be
+# specified. All options that can be passed to `SourceMap#generate` may also
+# be passed here.
+#
+# This returns a javascript string, unless `options.sourceMap` is passed,
+# in which case this returns a `{js, v3SourceMap, sourceMap}`
+# object, where sourceMap is a sourcemap.coffee#SourceMap object, handy for
+# doing programmatic lookups.
+exports.compile = compile = withPrettyErrors (code, options = {}) ->
+  # Clone `options`, to avoid mutating the `options` object passed in.
+  options = Object.assign {}, options
+  # Always generate a source map if no filename is passed in, since without a
+  # a filename we have no way to retrieve this source later in the event that
+  # we need to recompile it to get a source map for `prepareStackTrace`.
+  generateSourceMap = options.sourceMap or options.inlineMap or not options.filename?
+  filename = options.filename or '<anonymous>'
+
+  checkShebangLine filename, code
+
+  map = new SourceMap if generateSourceMap
+
+  tokens = lexer.tokenize code, options
+
+  # Pass a list of referenced variables, so that generated variables won’t get
+  # the same name.
+  options.referencedVars = (
+    token[1] for token in tokens when token[0] is 'IDENTIFIER'
+  )
+
+  # Check for import or export; if found, force bare mode.
+  unless options.bare? and options.bare is yes
+    for token in tokens
+      if token[0] in ['IMPORT', 'EXPORT']
+        options.bare = yes
+        break
+
+  nodes = parser.parse tokens
+  # If all that was requested was a POJO representation of the nodes, e.g.
+  # the abstract syntax tree (AST), we can stop now and just return that
+  # (after fixing the location data for the root/`File`»`Program` node,
+  # which might’ve gotten misaligned from the original source due to the
+  # `clean` function in the lexer).
+  if options.ast
+    nodes.allCommentTokens = helpers.extractAllCommentTokens tokens
+    sourceCodeNumberOfLines = (code.match(/\r?\n/g) or '').length + 1
+    sourceCodeLastLine = /.*$/.exec(code)[0] # `.*` matches all but line break characters.
+    ast = nodes.ast options
+    range = [0, code.length]
+    ast.start = ast.program.start = range[0]
+    ast.end = ast.program.end = range[1]
+    ast.range = ast.program.range = range
+    ast.loc.start = ast.program.loc.start = {line: 1, column: 0}
+    ast.loc.end.line = ast.program.loc.end.line = sourceCodeNumberOfLines
+    ast.loc.end.column = ast.program.loc.end.column = sourceCodeLastLine.length
+    ast.tokens = tokens
+    return ast
+
+  fragments = nodes.compileToFragments options
+
+  currentLine = 0
+  currentLine += 1 if options.header
+  currentLine += 1 if options.shiftLine
+  currentColumn = 0
+  js = ""
+  for fragment in fragments
+    # Update the sourcemap with data from each fragment.
+    if generateSourceMap
+      # Do not include empty, whitespace, or semicolon-only fragments.
+      if fragment.locationData and not /^[;\s]*$/.test fragment.code
+        map.add(
+          [fragment.locationData.first_line, fragment.locationData.first_column]
+          [currentLine, currentColumn]
+          {noReplace: true})
+      newLines = helpers.count fragment.code, "\n"
+      currentLine += newLines
+      if newLines
+        currentColumn = fragment.code.length - (fragment.code.lastIndexOf("\n") + 1)
+      else
+        currentColumn += fragment.code.length
+
+    # Copy the code from each fragment into the final JavaScript.
+    js += fragment.code
+
+  if options.header
+    header = "Generated by CoffeeScript #{@VERSION}"
+    js = "// #{header}\n#{js}"
+
+  if generateSourceMap
+    v3SourceMap = map.generate options, code
+
+  if options.transpile
+    if typeof options.transpile isnt 'object'
+      # This only happens if run via the Node API and `transpile` is set to
+      # something other than an object.
+      throw new Error 'The transpile option must be given an object with options to pass to Babel'
+
+    # Get the reference to Babel that we have been passed if this compiler
+    # is run via the CLI or Node API.
+    transpiler = options.transpile.transpile
+    delete options.transpile.transpile
+
+    transpilerOptions = Object.assign {}, options.transpile
+
+    # See https://github.com/babel/babel/issues/827#issuecomment-77573107:
+    # Babel can take a v3 source map object as input in `inputSourceMap`
+    # and it will return an *updated* v3 source map object in its output.
+    if v3SourceMap and not transpilerOptions.inputSourceMap?
+      transpilerOptions.inputSourceMap = v3SourceMap
+    transpilerOutput = transpiler js, transpilerOptions
+    js = transpilerOutput.code
+    if v3SourceMap and transpilerOutput.map
+      v3SourceMap = transpilerOutput.map
+
+  if options.inlineMap
+    encoded = base64encode JSON.stringify v3SourceMap
+    sourceMapDataURI = "//# sourceMappingURL=data:application/json;base64,#{encoded}"
+    sourceURL = "//# sourceURL=#{options.filename ? 'coffeescript'}"
+    js = "#{js}\n#{sourceMapDataURI}\n#{sourceURL}"
+
+  registerCompiled filename, code, map
+
+  if options.sourceMap
+    {
+      js
+      sourceMap: map
+      v3SourceMap: JSON.stringify v3SourceMap, null, 2
+    }
+  else
+    js
+
+# Tokenize a string of CoffeeScript code, and return the array of tokens.
+exports.tokens = withPrettyErrors (code, options) ->
+  lexer.tokenize code, options
+
+# Parse a string of CoffeeScript code or an array of lexed tokens, and
+# return the AST. You can then compile it by calling `.compile()` on the root,
+# or traverse it by using `.traverseChildren()` with a callback.
+exports.nodes = withPrettyErrors (source, options) ->
+  source = lexer.tokenize source, options if typeof source is 'string'
+  parser.parse source
+
+# This file used to export these methods; leave stubs that throw warnings
+# instead. These methods have been moved into `index.coffee` to provide
+# separate entrypoints for Node and non-Node environments, so that static
+# analysis tools don’t choke on Node packages when compiling for a non-Node
+# environment.
+exports.run = exports.eval = exports.register = ->
+  throw new Error 'require index.coffee, not this file'
+
+# Instantiate a Lexer for our use here.
+lexer = new Lexer
+
+# The real Lexer produces a generic stream of tokens. This object provides a
+# thin wrapper around it, compatible with the Jison API. We can then pass it
+# directly as a “Jison lexer.”
+parser.lexer =
+  yylloc:
+    range: []
+  options:
+    ranges: yes
+  lex: ->
+    token = parser.tokens[@pos++]
+    if token
+      [tag, @yytext, @yylloc] = token
+      parser.errorToken = token.origin or token
+      @yylineno = @yylloc.first_line
+    else
+      tag = ''
+    tag
+  setInput: (tokens) ->
+    parser.tokens = tokens
+    @pos = 0
+  upcomingInput: -> ''
+
+# Make all the AST nodes visible to the parser.
+parser.yy = require './nodes'
+
+# Override Jison's default error handling function.
+parser.yy.parseError = (message, {token}) ->
+  # Disregard Jison's message, it contains redundant line number information.
+  # Disregard the token, we take its value directly from the lexer in case
+  # the error is caused by a generated token which might refer to its origin.
+  {errorToken, tokens} = parser
+  [errorTag, errorText, errorLoc] = errorToken
+
+  errorText = switch
+    when errorToken is tokens[tokens.length - 1]
+      'end of input'
+    when errorTag in ['INDENT', 'OUTDENT']
+      'indentation'
+    when errorTag in ['IDENTIFIER', 'NUMBER', 'INFINITY', 'STRING', 'STRING_START', 'REGEX', 'REGEX_START']
+      errorTag.replace(/_START$/, '').toLowerCase()
+    else
+      helpers.nameWhitespaceCharacter errorText
+
+  # The second argument has a `loc` property, which should have the location
+  # data for this token. Unfortunately, Jison seems to send an outdated `loc`
+  # (from the previous token), so we take the location information directly
+  # from the lexer.
+  helpers.throwSyntaxError "unexpected #{errorText}", errorLoc
+
+# Based on http://v8.googlecode.com/svn/branches/bleeding_edge/src/messages.js
+# Modified to handle sourceMap
+formatSourcePosition = (frame, getSourceMapping) ->
+  filename = undefined
+  fileLocation = ''
+
+  if frame.isNative()
+    fileLocation = "native"
+  else
+    if frame.isEval()
+      filename = frame.getScriptNameOrSourceURL()
+      fileLocation = "#{frame.getEvalOrigin()}, " unless filename
+    else
+      filename = frame.getFileName()
+
+    filename or= "<anonymous>"
+
+    line = frame.getLineNumber()
+    column = frame.getColumnNumber()
+
+    # Check for a sourceMap position
+    source = getSourceMapping filename, line, column
+    fileLocation =
+      if source
+        "#{filename}:#{source[0]}:#{source[1]}"
+      else
+        "#{filename}:#{line}:#{column}"
+
+  functionName = frame.getFunctionName()
+  isConstructor = frame.isConstructor()
+  isMethodCall = not (frame.isToplevel() or isConstructor)
+
+  if isMethodCall
+    methodName = frame.getMethodName()
+    typeName = frame.getTypeName()
+
+    if functionName
+      tp = as = ''
+      if typeName and functionName.indexOf typeName
+        tp = "#{typeName}."
+      if methodName and functionName.indexOf(".#{methodName}") isnt functionName.length - methodName.length - 1
+        as = " [as #{methodName}]"
+
+      "#{tp}#{functionName}#{as} (#{fileLocation})"
+    else
+      "#{typeName}.#{methodName or '<anonymous>'} (#{fileLocation})"
+  else if isConstructor
+    "new #{functionName or '<anonymous>'} (#{fileLocation})"
+  else if functionName
+    "#{functionName} (#{fileLocation})"
+  else
+    fileLocation
+
+getSourceMap = (filename, line, column) ->
+  # Skip files that we didn’t compile, like Node system files that appear in
+  # the stack trace, as they never have source maps.
+  return null unless filename is '<anonymous>' or filename.slice(filename.lastIndexOf('.')) in FILE_EXTENSIONS
+
+  if filename isnt '<anonymous>' and sourceMaps[filename]?
+    return sourceMaps[filename][sourceMaps[filename].length - 1]
+  # CoffeeScript compiled in a browser or via `CoffeeScript.compile` or `.run`
+  # may get compiled with `options.filename` that’s missing, which becomes
+  # `<anonymous>`; but the runtime might request the stack trace with the
+  # filename of the script file. See if we have a source map cached under
+  # `<anonymous>` that matches the error.
+  else if sourceMaps['<anonymous>']?
+    # Work backwards from the most recent anonymous source maps, until we find
+    # one that works. This isn’t foolproof; there is a chance that multiple
+    # source maps will have line/column pairs that match. But we have no other
+    # way to match them. `frame.getFunction().toString()` doesn’t always work,
+    # and it’s not foolproof either.
+    for map in sourceMaps['<anonymous>'] by -1
+      sourceLocation = map.sourceLocation [line - 1, column - 1]
+      return map if sourceLocation?[0]? and sourceLocation[1]?
+
+  # If all else fails, recompile this source to get a source map. We need the
+  # previous section (for `<anonymous>`) despite this option, because after it
+  # gets compiled we will still need to look it up from
+  # `sourceMaps['<anonymous>']` in order to find and return it. That’s why we
+  # start searching from the end in the previous block, because most of the
+  # time the source map we want is the last one.
+  if sources[filename]?
+    answer = compile sources[filename][sources[filename].length - 1],
+      filename: filename
+      sourceMap: yes
+      literate: helpers.isLiterate filename
+    answer.sourceMap
+  else
+    null
+
+# Based on [michaelficarra/CoffeeScriptRedux](http://goo.gl/ZTx1p)
+# NodeJS / V8 have no support for transforming positions in stack traces using
+# sourceMap, so we must monkey-patch Error to display CoffeeScript source
+# positions.
+Error.prepareStackTrace = (err, stack) ->
+  getSourceMapping = (filename, line, column) ->
+    sourceMap = getSourceMap filename, line, column
+    answer = sourceMap.sourceLocation [line - 1, column - 1] if sourceMap?
+    if answer? then [answer[0] + 1, answer[1] + 1] else null
+
+  frames = for frame in stack
+    break if frame.getFunction() is exports.run
+    "    at #{formatSourcePosition frame, getSourceMapping}"
+
+  "#{err.toString()}\n#{frames.join '\n'}\n"
+
+checkShebangLine = (file, input) ->
+  firstLine = input.split(/$/m)[0]
+  rest = firstLine?.match(/^#!\s*([^\s]+\s*)(.*)/)
+  args = rest?[2]?.split(/\s/).filter (s) -> s isnt ''
+  if args?.length > 1
+    console.error '''
+      The script to be run begins with a shebang line with more than one
+      argument. This script will fail on platforms such as Linux which only
+      allow a single argument.
+    '''
+    console.error "The shebang line was: '#{firstLine}' in file '#{file}'"
+    console.error "The arguments were: #{JSON.stringify args}"

tests/syntax-tests/highlighted/F#/string.fs

@@ -0,0 +1,182 @@
+// Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
+
+namespace Microsoft.FSharp.Core
+
+    open System
+    open System.Text
+    open Microsoft.FSharp.Core.LanguagePrimitives.IntrinsicOperators
+    open Microsoft.FSharp.Core.Operators
+    open Microsoft.FSharp.Core.Operators.Checked
+    open Microsoft.FSharp.Collections
+    open Microsoft.FSharp.Primitives.Basics
+
+    [<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
+    [<RequireQualifiedAccess>]
+    module String =
+        [<Literal>]
+        /// LOH threshold is calculated from Internal.Utilities.Library.LOH_SIZE_THRESHOLD_BYTES,
+        /// and is equal to 80_000 / sizeof<char>
+        let LOH_CHAR_THRESHOLD = 40_000
+
+        [<CompiledName("Length")>]
+        let length (str:string) = if isNull str then 0 else str.Length
+
+        [<CompiledName("Concat")>]
+        let concat sep (strings : seq<string>) =  
+
+            let concatArray sep (strings: string []) =
+                match length sep with
+                | 0 -> String.Concat strings
+                // following line should be used when this overload becomes part of .NET Standard (it's only in .NET Core)
+                //| 1 -> String.Join(sep.[0], strings, 0, strings.Length)
+                | _ -> String.Join(sep, strings, 0, strings.Length)
+
+            match strings with
+            | :? array<string> as arr -> 
+                concatArray sep arr
+
+            | :? list<string> as lst -> 
+                lst 
+                |> List.toArray 
+                |> concatArray sep
+
+            | _ ->
+                String.Join(sep, strings)
+
+        [<CompiledName("Iterate")>]
+        let iter (action : (char -> unit)) (str:string) =
+            if not (String.IsNullOrEmpty str) then
+                for i = 0 to str.Length - 1 do
+                    action str.[i] 
+
+        [<CompiledName("IterateIndexed")>]
+        let iteri action (str:string) =
+            if not (String.IsNullOrEmpty str) then
+                let f = OptimizedClosures.FSharpFunc<_,_,_>.Adapt(action)
+                for i = 0 to str.Length - 1 do
+                    f.Invoke(i, str.[i]) 
+
+        [<CompiledName("Map")>]
+        let map (mapping: char -> char) (str:string) =
+            if String.IsNullOrEmpty str then
+                String.Empty
+            else
+                let result = str.ToCharArray()
+                let mutable i = 0
+                for c in result do
+                    result.[i] <- mapping c
+                    i <- i + 1
+
+                new String(result)
+
+        [<CompiledName("MapIndexed")>]
+        let mapi (mapping: int -> char -> char) (str:string) =
+            let len = length str
+            if len = 0 then 
+                String.Empty
+            else
+                let result = str.ToCharArray()
+                let f = OptimizedClosures.FSharpFunc<_,_,_>.Adapt(mapping)
+
+                let mutable i = 0
+                while i < len do
+                    result.[i] <- f.Invoke(i, result.[i])
+                    i <- i + 1
+
+                new String(result)
+
+        [<CompiledName("Filter")>]
+        let filter (predicate: char -> bool) (str:string) =
+            let len = length str
+
+            if len = 0 then 
+                String.Empty
+
+            elif len > LOH_CHAR_THRESHOLD then
+                // By using SB here, which is twice slower than the optimized path, we prevent LOH allocations 
+                // and 'stop the world' collections if the filtering results in smaller strings.
+                // We also don't pre-allocate SB here, to allow for less mem pressure when filter result is small.
+                let res = StringBuilder()
+                str |> iter (fun c -> if predicate c then res.Append c |> ignore)
+                res.ToString()
+
+            else
+                // Must do it this way, since array.fs is not yet in scope, but this is safe
+                let target = Microsoft.FSharp.Primitives.Basics.Array.zeroCreateUnchecked len
+                let mutable i = 0
+                for c in str do
+                    if predicate c then 
+                        target.[i] <- c
+                        i <- i + 1
+
+                String(target, 0, i)
+
+        [<CompiledName("Collect")>]
+        let collect (mapping: char -> string) (str:string) =
+            if String.IsNullOrEmpty str then
+                String.Empty
+            else
+                let res = StringBuilder str.Length
+                str |> iter (fun c -> res.Append(mapping c) |> ignore)
+                res.ToString()
+
+        [<CompiledName("Initialize")>]
+        let init (count:int) (initializer: int-> string) =
+            if count < 0 then invalidArgInputMustBeNonNegative "count" count
+            let res = StringBuilder count
+            for i = 0 to count - 1 do 
+               res.Append(initializer i) |> ignore
+            res.ToString()
+
+        [<CompiledName("Replicate")>]
+        let replicate (count:int) (str:string) =
+            if count < 0 then invalidArgInputMustBeNonNegative "count" count
+
+            let len = length str
+            if len = 0 || count = 0 then 
+                String.Empty
+
+            elif len = 1 then
+                new String(str.[0], count)
+
+            elif count <= 4 then
+                match count with
+                | 1 -> str
+                | 2 -> String.Concat(str, str)
+                | 3 -> String.Concat(str, str, str)
+                | _ -> String.Concat(str, str, str, str)
+
+            else
+                // Using the primitive, because array.fs is not yet in scope. It's safe: both len and count are positive.
+                let target = Microsoft.FSharp.Primitives.Basics.Array.zeroCreateUnchecked (len * count)
+                let source = str.ToCharArray()
+
+                // O(log(n)) performance loop:
+                // Copy first string, then keep copying what we already copied 
+                // (i.e., doubling it) until we reach or pass the halfway point
+                Array.Copy(source, 0, target, 0, len)
+                let mutable i = len
+                while i * 2 < target.Length do
+                    Array.Copy(target, 0, target, i, i)
+                    i <- i * 2
+
+                // finally, copy the remain half, or less-then half
+                Array.Copy(target, 0, target, i, target.Length - i)
+                new String(target)
+
+
+        [<CompiledName("ForAll")>]
+        let forall predicate (str:string) =
+            if String.IsNullOrEmpty str then
+                true
+            else
+                let rec check i = (i >= str.Length) || (predicate str.[i] && check (i+1)) 
+                check 0
+
+        [<CompiledName("Exists")>]
+        let exists predicate (str:string) =
+            if String.IsNullOrEmpty str then
+                false
+            else
+                let rec check i = (i < str.Length) && (predicate str.[i] || check (i+1)) 
+                check 0  

tests/syntax-tests/highlighted/Fortran (Fixed Form)/quicksort_real_F77.F

@@ -0,0 +1,323 @@
+C  Fortran 77 implementation of a quicksort algorithm for arrays with
+C  real entries.
+C  ----------
+C  June 2019 
+C  Jason Allen Anema, Ph.D.
+C  Division of Statistical Genomics
+C  Department of Genetics
+C  Washington University School of Medicine in St. Louis
+C 
+C  This work is partially supported NIH grant AG023746
+C  ----------
+C  Insertion sort is used for short arrays, as quicksort is slower on
+C  these.
+C  
+C  Hoare partition scheme is used (sweeping left and right), as it does
+C  three times fewer swaps on average that the Lamuto partition scheme.
+C  In conjunction with this, tripartite partition is performed
+C  concurrently (solving the "Dutch National Flag problem"). This avoids 
+C  horrible runtimes on highly repetitive arrays. For example, without  
+C  this, an array of random zeros and ones would have a runtime of
+C  O(N^2), but now has a runtime of O(N). The runtime for this algorthm
+C  on arrays with k highly repetitive entries is now O(kN).
+C    
+C  For medium length (sub)arrays, pivots are choosen using
+C  Median-of-Three, and those three items are sorted. For longer (sub)arrays
+C  the pseudomedian of nine (Median of medians). This avoids O(N^2) runtime on
+C  nonrandom inputs such as increasing and decreasing sequences. 
+C
+C  See Louis Bentley, Jon & McIlroy, Douglas. (1993). Engineering a Sort Function.
+C  Softw., Pract. Exper.. 23. 1249-1265. 10.1002/spe.4380231105 for details. 
+C
+C  The ordering on elements of the array are defined by a comparison
+C  function,compar, that is a user-supplied INTEGER*2 function of the form
+C           compar(a,b) which returns:
+C              -1 if a precedes b
+C              +1 if b precedes a
+C              0 is a and b are considered equivalent
+C  and thus defines a total ordering.
+C  
+C  If one would like to use the standard order on integers, the
+C  compar function could be written in a file "compint.F" as:
+C  ----------------------------------------------------------------
+C      INTEGER*2 FUNCTION compint(a,b)
+C      INTEGER a, b
+C      if(a.lt.b)then
+C         compint = -1
+C      elseif(a.gt.b)then
+C         compint = +1
+C      else
+C         compint = 0
+C      endif
+C      END
+C  ----------------------------------------------------------------
+C  Then in your program, call quicksort with:
+C      call quicksort_real_F77(array, n, compint)
+C
+C  The maximal length of an array in this implementation is (2^31-1),
+C  but can be changed to allow for length up to (2^63-1) by changing the
+C  data types of the relevant variables and constants. If you wish to 
+C  sort longer arrays, of length N, you'll need to customize variable 
+C  and constant types and set mstack to be at least (2*log_2(N)+2). 
+C
+C  ----------------------------------------------------------------
+C  Copyright 2019 Jason Allen Anema
+C  
+C  Permission is hereby granted, free of charge, to any person obtaining
+C  a copy of this software and associated documentation files (the "Software"),
+C  to deal in the Software without restriction, including without limitation the
+C  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+C  sell copies of the Software, and to permit persons to whom the Software is
+C  furnished to do so, subject to the following conditions:
+C
+C  The above copyright notice and this permission notice shall be included
+C  in all copies or substantial portions of the Software.
+C
+C  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+C  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+C  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+C  THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+C  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+C  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+C  IN THE SOFTWARE.
+C  -------------------------------------------------------------------
+C
+      SUBROUTINE quicksort_real_F77(array,n,compar)
+      INTEGER n, maxins, maxmid, mstack
+      REAL array(n)
+      PARAMETER (maxins = 7, maxmid = 40, mstack = 128)
+C        maxins: maximal size of (sub)arrays to be sorted with
+C           insertion sort.
+C        maxmid: maximal size of (sub)arrays that will be quicksorted with
+C           Median-of-Three pivots.
+C        mstack: maximal size of required auxiliary storage (a stack), plus 2 
+C           extra spots, which tracks the starts and ends of yet unsorted 
+C           subarrays. mstack = 130 is large enough to handle arrays up to 
+C           length 2^63-1. This maximal size follows from
+C           processing smaller arrays first and pigeonhole principal.
+C 
+      INTEGER  a, d, i, j, k, s, lo, mid, hi, tstack, bstack(mstack)
+C        a, d, i, j, k, s: indices
+C        lo, mid, and hi: their natural location in a (sub)array
+C        tstack:  equal to twice the number of additional subarrays still 
+C          needing to be sorted
+C        bstack: stack of the endpoints of unsorted subarrays
+      INTEGER pm1, pm2, pm3, pm4, pm5, pm6, pm7, pm8, pm9
+C        for pseudomedian of nine positions in (sub)arrays
+      REAL piv, temp
+C        piv is to store the pivot's value
+C    
+      EXTERNAL compar
+      INTEGER*2 compar
+C        compar is a user-supplied INTEGER*2 function of the form
+C           compar(a,b) which returns:
+C              -1 if a precedes b
+C              +1 if b precedes a
+C              0 is a and b are considered equivalent
+C           and thus defines a total ordering. 
+      tstack = 0
+      lo = 1 
+      hi = n
+C
+C  Insertion sort subarrays of size maxins or less
+ 1    if(hi-lo+1.le.maxins)then
+         do 10, i = lo + 1, hi, 1
+            temp = array(i)
+            do 11 j = i - 1, lo, -1
+               if(compar(array(j), temp).le.0)goto 2
+               array(j+1)=array(j)
+ 11         continue
+            j = lo - 1
+ 2          array(j+1) = temp
+ 10      continue
+         if(tstack.eq.0)return
+C  Pop the bstack, and start new partitioning
+         hi = bstack(tstack)
+         lo = bstack(tstack-1)
+         tstack = tstack - 2
+      else
+C  Use Median-of-Three as choice of pivot (median of lo, middle, hi)
+C  and reorder those elements appropriately when subarrays are medium
+C  length (between maxins and maxmid)
+         mid = lo +  (hi-lo)/2
+         if(hi-lo.le.maxmid)then
+            if(compar(array(mid), array(lo)).eq.-1)then
+               temp = array(lo)
+               array(lo) = array(mid)
+               array(mid) = temp
+            endif
+            if(compar(array(hi), array(lo)).eq.-1)then
+               temp = array(hi)
+               array(hi) = array(lo)
+               array(lo) = temp
+            endif
+            if(compar(array(hi), array(mid)).eq.-1)then
+               temp = array(hi)
+               array(hi) = array(mid)
+               array(mid) = temp
+            endif
+C  Use pseudomedian of nine (Median of medians) as choice of pivot when 
+C  subarrays are longer than maxmid. Note that doing it this way requires only 12
+C  comparisons for finding the pivot.
+         elseif(hi-lo+1.gt.maxmid)then
+            pm1 = lo
+            pm5 = lo + (hi-lo)/2
+            pm9 = hi
+            pm3 = lo + (pm5-lo)/2
+            pm7 = pm5 + (hi-pm5)/2
+            pm2 = lo + (pm3-lo)/2
+            pm4 = pm3 + (pm5-pm3)/2
+            pm6 = pm5 + (pm7-pm5)/2
+            pm8 = pm7 + (pm9-pm7)/2
+C  Median and sorting for pm1, pm2, pm3
+            if(compar(array(pm2), array(pm1)).eq.-1)then
+               temp = array(pm1)
+               array(pm1) = array(pm2)
+               array(pm2) = temp
+            endif
+            if(compar(array(pm3), array(pm1)).eq.-1)then
+               temp = array(pm3)
+               array(pm3) = array(pm1)
+               array(pm1) = temp
+            endif
+            if(compar(array(pm3), array(pm2)).eq.-1)then
+               temp = array(pm3)
+               array(pm3) = array(pm2)
+               array(pm2) = temp
+            endif
+C  Median and sorting for pm4, pm5, pm6
+            if(compar(array(pm5), array(pm4)).eq.-1)then
+               temp = array(pm4)
+               array(pm4) = array(pm5)
+               array(pm5) = temp
+            endif
+            if(compar(array(pm6), array(pm4)).eq.-1)then
+               temp = array(pm6)
+               array(pm6) = array(pm4)
+               array(pm4) = temp
+            endif
+            if(compar(array(pm6), array(pm5)).eq.-1)then
+               temp = array(pm6)
+               array(pm6) = array(pm5)
+               array(pm5) = temp
+            endif
+C  Median and sorting for pm7, pm8, pm9
+            if(compar(array(pm8), array(pm7)).eq.-1)then
+               temp = array(pm7)
+               array(pm7) = array(pm8)
+               array(pm8) = temp
+            endif
+            if(compar(array(pm9), array(pm7)).eq.-1)then
+               temp = array(pm9)
+               array(pm9) = array(pm7)
+               array(pm7) = temp
+            endif
+            if(compar(array(pm9), array(pm8)).eq.-1)then
+               temp = array(pm9)
+               array(pm9) = array(pm8)
+               array(pm8) = temp
+            endif
+C Median of the medians (which are now pm2, pm5, pm8)
+            if(compar(array(pm5), array(pm2)).eq.-1)then
+               temp = array(pm2)
+               array(pm2) = array(pm5)
+               array(pm5) = temp
+            endif
+            if(compar(array(pm8), array(pm2)).eq.-1)then
+               temp = array(pm8)
+               array(pm8) = array(pm2)
+               array(pm2) = temp
+            endif
+            if(compar(array(pm8), array(pm5)).eq.-1)then
+               temp = array(pm8)
+               array(pm8) = array(pm5)
+               array(pm5) = temp
+            endif
+         endif
+C  Pivot assigned for medium and long length subarrays.
+C  Note that pm5 = mid
+             piv = array(mid)
+C  Initialize pointers for partitioning
+            i = lo-1
+            j = hi+1
+C  Initialize counts of repeat values of pivot.
+            a = 0
+            d = 0
+C  Beginning of outer loop for placing pivot.
+ 3       continue
+C  Scan up to find an element > piv.
+            i = i + 1
+C  Check if pointers crossed.
+         if(j.lt.i)goto 5
+C  Check if i pointer hit hi boundary.
+         if(i.eq.hi)goto 4
+C      
+         if(compar(array(i), piv).eq.-1)goto 3
+C Check for copies of pivot from scanning right. 
+         if(compar(array(i), piv).eq.0)then
+             array(i) = array(lo+a)
+             array(lo+a) = piv
+             a = a + 1
+             goto 3 
+         endif
+C  Beginning of innerloop for placing pivot.
+ 4       continue
+C  Scan down to find an element < piv.
+            j = j - 1
+C  Check if pointers crossed.
+         if(j.lt.i)goto 5
+         if(compar(array(j), piv).eq.1)goto 4
+C  Check for copies of pivot from scanning left. 
+         if(compar(array(j), piv).eq.0)then
+            array(j) = array(hi-d)
+            array(hi-d) = piv
+            d = d + 1
+            goto 4      
+         endif
+C Check if pointers crossed.
+         if(j.lt.i)goto 5
+C  Exchange elements
+         temp = array(i)
+         array(i) = array(j)
+         array(j) = temp
+C  End of outermost loop for placing pivot.
+         goto 3
+C  Insert all copies of pivot in appropriate place
+ 5       s = MIN(a, j-lo-a+1)
+         DO 6 k = 1, s
+            array(lo-1+k) = array(i-k)
+            array(i-k) = piv
+ 6       CONTINUE
+         s = MIN(d, hi-j-d)
+         DO 7 k = 1, s
+            array(hi+1-k) = array(j+k)
+            array(j+k) = piv
+ 7       CONTINUE
+C  Increase effective stack size
+         tstack = tstack + 2 
+C  Push pointers to larger subarray on stack for later processing,
+C  process smaller subarray immediately. 
+         if(tstack.gt.mstack) THEN
+           WRITE(*,*)'Stack size is too small in quicksort fortran code quicksort_real_F77.F' 
+           WRITE(*,*)'Are you sure you want to sort an array this long?'
+           WRITE(*,*)'Your array has more than 2^63-1  entries?'
+           WRITE(*,*)'If so, set mstack parameter to be at least:'
+           WRITE(*,*)'2*ceiling(log_2(N))+2, for N = length of array,'
+           WRITE(*,*)'and recompile this subroutine.'
+           RETURN 
+         endif
+         if(hi-j-d-1.ge.j-a-lo)then
+            bstack(tstack) = hi
+            bstack(tstack-1) = MIN(j+d+1, hi)
+            hi=MAX(j-a,lo)
+         else
+            bstack(tstack)=MAX(j-a,lo)
+            bstack(tstack-1)=lo
+            lo=MIN(j+d+1,hi)
+         endif
+C
+C     end of outermost if statement 
+      endif
+      goto 1
+C     END of subroutine quicksort
+      END

tests/syntax-tests/highlighted/Fortran (Modern)/test_savetxt.f90

@@ -0,0 +1,119 @@
+program test_savetxt
+use stdlib_kinds, only: int32, sp, dp
+use stdlib_io, only: loadtxt, savetxt
+use stdlib_error, only: check
+implicit none
+
+character(:), allocatable :: outpath
+
+outpath = get_outpath() // "/tmp.dat"
+
+call test_iint32(outpath)
+call test_rsp(outpath)
+call test_rdp(outpath)
+call test_csp(outpath)
+call test_cdp(outpath)
+
+contains
+
+    function get_outpath() result(outpath)
+    integer :: ierr
+    character(256) :: argv
+    character(:), allocatable :: outpath
+
+    call get_command_argument(1, argv, status=ierr)
+    if (ierr==0) then
+        outpath = trim(argv)
+    else
+        outpath = '.'
+    endif
+    end function get_outpath
+
+    subroutine test_iint32(outpath)
+    character(*), intent(in) :: outpath
+    integer(int32) :: d(3, 2), e(2, 3)
+    integer(int32), allocatable :: d2(:, :)
+    d = reshape([1, 2, 3, 4, 5, 6], [3, 2])
+    call savetxt(outpath, d)
+    call loadtxt(outpath, d2)
+    call check(all(shape(d2) == [3, 2]))
+    call check(all(abs(d-d2) == 0))
+
+    e = reshape([1, 2, 3, 4, 5, 6], [2, 3])
+    call savetxt(outpath, e)
+    call loadtxt(outpath, d2)
+    call check(all(shape(d2) == [2, 3]))
+    call check(all(abs(e-d2) == 0))
+    end subroutine
+
+
+    subroutine test_rsp(outpath)
+    character(*), intent(in) :: outpath
+    real(sp) :: d(3, 2), e(2, 3)
+    real(sp), allocatable :: d2(:, :)
+    d = reshape([1, 2, 3, 4, 5, 6], [3, 2])
+    call savetxt(outpath, d)
+    call loadtxt(outpath, d2)
+    call check(all(shape(d2) == [3, 2]))
+    call check(all(abs(d-d2) < epsilon(1._sp)))
+
+    e = reshape([1, 2, 3, 4, 5, 6], [2, 3])
+    call savetxt(outpath, e)
+    call loadtxt(outpath, d2)
+    call check(all(shape(d2) == [2, 3]))
+    call check(all(abs(e-d2) < epsilon(1._sp)))
+    end subroutine test_rsp
+
+
+    subroutine test_rdp(outpath)
+    character(*), intent(in) :: outpath
+    real(dp) :: d(3, 2), e(2, 3)
+    real(dp), allocatable :: d2(:, :)
+    d = reshape([1, 2, 3, 4, 5, 6], [3, 2])
+    call savetxt(outpath, d)
+    call loadtxt(outpath, d2)
+    call check(all(shape(d2) == [3, 2]))
+    call check(all(abs(d-d2) < epsilon(1._dp)))
+
+    e = reshape([1, 2, 3, 4, 5, 6], [2, 3])
+    call savetxt(outpath, e)
+    call loadtxt(outpath, d2)
+    call check(all(shape(d2) == [2, 3]))
+    call check(all(abs(e-d2) < epsilon(1._dp)))
+    end subroutine test_rdp
+
+    subroutine test_csp(outpath)
+    character(*), intent(in) :: outpath
+    complex(sp) :: d(3, 2), e(2, 3)
+    complex(sp), allocatable :: d2(:, :)
+    d = cmplx(1, 1,kind=sp)* reshape([1, 2, 3, 4, 5, 6], [3, 2])
+    call savetxt(outpath, d)
+    call loadtxt(outpath, d2)
+    call check(all(shape(d2) == [3, 2]))
+    call check(all(abs(d-d2) < epsilon(1._sp)))
+
+    e = cmplx(1, 1,kind=sp)* reshape([1, 2, 3, 4, 5, 6], [2, 3])
+    call savetxt(outpath, e)
+    call loadtxt(outpath, d2)
+    call check(all(shape(d2) == [2, 3]))
+    call check(all(abs(e-d2) < epsilon(1._sp)))
+    end subroutine test_csp
+
+    subroutine test_cdp(outpath)
+    character(*), intent(in) :: outpath
+    complex(dp) :: d(3, 2), e(2, 3)
+    complex(dp), allocatable :: d2(:, :)
+    d = cmplx(1._dp, 1._dp,kind=dp)* reshape([1, 2, 3, 4, 5, 6], [3, 2])
+    call savetxt(outpath, d)
+    call loadtxt(outpath, d2)
+    call check(all(shape(d2) == [3, 2]))
+    call check(all(abs(d-d2) < epsilon(1._dp)))
+
+    e = cmplx(1, 1,kind=dp)* reshape([1, 2, 3, 4, 5, 6], [2, 3])
+    call savetxt(outpath, e)
+    call loadtxt(outpath, d2)
+    call check(all(shape(d2) == [2, 3]))
+    call check(all(abs(e-d2) < epsilon(1._dp)))
+    end subroutine test_cdp
+
+end program test_savetxt

tests/syntax-tests/highlighted/Fortran Namelist/test.namelist

@@ -0,0 +1,5 @@
+&TEST
+FOO=0,
+BAR=1.0,
+BAZ='Hello, World!'
+/

tests/syntax-tests/highlighted/Groff/rustdoc.1

@@ -0,0 +1,126 @@
+.TH RUSTDOC "1" "<INSERT DATE HERE>" "rustdoc <INSERT VERSION HERE>" "User Commands"
+.SH NAME
+rustdoc \- generate documentation from Rust source code
+.SH SYNOPSIS
+.B rustdoc
+[\fIOPTIONS\fR] \fIINPUT\fR
+
+.SH DESCRIPTION
+This tool generates API reference documentation by extracting comments from
+source code written in the Rust language, available at
+<\fBhttps://www.rust-lang.org\fR>. It accepts several input formats and
+provides several output formats for the generated documentation.
+
+.SH OPTIONS
+
+.TP
+\fB\-r\fR, \fB\-\-input\-format\fR \fIFORMAT\fR
+rust
+.TP
+\fB\-w\fR, \fB\-\-output\-format\fR \fIFORMAT\fR
+html
+.TP
+\fB\-o\fR, \fB\-\-output\fR \fIOUTPUT\fR,
+where to place the output (default: \fIdoc/\fR for html)
+.TP
+\fB\-\-passes\fR \fILIST\fR
+space\[hy]separated list of passes to run (default: '')
+.TP
+\fB\-\-no\-defaults\fR
+don't run the default passes
+.TP
+\fB\-\-plugins\fR \fILIST\fR
+space-separated list of plugins to run (default: '')
+.TP
+\fB\-\-plugin\-path\fR \fIDIR\fR
+directory to load plugins from (default: \fI/tmp/rustdoc_ng/plugins\fR)
+.TP
+\fB\-\-target\fR \fITRIPLE\fR
+target triple to document
+.TP
+\fB\-\-crate\-name\fR \fINAME\fR
+specify the name of this crate
+.TP
+\fB\-L\fR, \fB\-\-library\-path\fR \fIDIR\fR
+directory to add to crate search path
+.TP
+\fB\-\-cfg\fR \fISPEC\fR
+pass a \fI\-\-cfg\fR to rustc
+.TP
+\fB\-\-extern\fR \fIVAL\fR
+pass an \fI\-\-extern\fR to rustc
+.TP
+\fB\-\-test\fR
+run code examples as tests
+.TP
+\fB\-\-test\-args\fR \fIARGS\fR
+pass arguments to the test runner
+.TP
+\fB\-\-html\-in\-header\fR \fIFILE\fR
+file to add to <head>
+.TP
+\fB\-\-html\-before\-content\fR \fIFILES\fR
+files to include inline between <body> and the content of a rendered Markdown
+file or generated documentation
+.TP
+\fB\-\-markdown\-before\-content\fR \fIFILES\fR
+files to include inline between <body> and the content of a rendered
+Markdown file or generated documentation
+.TP
+\fB\-\-html\-after\-content\fR \fIFILES\fR
+files to include inline between the content and </body> of a rendered
+Markdown file or generated documentation
+.TP
+\fB\-\-markdown\-after\-content\fR \fIFILES\fR
+files to include inline between the content and </body> of a rendered
+Markdown file or generated documentation
+.TP
+\fB\-\-markdown\-css\fR \fIFILES\fR
+CSS files to include via <link> in a rendered Markdown file Markdown file or
+generated documentation
+.TP
+\fB\-\-markdown\-playground\-url\fR \fIURL\fR
+URL to send code snippets to
+.TP
+\fB\-\-markdown\-no\-toc\fR
+don't include table of contents
+.TP
+\fB\-h\fR, \fB\-\-extend\-css\fR
+to redefine some css rules with a given file to generate doc with your own theme
+.TP
+\fB\-V\fR, \fB\-\-version\fR
+Print rustdoc's version
+
+.SH "OUTPUT FORMATS"
+
+The rustdoc tool can generate output in an HTML format.
+
+If using an HTML format, then the specified output destination will be the root
+directory of an HTML structure for all the documentation.
+Pages will be placed into this directory, and source files will also
+possibly be rendered into it as well.
+
+.SH "EXAMPLES"
+
+To generate documentation for the source in the current directory:
+    $ rustdoc hello.rs
+
+List all available passes that rustdoc has, along with default passes:
+    $ rustdoc \-\-passes list
+
+The generated HTML can be viewed with any standard web browser.
+
+.SH "SEE ALSO"
+
+.BR rustc (1)
+
+.SH "BUGS"
+See <\fBhttps://github.com/rust\-lang/rust/issues\fR>
+for issues.
+
+.SH "AUTHOR"
+See the version control history or <\fBhttps://thanks.rust\-lang.org\fR>
+
+.SH "COPYRIGHT"
+This work is dual\[hy]licensed under Apache\ 2.0 and MIT terms.
+See \fICOPYRIGHT\fR file in the rust source distribution.

tests/syntax-tests/highlighted/Ignored suffixes/test.rs.bak

@@ -0,0 +1 @@
+// foo.bak (editor etc backup) should highlight same as foo

tests/syntax-tests/highlighted/Ignored suffixes/test.rs.dpkg-dist

@@ -0,0 +1 @@
+// foo.dpkg-dist (Debian dpkg backup) should highlight same as foo

tests/syntax-tests/highlighted/Ignored suffixes/test.rs.dpkg-old

@@ -0,0 +1 @@
+// foo.dpkg-old (Debian dpkg backup) should highlight same as foo

tests/syntax-tests/highlighted/Ignored suffixes/test.rs.in

@@ -0,0 +1 @@
+// foo.in (build system input) should highlight same as foo

tests/syntax-tests/highlighted/Ignored suffixes/test.rs.in.in

@@ -0,0 +1 @@
+// foo.in.in (build system input, doubly replaced) should highlight same as foo

tests/syntax-tests/highlighted/Ignored suffixes/test.rs.old

@@ -0,0 +1 @@
+// foo.old (editor etc backup) should highlight same as foo

tests/syntax-tests/highlighted/Ignored suffixes/test.rs.orig

@@ -0,0 +1 @@
+// foo.orig (editor, diff etc backup) should highlight same as foo

tests/syntax-tests/highlighted/Ignored suffixes/test.rs.orig~

@@ -0,0 +1 @@
+// foo.orig~ (backup of an editor, diff etc backup) should highlight same as foo

tests/syntax-tests/highlighted/Ignored suffixes/test.rs.rpmnew

@@ -0,0 +1 @@
+// foo.rpmnew (Red Hat rpm backup) should highlight same as foo

tests/syntax-tests/highlighted/Ignored suffixes/test.rs.rpmorig

@@ -0,0 +1 @@
+// foo.rpmorig (Red Hat rpm backup) should highlight same as foo

tests/syntax-tests/highlighted/Ignored suffixes/test.rs.rpmsave

@@ -0,0 +1 @@
+// foo.rpmsave (Red Hat rpm backup) should highlight same as foo

tests/syntax-tests/highlighted/Ignored suffixes/test.rs~

@@ -0,0 +1 @@
+// foo~ (editor backup) should highlight same as foo

tests/syntax-tests/highlighted/Ignored suffixes/test.unknown~

@@ -0,0 +1 @@
+// foo~ for unknown foo should not highlight

tests/syntax-tests/highlighted/Java Server Page (JSP)/sessionDetail.jsp

@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<%--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+--%>
+<%@page session="false" contentType="text/html; charset=ISO-8859-1" %>
+<%@page import="java.util.Enumeration" %>
+<%@page import="jakarta.servlet.http.HttpSession" %>
+<%@page import="org.apache.catalina.Session" %>
+<%@page import="org.apache.catalina.manager.JspHelper" %>
+<%@page import="org.apache.catalina.util.ContextName" %>
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<%--!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"--%>
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<% String path = (String) request.getAttribute("path");
+   String version = (String) request.getAttribute("version");
+   ContextName cn = new ContextName(path, version);
+   Session currentSession = (Session)request.getAttribute("currentSession");
+   String currentSessionId = null;
+   HttpSession currentHttpSession = null;
+   if (currentSession != null) {
+       currentHttpSession = currentSession.getSession();
+       currentSessionId = JspHelper.escapeXml(currentSession.getId());
+   } else {
+       currentSessionId = "Session invalidated";
+   }
+   String submitUrl = JspHelper.escapeXml(response.encodeURL(
+           ((HttpServletRequest) pageContext.getRequest()).getRequestURI() +
+           "?path=" + path + "&version=" + version));
+%>
+<head>
+    <meta http-equiv="content-type" content="text/html; charset=iso-8859-1"/>
+    <meta http-equiv="pragma" content="no-cache"/><!-- HTTP 1.0 -->
+    <meta http-equiv="cache-control" content="no-cache,must-revalidate"/><!-- HTTP 1.1 -->
+    <meta http-equiv="expires" content="0"/><!-- 0 is an invalid value and should be treated as 'now' -->
+    <meta http-equiv="content-language" content="en"/>
+    <meta name="author" content="Cedrik LIME"/>
+    <meta name="copyright" content="copyright 2005-2021 the Apache Software Foundation"/>
+    <meta name="robots" content="noindex,nofollow,noarchive"/>
+    <title>Sessions Administration: details for <%= currentSessionId %></title>
+</head>
+<body>
+<% if (currentHttpSession == null) { %>
+   <h1><%=currentSessionId%></h1>
+<% } else { %>
+   <h1>Details for Session <%= currentSessionId %></h1>
+
+   <table style="text-align: left;" border="0">
+     <tr>
+       <th>Session Id</th>
+       <td><%= currentSessionId %></td>
+     </tr>
+     <tr>
+       <th>Guessed Locale</th>
+       <td><%= JspHelper.guessDisplayLocaleFromSession(currentSession) %></td>
+     </tr>
+     <tr>
+       <th>Guessed User</th>
+       <td><%= JspHelper.guessDisplayUserFromSession(currentSession) %></td>
+     </tr>
+     <tr>
+       <th>Creation Time</th>
+       <td><%= JspHelper.getDisplayCreationTimeForSession(currentSession) %></td>
+     </tr>
+     <tr>
+       <th>Last Accessed Time</th>
+       <td><%= JspHelper.getDisplayLastAccessedTimeForSession(currentSession) %></td>
+     </tr>
+     <tr>
+       <th>Session Max Inactive Interval</th>
+       <td><%= JspHelper.secondsToTimeString(currentSession.getMaxInactiveInterval()) %></td>
+     </tr>
+     <tr>
+       <th>Used Time</th>
+       <td><%= JspHelper.getDisplayUsedTimeForSession(currentSession) %></td>
+     </tr>
+     <tr>
+       <th>Inactive Time</th>
+       <td><%= JspHelper.getDisplayInactiveTimeForSession(currentSession) %></td>
+     </tr>
+     <tr>
+       <th>TTL</th>
+       <td><%= JspHelper.getDisplayTTLForSession(currentSession) %></td>
+     </tr>
+   </table>
+
+   <form method="post" action="<%= submitUrl %>">
+     <div>
+       <input type="hidden" name="sessionId" value="<%= currentSessionId %>" />
+       <input type="hidden" name="action" value="sessionDetail" />
+       <%
+       if ("Primary".equals(request.getParameter("sessionType"))) {
+       %>
+         <input type="hidden" name="sessionType" value="Primary" />
+       <%
+       }
+       %>    <input type="submit" value="Refresh" />
+     </div>
+   </form>
+
+   <div class="error"><%= JspHelper.escapeXml(request.getAttribute("error")) %></div>
+   <div class="message"><%= JspHelper.escapeXml(request.getAttribute("message")) %></div>
+
+   <table style="text-align: left;" border="1" cellpadding="2" cellspacing="2">
+   <% int nAttributes = 0;
+      Enumeration<String> attributeNamesEnumeration = currentHttpSession.getAttributeNames();
+      while (attributeNamesEnumeration.hasMoreElements()) {
+          attributeNamesEnumeration.nextElement();
+          ++nAttributes;
+      }
+   %>
+       <caption style="font-variant: small-caps;"><%= JspHelper.formatNumber(nAttributes) %> attributes</caption>
+       <thead>
+           <tr>
+               <th>Remove Attribute</th>
+               <th>Attribute name</th>
+               <th>Attribute value</th>
+           </tr>
+       </thead>
+       <%--tfoot>
+           <tr>
+               <td colspan="3" style="text-align: center;">
+                   TODO: set Max Inactive Interval on sessions
+               </td>
+           </tr>
+       </tfoot--%>
+       <tbody>
+   <% attributeNamesEnumeration = currentHttpSession.getAttributeNames();
+      while (attributeNamesEnumeration.hasMoreElements()) {
+          String attributeName = attributeNamesEnumeration.nextElement();
+   %>
+           <tr>
+               <td align="center">
+                   <form method="post" action="<%= submitUrl %>">
+                       <div>
+                           <input type="hidden" name="action" value="removeSessionAttribute" />
+                           <input type="hidden" name="sessionId" value="<%= currentSessionId %>" />
+                           <input type="hidden" name="attributeName" value="<%= JspHelper.escapeXml(attributeName) %>" />
+                           <%
+                             if ("Primary".equals(request.getParameter("sessionType"))) {
+                           %>
+                             <input type="submit" value="Remove" />
+                             <input type="hidden" name="sessionType" value="Primary" />
+                           <%
+                             } else {
+                               out.print("Primary sessions only");
+                             }
+                           %>
+                       </div>
+                   </form>
+               </td>
+               <td><%= JspHelper.escapeXml(attributeName) %></td>
+               <td><% Object attributeValue = currentHttpSession.getAttribute(attributeName); %><span title="<%= attributeValue == null ? "" : attributeValue.getClass().toString() %>"><%= JspHelper.escapeXml(attributeValue) %></span></td>
+           </tr>
+   <% } // end while %>
+       </tbody>
+   </table>
+<% } // endif%>
+
+<form method="post" action="<%=submitUrl%>">
+  <p style="text-align: center;">
+    <input type="submit" value="Return to session list" />
+  </p>
+</form>
+
+<%--div style="display: none;">
+<p>
+    <a href="http://validator.w3.org/check?uri=referer"><img
+        src="http://www.w3.org/Icons/valid-html401"
+        alt="Valid HTML 4.01!" height="31" width="88"></a>
+    <a href="http://validator.w3.org/check?uri=referer"><img
+        src="http://www.w3.org/Icons/valid-xhtml10"
+        alt="Valid XHTML 1.0!" height="31" width="88" /></a>
+    <a href="http://validator.w3.org/check?uri=referer"><img
+        src="http://www.w3.org/Icons/valid-xhtml11"
+        alt="Valid XHTML 1.1!" height="31" width="88" /></a>
+</p>
+</div--%>
+
+</body>
+</html>

tests/syntax-tests/highlighted/Julia/test.jl

@@ -1,10 +1,10 @@
-x = 3
+x = 3
 
-y = 2x
+y = 2x
 
 typeof(y)
 
-f(x) = 2 + x
+f(x) = 2 + x
 
 
 f
@@ -12,44 +12,44 @@
 f(10)
 
 
-function g(x, y)
-    z = x + y
-    return z^2
+function g(x, y)
+    z = x + y
+    return z^2
 end
 
 g(1, 2)
 
-let s = 0
-    for i in 1:10
-        s += i    # Equivalent to s = s + i
+let s = 0
+    for i in 1:10
+        s += i    # Equivalent to s = s + i
     end
-    s
+    s
 end
 
 
 typeof(1:10)
 
 function mysum(n)
-    s = 0
-    for i in 1:n
-        s += i
+    s = 0
+    for i in 1:n
+        s += i
     end
-    return s
+    return s
 end
 
 mysum(100)
 
-a = 3
+a = 3
 
-a < 5
+a < 5
 
-if a < 5
+if a < 5
     "small"
 else
     "big"
 end
 
-v = [1, 2, 3]
+v = [1, 2, 3]
 
 typeof(v)
 
@@ -57,15 +57,15 @@
 
 v[2] = 10
 
-v2 = [i^2 for i in 1:10]
+v2 = [i^2 for i in 1:10]
 
-M = [1 2
+M = [1 2
      3 4]
 
 typeof(M)
 
 zeros(5, 5)
 
-zeros(Int, 4, 5)
+zeros(Int, 4, 5)
 
-[i + j for i in 1:5, j in 1:6]
+[i + j for i in 1:5, j in 1:6]

tests/syntax-tests/highlighted/LLVM/test.ll

@@ -0,0 +1,29 @@
+; ModuleID = 'test.c'
+source_filename = "test.c"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-pc-linux-gnu"
+
+@.str = private unnamed_addr constant [13 x i8] c"Hello World!\00", align 1
+
+; Function Attrs: noinline norecurse optnone uwtable
+define dso_local i32 @main(i32 %0, i8** %1) #0 {
+  %3 = alloca i32, align 4
+  %4 = alloca i32, align 4
+  %5 = alloca i8**, align 8
+  store i32 0, i32* %3, align 4
+  store i32 %0, i32* %4, align 4
+  store i8** %1, i8*** %5, align 8
+  %6 = call i32 @puts(i8* getelementptr inbounds ([13 x i8], [13 x i8]* @.str, i64 0, i64 0))
+  ret i32 1337
+}
+
+declare dso_local i32 @puts(i8*) #1
+
+attributes #0 = { noinline norecurse optnone uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
+
+!llvm.module.flags = !{!0}
+!llvm.ident = !{!1}
+
+!0 = !{i32 1, !"wchar_size", i32 4}
+!1 = !{!"clang version 10.0.0-4ubuntu1 "}

tests/syntax-tests/highlighted/Literate Haskell/Main.lhs

@@ -0,0 +1,47 @@
+\documentclass{article}
+
+\begin{document}
+
+\section*{Introduction}
+
+Text outside code environments should follow TeX/LaTeX highlighting.
+
+The code environment delimiters themselves should be highlighted.
+
+Text inside code environments should follow regular Haskell highlighting.
+
+\begin{code}
+import           Data.List
+import           System.Environment
+import           Text.Printf
+
+twoSumN :: Int -> [Int] -> [Int]
+twoSumN _ [] = []
+twoSumN n (x : xs) | (n - x) `elem` xs = [x, n - x]
+                   | otherwise         = twoSumN n xs
+
+threeSumN :: Int -> [Int] -> [Int]
+threeSumN _ [] = []
+threeSumN n (x : xs) | null partial = threeSumN n xs
+                     | otherwise    = x : partial
+  where partial = twoSumN (n - x) xs
+\end{code}
+
+Text in-between code environments.
+% LaTeX comment.
+
+\begin{code}
+output :: String -> IO ()
+output path = do
+  input <- sort . map read . filter (not . null) . lines <$> readFile path
+  printf "File: %s\n" path
+  printf "  Part 1: %d\n" . product . twoSumN 2020 $ input
+  printf "  Part 2: %d\n" . product . threeSumN 2020 $ input
+
+-- Haskell comment inside code environment.
+
+main :: IO ()
+main = getArgs >>= mapM_ output
+\end{code}
+
+\end{document}

tests/syntax-tests/highlighted/NAnt Build File/Default.build

@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="Paraesthesia.Tools.NAntTasks" default="all" verbose="false">
+	<!-- === ENVIRONMENT SETUP === -->
+	<property name="nant.settings.currentframework" value="net-2.0"/>
+	<tstamp />
+	<sysinfo />
+	<property name="build.config" value="Release" />
+	<property name="build.version" value="2.0.0.0" />
+	<property name="build.name" value="Paraesthesia.Tools.NAntTasks" />
+	<property name="build.dir" value="${project::get-base-directory()}\build" />
+	<property name="build.bin.dir" value="${build.dir}\bin" />
+	<property name="build.doc.dir" value="${build.dir}\doc" />
+	<property name="build.install.dir" value="${build.dir}\install" />
+	<property name="build.log.dir" value="${build.dir}\log" />
+	
+	<!-- === STANDARD TARGETS === -->
+	<target name="all" depends="build-tasks test" description="Builds all custom NAnt task projects."/>
+
+	<target name="clean" description="Remove all compiled output folders.">
+		<echo message="Removing build output folder..."/>
+		<delete dir="${build.dir}" failonerror="false" verbose="false"/>
+		<echo message="Removing compilation artifact folders..."/>
+		<delete failonerror="false" verbose="false">
+			<fileset>
+				<exclude name="lib" />
+				<exclude name="lib\**" />
+				<include name="**\obj\**" />
+				<include name="**\bin\**" />
+			</fileset>
+		</delete>
+		<echo message="Clean complete."/>
+	</target>
+
+	<target name="test" description="Run unit tests on this project." depends="build-tests">
+		<!-- TODO: Run the unit tests -->
+	</target>
+
+	<target name="doc" description="Generates NDoc documentation." depends="build-tasks">
+		<ndoc>
+			<assemblies basedir="${build.bin.dir}">
+				<include name="Paraesthesia.Tools.*.dll"/>
+			</assemblies>
+			<summaries>
+				<include name="NamespaceSummary.xml"/>
+			</summaries>
+			<documenters>
+				<documenter name="MSDN">
+					<property name="AutoDocumentConstructors" value="True" />
+					<property name="AutoPropertyBackerSummaries" value="True" />
+					<property name="CollectionNamespace" value="${build.name} v${build.version}" />
+					<property name="CopyrightHref" value="http://www.paraesthesia.com" />
+					<property name="CopyrightText" value="Copyright 2007 Travis Illig" />
+					<property name="DefaultTOC" value="Empty" />
+					<property name="DeleteCHM" value="False" />
+					<property name="DocumentEmptyNamespaces" value="False" />
+					<property name="DocumentInternals" value="False" />
+					<property name="DocumentPrivates" value="False" />
+					<property name="DocumentProtected" value="True" />
+					<property name="GenerateCollectionFiles" value="True" />
+					<property name="HtmlHelpCompilerFilename" value="hhc.exe" />
+					<property name="HtmlHelpName" value="${build.name} v${build.version}" />
+					<property name="IncludeAssemblyVersion" value="True" />
+					<property name="IncludeFavorites" value="True" />
+					<property name="IncludeHeirarchy" value="True" />
+					<property name="LinkToSdkDocVersion" value="SDK_v1_1" />
+					<property name="OmitObjectTags" value="False" />
+					<property name="OutputDirectory" value="${build.doc.dir}" />
+					<property name="PlugInNamespace" value="ms.vscc" />
+					<property name="RootPageContainsNamespaces" value="True" />
+					<property name="ShowMissingParams" value="True" />
+					<property name="ShowMissingRemarks" value="False" />
+					<property name="ShowMissingReturns" value="True" />
+					<property name="ShowMissingSummaries" value="True" />
+					<property name="ShowMissingValues" value="True" />
+					<property name="ShowVisualBasic" value="False" />
+					<property name="SortTOCByNamespace" value="True" />
+					<property name="SplitTOCs" value="False" />
+					<property name="Title" value="${build.name} v${build.version}" />
+				</documenter>
+			</documenters>
+		</ndoc>
+		<delete>
+			<fileset basedir="${build.doc.dir}">
+				<include name="**/**" />
+				<exclude name="*.chm" />
+			</fileset>
+		</delete>
+	</target>
+	
+	<target name="install" description="Creates distribution packages." depends="all">
+		<mkdir dir="${build.install.dir}" />
+		<zip verbose="true"
+			zipfile="${build.install.dir}/${build.name}_${build.version}.zip"
+			ziplevel="9">
+			<fileset basedir="${build.dir}">
+				<include name="**" />
+				<exclude name="${build.install.dir}/**" />
+				<exclude name="${build.log.dir}/**" />
+			</fileset>
+			<fileset basedir=".">
+				<include name="readme.txt" />
+			</fileset>
+		</zip>
+		<zip verbose="true"
+			zipfile="${build.install.dir}/${build.name}_${build.version}_src.zip"
+			ziplevel="9">
+			<fileset basedir=".">
+				<include name="**" />
+				<exclude name="**/*.suo" />
+				<exclude name="**/*.user" />
+				<exclude name="**/*.cache" />
+				<exclude name="**/bin/**" />
+				<exclude name="**/build/**" />
+				<exclude name="**/lib/*.dll" />
+				<exclude name="**/obj/**" />
+			</fileset>
+		</zip>
+	</target>
+	
+	<target name="production" description="Executes the production build." depends="clean set-version all test doc cleanup-build-output install">
+		<echo message="Completed production build." />
+	</target>
+
+
+	
+	<!-- === PREREQUISITE TASKS === -->
+	<target name="build-tasks" description="Builds the custom NAnt task solution.">
+		<!-- solution configuration="${build.config}" outputdir="${build.bin.dir}" solutionfile="Paraesthesia.Tools.NAntTasks.sln" / -->
+		<exec program="MSBuild.exe">
+			<arg value="Paraesthesia.Tools.NAntTasks.sln" />
+			<arg line="/p:Configuration=${build.config}" />
+			<arg line="/p:OutDir=&quot;${build.bin.dir}\\&quot;" />
+		</exec>
+	</target>
+	
+	<target name="build-tests" description="Builds the unit tests for the project.">
+		<!-- TODO: When there are unit tests, build them. -->
+	</target>
+
+	<target name="cleanup-build-output" description="Cleans up the build output for archival.">
+		<echo message="Cleaning up build output..." />
+		<delete>
+			<fileset basedir="${build.bin.dir}">
+				<include name="*" />
+				<exclude name="Paraesthesia.Tools.*" />
+			</fileset>
+		</delete>
+		<echo message="Build output cleaned up.  Only project output files remain." />
+	</target>
+
+	<target name="set-version" description="Updates the build assembly version.">
+		<asminfo output="AssemblyVersion.cs" language="CSharp">
+			<imports>
+				<import namespace="System.Reflection" />
+			</imports>
+			<attributes>
+				<attribute type="AssemblyVersionAttribute" value="${build.version}"/>
+				<attribute type="AssemblyCompanyAttribute" value="Paraesthesia" />
+				<attribute type="AssemblyCopyrightAttribute" value="(c) 2007 - ${datetime::get-year(datetime::now())} Travis Illig" />
+			</attributes>
+			<references>
+				<include name="System.dll" />
+			</references>
+		</asminfo>
+	</target>
+
+</project>

tests/syntax-tests/highlighted/Puppet/manifest_large_exported_classes_node.pp

@@ -0,0 +1,65 @@
+class foo ($bar) {
+  @@notify { 'foo': }
+}
+@@file { "somedir/${name}_${munin_port_real}":
+  ensure => present,
+  content => template("munin/defaultclient.erb"),
+}
+# Collect all exported files
+File <<||>>
+
+# Compile the munin.conf with a local header
+concatenated_file { "/etc/munin/munin.conf":
+    dir => somedir,
+    header => "/etc/munin/munin.conf.header",
+}
+hosting_vserver_configuration {
+    "erics":
+        domain => "orange.co",
+        type => "friend",
+        context => 13,
+        ip => "255.255.255.254", prefix => 27,
+        admin_user => "erict", admin_user_name => "hello, its me",
+        admin_user_email => "erict@orange.co",
+        customer => "hello? is it me?",
+        admin_password => file("/etc/puppet/secrets/hosting/erict_passwd"),
+}
+class davids_black_co_at {
+    ## Create users for my parents and my grandmother
+    hosting::user {
+        rztt: realname => "some other rztt",
+            uid => 2001, admin => true;
+        same: realname => "could be same",
+            uid => 2002;
+        imapersontoodamnit: realname => "some one else",
+            uid => 2003;
+    }
+
+    # Install git.black.co.at
+    include git::daemon
+    include git::web
+    git::web::export { [manifests, "puppet-trunk"]: }
+
+    # Provision an additional mysql database on the database server
+    hosting::database { "fogbugz": type => mysql }
+    # Create another VirtualHost
+    apache2::site { "local-fogbugz":
+        source => "puppet://$servername/files/hosting/erict/sites/local-fogbugz"
+    }
+}
+node backuppc {
+        # only use the smarthost
+        $mta = ssmtp
+        # this is a vserver on this host, so register correctly in nagios
+        $nagios_parent = "orange.co"
+        # I'm sharing an IP here, so those things have to have their own ports
+        $apache2_port = 8080
+        $munin_port = 5008
+        $munin_stats_port = 8667
+
+        # default configuration
+        include dbp
+
+        # configure the backuppc server
+        include backuppc::server
+}

tests/syntax-tests/highlighted/Python/battest.py

@@ -8,7 +8,7 @@
 h2 = 4  # this is a comment
 """this is also a comment"""
 
-# Import testt
+# Import test
 
 # class test
 
@@ -16,14 +16,19 @@
 class Hello:
     def __init__(self, x):
         self.name = x
-
+        
     def selfprint(self):
         print("hello my name is ", self.name)
 
     def testprint(self):
         print(1*2, 2+3, 4 % 5, 8-4, 9/4, 23//4)
 
-
+# Decorators test
+class Decorators:
+    @classmethod
+    def decoratorsTest(self):
+        pass
+    
 H1 = Hello("john")
 H1.selfprint()
 H1.testprint()
@@ -37,8 +42,8 @@
 print(a[2])
 print(a[2:])
 
-# dictioary test
-# copied from w3school example
+# dictionary test
+# copied from w3schools example
 
 myfamily = {
     "child1": {
@@ -55,7 +60,7 @@
     }
 }
 
-# touple test
+# tuple test
 
 testTuple = ("one", 2, "3")
 print(testTuple)
@@ -70,7 +75,7 @@
 
 formattest = "teststring is ={}".format(5)
 
-# lamda test
+# lambda test
 
 
 def x2(n):

tests/syntax-tests/highlighted/Rego/src_test.rego

@@ -0,0 +1,181 @@
+package k8sazureprocmount
+
+test_input_container_not_proc_mount_allowed {
+    input := { "review": input_review, "parameters": input_parameters_default}
+    results := violation with input as input
+    count(results) == 0
+}
+test_input_container_proc_mount_not_allowed {
+    input := { "review": input_review_unmasked, "parameters": input_parameters_default}
+    results := violation with input as input
+    count(results) == 1
+}
+test_input_container_proc_mount_not_allowed_null_param {
+    input := { "review": input_review_unmasked, "parameters": null }
+    results := violation with input as input
+    count(results) == 1
+}
+test_input_container_proc_mount_not_allowed_missing_param {
+    input := { "review": input_review_unmasked }
+    results := violation with input as input
+    count(results) == 1
+}
+test_input_container_many_not_proc_mount_allowed {
+    input := { "review": input_review_many, "parameters": input_parameters_default}
+    results := violation with input as input
+    count(results) == 0
+}
+test_input_container_many_mixed_proc_mount_not_allowed {
+    input := { "review": input_review_many_mixed, "parameters": input_parameters_default}
+    results := violation with input as input
+    count(results) == 1
+}
+test_input_container_many_mixed_proc_mount_not_allowed_two {
+    input := { "review": input_review_many_mixed_two, "parameters": input_parameters_default}
+    results := violation with input as input
+    count(results) == 2
+}
+test_input_container_proc_mount_case_insensitive {
+    input := { "review": input_review, "parameters": input_parameters_default_lower}
+    results := violation with input as input
+    count(results) == 0
+}
+test_input_container_not_proc_mount_unmasked {
+    input := { "review": input_review, "parameters": input_parameters_unmasked}
+    results := violation with input as input
+    count(results) == 0
+}
+test_input_container_proc_mount_unmasked {
+    input := { "review": input_review_unmasked, "parameters": input_parameters_unmasked}
+    results := violation with input as input
+    count(results) == 0
+}
+test_input_container_many_mixed_proc_mount_allowed_two {
+    input := { "review": input_review_many_mixed_two, "parameters": input_parameters_unmasked}
+    results := violation with input as input
+    count(results) == 0
+}
+
+input_review = {
+    "object": {
+        "metadata": {
+            "name": "nginx"
+        },
+        "spec": {
+            "containers": input_containers_one
+        }
+    }
+}
+
+input_review_unmasked = {
+    "object": {
+        "metadata": {
+            "name": "nginx"
+        },
+        "spec": {
+            "containers": input_containers_one_unmasked
+        }
+    }
+}
+
+input_review_many = {
+    "object": {
+        "metadata": {
+            "name": "nginx"
+        },
+        "spec": {
+            "containers": input_containers_many,
+            "initContainers": input_containers_one
+        }
+    }
+}
+
+input_review_many_mixed = {
+    "object": {
+        "metadata": {
+            "name": "nginx"
+        },
+        "spec": {
+            "containers": input_containers_many,
+            "initContainers": input_containers_one_unmasked
+        }
+    }
+}
+
+input_review_many_mixed_two = {
+    "object": {
+        "metadata": {
+            "name": "nginx"
+        },
+        "spec": {
+            "containers": input_containers_many_mixed,
+            "initContainers": input_containers_one_unmasked
+        }
+    }
+}
+
+input_containers_one = [
+{
+    "name": "nginx",
+    "image": "nginx",
+    "securityContext": {
+      "procMount": "Default"
+    }
+}]
+
+input_containers_one_unmasked = [
+{
+    "name": "nginx",
+    "image": "nginx",
+    "securityContext": {
+      "procMount": "Unmasked"
+    }
+}]
+
+input_containers_many = [
+{
+    "name": "nginx",
+    "image": "nginx",
+    "securityContext": {
+      "procMount": "Default"
+    }
+},
+{
+    "name": "nginx1",
+    "image": "nginx"
+},
+{
+    "name": "nginx2",
+    "image": "nginx",
+    "securityContext": {
+      "runAsUser": "1000"
+    }
+}]
+
+input_containers_many_mixed = [
+{
+    "name": "nginx",
+    "image": "nginx",
+    "securityContext": {
+      "procMount": "Default"
+    }
+},
+{
+    "name": "nginx1",
+    "image": "nginx",
+    "securityContext": {
+      "procMount": "Unmasked"
+    }
+}]
+
+input_parameters_default = {
+     "procMount": "Default"
+}
+
+input_parameters_default_lower = {
+     "procMount": "default"
+}
+
+input_parameters_unmasked = {
+     "procMount": "Unmasked"
+}

tests/syntax-tests/highlighted/Robot Framework/recipe141_aws_simple_storage_service.robot

@@ -0,0 +1,31 @@
+*** Settings ***
+Documentation     PROBLEM:
+...               You want to test the existence of a file in an AWS S3 bucket
+...               without using lower level Python code or developing a custom library.
+...               DISCUSSION:
+...               This recipe demonstrates:
+...               - using a Suite Teardown to end the test suite cleanly
+...               - using keywords from an external library
+...               - accessing OS Environment Variables directly using %{} syntax
+...               This recipe has the following external dependencies:
+...               $ pip install --upgrade robotframework-aws
+...               This recipe also requires the following OS environment variables:
+...               AWS_ACCESS_KEY_ID
+...               AWS_SECRET_ACCESS_KEY
+Suite Teardown    Delete All Sessions
+Library           AWSLibrary
+Force Tags        no-ci-testing
+
+*** Variables ***
+${recipe}         Recipe 14.1 AWS Simple Storage Service
+${level}          Intermediate
+${category}       External Library: AWSLibrary
+${REGION}         us-east-1
+${BUCKET}         YOUR_BUCKET_NAME_GOES_HERE
+${KEY}            YOUR_FILE_PATH_GOES_HERE
+
+*** Test Cases ***
+Check Key Exists In Bucket
+    Log Variables
+    Create Session With Keys    ${REGION}    %{AWS_ACCESS_KEY_ID}    %{AWS_SECRET_ACCESS_KEY}
+    Key Should Exist            ${BUCKET}    ${KEY}

tests/syntax-tests/highlighted/Slim/test.slim

@@ -0,0 +1,20 @@
+doctype html
+html lang=locale
+  head
+    meta charset='utf-8'
+    title #{@title ? "#{@title} | Testing" : 'Testing'}
+    == stylesheet('app.css')
+
+  body
+    header
+      h1.title Testing
+
+      - @links.each do |link|
+        a href=link.href
+          =link.title
+    div
+      == yield
+
+    - if APP_ENV == 'production'
+      footer
+        p Testing

tests/syntax-tests/highlighted/Strace/ls.strace

@@ -0,0 +1,94 @@
+execve("/usr/bin/ls", ["ls"], 0x7fff7d89cea0 /* 34 vars */) = 0
+brk(NULL)                               = 0x55bc0a294000
+access("/etc/ld.so.preload", R_OK)      = -1 ENOENT (No such file or directory)
+openat(AT_FDCWD, "/etc/ld.so.cache", O_RDONLY|O_CLOEXEC) = 3
+fstat(3, {st_mode=S_IFREG|0644, st_size=45404, ...}) = 0
+mmap(NULL, 45404, PROT_READ, MAP_PRIVATE, 3, 0) = 0x7f7066972000
+close(3)                                = 0
+openat(AT_FDCWD, "/lib/x86_64-linux-gnu/libselinux.so.1", O_RDONLY|O_CLOEXEC) = 3
+read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0@k\0\0\0\0\0\0"..., 832) = 832
+fstat(3, {st_mode=S_IFREG|0644, st_size=155296, ...}) = 0
+mmap(NULL, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x7f7066970000
+mmap(NULL, 2259632, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x7f7066748000
+mprotect(0x7f706676d000, 2093056, PROT_NONE) = 0
+mmap(0x7f706696c000, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x24000) = 0x7f706696c000
+mmap(0x7f706696e000, 6832, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0x7f706696e000
+close(3)                                = 0
+openat(AT_FDCWD, "/lib/x86_64-linux-gnu/libc.so.6", O_RDONLY|O_CLOEXEC) = 3
+read(3, "\177ELF\2\1\1\3\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\260A\2\0\0\0\0\0"..., 832) = 832
+fstat(3, {st_mode=S_IFREG|0755, st_size=1824496, ...}) = 0
+mmap(NULL, 1837056, PROT_READ, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x7f7066587000
+mprotect(0x7f70665a9000, 1658880, PROT_NONE) = 0
+mmap(0x7f70665a9000, 1343488, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x22000) = 0x7f70665a9000
+mmap(0x7f70666f1000, 311296, PROT_READ, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x16a000) = 0x7f70666f1000
+mmap(0x7f706673e000, 24576, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x1b6000) = 0x7f706673e000
+mmap(0x7f7066744000, 14336, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0x7f7066744000
+close(3)                                = 0
+openat(AT_FDCWD, "/lib/x86_64-linux-gnu/libpcre.so.3", O_RDONLY|O_CLOEXEC) = 3
+read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\340!\0\0\0\0\0\0"..., 832) = 832
+fstat(3, {st_mode=S_IFREG|0644, st_size=468944, ...}) = 0
+mmap(NULL, 471304, PROT_READ, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x7f7066513000
+mmap(0x7f7066515000, 335872, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x2000) = 0x7f7066515000
+mmap(0x7f7066567000, 122880, PROT_READ, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x54000) = 0x7f7066567000
+mmap(0x7f7066585000, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x71000) = 0x7f7066585000
+close(3)                                = 0
+openat(AT_FDCWD, "/lib/x86_64-linux-gnu/libdl.so.2", O_RDONLY|O_CLOEXEC) = 3
+read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0000\21\0\0\0\0\0\0"..., 832) = 832
+fstat(3, {st_mode=S_IFREG|0644, st_size=14592, ...}) = 0
+mmap(NULL, 16656, PROT_READ, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x7f706650e000
+mmap(0x7f706650f000, 4096, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x1000) = 0x7f706650f000
+mmap(0x7f7066510000, 4096, PROT_READ, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x2000) = 0x7f7066510000
+mmap(0x7f7066511000, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x2000) = 0x7f7066511000
+close(3)                                = 0
+openat(AT_FDCWD, "/lib/x86_64-linux-gnu/libpthread.so.0", O_RDONLY|O_CLOEXEC) = 3
+read(3, "\177ELF\2\1\1\3\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0@l\0\0\0\0\0\0"..., 832) = 832
+fstat(3, {st_mode=S_IFREG|0755, st_size=146968, ...}) = 0
+mmap(NULL, 132288, PROT_READ, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x7f70664ed000
+mmap(0x7f70664f3000, 61440, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x6000) = 0x7f70664f3000
+mmap(0x7f7066502000, 24576, PROT_READ, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x15000) = 0x7f7066502000
+mmap(0x7f7066508000, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x1a000) = 0x7f7066508000
+mmap(0x7f706650a000, 13504, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0x7f706650a000
+close(3)                                = 0
+mmap(NULL, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x7f70664eb000
+arch_prctl(ARCH_SET_FS, 0x7f70664ec380) = 0
+mprotect(0x7f706673e000, 16384, PROT_READ) = 0
+mprotect(0x7f7066508000, 4096, PROT_READ) = 0
+mprotect(0x7f7066511000, 4096, PROT_READ) = 0
+mprotect(0x7f7066585000, 4096, PROT_READ) = 0
+mprotect(0x7f706696c000, 4096, PROT_READ) = 0
+mprotect(0x55bc08de8000, 4096, PROT_READ) = 0
+mprotect(0x7f70669a5000, 4096, PROT_READ) = 0
+munmap(0x7f7066972000, 45404)           = 0
+set_tid_address(0x7f70664ec650)         = 1737
+set_robust_list(0x7f70664ec660, 24)     = 0
+rt_sigaction(SIGRTMIN, {sa_handler=0x7f70664f36b0, sa_mask=[], sa_flags=SA_RESTORER|SA_SIGINFO, sa_restorer=0x7f70664ff730}, NULL, 8) = 0
+rt_sigaction(SIGRT_1, {sa_handler=0x7f70664f3740, sa_mask=[], sa_flags=SA_RESTORER|SA_RESTART|SA_SIGINFO, sa_restorer=0x7f70664ff730}, NULL, 8) = 0
+rt_sigprocmask(SIG_UNBLOCK, [RTMIN RT_1], NULL, 8) = 0
+prlimit64(0, RLIMIT_STACK, NULL, {rlim_cur=8192*1024, rlim_max=RLIM64_INFINITY}) = 0
+statfs("/sys/fs/selinux", 0x7ffd655ea110) = -1 ENOENT (No such file or directory)
+statfs("/selinux", 0x7ffd655ea110)      = -1 ENOENT (No such file or directory)
+brk(NULL)                               = 0x55bc0a294000
+brk(0x55bc0a2b5000)                     = 0x55bc0a2b5000
+openat(AT_FDCWD, "/proc/filesystems", O_RDONLY|O_CLOEXEC) = 3
+fstat(3, {st_mode=S_IFREG|0444, st_size=0, ...}) = 0
+read(3, "nodev\tsysfs\nnodev\trootfs\nnodev\tr"..., 1024) = 333
+read(3, "", 1024)                       = 0
+close(3)                                = 0
+access("/etc/selinux/config", F_OK)     = -1 ENOENT (No such file or directory)
+openat(AT_FDCWD, "/usr/lib/locale/locale-archive", O_RDONLY|O_CLOEXEC) = 3
+fstat(3, {st_mode=S_IFREG|0644, st_size=3031696, ...}) = 0
+mmap(NULL, 3031696, PROT_READ, MAP_PRIVATE, 3, 0) = 0x7f7066206000
+close(3)                                = 0
+ioctl(1, TCGETS, {B38400 opost isig icanon echo ...}) = 0
+ioctl(1, TIOCGWINSZ, {ws_row=46, ws_col=173, ws_xpixel=0, ws_ypixel=0}) = 0
+openat(AT_FDCWD, ".", O_RDONLY|O_NONBLOCK|O_CLOEXEC|O_DIRECTORY) = 3
+fstat(3, {st_mode=S_IFDIR|0700, st_size=4096, ...}) = 0
+getdents64(3, /* 3 entries */, 32768)   = 80
+getdents64(3, /* 0 entries */, 32768)   = 0
+close(3)                                = 0
+fstat(1, {st_mode=S_IFCHR|0620, st_rdev=makedev(0x88, 0), ...}) = 0
+write(1, "ls.strace\n", 10)             = 10
+close(1)                                = 0
+close(2)                                = 0
+exit_group(0)                           = ?
++++ exited with 0 +++

tests/syntax-tests/highlighted/Stylus/gradients.styl

@@ -0,0 +1,90 @@
+@import 'config'
+
+/*
+ * Implicit color stop position.
+ */
+
+pos-in-stops(i, stops)
+  len = length(stops)
+  if len - 1 == i
+    100%
+  else if i
+    unit(i / len * 100, '%')
+  else
+    0
+
+/*
+ * Normalize color stops:
+ *
+ *   - (color pos) -> (pos color)
+ *   - (color) -> (implied-pos color)
+ *
+ */
+
+normalize-stops(stops)
+  stops = clone(stops)
+  for stop, i in stops
+    if length(stop) == 1
+      color = stop[0]
+      stop[0] = pos-in-stops(i, stops)
+      stop[1] = color
+    else if typeof(stop[1]) == 'unit'
+      pos = stop[1]
+      stop[1] = stop[0]
+      stop[0] = pos
+  stops
+
+/*
+ * Join color stops with the given translation function.
+ */
+
+join-stops(stops, translate)
+  str = ''
+  len = length(stops)
+  for stop, i in stops
+    str += ', ' if i
+    pos = stop[0]
+    color = stop[1]
+    str += translate(color, pos)
+  unquote(str)
+
+/*
+ * Standard color stop.
+ */
+
+std-stop(color, pos)
+  '%s %s' % (color pos)
+
+/*
+ * Create a linear gradient with the given start position
+ * and variable number of color stops.
+ *
+ * Examples:
+ *
+ *    background: linear-gradient(top, red, green, blue)
+ *    background: linear-gradient(bottom, red, green 50%, blue)
+ *    background: linear-gradient(bottom, red, 50% green, blue)
+ *    background: linear-gradient(bottom, red, 50% green, 90% white, blue)
+ *
+ */
+
+linear-gradient(start, stops...)
+  error('color stops required') unless length(stops)
+
+  unquote('linear-gradient(' + join(', ',arguments) + ')')
+
+/*
+ * Create a linear gradient image with the given start position
+ * and variable number of color stops.
+ */
+
+linear-gradient-image(start, stops...)
+  error('node-canvas is required for linear-gradient-image()') unless has-canvas
+  stops = stops[0] if length(stops) == 1
+  error('gradient image size required') unless start[0] is a 'unit'
+  size = start[0]
+  start = start[1] or 'top'
+  grad = create-gradient-image(size, start)
+  stops = normalize-stops(stops)
+  add-color-stop(grad, stop[0], stop[1]) for stop in stops
+  'url(%s)' % gradient-data-uri(grad)

tests/syntax-tests/highlighted/Syslog/example.syslog

@@ -9,3 +9,8 @@
 Apr  4 09:30:01 hostname-here CRON[89278]: (root) CMD ([ -x /etc/init.d/anacron ] && if [ ! -d /run/systemd/system ]; then /usr/sbin/invoke-rc.d anacron start >/dev/null; fi)
 Apr  4 16:32:07 hostname-here NetworkManager[740]: <info>  [1617629527.1101] manager: NetworkManager state is now CONNECTED_GLOBAL
 Apr  4 22:00:45 hostname-here dbus-daemon[1094]: [session uid=1000 pid=1094] Successfully activated service 'io.github.celluloid_player.Celluloid'
+Aug 11 13:29:06 hostname-here insomnia_insomnia.desktop[142666]: 13:29:06.316 › [updater] Updater not running platform=linux dev=false
+Aug 11 13:36:34 192.168.220.5 nginx: 2021/08/11 13:36:34 [debug] 2031#2031: epoll add event: fd:6 op:1 ev:00002001
+Aug 11 21:31:08 ::1 nginx: 2021/08/11 21:31:08 [debug] 760831#760831: epoll add event: fd:6 op:1 ev:10000001
+Aug 11 21:40:31 hostname-here scop hello
+Aug 16 21:38:21 hostname-here systemd[1]: Finished Cleanup of Temporary Directories.

tests/syntax-tests/highlighted/TypeScriptReact/app.tsx

@@ -0,0 +1,35 @@
+import * as React from "react";
+import { HelloComponent } from "./hello";
+import { NameEditComponent } from "./nameEdit";
+
+export const App = () => {
+  const [name, setName] = React.useState("defaultUserName");
+  const [editingName, setEditingName] = React.useState("defaultUserName");
+
+  const loadUsername = () => {
+    setTimeout(() => {
+      setName("name from async call");
+      setEditingName("name from async call");
+    }, 500);
+  };
+
+  React.useEffect(() => {
+    loadUsername();
+  }, []);
+
+  const setUsernameState = () => {
+    setName(editingName);
+  };
+
+  return (
+    <>
+      <HelloComponent userName={name} />
+      <NameEditComponent
+        initialUserName={name}
+        editingName={editingName}
+        onNameUpdated={setUsernameState}
+        onEditingNameUpdated={setEditingName}
+      />
+    </>
+  );
+};

tests/syntax-tests/highlighted/Verilog/div_pipelined.v

@@ -0,0 +1,172 @@
+// Copyright 2018 Schuyler Eldridge
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Implements a fixed-point parameterized pipelined division
+// operation. Outputs are expected to be on range [-1,1), techincally
+// [-1,2^(BITS-1)-1/2^(BITS-1)]. There is no convergent rounding.
+//
+// [TODO] Implement optional convergent rounding and some form of
+// variable output binary point placement. There are arguments in
+// these changes that make sense (specifically, adding an additional
+// bit results in a gain of one value when all the other 2^6 values
+// greater than 1 aren't used). Other improvements that are needed: 1)
+// quotient_gen is getting smaller by one bit in every stage, it would
+// make more sense to generate this as such, 2) there's some weird
+// initial behavior after rst_n is deasserted, you get weird output on
+// the quotient line for a number of cycles.
+//
+// [TODO] This doesn't exactly behave as expected if you specify
+// different BITS and STAGES parameters (which for a functional
+// module, should be implemented). Note, that this technically works,
+// but needs more investigation to fully understand its properties.
+
+`timescale 1ns / 1ps
+module div_pipelined
+  (
+   input                 clk,
+   input                 rst_n,
+   input                 start,
+   input [BITS-1:0]      dividend,
+   input [BITS-1:0]      divisor,
+   output reg            data_valid,
+   output reg            div_by_zero,
+   output reg [STAGES-1:0] quotient
+   //   output reg [7:0]      quotient_correct
+   );
+
+  // WARNING!!! THESE PARAMETERS ARE INTENDED TO BE MODIFIED IN A TOP
+  // LEVEL MODULE. LOCAL CHANGES HERE WILL, MOST LIKELY, BE
+  // OVERWRITTEN!
+  parameter
+    BITS  = 8,
+    STAGES  = BITS;
+
+  // y = a/bQ
+
+  reg [STAGES-1:0]       start_gen, negative_quotient_gen, div_by_zero_gen;
+  reg [BITS*2*(STAGES-1)-1:0] dividend_gen, divisor_gen, quotient_gen;
+  wire [BITS-1:0]             pad_dividend;
+  wire [BITS-2:0]             pad_divisor;
+
+  assign pad_dividend  = 0;
+  assign pad_divisor  = 0;
+
+  // sign conversion stage
+  always @ (posedge clk or negedge rst_n)
+    begin
+      if (!rst_n) begin
+        div_by_zero_gen[0] <= 0;
+        start_gen[0] <=0;
+        negative_quotient_gen[0] <= 0;
+        dividend_gen[BITS*2-1:0] <= 0;
+        divisor_gen[BITS*2-1:0] <= 0; end
+      else begin
+        div_by_zero_gen[0]       <= (divisor == 0);
+        start_gen[0]             <= start;
+        negative_quotient_gen[0] <= dividend[BITS-1] ^ divisor[BITS-1];
+        dividend_gen[BITS*2-1:0] <= (dividend[BITS-1]) ? ~{dividend,pad_dividend} + 1 : {dividend,pad_dividend};
+        divisor_gen[BITS*2-1:0]  <= (divisor [BITS-1]) ? ~{1'b1,divisor, pad_divisor} + 1 : {1'b0,divisor, pad_divisor};
+      end
+    end
+
+  // first computation stage
+  always @ (posedge clk or negedge rst_n) begin
+    if (!rst_n) begin
+      div_by_zero_gen[1]              <= 0;
+      start_gen[1]                    <= 0;
+      negative_quotient_gen[1]        <= 0;
+      divisor_gen[BITS*2*2-1:BITS*2]  <= 0;
+      quotient_gen[BITS*2-1:0]        <= 0;
+      dividend_gen[BITS*2*2-1:BITS*2] <= 0;
+    end
+    else begin
+      div_by_zero_gen[1]             <= div_by_zero_gen[0];
+      start_gen[1]                   <= start_gen[0];
+      negative_quotient_gen[1]       <= negative_quotient_gen[0];
+      divisor_gen[BITS*2*2-1:BITS*2] <= divisor_gen[BITS*2-1:0] >> 1;
+      if ( dividend_gen[BITS*2-1:0] >= divisor_gen[BITS*2-1:0]) begin
+        quotient_gen[BITS*2-1:0] <= 1 << STAGES - 2;
+        dividend_gen[BITS*2*2-1:BITS*2] <= dividend_gen[BITS*2-1:0] - divisor_gen[BITS*2-1:0];
+      end
+      else begin
+        quotient_gen[BITS*2-1:0] <= 0;
+        dividend_gen[BITS*2*2-1:BITS*2] <= dividend_gen[BITS*2-1:0];
+      end
+    end // else: !if(!rst_n)
+  end // always @ (posedge clk)
+
+  generate
+    genvar            i;
+    for (i = 1; i < STAGES - 2; i = i + 1) begin : pipeline
+      always @ (posedge clk or negedge rst_n) begin
+        if (!rst_n) begin
+          div_by_zero_gen[i+1]                     <= 0;
+          start_gen[i+1]                           <= 0;
+          negative_quotient_gen[i+1]               <= 0;
+          divisor_gen[BITS*2*(i+2)-1:BITS*2*(i+1)] <= 0;
+          quotient_gen[BITS*2*(i+1)-1:BITS*2*i]     <= 0;
+          dividend_gen[BITS*2*(i+2)-1:BITS*2*(i+1)] <= 0;
+        end
+        else begin
+          div_by_zero_gen[i+1]                     <= div_by_zero_gen[i];
+          start_gen[i+1]                           <= start_gen[i];
+          negative_quotient_gen[i+1]               <= negative_quotient_gen[i];
+          divisor_gen[BITS*2*(i+2)-1:BITS*2*(i+1)] <= divisor_gen[BITS*2*(i+1)-1:BITS*2*i] >> 1;
+          if (dividend_gen[BITS*2*(i+1)-1:BITS*2*i] >= divisor_gen[BITS*2*(i+1)-1:BITS*2*i]) begin
+            quotient_gen[BITS*2*(i+1)-1:BITS*2*i] <= quotient_gen[BITS*2*i-1:BITS*2*(i-1)] | (1 << (STAGES-2-i));
+            dividend_gen[BITS*2*(i+2)-1:BITS*2*(i+1)] <= dividend_gen[BITS*2*(i+1)-1:BITS*2*i] - divisor_gen[BITS*2*(i+1)-1:BITS*2*i];
+          end
+          else begin
+            quotient_gen[BITS*2*(i+1)-1:BITS*2*i]     <= quotient_gen[BITS*2*i-1:BITS*2*(i-1)];
+            dividend_gen[BITS*2*(i+2)-1:BITS*2*(i+1)] <= dividend_gen[BITS*2*(i+1)-1:BITS*2*i];
+          end
+        end // else: !if(!rst_n)
+      end // always @ (posedge clk or negedge rst_n)
+    end // block: pipeline
+  endgenerate
+
+  // last computation stage
+  always @ (posedge clk or negedge rst_n) begin
+    if (!rst_n) begin
+      div_by_zero_gen[STAGES-1]                           <= 0;
+      start_gen[STAGES-1]                                 <= 0;
+      negative_quotient_gen[STAGES-1]                     <= 0;
+      quotient_gen[BITS*2*(STAGES-1)-1:BITS*2*(STAGES-2)] <= 0;
+    end
+    else begin
+      div_by_zero_gen[STAGES-1]       <= div_by_zero_gen[STAGES-2];
+      start_gen[STAGES-1]             <= start_gen[STAGES-2];
+      negative_quotient_gen[STAGES-1] <= negative_quotient_gen[STAGES-2];
+      if ( dividend_gen[BITS*2*(STAGES-1)-1:BITS*2*(STAGES-2)] >= divisor_gen[BITS*2*(STAGES-1)-1:BITS*2*(STAGES-2)] )
+        quotient_gen[BITS*2*(STAGES-1)-1:BITS*2*(STAGES-2)] <= quotient_gen[BITS*2*(STAGES-2)-1:BITS*2*(STAGES-3)] | 1;
+      else
+        quotient_gen[BITS*2*(STAGES-1)-1:BITS*2*(STAGES-2)] <= quotient_gen[BITS*2*(STAGES-2)-1:BITS*2*(STAGES-3)];
+    end // else: !if(!rst_n)
+  end // always @ (posedge clk)
+
+  // sign conversion stage
+  always @ (posedge clk or negedge rst_n) begin
+    if (!rst_n) begin
+      div_by_zero <= 0;
+      data_valid  <= 0;
+      quotient    <= 0;
+    end
+    else begin
+      div_by_zero <= div_by_zero_gen[STAGES-1];
+      data_valid  <= start_gen[STAGES-1];
+      quotient    <= (negative_quotient_gen[STAGES-1]) ? ~quotient_gen[BITS*2*(STAGES-1)-1:BITS*2*(STAGES-2)] + 1 : quotient_gen[BITS*2*(STAGES-1)-1:BITS*2*(STAGES-2)];
+    end
+  end
+
+endmodule

tests/syntax-tests/highlighted/XAML/ItemPage.xaml

@@ -0,0 +1,264 @@
+<!--
+    //*********************************************************
+    //
+    // Copyright (c) Microsoft. All rights reserved.
+    // THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF
+    // ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY
+    // IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR
+    // PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.
+    //
+    //*********************************************************
+-->
+<Page
+    x:Class="AppUIBasics.ItemPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:common="using:AppUIBasics.Common"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:data="using:AppUIBasics.Data"
+    xmlns:local="using:AppUIBasics"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    x:Name="pageRoot"
+    mc:Ignorable="d">
+
+    <!--
+        This grid acts as a root panel for the page that defines two rows:
+        * Row 0 contains the back button and page title
+        * Row 1 contains the rest of the page layout
+    -->
+    <Grid x:Name="rootPanel" d:DataContext="{Binding Groups[0].Items[0], Source={d:DesignData Source=/DataModel/ControlinfoData.json, Type=data:ControlInfoDataSource}}" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+        <VisualStateManager.VisualStateGroups>
+            <VisualStateGroup>
+                <VisualState>
+                    <VisualState.StateTriggers>
+                        <local:DeviceFamilyTrigger DeviceFamily="Windows.Xbox" />
+                    </VisualState.StateTriggers>
+                    <VisualState.Setters>
+                        <Setter Target="svPanel.Margin" Value="0,0,48,27" />
+                    </VisualState.Setters>
+                </VisualState>
+            </VisualStateGroup>
+            <VisualStateGroup>
+                <VisualState x:Name="NormalFrameContent" />
+                <VisualState x:Name="WideFrameContent">
+                    <VisualState.Setters>
+                        <Setter Target="contentFrame.Width" Value="1028" />
+                        <Setter Target="contentFrame.HorizontalAlignment" Value="Left" />
+                    </VisualState.Setters>
+                </VisualState>
+            </VisualStateGroup>
+            <VisualStateGroup x:Name="LayoutVisualStates">
+                <VisualState x:Name="LargeLayout">
+                    <VisualState.StateTriggers>
+                        <AdaptiveTrigger MinWindowWidth="1372" />
+                    </VisualState.StateTriggers>
+                </VisualState>
+                <VisualState x:Name="WideLayout">
+                    <VisualState.StateTriggers>
+                        <AdaptiveTrigger MinWindowWidth="{StaticResource Breakpoint640Plus}" />
+                    </VisualState.StateTriggers>
+                    <VisualState.Setters>
+                        <Setter Target="seeAlsoPanel.Width" Value="Auto" />
+                        <Setter Target="seeAlsoPanel.(Grid.Row)" Value="3" />
+                        <Setter Target="seeAlsoPanel.(Grid.Column)" Value="0" />
+                        <Setter Target="seeAlsoPanel.(Grid.ColumnSpan)" Value="3" />
+
+                        <Setter Target="SourcePanel.(Grid.ColumnSpan)" Value="1" />
+
+                        <Setter Target="DocumentationPanel.(Grid.ColumnSpan)" Value="1" />
+
+                        <Setter Target="RelatedControlsPanel.(Grid.Row)" Value="0" />
+                        <Setter Target="RelatedControlsPanel.(Grid.Column)" Value="2" />
+                        <Setter Target="RelatedControlsPanel.(Grid.ColumnSpan)" Value="1" />
+
+                        <Setter Target="FeedbackPanel.(Grid.Row)" Value="1" />
+                        <Setter Target="FeedbackPanel.(Grid.Column)" Value="2" />
+                        <Setter Target="FeedbackPanel.(Grid.ColumnSpan)" Value="1" />
+                    </VisualState.Setters>
+                </VisualState>
+                <VisualState x:Name="NarrowLayout">
+                    <VisualState.StateTriggers>
+                        <AdaptiveTrigger MinWindowWidth="0" />
+                    </VisualState.StateTriggers>
+                    <VisualState.Setters>
+                        <Setter Target="seeAlsoPanel.Width" Value="Auto" />
+                        <Setter Target="seeAlsoPanel.(Grid.Row)" Value="3" />
+                        <Setter Target="seeAlsoPanel.(Grid.Column)" Value="0" />
+                        <Setter Target="seeAlsoPanel.(Grid.ColumnSpan)" Value="3" />
+
+                        <Setter Target="SourcePanel.(Grid.ColumnSpan)" Value="1" />
+
+                        <Setter Target="DocumentationPanel.(Grid.ColumnSpan)" Value="1" />
+
+                        <Setter Target="RelatedControlsPanel.(Grid.Row)" Value="0" />
+                        <Setter Target="RelatedControlsPanel.(Grid.Column)" Value="2" />
+                        <Setter Target="RelatedControlsPanel.(Grid.ColumnSpan)" Value="1" />
+
+                        <Setter Target="FeedbackPanel.(Grid.Row)" Value="1" />
+                        <Setter Target="FeedbackPanel.(Grid.Column)" Value="2" />
+                        <Setter Target="FeedbackPanel.(Grid.ColumnSpan)" Value="1" />
+
+                        <Setter Target="rightMargin.Width" Value="0" />
+                        <Setter Target="contentRoot.Padding" Value="14,0" />
+                    </VisualState.Setters>
+                </VisualState>
+            </VisualStateGroup>
+        </VisualStateManager.VisualStateGroups>
+
+        <!--  Content Region  -->
+        <ScrollViewer
+            x:Name="svPanel"
+
+            VerticalScrollBarVisibility="Auto"
+            VerticalScrollMode="Auto">
+            <Grid x:Name="contentRoot" Padding="24,0,0,0" SizeChanged="OnContentRootSizeChanged">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition x:Name="contentColumn" />
+                    <ColumnDefinition x:Name="rightMargin" Width="20" />
+                    <ColumnDefinition x:Name="infoColumn" Width="Auto" />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="20" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+
+                <TextBlock
+                    x:Name="descriptionText"
+                    Style="{ThemeResource BodyTextBlockStyle}"
+                    Grid.ColumnSpan="2"
+                    Margin="0,5,24,0"
+                    Text="{x:Bind Item.Description}" />
+
+                <Frame x:Name="contentFrame" Grid.Row="1" />
+
+                <Grid
+                    x:Name="seeAlsoPanel"
+                    Grid.Row="0"
+                    Grid.RowSpan="2"
+                    Grid.Column="2"
+                    Width="280"
+                    Margin="0,0,24,24">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition />
+                        <ColumnDefinition Width="20" />
+                        <ColumnDefinition />
+                    </Grid.ColumnDefinitions>
+
+                    <StackPanel x:Name="SourcePanel" Grid.Row="0" Grid.ColumnSpan="3" Margin="0,0,0,40">
+                        <TextBlock
+                            x:Name="SourceHeader"
+                            x:Uid="SourceHeader"
+                            Style="{ThemeResource SubtitleTextBlockStyle}"
+                            Text="View page code on GitHub"/>
+                        <HyperlinkButton
+                            x:Name="PageMarkupGitHubLink"
+                            ToolTipService.ToolTip="{x:Bind PageMarkupGitHubLink.NavigateUri, Mode=OneWay}">
+                            <TextBlock Text="XAML source code"/>
+                        </HyperlinkButton>
+                        <HyperlinkButton
+                            x:Name="PageCodeGitHubLink"
+                            ToolTipService.ToolTip="{x:Bind PageCodeGitHubLink.NavigateUri, Mode=OneWay}"
+                            Margin="0,12,0,0">
+                            <TextBlock Text="C# source code"/>
+                        </HyperlinkButton>
+                    </StackPanel>
+
+                    <StackPanel x:Name="DocumentationPanel" Grid.Row="1" Grid.ColumnSpan="3" Margin="0,0,0,40">
+                        <TextBlock
+                            x:Name="docHeader"
+                            x:Uid="DocHeader"
+                            Style="{StaticResource SubtitleTextBlockStyle}" />
+                        <ItemsControl
+                            x:Name="DocsList"
+                            Margin="0,12,0,0"
+                            IsTabStop="False"
+                            ItemsSource="{x:Bind Item.Docs}">
+                            <ItemsControl.ItemsPanel>
+                                <ItemsPanelTemplate>
+                                    <StackPanel Orientation="Vertical" />
+                                </ItemsPanelTemplate>
+                            </ItemsControl.ItemsPanel>
+                            <ItemsControl.ItemTemplate>
+                                <DataTemplate x:DataType="data:ControlInfoDocLink">
+                                    <HyperlinkButton NavigateUri="{Binding Uri}" ToolTipService.ToolTip="{Binding Uri}">
+                                        <TextBlock Text="{x:Bind Title}" />
+                                    </HyperlinkButton>
+                                </DataTemplate>
+                            </ItemsControl.ItemTemplate>
+                        </ItemsControl>
+                    </StackPanel>
+
+                    <StackPanel x:Name="RelatedControlsPanel" Grid.Row="2" Grid.ColumnSpan="3" Margin="0,0,0,40">
+                        <TextBlock
+                            x:Name="relatedControlsHeader"
+                            x:Uid="RelatedControlsHeader"
+                            Style="{StaticResource SubtitleTextBlockStyle}" />
+
+                        <ItemsControl
+                            x:Name="relatedItemsControl"
+                            Margin="0,12,0,0"
+                            IsTabStop="False"
+                            ItemsSource="{x:Bind Item.RelatedControls}">
+                            <ItemsControl.ItemsPanel>
+                                <ItemsPanelTemplate>
+                                    <StackPanel Orientation="Vertical" />
+                                </ItemsPanelTemplate>
+                            </ItemsControl.ItemsPanel>
+                            <ItemsControl.ItemTemplate>
+                                <DataTemplate x:DataType="x:String">
+                                    <!-- A HyperlinkButton must always provide an accessible name to a screen reader which
+                                         conveys the purpose of the link. By default, when the HyperlinkButton is built
+                                         as below, with an Image and TextBlock, the HyperlinkButton provides no accessible
+                                         name. So bind the accessible name to the same data that provides the text shown
+                                         visually on the contained TextBlock. -->
+                                    <HyperlinkButton AutomationProperties.Name="{x:Bind}" Click="OnRelatedControlClick">
+                                        <RelativePanel>
+                                            <!-- Now that the HyperlinkButton has a helpful accessible name, it serves no
+                                                 useful purpose for the contained Image, (which is purely decorative,) or
+                                                 the contained TextBlock to be exposed to a screen reader. All the information
+                                                 required by customers using a screen reader is accessible directly through the
+                                                 Hyperlink button. As such, mark the contained elements as not being interesting
+                                                 to a screen reader through use of the AutomationProperties.AccessibilityView
+                                                 property. -->
+                                            <Image
+                                                AutomationProperties.AccessibilityView="Raw"
+                                                x:Name="iconImage"
+                                                Width="25"
+                                                Margin="0,0,15,0"
+                                                common:ImageLoader.Source="{Binding}" />
+                                            <TextBlock
+                                                AutomationProperties.AccessibilityView="Raw"
+                                                Foreground="{ThemeResource HyperlinkButtonForeground}"
+                                                RelativePanel.RightOf="iconImage"
+                                                Text="{x:Bind}"
+                                                TextWrapping="Wrap" />
+                                        </RelativePanel>
+                                    </HyperlinkButton>
+                                </DataTemplate>
+                            </ItemsControl.ItemTemplate>
+                        </ItemsControl>
+                    </StackPanel>
+
+                    <StackPanel x:Name="FeedbackPanel" Grid.Row="3" Grid.ColumnSpan="3">
+                        <TextBlock
+                            x:Name="feedbackHeader"
+                            x:Uid="FeedbackHeader"
+                            Style="{StaticResource SubtitleTextBlockStyle}" />
+                        <HyperlinkButton NavigateUri="https://github.com/microsoft/Xaml-Controls-Gallery/issues/new/choose" 
+                                         ToolTipService.ToolTip="https://github.com/microsoft/Xaml-Controls-Gallery/issues/new/choose">
+                            <TextBlock x:Uid="FeedbackLink" />
+                        </HyperlinkButton>
+                    </StackPanel>
+                </Grid>
+            </Grid>
+        </ScrollViewer>
+    </Grid>
+</Page>