Update dependencies

closes #865

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,39 @@
+---
+name: Bug Report
+about: Report a bug.
+title: ""
+labels: bug
+assignees: ''
+
+---
+
+<!--
+Hey there, thanks for creating an issue!
+
+In order to reproduce your issue, we might need to know a little bit more about the environment
+which you're running `bat` on.
+
+If you're on Linux or MacOS:
+  Please run the script at https://github.com/sharkdp/bat/blob/master/diagnostics/info.sh and
+  paste the output at the bottom of the bug report.
+
+If you're on Windows:
+  Please tell us about your Windows Version (e.g. "Windows 10 1908") at the
+  bottom of the bug report.
+-->
+
+**What version of `bat` are you using?**
+[paste the output of `bat --version` here]
+
+**Describe the bug you encountered:**
+...
+
+**Describe what you expected to happen?**
+...
+
+**How did you install `bat`?**
+apt-get, homebrew, GitHub release, etc.
+
+---
+
+[paste the output of `info.sh` here]

.github/ISSUE_TEMPLATE/config.yml

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

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,10 @@
+---
+name: Feature Request
+about: Suggest an idea for this project.
+title: ''
+labels: feature-request
+assignees: ''
+
+---
+
+

.github/ISSUE_TEMPLATE/question.md

@@ -0,0 +1,10 @@
+---
+name: Question
+about: Ask a question about 'bat'.
+title: ''
+labels: question
+assignees: ''
+
+---
+
+

.github/ISSUE_TEMPLATE/syntax_request.md

@@ -0,0 +1,29 @@
+---
+name: Syntax Request
+about: Request adding a new syntax to bat.
+title: ""
+labels: syntax-request
+assignees: ''
+
+---
+
+<!--
+BEFORE YOU MAKE A REQUEST:
+
+Are you looking to add a new syntax to use on one of your devices?
+Bat supports locally-installed language definitions. See the link below:
+
+https://github.com/sharkdp/bat#adding-new-syntaxes--language-definitions
+
+If you think adding this syntax would help others as well, please make sure that it meets our
+guidelines for adding new syntaxes:
+
+ - 10,000 downloads on packagecontrol.io
+-->
+
+
+**Syntax:**
+[Name or description of the syntax/language here]
+
+**Guideline Criteria:**
+[packagecontro.io link here]

.gitignore

@@ -1,3 +1,7 @@
-
 /target/
 **/*.rs.bk
+
+# Generated files
+/assets/completions/bat.fish
+/assets/manual/bat.1
+/assets/metadata.yaml

.gitmodules

@@ -1,32 +1,32 @@
 [submodule "assets/syntaxes/Elixir"]
-	path = assets/syntaxes/Elixir
+	path = assets/syntaxes/02_Extra/Elixir
 	url = https://github.com/princemaple/elixir-sublime-syntax/
 [submodule "assets/syntaxes/Packages"]
-	path = assets/syntaxes/Packages
+	path = assets/syntaxes/01_Packages
 	url = https://github.com/sublimehq/Packages/
 [submodule "assets/syntaxes/TOML"]
-	path = assets/syntaxes/TOML
+	path = assets/syntaxes/02_Extra/TOML
 	url = https://github.com/jasonwilliams/sublime_toml_highlighting
 [submodule "assets/syntaxes/Julia"]
-	path = assets/syntaxes/Julia
+	path = assets/syntaxes/02_Extra/Julia
 	url = https://github.com/JuliaEditorSupport/Julia-sublime
 [submodule "assets/themes/sublime-monokai-extended"]
 	path = assets/themes/sublime-monokai-extended
 	url = https://github.com/jonschlinkert/sublime-monokai-extended
 [submodule "assets/syntaxes/Docker"]
-	path = assets/syntaxes/Docker
+	path = assets/syntaxes/02_Extra/Docker
 	url = https://github.com/asbjornenge/Docker.tmbundle
 [submodule "assets/syntaxes/VimL"]
-	path = assets/syntaxes/VimL
+	path = assets/syntaxes/02_Extra/VimL
 	url = https://github.com/SalGnt/Sublime-VimL
 [submodule "assets/syntaxes/INI"]
-	path = assets/syntaxes/INI
+	path = assets/syntaxes/02_Extra/INI
 	url = https://github.com/clintberry/sublime-text-2-ini
 [submodule "assets/syntaxes/CMake"]
-	path = assets/syntaxes/CMake
+	path = assets/syntaxes/02_Extra/CMake
 	url = https://github.com/zyxar/Sublime-CMakeLists
 [submodule "assets/syntaxes/LESS"]
-	path = assets/syntaxes/LESS
+	path = assets/syntaxes/02_Extra/LESS
 	url = https://github.com/danro/LESS-sublime
 [submodule "assets/themes/DarkNeon"]
 	path = assets/themes/DarkNeon
@@ -41,115 +41,141 @@
 	path = assets/themes/TwoDark
 	url = https://github.com/erremauro/TwoDark
 [submodule "assets/syntaxes/AWK"]
-	path = assets/syntaxes/AWK
+	path = assets/syntaxes/02_Extra/AWK
 	url = https://github.com/JohnNilsson/awk-sublime
 [submodule "assets/syntaxes/Nix"]
-	path = assets/syntaxes/Nix
+	path = assets/syntaxes/02_Extra/Nix
 	url = https://github.com/wmertens/sublime-nix
 [submodule "assets/themes/zenburn"]
 	path = assets/themes/zenburn
 	url = https://github.com/colinta/zenburn.git
 [submodule "assets/syntaxes/Kotlin"]
-	path = assets/syntaxes/Kotlin
+	path = assets/syntaxes/02_Extra/Kotlin
 	url = https://github.com/vkostyukov/kotlin-sublime-package
 [submodule "assets/syntaxes/Elm"]
-	path = assets/syntaxes/Elm
+	path = assets/syntaxes/02_Extra/Elm
 	url = https://github.com/elm-community/SublimeElmLanguageSupport
 [submodule "assets/syntaxes/TypeScript"]
-	path = assets/syntaxes/TypeScript
+	path = assets/syntaxes/02_Extra/TypeScript
 	url = https://github.com/Microsoft/TypeScript-Sublime-Plugin
 [submodule "assets/syntaxes/Puppet"]
-	path = assets/syntaxes/Puppet
+	path = assets/syntaxes/02_Extra/Puppet
 	url = https://github.com/russCloak/SublimePuppet
 [submodule "assets/syntaxes/CSV"]
-	path = assets/syntaxes/CSV
+	path = assets/syntaxes/02_Extra/CSV
 	url = https://github.com/wadetb/Sublime-Text-Advanced-CSV
 [submodule "assets/themes/onehalf"]
 	path = assets/themes/onehalf
 	url = https://github.com/sonph/onehalf
 [submodule "assets/syntaxes/JavaScript (Babel)"]
-	path = assets/syntaxes/JavaScript (Babel)
+	path = assets/syntaxes/02_Extra/JavaScript (Babel)
 	url = https://github.com/babel/babel-sublime
 [submodule "assets/syntaxes/Cabal"]
-	path = assets/syntaxes/Cabal
+	path = assets/syntaxes/02_Extra/Cabal
 	url = https://github.com/SublimeHaskell/SublimeHaskell
 [submodule "assets/syntaxes/Dart"]
-	path = assets/syntaxes/Dart
+	path = assets/syntaxes/02_Extra/Dart
 	url = https://github.com/guillermooo/dart-sublime-bundle
 [submodule "assets/syntaxes/FSharp"]
-	path = assets/syntaxes/FSharp
+	path = assets/syntaxes/02_Extra/FSharp
 	url = https://github.com/hoest/sublimetext-fsharp
 [submodule "assets/syntaxes/PureScript"]
-	path = assets/syntaxes/PureScript
+	path = assets/syntaxes/02_Extra/PureScript
 	url = https://github.com/tellnobody1/sublime-purescript-syntax
 [submodule "assets/syntaxes/Swift"]
-	path = assets/syntaxes/Swift
+	path = assets/syntaxes/02_Extra/Swift
 	url = https://github.com/quiqueg/Swift-Sublime-Package
 [submodule "assets/syntaxes/Crystal"]
-	path = assets/syntaxes/Crystal
+	path = assets/syntaxes/02_Extra/Crystal
 	url = https://github.com/crystal-lang-tools/sublime-crystal.git
 [submodule "assets/syntaxes/PowerShell"]
-	path = assets/syntaxes/PowerShell
+	path = assets/syntaxes/02_Extra/PowerShell
 	url = https://github.com/PowerShell/EditorSyntax
 [submodule "assets/syntaxes/Robot"]
-	path = assets/syntaxes/Robot
+	path = assets/syntaxes/02_Extra/Robot
 	url = https://github.com/andriyko/sublime-robot-framework-assistant.git
 [submodule "assets/themes/sublime-snazzy"]
 	path = assets/themes/sublime-snazzy
 	url = https://github.com/greggb/sublime-snazzy
-[submodule "assets/syntaxes/HTML (Twig)"]
-	path = assets/syntaxes/HTML (Twig)
-	url = https://github.com/Anomareh/PHP-Twig.tmbundle.git
 [submodule "assets/syntaxes/AsciiDoc"]
-	path = assets/syntaxes/AsciiDoc
+	path = assets/syntaxes/02_Extra/AsciiDoc
 	url = https://github.com/SublimeText/AsciiDoc.git
 [submodule "assets/syntaxes/Assembly (ARM)"]
-	path = assets/syntaxes/Assembly (ARM)
+	path = assets/syntaxes/02_Extra/Assembly (ARM)
 	url = https://github.com/tvi/Sublime-ARM-Assembly
 [submodule "assets/syntaxes/syslog-syntax"]
-	path = assets/syntaxes/Syslog
+	path = assets/syntaxes/02_Extra/Syslog
 	url = https://github.com/caos21/syslog-syntax.git
 	branch = master
 [submodule "assets/syntaxes/protobuf-syntax-highlighting"]
-	path = assets/syntaxes/Protobuf
+	path = assets/syntaxes/02_Extra/Protobuf
 	url = https://github.com/VcamX/protobuf-syntax-highlighting.git
 	branch = master
 [submodule "assets/syntaxes/Terraform"]
-	path = assets/syntaxes/Terraform
+	path = assets/syntaxes/02_Extra/Terraform
 	url = https://github.com/alexlouden/Terraform.tmLanguage.git
 [submodule "assets/syntaxes/Jsonnet"]
-	path = assets/syntaxes/Jsonnet
+	path = assets/syntaxes/02_Extra/Jsonnet
 	url = https://github.com/gburiola/sublime-jsonnet-syntax.git
 [submodule "assets/syntaxes/varlink"]
-	path = assets/syntaxes/varlink
+	path = assets/syntaxes/02_Extra/varlink
 	url = https://github.com/varlink/syntax-highlight-varlink.git
 [submodule "assets/syntaxes/sublime-fish"]
-	path = assets/syntaxes/sublime-fish
+	path = assets/syntaxes/02_Extra/Fish
 	url = https://github.com/Phidica/sublime-fish.git
 [submodule "assets/syntaxes/Org mode"]
-	path = assets/syntaxes/Org mode
+	path = assets/syntaxes/02_Extra/Org mode
 	url = https://github.com/jezcope/Org.tmbundle.git
 [submodule "assets/syntaxes/requirementstxt"]
-	path = assets/syntaxes/requirementstxt
+	path = assets/syntaxes/02_Extra/requirementstxt
 	url = https://github.com/wuub/requirementstxt
 [submodule "assets/syntaxes/DotENV"]
-	path = assets/syntaxes/DotENV
+	path = assets/syntaxes/02_Extra/DotENV
 	url = https://github.com/zaynali53/DotENV
 [submodule "assets/syntaxes/hosts"]
-	path = assets/syntaxes/hosts
+	path = assets/syntaxes/02_Extra/hosts
 	url = https://github.com/brandonwamboldt/sublime-hosts
 [submodule "assets/syntaxes/ssh-config"]
-	path = assets/syntaxes/ssh-config
+	path = assets/syntaxes/02_Extra/ssh-config
 	url = https://github.com/robballou/sublimetext-sshconfig.git
 [submodule "assets/syntaxes/GraphQL"]
-	path = assets/syntaxes/GraphQL
+	path = assets/syntaxes/02_Extra/GraphQL
 	url = https://github.com/dncrews/GraphQL-SublimeText3.git
 [submodule "assets/syntaxes/Verilog"]
-	path = assets/syntaxes/Verilog
+	path = assets/syntaxes/02_Extra/Verilog
 	url = https://github.com/pro711/sublime-verilog
 [submodule "assets/syntaxes/SCSS_Sass"]
-	path = assets/syntaxes/SCSS_Sass
+	path = assets/syntaxes/02_Extra/SCSS_Sass
 	url = https://github.com/braver/SublimeSass
 [submodule "assets/syntaxes/Strace"]
-	path = assets/syntaxes/Strace
+	path = assets/syntaxes/02_Extra/Strace
 	url = https://github.com/djuretic/SublimeStrace
+[submodule "assets/syntaxes/Jinja2"]
+	path = assets/syntaxes/02_Extra/Jinja2
+	url = https://github.com/Martin819/sublime-jinja2
+[submodule "assets/syntaxes/SLS"]
+	path = assets/syntaxes/02_Extra/SLS
+	url = https://github.com/saltstack/sublime-text
+	branch = master
+[submodule "assets/themes/dracula-sublime"]
+	path = assets/themes/dracula-sublime
+	url = https://github.com/dracula/sublime.git
+[submodule "assets/syntaxes/HTML (Twig)"]
+	path = assets/syntaxes/02_Extra/HTML (Twig)
+	url = https://github.com/Anomareh/PHP-Twig.tmbundle.git
+[submodule "assets/themes/Nord-sublime"]
+	path = assets/themes/Nord-sublime
+	url = https://github.com/crabique/Nord-plist.git
+[submodule "assets/themes/solarized-sublime"]
+	path = assets/themes/solarized-sublime
+	url = https://github.com/paulcpederson/solarized-sublime.git
+[submodule "assets/syntaxes/Vue"]
+	path = assets/syntaxes/02_Extra/Vue
+	url = https://github.com/vuejs/vue-syntax-highlight.git
+	branch = new
+[submodule "assets/syntaxes/CoffeeScript"]
+	path = assets/syntaxes/02_Extra/CoffeeScript
+	url = https://github.com/sustained/CoffeeScript-Sublime-Plugin
+[submodule "assets/syntaxes/02_Extra/Stylus"]
+	path = assets/syntaxes/02_Extra/Stylus
+	url = https://github.com/billymoon/Stylus

.travis.yml

@@ -32,24 +32,25 @@ matrix:
 
     # Minimum Rust supported channel.
     - os: linux
-      rust: 1.35.0
+      rust: 1.37.0
       env: TARGET=x86_64-unknown-linux-gnu
     - os: linux
-      rust: 1.35.0
+      rust: 1.37.0
       env:
         - TARGET=x86_64-unknown-linux-musl
         - CC_x86_64_unknown_linux_musl=/usr/bin/musl-gcc
     - os: osx
-      rust: 1.35.0
+      rust: 1.37.0
       env: TARGET=x86_64-apple-darwin
 
-    # Code formatting check
+    # Disable nightly for now
-    - os: linux
+    # # Code formatting check
-      rust: nightly
+    # - os: linux
-      # skip the global install step
+    #   rust: nightly
-      install:
+    #   # skip the global install step
-        - cargo install --debug --force rustfmt-nightly
+    #   install:
-      script: cargo fmt -- --check
+    #     - cargo install --debug --force rustfmt-nightly
+    #   script: cargo fmt -- --check
 
 sudo: required
 
@@ -103,10 +104,3 @@ deploy:
 notifications:
   email:
     on_success: never
-
-# Caching
-cache:
-  directories:
-    - /home/travis/.cargo
-before_cache:
-  - rm -rf /home/travis/.cargo/registry

CHANGELOG.md

@@ -0,0 +1,629 @@
+# Upcoming release
+
+
+## Features
+## Bugfixes
+## Other
+## `bat` as a library
+## New syntaxes
+## New themes
+
+## Packaging
+
+
+# v0.14.0
+
+## Features
+
+- Added a new `--file-name <name>…` option to overwrite the displayed filename(s)
+  in the header. This is useful when piping input into `bat`. See #654 and #892 (@neuronull).
+- Added a new `--generate-config-file` option to create an initial configuration file
+  at the right place. See #870 (@jmick414)
+
+## Bugfixes
+
+- Performance problems with C# source code have been fixed, see #677 (@keith-hall)
+- Performance problems with Makefiles have been fixed, see #750 (@keith-hall)
+- Fix bug when highlighting Ruby files with unindented heredocs, see #914 (@keith-hall)
+- A highlighting problem with Rust source code has been fixed, see #924 (@keith-hall)
+- Windows: short files that do not require paging are displayed and then lost, see #887
+- `--highlight-line` did not work correctly in combination with `--tabs=0` and `--wrap=never`,
+  see #937
+
+## Other
+
+- When saving/reading user-provided syntaxes or themes, `bat` will now maintain a
+  `metadata.yaml` file which includes information about the `bat` version which was
+  used to create the cached files. When loading cached files, we now print an error
+  if they have been created with an incompatible version. See #882
+- Updated `liquid` dependency to 0.20, see #880 (@ignatenkobrain)
+
+## `bat` as a library
+
+- A completely new "high level" API has been added that is much more convenient
+  to use. See the `examples` folder for the updated code. The older "low level"
+  API is still available (basically everything that is not in the root `bat`
+  module), but has been refactored quite a bit. It is recommended to only use
+  the new "high level" API, if possible. This will be much easier to keep stable.
+  Note that this should still be considered a "beta" release of `bat`-as-a-library.
+  For more details and some screenshots of the example programs, see #936.
+- Stripped out a lot of binary-only dependencies, see #895 and #899 (@dtolnay)
+
+  This introduces a `features = ["application"]` which is enabled by default and pulls in
+  everything required by `bat` the application. When depending on bat as a library, downstream
+  `Cargo.toml` should disable this feature to cut out inapplicable heavy dependencies:
+  ``` toml
+  [dependencies]
+  bat = { version = "0.14", default-features = false }
+  ```
+  Other optional functionality has also been put behind features: `paging` and `git` support.
+- Allow using the library with older syntect, see #896 and #898 (@dtolnay)
+
+## New syntaxes
+
+- Rego, see #872 (@patrick-east)
+- Stylo, see #917
+
+
+# v0.13.0
+
+## `bat` as a library
+
+Beginning with this release, `bat` can be used as a library (#423).
+
+This was a huge effort and I want to thank all people who made this possible: @DrSensor, @mitsuhiko, @mre, @eth-p!
+
+- Initial attempt in #469 (@mitsuhiko)
+- Second attempt, complete restructuring of the `bat` crate, see #679 (@DrSensor)
+- Updates to example, public API, error handling, further refactoring: #693 #873 #875 (@sharkdp)
+
+I want to stress that this is the very first release of the library. Things are very likely to change. A lot of things are still missing (including the documentation).
+
+That being said, you can start using it! See the example programs in [`examples/`](https://github.com/sharkdp/bat/tree/master/examples).
+
+You can see the API documentation here: https://docs.rs/bat/
+
+## Features
+
+- (**Breaking change**) Glob-based syntax mapping, see #877 and #592. With this change,
+  users need to update their bat config files (`bat --config-file`), if they have any `--map-syntax` settings
+  present.
+
+  The option now works like this:
+  ```bash
+  --map-syntax <glob-pattern>:<syntax-name>
+  ```
+
+  For more information, see the `--help` text, the man page or the README.
+
+  This new feature allows us to properly highlight files like:
+  * `/etc/profile`
+  * `~/.ssh/config`
+
+- `--highlight-line` now accepts line ranges, see #809 (@lkalir)
+- Proper wrapping support for output with wide Unicode characters, see #811 #787 and #815 (@Kogia-sima)
+- A lot of updates to existing syntaxes via #644 (@benwaffle, @keith-hall)
+- `BAT_CACHE_PATH` can be used to place cached `bat` assets in a non-standard path, see #829 (@neuronull)
+- Support combination of multiple styles at the same time, see #857 (@aslpavel)
+
+## Bugfixes
+
+- Do not pass '--no-init' on newer less versions, see #749 and #786 (@sharkdp)
+- 'bat cache' still takes precedence over existing files, see #666 (@sharkdp)
+- `.sc` files should be treated as scala files, see #443 (@benwaffle)
+- Allow underscores and dashes in page names, see #670 (@LunarLambda)
+- Keep empty lines empty, see #601 (@mbarbar)
+- Wrapping does not work when piping, see #758 (@fusillicode, @allevo, @gildo)
+- Allow for non-unicode filenames, see #225 (@sharkdp)
+- Empty file without header produces incomplete grid, see #798 (@eth-p)
+- Files named `build` don't respect shebang lines, see #685 (@sharkdp)
+
+## Other
+
+- Parametrizable names for man page and shell completion files, see #659 #673 #656 (@eth-p)
+- Enabled LTO, making `bat` about 10% faster, see #719 (@bolinfest, @sharkdp)
+- Suggestions non how to configure `bat` for MacOS dark mode, see README (@jerguslejko)
+- Extended ["Integration with other tools"](https://github.com/sharkdp/bat#integration-with-other-tools) section (@eth-p)
+- Updated [instrutions on how to use `bat` as a `man`-pager](https://github.com/sharkdp/bat#man), see #652, see #667 (@sharkdp)
+- Add section concerning file encodings, see #688 and #568 (@sharkdp)
+- Updated sort order of command-line options in `--help` text and manpage, see #653 and #700 (@hrlmartins)
+- Updates to the man page syntax, see #718 (@sharkdp)
+- Japanese documentation updates, see #863 (@k-ta-yamada, @sorairolake and @wt-l00)
+- Accept "default" as a theme, see #757 (@fvictorio)
+- Updated Windows installation instructions, see #852 (@sorenbug)
+- Updated man page, see #573 (@sharkdp)
+
+## New syntaxes
+
+- Jinja2, see #648 (@Martin819)
+- SaltStack SLS, see #658 (@Martin819)
+- `/etc/fstab`, see #696 (@flopp and @eth-p)
+- `/etc/group` and `/etc/passwd`, see #698 (@argentite)
+- `/proc/cpuinfo` and `/proc/meminfo`, see #593 (@sharkdp)
+- Nim, see #542 (@sharkdp)
+- Vue, see #826 (@chaaaaarlotte)
+- CoffeScript, see #833 (@sharkdp)
+
+## New themes
+
+- Dracula, see #687 (@clarfon)
+- Nord, see #760 (@crabique)
+- Solarized light and dark, see #768 (@hakamadare)
+
+## Packaging
+
+- `bat` is now in the official Ubuntu and Debian repositories, see #323 and #705 (@MarcoFalke)
+- `bat` can now be installed via MacPorts, see #675 (@bn3t)
+- Install fish completions into 'vendor_completions.d', see #651 (@sharkdp)
+
+## Thanks
+
+- To @eth-p for joining me as a maintainer! I'm very grateful for all the work you put into
+  managing and responding to issues, improving our deployment, adding PR/issue templates (#837) as
+  well as fixing bugs and implementing new features.
+
+# v0.12.1
+
+## Bugfixes
+
+- Fixes a bug for older Windows versions (*"The procedure entry point `CreateFile2` could not be located"*), see #643 (@rivy)
+
+# v0.12.0
+
+## Features
+
+- Binary file content can now be viewed with `bat -A`, see #623, #640 (@pjsier and @sharkdp)
+- `bat` can now be used as a man pager. Take a look at the README and #523 for more details.
+- Add new style component to separate multiple `--line-range`s, see #570 (@eth-p)
+- Added `-L` as an alias for `--list-languages`
+
+## Bugfixes
+
+- Output looks unbalanced when using '--style=grid,numbers' without 'header', see #571 (@eth-p)
+- issues with filenames starting with "cache", see #584
+- Can't build cache with new theme without creating cache dir, see #576 (@frm)
+- `--terminal-width -10` is parsed incorrectly, see #611
+
+## Other
+
+- Added fish completions to DEB package, see #554
+
+## New syntaxes
+
+- Emacs Org mode, see #36 (@bricewge)
+- `requirements.txt`
+- DotENV `.env`
+- SSH config syntax (`-l ssh_config`), see #582 (@issmirnov)
+- `/etc/hosts`, see #583 (@issmirnov)
+- GraphQL, see #625 (@dandavison)
+- Verilog, see #616
+- SCSS and Sass, see #637
+- `strace` syntax, see #599
+
+## Packaging
+
+- `bat` is now in the official Gentoo repositories, see #588 (@toku-sa-n)
+- `bat` is now in the official Alpine Linux repositories, see #586 (@5paceToast)
+- `bat` is in the official Fedora repositories, see #610 (@ignatenkobrain)
+
+# v0.11.0
+
+## Features
+
+- Three new special color themes are available: `ansi-light`, `ansi-dark` and `base16`. These
+  are useful for people that often switch from dark to light themes in their terminal emulator
+  or for people that want the colors to match their terminal theme colors. For more details,
+  see #543 and #490 (@mk12, implementation idea by @trishume)
+- Hand-written auto completion script for Fish shell, see #524 and #555 (@ev-dev and @eth-p)
+- The `-p`/`--plain` option can now be used twice (typically `-pp`). The first `-p` switches the
+  `--style` to "plain". The second `-p` disables the pager. See #560 and #552 (@eth-p)
+
+## Bugfixes
+
+- Do not replace arguments to `less` when using `--pager`, see #509
+- Binary files will now be indicated by a warning in interactive mode, see #530 #466 #550 (@maxfilov)
+- Empty files are (once again) printed with a single header line, see #504 and #566 (@reidwagner
+  and @sharkdp)
+- `--terminal-width=0` is now disallowed, see #559 (@eth-p)
+- Accidental printing of files named `cache`, see #557
+
+## Other
+
+- New integration tests, see #500 and #502 (@reidwagner and @sharkdp)
+- New ["Integration with other tools"](https://github.com/sharkdp/bat#integration-with-other-tools) section in the README.
+- Migrated to Rust 2018 (@expobrain)
+
+## New syntaxes
+
+- F# syntax has been updated, see #531 (@stroborobo)
+- Fish shell, see #548 (@sanga)
+
+## Packaging
+
+- `bat` is now available on Chocolatey, see #541 (@rasmuskriest)
+
+# v0.10.0
+
+## Features
+
+- Added new `--highlight-line <N>` option, see #453, #346 and #175 (@tskinn and @sharkdp)
+
+## Changes
+
+- **Change the default configuration directory on macOS** to `~/.config/bat`, see #442 (@lavifb). If you are on macOS, you need to copy your configuration directory from the previous place (`~/Library/Preferences/bat`) to the new place (`~/.config/bat`).
+- Completely disabled the generation of shell completion files, see #372
+- Properly set arguments to `less` if `PAGER` environment variable contains something like `less -F` (which is missing the `-R` option), see #430 (@majecty)
+- Report the name of missing files, see #444 (@ufuji1984)
+- Don't start pager if file doesn't exist, see #387
+- Rename `bat cache --init` to `bat cache --build`, see #498
+- Move the `--config-dir` and `--cache-dir` options from `bat cache` to `bat` and hide them from the help text.
+
+## Bugfixes
+
+- Blank line at the end of output when using `--style=plain`, see #379
+- EOF must be sent twice on stdin if no other input is sent, see #477 (@reidwagner)
+
+## New syntaxes
+
+- Twig (@ahmedelgabri)
+- `.desktop` files (@jleclanche)
+- AsciiDoc (@markusthoemmes)
+- Assembly (x86_64 and ARM)
+- Log files (@caos21)
+- Protobuf and ProtobufText (@caos21)
+- Terraform (@caos21)
+- Jsonnet (@hfm)
+- Varlink (@haraldh)
+
+## Other
+
+- Added Japanese version of README (@sh-tech and @object1037)
+- Code improvements (@barskern)
+
+# v0.9.0
+
+## Features
+
+- A new `-A`/`--show-all` option has been added to show and highlight non-printable characters (in analogy to GNU `cat`s option):
+
+  ![](https://camo.githubusercontent.com/c3e769482ef3184f6be6adaa34bdc8d19c378254/68747470733a2f2f692e696d6775722e636f6d2f324b54486859542e706e67)
+
+  see #395 and #381 for more details.
+
+- Added `--pager` option (to configure the pager from the configuration file), see #362 (@majecty)
+
+- 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
+  of styles from the config file, see #367 (@sindreij)
+
+- Allow for multiple `--line-range` arguments, see #23
+
+- The `--terminal-width` option can now also accept offsets, see #376
+
+## Changes
+
+- Use of italics is now *disabled by default* (see #389 for details). They can be
+  re-enabled by adding `--italic-text=always` to your configuration file.
+
+- The default tab-width has been set to 4.
+
+- Added new "Sublime Snazzy" theme.
+
+- Shell completions are currently *not* shipped anymore, see #372 for details.
+
+## Bugfixes
+
+- Avoid endless recursion when `PAGER="bat"`, see #383 (@rodorgas)
+
+## Other
+
+- `bat` is now available on openSUSE, see #405 (@dmarcoux)
+
+- Added section about the new configuration file in the README (@deg4uss3r)
+
+- Chinese translation of README (@chinanf-boy)
+
+- Re-written tests for `--tabs` (@choznerol)
+
+- Speed up integration tests, see #394
+
+# v0.8.0
+
+## Features
+
+- Support for a configuration file with the following simple format:
+
+  ```bash
+  --tabs=4
+  --theme="Sublime Snazzy"
+
+  # A line-comment
+  --map-syntax .ignore:.gitignore
+  --map-syntax PKGBUILD:bash
+  --map-syntax Podfile:ruby
+
+  # Flags and options can also be on a single line:
+  --wrap=never --paging=never
+  ```
+
+  The configuration file path can be accessed via `bat --config-file`. On Linux,
+  it is stored in `~/.config/bat/config`.
+
+- Support for the `BAT_OPTS` environment variable with the same format as specified
+  above (in a single line). This takes precedence over the configuration file.
+
+  See also #310.
+
+- Support for custom syntax mappings via the `-m`/`--max-syntax` option.
+
+  This allows users to (re)map certain file extensions or file names to an existing syntax:
+
+  ``` bash
+  bat --map-syntax .config:json ...
+  ```
+
+  The option can be use multiple times. Note that you can easily make these mappings permanent by using bats new configuration file.
+
+  See #169
+
+- Support pager command-line arguments in `PAGER` and `BAT_PAGER`, see #352 (@Foxboron)
+
+- Add support for wildcards in Windows CMD, see #309 (@zxey)
+
+- First-line syntax detection for all input types, see #205
+
+- Encoding support for UTF-16LE and UTF-16BE, see #285
+
+- New syntaxes: Robot framework (@sanga)
+
+## Changes
+
+- Binary files are now detected and not displayed when the output goes to an interactive terminal, see #205
+
+## Bugfixes
+
+- JavaDoc comments break syntax highlighting in .java files, see #81
+
+- Bat Panics on Haskell Source Code, see #314
+
+## Other
+
+- Better `-h` and `--help` texts.
+
+- Updated documentation on how to configure `bat`s pager
+
+- Updated documentation for light backgrounds, see #328 (@russtaylor)
+
+- Generate shell completions during build, see #115 (@davideGiovannini)
+
+- A lot of new tests have been written
+
+- `bat` is now available via [Termux](https://termux.com/), see #341 (@fornwall)
+
+- `bat` is now available via [nix](https://nixos.org/nix), see #344 (@mgttlinger)
+
+- `bat` is now available via [Docker](https://hub.docker.com/r/danlynn/bat/), see #331 (@danlynn)
+
+# v0.7.1
+
+## Features
+
+- Use the `ansi_colours` package by @mina86 for better true-color approximation on 8 bit color terminals, see #319 and #202.
+
+## Bugfixes
+
+- Bat Panics on Haskell Source Code, see #314
+- Disable wrapping when `--style=plain`/`-p` is used, see #289 
+
+## Other
+
+- Added Ansible install instructions (@aeimer)
+- Added section about Cygwin to the README (@eth-p)
+
+# v0.7.0
+
+## Features
+
+- Tabs are now (optionally) expanded to spaces. This can be controlled with the new
+  `--tabs` command-line option or the `BAT_TABS` environment variable. The
+  new feature also closes two bugs #166 and #184. For more information, see #302 (@eth-p).
+
+- Added support for the `BAT_STYLE` environment variable, see #208 (@ms2300)
+
+- Added `OneHalf` theme for terminals with a light-gray background, see #256
+
+- Added new syntaxes for CSV, JSX in JavaScript and TypeScript, Cabal, Dart,
+  F#, PureScript, Swift, Crystal, PowerShell (Many Thanks to @tobenna and @mimadrid)
+
+## Changes
+
+- Query `git diff` only when needed, see #303 (@ShikChen)
+
+- Disable wrapping when `--plain` is used, see #289 (@eth-p)
+
+## Bugfixes
+
+- Can read files named `cache`, see #275 (@BK1603)
+
+- A lot of bugfixes for Windows, see #252, #264
+
+- Detect `less` reliably and in a portable way, see #271 and #290 (@Aankhen)
+
+- last decoration line is not formatted properly with `--wrap never`, see #299 (@Rogach)
+
+- Do not show file header for directories, see #292
+
+## Other
+
+- Enabled a new `aarch64` build target, see #258 (@rachitchokshi)
+
+- Provide Debian packages for `armhf`, see #280 (@rachitchokshi)
+
+- Added README section about "`bat` on Windows" (@Aankhen)
+
+- Windows installation via scoop (@meltinglava)
+
+# v0.6.1
+
+## Bugfixes
+
+- Fixed panic when running `bat --list-languages | head`, see #232 (@mchlrhw)
+- Respect `--color` settings for `--list-themes` and `--list-languages`, see #233 
+- Git modifications now work on Windows
+
+## Other
+
+- There will be auto-generated Windows releases, starting with this version (@anykao)
+
+# v0.6.0
+
+## Features
+
+- The `--list-themes` option now shows a preview for each highlighting theme (@ms2300)
+- Added `-p`/`--plain` as an alias for `--style=plain`, see #212 (@ms2300)
+- Major refactorings, enabling some progress on #150. In non-interactive mode, `bat` will now copy input bytes 1:1.
+- New languages: Elm, Kotlin, Puppet, TypeScript, see #215 #216 #217 #218
+- New syntax highlighting theme: zenburn (@colindean)
+
+## Changes
+
+- New themes in `$BAT_CONFIG_DIR/themes` are now loaded *in addition* to
+  the default themes (they may also override), see #172
+- The `Default.tmTheme` symlink is not necessary anymore.
+
+## Bugfixes
+
+* Using `bat cache --init` leads to duplicated syntaxes, see #206
+
+## Other
+
+* Extended and cleaned-up `--help` text.
+* Added initial version of a man page, see #52  
+* New README sections: *Development* and *Troubleshooting*, see #220
+
+# v0.5.0
+
+## Features
+
+- Added `--line-range n:m` option to print a range of lines, see #159 (@tskinn)
+- The syntax highlighting theme can now be controlled by the `BAT_THEME` environment variable, see [README](https://github.com/sharkdp/bat#highlighting-theme) and #177 (@mandx)
+- The `PAGER` and `BAT_PAGER` environment variables can be used to control the pager that `bat` uses, see #158 and the [new README section](https://github.com/sharkdp/bat#using-a-different-pager)
+- Added syntax highlighting for Nix, see #180
+- Added syntax highlighting for AWK (Gert Hulselmans)
+
+## Changes
+
+- The customization of syntax sets and theme sets is now separated. Syntax definitions are now loaded *in addition* to the ones that are stored in the `bat` binary by default. Please refer to these new sections in the README: [Adding new syntaxes](https://github.com/sharkdp/bat#adding-new-syntaxes--language-definitions), [Adding new themes](https://github.com/sharkdp/bat#adding-new-themes), also see #172 
+- The color for the filename is now the default foreground color. The colors for the grid and the line numbers is now determined from the syntax highlighting theme, which now also works for light backgrounds, see #178.
+
+## Bugfixes
+
+- Escape Sequences get partially stripped, see #182 (@eth-p)
+- Use separate Git repository for snapshot testing, see #165 and #161
+- Markdown breaking on JavaScript, see #183 
+
+## Other
+
+- Binaries for armv7 are now provided, see #196 
+- `bat` is now in the official [Arch package repositories](https://www.archlinux.org/packages/community/x86_64/bat/).
+- Optimizations in the RGB => 8-bit conversion (@mina86)
+
+# v0.4.1
+
+(this is just a small bugfix release, see 0.4.0 for all features and changes)
+
+## Bugfixes
+
+- Fix problem with `cargo test` when `bat` is not checked out in a Git repository, see #161 
+
+# v0.4.0
+
+## Features
+
+* Support for line-wrapping, see #54 and #102 (@eth-p)
+* New and updated `--style` parameter, see #74 and README (@pitkley)
+* Added `--theme` and `--list-themes` options, see #89 (@rleungx)
+* Added syntax highlighting for: Julia (@iamed2), Dockerfiles, VimL, CMake, INI, Less
+* Added a few popular Sublime Text highlighting themes, see #133
+* Support for bold, italic and underline font styles, see #96
+* Support for 32bit systems is now available, see #84
+* Added `-u` and `-n` options, see #134
+* ANSI color support on Windows 10
+
+## Changes
+
+* The customization folder for own syntaxes has been renamed from `syntax` to `syntaxes`, see README.
+* Changed Markdown syntax to the default Sublime Text syntax, see #157
+* Sorted language listing (@rleungx)
+* Command line arguments like `--theme` or `--color` can now override themselves.
+* Improved `--help` text.
+
+## Bugfixes
+
+- Fixed crash for (really) small terminal sizes, see #117 (@eth-p)
+- Syntax detection for `.bashrc`, `CMakeLists.txt` etc., see #100
+- Properly handle lines with invalid UTF-8, see #7 (@BrainMaestro)
+- Better error handling, see #17 (@rleungx and @sharkdp)
+- Proper handling of UTF-8 characters in `less`, see #98 (@ghuls)
+- Build fix on nightly, see #148 (@tathanhdinh)
+
+## Other
+
+- [Comparison with alternative projects](https://github.com/sharkdp/bat/blob/master/doc/alternatives.md).
+- New "bat" logo in the README, see #119 (@jraulhernandezi)
+- Output test cases (@BrainMaestro)
+- Lots of great refactoring work (@BrainMaestro)
+
+# v0.3.0
+
+## Features
+
+* Automatic paging by integrating with `less`, see #29 (@BrainMaestro)
+* Added support for reading from standard input, see #2
+* Added support for writing to non-interactive terminals (pipes, files, ..); new
+  `--color=auto/always/never` option, see #26 (@BrainMaestro)
+* Added `--list-languages` option to print all available syntaxes, see #69 (@connorkuehl)
+* New option to specify the syntax via `-l`/`--language`, see #19 (@BrainMaestro)
+* New option to control the output style (`--style`), see #5 (@nakulcg)
+* Added syntax highlighting support for TOML files, see #37
+
+## Changes
+
+* The `init-cache` sub-command has been removed. The cache can now be controlled via
+  `bat cache`. See `bat cache -h` for all available commands.
+
+## Bug fixes
+
+* Get git repository from file path instead of current directory, see #22 (@nakulcg)
+* Process substitution can now be used with bat (`bat <(echo a) <(echo b)`), see #80
+
+## Thanks
+
+I'd like to say a big THANK YOU to all contributors and everyone that has given us
+some form of feedback.
+
+Special thanks go to @BrainMaestro for his huge support with new features, bug reports
+and code reviews!
+
+# v0.2.3
+
+- Added a new statically linked version of bat (`..-musl-..`)
+
+# v0.2.2
+
+- Remove openssl dependency completely, see #30.
+
+# v0.2.1
+
+- Added Elixir syntax, see #25.
+- Use libcurl-openssl instead of libcurl-gnutls, see #30.
+
+# v0.2.0
+
+- Support for custom syntaxes, add 'Markdown extended' theme
+- Bugfix: Git modifications not shown from child folder
+
+# v0.1.0
+
+Initial release

Cargo.toml

@@ -7,7 +7,7 @@ license = "MIT/Apache-2.0"
 name = "bat"
 readme = "README.md"
 repository = "https://github.com/sharkdp/bat"
-version = "0.12.1"
+version = "0.14.0"
 exclude = [
     "assets/syntaxes/*",
     "assets/themes/*",
@@ -15,42 +15,71 @@ exclude = [
 build = "build.rs"
 edition = '2018'
 
+[features]
+default = ["application"]
+# Feature required for bat the application. Should be disabled when depending on
+# bat as a library.
+application = [
+    "atty",
+    "clap",
+    "dirs",
+    "git",
+    "lazy_static",
+    "liquid",
+    "paging",
+    "wild",
+    "regex-onig",
+]
+git = ["git2"] # Support indicating git modifications
+paging = ["shell-words"] # Support applying a pager on the output
+regex-onig = ["syntect/regex-onig"] # Use the "oniguruma" regex engine
+regex-fancy = ["syntect/regex-fancy"] # Use the rust-only "fancy-regex" engine
+
 [dependencies]
-atty = "0.2.13"
+atty = { version = "0.2.14", optional = true }
 ansi_term = "^0.12.1"
 ansi_colours = "^1.0"
-console = "0.8"
+console = "0.10"
-dirs = "2.0"
+dirs = { version = "2.0", optional = true }
-lazy_static = "1.4"
+lazy_static = { version = "1.4", optional = true }
-wild = "2.0"
+wild = { version = "2.0", optional = true }
 content_inspector = "0.2.4"
 encoding = "0.2"
-shell-words = "0.1.0"
+shell-words = { version = "0.1.0", optional = true }
+unicode-width = "0.1.7"
+globset = "0.4"
+serde = { version = "1.0", features = ["derive"] }
+serde_yaml = "0.8"
+semver = "0.9"
 
 [dependencies.git2]
-version = "0.10"
+version = "0.13"
+optional = true
 default-features = false
-features = []
 
 [dependencies.syntect]
-version = "3.2.1"
+version = "4.1.0"
 default-features = false
 features = ["parsing", "yaml-load", "dump-load", "dump-create"]
 
 [dependencies.clap]
 version = "2.33"
+optional = true
 default-features = false
 features = ["suggestions", "color", "wrap_help"]
 
 [dependencies.error-chain]
 version = "0.12"
 default-features = false
-features = []
 
 [dev-dependencies]
 tempdir = "0.3"
-assert_cmd = "0.11.1"
+assert_cmd = "1.0.1"
-escargot = "0.5.0"
 
 [build-dependencies]
-clap = "2.33"
+clap = { version = "2.33", optional = true }
+liquid = { version = "0.20", optional = true }
+lazy_static = { version = "1.4", optional = true }
+
+[profile.release]
+lto = true

LICENSE-MIT

@@ -1,4 +1,4 @@
-Copyright (c) 2018 bat-developers (https://github.com/sharkdp/bat).
+Copyright (c) 2018-2020 bat-developers (https://github.com/sharkdp/bat).
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,7 +1,7 @@
 <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?svg=true"></a>
+  <a href="https://ci.appveyor.com/project/sharkdp/bat"><img src="https://ci.appveyor.com/api/projects/status/cptsmtbiwbnr2vhf/branch/master?svg=true"></a>
   <img src="https://img.shields.io/crates/l/bat.svg" alt="license">
   <a href="https://crates.io/crates/bat"><img src="https://img.shields.io/crates/v/bat.svg?colorB=319e8c" alt="Version info"></a><br>
   A <i>cat(1)</i> clone with syntax highlighting and Git integration.
@@ -13,7 +13,7 @@
   <a href="#installation">Installation</a> •
   <a href="#customization">Customization</a> •
   <a href="#project-goals-and-alternatives">Project goals, alternatives</a> •
-  Translation [<a href="https://github.com/chinanf-boy/bat-zh">中文</a>][<a href="doc/README-ja.md">日本文</a>]
+  Translation [<a href="https://github.com/chinanf-boy/bat-zh">中文</a>][<a href="doc/README-ja.md">日本語</a>][<a href="doc/README-ko.md">한국어</a>]
 </p>
 
 ### Syntax highlighting
@@ -105,6 +105,14 @@ If you happen to use [`fd`](https://github.com/sharkdp/fd), you can use the `-X`
 fd … -X bat
 ```
 
+#### `ripgrep`
+
+With [`batgrep`](https://github.com/eth-p/bat-extras/blob/master/doc/batgrep.md), `bat` can be used as the printer for [`ripgrep`](https://github.com/BurntSushi/ripgrep) search results.
+
+```bash
+batgrep needle src/
+```
+
 #### `tail -f`
 
 `bat` can be combined with `tail -f` to continuously monitor a given file with syntax highlighting.
@@ -114,7 +122,7 @@ tail -f /var/log/pacman.log | bat --paging=never -l log
 Note that we have to switch off paging in order for this to work. We have also specified the syntax
 explicitly (`-l log`), as it can not be auto-detected in this case.
 
-#### `git show`
+#### `git`
 
 You can combine `bat` with `git show` to view an older version of a given file with proper syntax
 highlighting:
@@ -122,6 +130,8 @@ highlighting:
 git show v0.6.0:src/main.rs | bat -l rs
 ```
 
+Note that syntax highlighting within diffs is currently not supported. If you are looking for this, check out [`delta`](https://github.com/dandavison/delta).
+
 #### `xclip`
 
 The line numbers and Git modification markers in the output of `bat` can make it hard to copy
@@ -134,14 +144,25 @@ bat main.cpp | xclip
 
 #### `man`
 
-`bat` can be used as a pager for `man`. It can be used like this:
+`bat` can be used as a colorizing pager for `man`, by setting the
-```
+`MANPAGER` environment variable:
-export MANPAGER="sh -c 'col -b | bat -l man -p'"
 
+```bash
+export MANPAGER="sh -c 'col -bx | bat -l man -p'"
 man 2 select
 ```
 
-The [Manpage syntax](assets/syntaxes/Manpage.sublime-syntax) is developed in this repository and still needs some work.
+It might also be necessary to set `MANROFFOPT="-c"` if you experience
+formatting problems.
+
+If you prefer to have this bundled in a new command, you can also use [`batman`](https://github.com/eth-p/bat-extras/blob/master/doc/batman.md).
+
+Note that the [Manpage syntax](assets/syntaxes/02_Extra/Manpage.sublime-syntax) is developed in this repository and still needs some work.
+
+#### `prettier` / `shfmt` / `rustfmt`
+
+The [`prettybat`](https://github.com/eth-p/bat-extras/blob/master/doc/prettybat.md) script is a wrapper that will format code and print it with `bat`.
+
 
 ## Installation
 
@@ -150,10 +171,23 @@ The [Manpage syntax](assets/syntaxes/Manpage.sublime-syntax) is developed in thi
 ### On Ubuntu
 *... and other Debian-based Linux distributions.*
 
-Download the latest `.deb` package from the [release page](https://github.com/sharkdp/bat/releases)
+`bat` is making its way through the [Ubuntu](https://packages.ubuntu.com/eoan/bat) and
-and install it via:
+[Debian](https://packages.debian.org/sid/bat) package release process, and is available
-``` bash
+for Ubuntu as of Eoan 19.10. On Debian `bat` is currently only available on the unstable
-sudo dpkg -i bat_0.12.1_amd64.deb  # adapt version number and architecture
+"Sid" branch.
+
+If your Ubuntu/Debian installation is new enough you can simply run:
+
+```bash
+apt install bat
+```
+
+If the package has not yet been promoted to your Ubuntu/Debian installation, or you want
+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.13.0_amd64.deb  # adapt version number and architecture
 ```
 
 ### On Alpine Linux
@@ -194,7 +228,7 @@ emerge sys-apps/bat
 ### On Void Linux
 
 You can install `bat` via xbps-install:
-```
+```bash
 xbps-install -S bat
 ```
 
@@ -225,7 +259,7 @@ nix-env -i bat
 
 You can install `bat` with zypper:
 
-```
+```bash
 zypper install bat
 ```
 
@@ -237,20 +271,38 @@ You can install `bat` with [Homebrew](http://braumeister.org/formula/bat):
 brew install bat
 ```
 
-### On Windows
+Or install `bat` with [MacPorts](https://ports.macports.org/port/bat/summary):
-
-You can download prebuilt binaries from the [Release page](https://github.com/sharkdp/bat/releases),
-or install it with [scoop](https://scoop.sh/) or [Chocolatey](https://chocolatey.org):
 
 ```bash
-scoop install bat
+port install bat
 ```
 
+### On Windows
+
+There are a few options to install `bat` on Windows. Once you have installed `bat`,
+take a look at the ["Using `bat` on Windows"](#using-bat-on-windows) section.
+
+#### With Chocolatey
+
+You can install `bat` via [Chocolatey](https://chocolatey.org/packages/Bat):
 ```bash
 choco install bat
 ```
 
-[See below](#using-bat-on-windows) for notes.
+#### With Scoop
+
+You can install `bat` via [scoop](https://scoop.sh/):
+```bash
+scoop install bat
+```
+
+You will need to install the [Visual C++ Redistributable](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads) package.
+
+#### From prebuilt binaries:
+
+You can download prebuilt binaries from the [Release page](https://github.com/sharkdp/bat/releases),
+
+You will need to install the [Visual C++ Redistributable](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads) package.
 
 ### Via Docker
 
@@ -296,15 +348,14 @@ binaries are also available: look for archives with `musl` in the file name.
 
 ### From source
 
-If you want to build `bat` from source, you need Rust 1.35 or
+If you want to build `bat` from source, you need Rust 1.37 or
 higher. You can then use `cargo` to build everything:
 
 ```bash
 cargo install bat
 ```
 
-You may have to install `cmake` and the `libz` development package
+On some platforms, you might need to install `llvm` and/or `libclang-dev`.
-(`libz-dev` or `libz-devel`) in order for the build to succeed.
 
 ## Customization
 
@@ -319,7 +370,7 @@ make the change permanent. Alternatively, use `bat`s
 
 If you want to preview the different themes on a custom file, you can use
 the following command (you need [`fzf`](https://github.com/junegunn/fzf) for this):
-``` bash
+```bash
 bat --list-themes | fzf --preview="bat --theme={} --color=always /path/to/file"
 ```
 
@@ -403,18 +454,29 @@ export BAT_PAGER="less -RF"
 Instead of using environment variables, you can also use `bat`s [configuration file](https://github.com/sharkdp/bat#configuration-file) to configure the pager (`--pager` option).
 
 **Note**: By default, if the pager is set to `less` (and no command-line options are specified),
-`bat` will pass the following command line
+`bat` will pass the following command line options to the pager: `-R`/`--RAW-CONTROL-CHARS`,
-options to the pager: `-R`/`--RAW-CONTROL-CHARS`, `-F`/`--quit-if-one-screen` and `-X`/`--no-init`.
+`-F`/`--quit-if-one-screen` and `-X`/`--no-init`. The last option (`-X`) is only used for `less`
-The first (`-R`) is needed to interpret ANSI colors correctly. The second option (`-F`) instructs
+versions older than 530.
+
+The `-R` option is needed to interpret ANSI colors correctly. The second option (`-F`) instructs
 less to exit immediately if the output size is smaller than the vertical size of the terminal.
 This is convenient for small files because you do not have to press `q` to quit the pager. The
 third option (`-X`) is needed to fix a bug with the `--quit-if-one-screen` feature in old versions
-of `less`. Unfortunately, it also breaks mouse-wheel support in `less`. If you want to enable
+of `less`. Unfortunately, it also breaks mouse-wheel support in `less`.
-mouse-wheel scrolling, you can either pass just `-R` (as in the example above, this will disable
-the quit-if-one-screen feature), or you can use a recent version of `less` and pass `-RF` which
-will hopefully enable both quit-if-one-screen and mouse-wheel scrolling.
 
-If scrolling still doesn't work for you, you can try to pass the `-S` option in addition.
+If you want to enable mouse-wheel scrolling on older versions of `less`, you can pass just `-R` (as
+in the example above, this will disable the quit-if-one-screen feature). For less 530 or newer,
+it should work out of the box.
+
+### Dark mode
+
+If you make use of the dark mode feature in macOS, you might want to configure `bat` to use a different
+theme based on the OS theme. The following snippet uses the `default` theme when in the _dark mode_
+and the `GitHub` theme when in the _light mode_.
+
+```bash
+alias cat="bat --theme=\$(defaults read -globalDomain AppleInterfaceStyle &> /dev/null && echo default || echo GitHub)"
+```
 
 ## Configuration file
 
@@ -430,6 +492,11 @@ non-default location of the configuration file:
 export BAT_CONFIG_PATH="/path/to/bat.conf"
 ```
 
+A default configuration file can be created with the `--generate-config-file` option.
+```bash
+bat --generate-config-file
+```
+
 ### Format
 
 The configuration file is a simple list of command line arguments. Use `bat --help` to see a full list of possible options and values. In addition, you can add comments by prepending a line with the `#` character.
@@ -445,15 +512,11 @@ Example configuration file:
 # Use italic text on the terminal (not supported on all terminals)
 --italic-text=always
 
-# Add mouse scrolling support in less (does not work with older
+# Use C++ syntax for .ino files
-# versions of "less")
+--map-syntax "*.ino:C++"
---pager="less -FR"
 
-# Use C++ syntax (instead of C) for .h header files
+# Use ".gitignore"-style highlighting for ".ignore" files
---map-syntax h:cpp
+--map-syntax ".ignore:Git Ignore"
-
-# Use "gitignore" highlighting for ".ignore" files
---map-syntax .ignore:.gitignore
 ```
 
 ## Using `bat` on Windows
@@ -484,7 +547,7 @@ or by setting `BAT_PAGER` to an empty string.
 
 This can be solved by creating a wrapper or adding the following function to your `.bash_profile` file:
 
-```shell
+```bash
 bat() {
     local index
     local args=("$@")
@@ -517,6 +580,18 @@ are supported (and fall back to 8-bit colors).
 Please try a different theme (see `bat --list-themes` for a list). The `OneHalfDark` and
 `OneHalfLight` themes provide grid and line colors that are brighter.
 
+### File encodings
+
+`bat` natively supports UTF-8 as well as UTF-16. For every other file encoding, you may need to
+convert to UTF-8 first because the encodings can typically not be auto-detected. You can `iconv`
+to do so.
+Example: if you have a PHP file in Latin-1 (ISO-8859-1) encoding, you can call:
+``` bash
+iconv -f ISO-8859-1 -t UTF-8 my-file.php | bat
+```
+Note: you might have to use the `-l`/`--language` option if the syntax can not be auto-detected
+by `bat`.
+
 ## Development
 
 ```bash
@@ -525,7 +600,7 @@ git clone --recursive https://github.com/sharkdp/bat
 
 # Build (debug version)
 cd bat
-cargo build
+cargo build --bins
 
 # Run unit tests and integration tests
 cargo test
@@ -538,6 +613,11 @@ bash assets/create.sh
 cargo install -f
 ```
 
+## Maintainers
+
+- [sharkdp](https://github.com/sharkdp)
+- [eth-p](https://github.com/eth-p)
+
 ## Project goals and alternatives
 
 `bat` tries to achieve the following goals:
@@ -549,3 +629,10 @@ cargo install -f
 
 There are a lot of alternatives, if you are looking for similar programs. See
 [this document](doc/alternatives.md) for a comparison.
+
+## License
+Copyright (c) 2018-2020 [bat-developers](https://github.com/sharkdp/bat).
+
+`bat` is distributed under the terms of both the MIT License and the Apache License 2.0.
+
+See the [LICENSE-APACHE](LICENSE-APACHE) and [LICENSE-MIT](LICENSE-MIT) files for license details.

appveyor.yml

@@ -16,11 +16,11 @@ install:
 build: false
 test_script:
   - cargo test --target %TARGET% --verbose
-  - cargo run --target %TARGET% -- src/main.rs README.md --paging=never
+  - cargo run --target %TARGET% -- src/bin/bat/main.rs README.md --paging=never
 
 before_deploy:
   # Generate artifacts for release
-  - cargo build --release --verbose
+  - cargo build --bins --release --verbose
   - ps: ci\before_deploy.ps1
 
 deploy:

assets/README.md

@@ -38,3 +38,7 @@ The following files have been manually modified after converting from a `.tmLang
 ### Non-submodule additions
 
 * `Assembly (x86_64)` has been manually added from https://github.com/13xforever/x86-assembly-textmate-bundle due to `git clone` recursion problems
+* `Nim.sublime-syntax` has been added manually from https://github.com/getzola/zola/blob/master/sublime_syntaxes/Nim.sublime-syntax as there was no suitable Git repository for it. The original syntax seems to originate from https://github.com/Varriount/NimLime
+* `Rego.sublime-syntax` has been added manually from https://github.com/open-policy-agent/opa/blob/master/misc/syntax/sublime/rego.sublime-syntax
+   as it is not kept in a standalone repository. The file is generated from
+   https://github.com/open-policy-agent/opa/blob/master/misc/syntax/textmate/Rego.tmLanguage

assets/completions/bat.fish

@@ -1,76 +0,0 @@
-# Fish Shell Completions
-# Place or symlink to $XDG_CONFIG_HOME/fish/completions/bat.fish ($XDG_CONFIG_HOME is usually set to ~/.config)
-
-# Helper function:
-function __bat_autocomplete_languages --description "A helper function used by "(status filename)
-	bat --list-languages | awk -F':' '
-		{
-			lang=$1
-			split($2, exts, ",")
-
-			for (i in exts) {
-				ext=exts[i]
-				if (ext !~ /[A-Z].*/ && ext !~ /^\..*rc$/) {
-					print ext"\t"lang
-				}
-			}
-		}
-	' | sort
-end
-
-# Completions:
-
-complete -c bat -l color -xka "auto never always" -d "Specify when to use colored output (default: auto)" -n "not __fish_seen_subcommand_from cache"
-
-complete -c bat -l config-dir -d "Display location of 'bat' configuration directory" -n "not __fish_seen_subcommand_from cache"
-
-complete -c bat -l config-file -d "Display location of 'bat' configuration file" -n "not __fish_seen_subcommand_from cache"
-
-complete -c bat -l decorations -xka "auto never always" -d "Specify when to use the decorations specified with '--style' (default: auto)" -n "not __fish_seen_subcommand_from cache"
-
-complete -c bat -s h -l help -d "Print help message" -n "not __fish_seen_subcommand_from cache"
-
-complete -c bat -s H -l highlight-line -x -d "<N> Highlight the N-th line with a different background color" -n "not __fish_seen_subcommand_from cache"
-
-complete -c bat -l italic-text -xka "always never" -d "Specify when to use ANSI sequences for italic text (default: never)" -n "not __fish_seen_subcommand_from cache"
-
-complete -c bat -s l -l language -d "Set the language for syntax highlighting" -n "not __fish_seen_subcommand_from cache" -xa "(__bat_autocomplete_languages)" 
-
-complete -c bat -s r -l line-range -x -d "<N:M> Only print the specified range of lines for each file" -n "not __fish_seen_subcommand_from cache"
-
-complete -c bat -l list-languages -d "Display list of supported languages for syntax highlighting" -n "not __fish_seen_subcommand_from cache"
-
-complete -c bat -l list-themes -d "Display a list of supported themes for syntax highlighting" -n "not __fish_seen_subcommand_from cache"
-
-complete -c bat -s m -l map-syntax -x -d "<from:to> Map a file extension or file name to an existing syntax" -n "not __fish_seen_subcommand_from cache"
-
-complete -c bat -s n -l number -d "Only show line numbers, no other decorations. Alias for '--style=numbers'" -n "not __fish_seen_subcommand_from cache"
-
-complete -c bat -l pager -x -d "<command> Specify which pager program to use (default: less)" -n "not __fish_seen_subcommand_from cache"
-
-complete -c bat -l paging -xka "auto never always" -d "Specify when to use the pager (default: auto)" -n "not __fish_seen_subcommand_from cache"
-
-complete -c bat -s p -l plain -d "Only show plain style, no decorations. Alias for '--style=plain'" -n "not __fish_seen_subcommand_from cache"
-
-complete -c bat -s A -l show-all -d "Show non-printable characters like space/tab/newline" -n "not __fish_seen_subcommand_from cache"
-
-complete -c bat -l style -xka "auto full plain changes header grid numbers" -d "Comma-separated list of style elements or presets to display with file contents" -n "not __fish_seen_subcommand_from cache"
-
-complete -c bat -l tabs -x -d "<T> Set the tab width to T spaces (width of 0 passes tabs through directly)" -n "not __fish_seen_subcommand_from cache"
-
-complete -c bat -l terminal-width -x -d "<width> Explicitly set terminal width; Prefix with '+' or '-' to offset (default width is auto determined)" -n "not __fish_seen_subcommand_from cache"
-
-complete -c bat -l theme -xka "(bat --list-themes | cat)" -d "Set the theme for syntax highlighting" -n "not __fish_seen_subcommand_from cache"
-
-complete -c bat -s u -l unbuffered -d "POSIX-compliant unbuffered output. Option is ignored" -n "not __fish_seen_subcommand_from cache"
-
-complete -c bat -s V -l version -d "Show version information" -n "not __fish_seen_subcommand_from cache"
-
-complete -c bat -l wrap -xka "auto never character" -d "<mode> Specify the text-wrapping mode (default: auto)" -n "not __fish_seen_subcommand_from cache"
-
-# Sub-command 'cache' completions
-complete -c bat -a "cache" -d "Modify the syntax/language definition cache" -n "not __fish_seen_subcommand_from cache"
-
-complete -c bat -l build -f -d "Parse syntaxes/language definitions into cache" -n "__fish_seen_subcommand_from cache"
-
-complete -c bat -l clear -f -d "Reset syntaxes/language definitions to default settings" -n "__fish_seen_subcommand_from cache"

assets/completions/bat.fish.in

@@ -0,0 +1,76 @@
+# Fish Shell Completions
+# Place or symlink to $XDG_CONFIG_HOME/fish/completions/{{PROJECT_EXECUTABLE}}.fish ($XDG_CONFIG_HOME is usually set to ~/.config)
+
+# Helper function:
+function __{{PROJECT_EXECUTABLE}}_autocomplete_languages --description "A helper function used by "(status filename)
+	{{PROJECT_EXECUTABLE}} --list-languages | awk -F':' '
+		{
+			lang=$1
+			split($2, exts, ",")
+
+			for (i in exts) {
+				ext=exts[i]
+				if (ext !~ /[A-Z].*/ && ext !~ /^\..*rc$/) {
+					print ext"\t"lang
+				}
+			}
+		}
+	' | sort
+end
+
+# Completions:
+
+complete -c {{PROJECT_EXECUTABLE}} -l color -xka "auto never always" -d "Specify when to use colored output (default: auto)" -n "not __fish_seen_subcommand_from cache"
+
+complete -c {{PROJECT_EXECUTABLE}} -l config-dir -d "Display location of '{{PROJECT_EXECUTABLE}}' configuration directory" -n "not __fish_seen_subcommand_from cache"
+
+complete -c {{PROJECT_EXECUTABLE}} -l config-file -d "Display location of '{{PROJECT_EXECUTABLE}}' configuration file" -n "not __fish_seen_subcommand_from cache"
+
+complete -c {{PROJECT_EXECUTABLE}} -l decorations -xka "auto never always" -d "Specify when to use the decorations specified with '--style' (default: auto)" -n "not __fish_seen_subcommand_from cache"
+
+complete -c {{PROJECT_EXECUTABLE}} -s h -l help -d "Print help message" -n "not __fish_seen_subcommand_from cache"
+
+complete -c {{PROJECT_EXECUTABLE}} -s H -l highlight-line -x -d "<N> Highlight the N-th line with a different background color" -n "not __fish_seen_subcommand_from cache"
+
+complete -c {{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 r -l line-range -x -d "<N:M> Only print the specified range of lines for each file" -n "not __fish_seen_subcommand_from cache"
+
+complete -c {{PROJECT_EXECUTABLE}} -l list-languages -d "Display list of supported languages for syntax highlighting" -n "not __fish_seen_subcommand_from cache"
+
+complete -c {{PROJECT_EXECUTABLE}} -l list-themes -d "Display a list of supported themes for syntax highlighting" -n "not __fish_seen_subcommand_from cache"
+
+complete -c {{PROJECT_EXECUTABLE}} -s m -l map-syntax -x -d "<from:to> Map a file extension or file name to an existing syntax" -n "not __fish_seen_subcommand_from cache"
+
+complete -c {{PROJECT_EXECUTABLE}} -s n -l number -d "Only show line numbers, no other decorations. Alias for '--style=numbers'" -n "not __fish_seen_subcommand_from cache"
+
+complete -c {{PROJECT_EXECUTABLE}} -l pager -x -d "<command> Specify which pager program to use (default: less)" -n "not __fish_seen_subcommand_from cache"
+
+complete -c {{PROJECT_EXECUTABLE}} -l paging -xka "auto never always" -d "Specify when to use the pager (default: auto)" -n "not __fish_seen_subcommand_from cache"
+
+complete -c {{PROJECT_EXECUTABLE}} -s p -l plain -d "Only show plain style, no decorations. Alias for '--style=plain'" -n "not __fish_seen_subcommand_from cache"
+
+complete -c {{PROJECT_EXECUTABLE}} -s A -l show-all -d "Show non-printable characters like space/tab/newline" -n "not __fish_seen_subcommand_from cache"
+
+complete -c {{PROJECT_EXECUTABLE}} -l style -xka "auto full plain changes header grid numbers" -d "Comma-separated list of style elements or presets to display with file contents" -n "not __fish_seen_subcommand_from cache"
+
+complete -c {{PROJECT_EXECUTABLE}} -l tabs -x -d "<T> Set the tab width to T spaces (width of 0 passes tabs through directly)" -n "not __fish_seen_subcommand_from cache"
+
+complete -c {{PROJECT_EXECUTABLE}} -l terminal-width -x -d "<width> Explicitly set terminal width; Prefix with '+' or '-' to offset (default width is auto determined)" -n "not __fish_seen_subcommand_from cache"
+
+complete -c {{PROJECT_EXECUTABLE}} -l theme -xka "({{PROJECT_EXECUTABLE}} --list-themes | cat)" -d "Set the theme for syntax highlighting" -n "not __fish_seen_subcommand_from cache"
+
+complete -c {{PROJECT_EXECUTABLE}} -s u -l unbuffered -d "POSIX-compliant unbuffered output. Option is ignored" -n "not __fish_seen_subcommand_from cache"
+
+complete -c {{PROJECT_EXECUTABLE}} -s V -l version -d "Show version information" -n "not __fish_seen_subcommand_from cache"
+
+complete -c {{PROJECT_EXECUTABLE}} -l wrap -xka "auto never character" -d "<mode> Specify the text-wrapping mode (default: auto)" -n "not __fish_seen_subcommand_from cache"
+
+# Sub-command 'cache' completions
+complete -c {{PROJECT_EXECUTABLE}} -a "cache" -d "Modify the syntax/language definition cache" -n "not __fish_seen_subcommand_from cache"
+
+complete -c {{PROJECT_EXECUTABLE}} -l build -f -d "Parse syntaxes/language definitions into cache" -n "__fish_seen_subcommand_from cache"
+
+complete -c {{PROJECT_EXECUTABLE}} -l clear -f -d "Reset syntaxes/language definitions to default settings" -n "__fish_seen_subcommand_from cache"

assets/create.sh

@@ -2,16 +2,62 @@
 set -euo pipefail
 
 ASSET_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+REPO_DIR="$ASSET_DIR/.."
+
+# Ensure submodules are initialized.
+function update_submodules() {
+	local submodule
+	local submodule_prompt=unspecified
+	local submodule_path
+
+	{
+		while { read -r submodule && read -r submodule_path; } <&3; do
+			if ! [[ -d "${REPO_DIR}/.git/modules/${submodule}" ]] && [[ -d "${REPO_DIR}/${submodule_path}" ]]; then
+				if [[ "$submodule_prompt" = "unspecified" ]]; then
+					echo "One or more submodules were found to be uninitialized."
+					printf "Initialize and update them? [Y/n] "
+					read -r submodule_prompt
+				fi
+
+				case "$submodule_prompt" in
+					y|yes|'') {
+						git -C "$REPO_DIR" submodule update --init "$submodule_path"
+					};;
+					n|no) {
+						return
+					};;
+					*) {
+						echo "Unknown answer. Not updating submodules."
+					};;
+				esac
+			fi
+		done
+	} 3< <(git config --file "${REPO_DIR}/.gitmodules" --null --get-regexp path | xargs -0 printf "%s\n" | sed 's/^submodule.//;s/.path$//')
+}
+
+if [ -t 0 ]; then
+	update_submodules
+fi
 
 # Always remove the local cache to avoid any confusion
 bat cache --clear
 
-# TODO: Remove this (and the reverse part below) when
+# TODO:
-# https://github.com/trishume/syntect/issues/222 has been fixed
+# - Remove the JavaDoc patch once https://github.com/trishume/syntect/issues/222 has been fixed
-JAVADOC_FILE="${ASSET_DIR}/syntaxes/Packages/Java/JavaDoc.sublime-syntax"
+# - Remove the C# patch once https://github.com/sublimehq/Packages/pull/2331 has been merged
-JAVADOC_PATCH="${ASSET_DIR}/JavaDoc.sublime-syntax.patch"
+
-patch "$JAVADOC_FILE" "$JAVADOC_PATCH"
+(
+    cd "$ASSET_DIR"
+    for patch in patches/*.patch; do
+        patch --strip=0 < "$patch"
+    done
+)
 
 bat cache --build --blank --source="$ASSET_DIR" --target="$ASSET_DIR"
 
-patch -R "$JAVADOC_FILE" "$JAVADOC_PATCH"
+(
+    cd "$ASSET_DIR"
+    for patch in patches/*.patch; do
+        patch --strip=0 --reverse < "$patch"
+    done
+)

assets/manual/bat.1.in

@@ -0,0 +1,173 @@
+.TH {{PROJECT_EXECUTABLE | upcase}} "1"
+.SH NAME
+{{PROJECT_EXECUTABLE}} \- a cat(1) clone with syntax highlighting and Git integration.
+.SH "USAGE"
+.IP "{{PROJECT_EXECUTABLE}} [OPTIONS] [FILE]..."
+.IP "{{PROJECT_EXECUTABLE}} cache [CACHE-OPTIONS] [--build|--clear]
+.SH DESCRIPTION
+{{PROJECT_EXECUTABLE}} prints the syntax-highlighted content of a collection of FILEs to the
+terminal. If no FILE is specified, or when FILE is '-', it reads from standard input.
+
+{{PROJECT_EXECUTABLE}} supports a large number of programming and markup languages.
+It also communicates with git(1) to show modifications with respect to the git index.
+{{PROJECT_EXECUTABLE}} automatically pipes its output through a pager (by default: less).
+
+Whenever the output of {{PROJECT_EXECUTABLE}} goes to a non-interactive terminal, i.e. when the
+output is piped into another process or into a file, {{PROJECT_EXECUTABLE}} will act as a drop-in
+replacement for cat(1) and fall back to printing the plain file contents.
+
+.SH "OPTIONS"
+General remarks: Command-line options like '-l'/'--language' that take values can be specified as
+either '--language value', '--language=value', '-l value' or '-lvalue'.
+.HP
+\fB\-A\fR, \fB\-\-show\-all\fR
+.IP
+Show non\-printable characters like space, tab or newline. Use '\-\-tabs' to
+control the width of the tab\-placeholders.
+.HP
+\fB\-p\fR, \fB\-\-plain\fR
+.IP
+Only show plain style, no decorations. This is an alias for
+\&'\-\-style=plain'. When '\-p' is used twice ('\-pp'), it also disables
+automatic paging (alias for '\-\-style=plain \fB\-\-pager\fR=\fI\,never\/\fR').
+.HP
+\fB\-l\fR, \fB\-\-language\fR <language>
+.IP
+Explicitly set the language for syntax highlighting. The language can be
+specified as a name (like 'C++' or 'LaTeX') or possible file extension
+(like 'cpp', 'hpp' or 'md'). Use '\-\-list\-languages' to show all supported
+language names and file extensions.
+.HP
+\fB\-H\fR, \fB\-\-highlight\-line\fR <N:M>...
+.IP
+Highlight the specified line ranges with a different background color For example:
+.RS
+.IP "\-\-highlight\-line 40"
+highlights line 40
+.IP "\-\-highlight\-line 30:40"
+highlights lines 30 to 40
+.IP "\-\-highlight\-line :40"
+highlights lines 1 to 40
+.IP "\-\-highlight\-line 40:"
+highlights lines 40 to the end of the file
+.RE
+.HP
+\fB\-\-tabs\fR <T>
+.IP
+Set the tab width to T spaces. Use a width of 0 to pass tabs through directly
+.HP
+\fB\-\-wrap\fR <mode>
+.IP
+Specify the text\-wrapping mode (*auto*, never, character). The '\-\-terminal\-width' option
+can be used in addition to control the output width.
+.HP
+\fB\-\-terminal\-width\fR <width>
+.IP
+Explicitly set the width of the terminal instead of determining it automatically. If
+prefixed with '+' or '\-', the value will be treated as an offset to the actual terminal
+width. See also: '\-\-wrap'.
+.HP
+\fB\-n\fR, \fB\-\-number\fR
+.IP
+Only show line numbers, no other decorations. This is an alias for '\-\-style=numbers'
+.HP
+\fB\-\-color\fR <when>
+.IP
+Specify when to use colored output. The automatic mode only enables colors if an
+interactive terminal is detected. Possible values: *auto*, never, always.
+.HP
+\fB\-\-italic\-text\fR <when>
+.IP
+Specify when to use ANSI sequences for italic text in the output. Possible values:
+always, *never*.
+.HP
+\fB\-\-decorations\fR <when>
+.IP
+Specify when to use the decorations that have been specified via '\-\-style'. The
+automatic mode only enables decorations if an interactive terminal is detected. Possible
+values: *auto*, never, always.
+.HP
+\fB\-\-paging\fR <when>
+.IP
+Specify when to use the pager. To control which pager is used, set the PAGER or
+BAT_PAGER environment variables (the latter takes precedence) or use the '\-\-pager'
+option. To disable the pager permanently, set BAT_PAGER to an empty string or set
+\&'\-\-paging=never' in the configuration file. Possible values: *auto*, never, always.
+.HP
+\fB\-\-pager\fR <command>
+.IP
+Determine which pager is used. This option will overwrite the PAGER and BAT_PAGER
+environment variables. The default pager is 'less'. To disable the pager completely, use
+the '\-\-paging' option. Example: '\-\-pager "less \fB\-RF\fR"'.
+.HP
+\fB\-m\fR, \fB\-\-map\-syntax\fR <glob-pattern:syntax-name>...
+.IP
+Map a glob pattern to an existing syntax name. The glob pattern is matched on the full
+path and the filename. For example, to highlight *.build files with the Python syntax,
+use -m '*.build:Python'. To highlight files named '.myignore' with the Git Ignore
+syntax, use -m '.myignore:Git Ignore'.
+.HP
+\fB\-\-theme\fR <theme>
+.IP
+Set the theme for syntax highlighting. Use '\-\-list\-themes' to see all available themes.
+To set a default theme, add the '\-\-theme="..."' option to the configuration file or
+export the BAT_THEME environment variable (e.g.: export BAT_THEME="...").
+.HP
+\fB\-\-list\-themes\fR
+.IP
+Display a list of supported themes for syntax highlighting.
+.HP
+\fB\-\-style\fR <style\-components>
+.IP
+Configure which elements (line numbers, file headers, grid borders, Git modifications,
+\&..) to display in addition to the file contents. The argument is a comma\-separated list
+of components to display (e.g. 'numbers,changes,grid') or a pre\-defined style ('full').
+To set a default style, add the '\-\-style=".."' option to the configuration file or
+export the BAT_STYLE environment variable (e.g.: export BAT_STYLE=".."). Possible
+values: *auto*, full, plain, changes, header, grid, numbers, snip.
+.HP
+\fB\-r\fR, \fB\-\-line\-range\fR <N:M>...
+.IP
+Only print the specified range of lines for each file. For example:
+.RS
+.IP "\-\-line\-range 30:40"
+prints lines 30 to 40
+.IP "\-\-line\-range :40"
+prints lines 1 to 40
+.IP "\-\-line\-range 40:"
+prints lines 40 to the end of the file
+.RE
+.HP
+\fB\-L\fR, \fB\-\-list\-languages\fR
+.IP
+Display a list of supported languages for syntax highlighting.
+.HP
+\fB\-u\fR, \fB\-\-unbuffered\fR
+.IP
+This option exists for POSIX\-compliance reasons ('u' is for 'unbuffered'). The output is
+always unbuffered \- this option is simply ignored.
+.HP
+\fB\-h\fR, \fB\-\-help\fR
+.IP
+Print this help message.
+.HP
+\fB\-V\fR, \fB\-\-version\fR
+.IP
+Show version information.
+.SH "POSITIONAL ARGUMENTS"
+.HP
+\fB<FILE>...\fR
+.IP
+Files to print and concatenate. Use a dash ('\-') or no argument at all to read from
+standard input.
+.SH "SUBCOMMANDS"
+.HP
+\fBcache\fR - Modify the syntax\-definition and theme cache.
+.SH "FILES"
+{{PROJECT_EXECUTABLE}} can also be customized with a configuration file. The location of the file
+is dependent on your operating system. To get the default path for your system, call:
+
+\fB{{PROJECT_EXECUTABLE}} --config-file\fR
+
+Alternatively, you can use the BAT_CONFIG_PATH environment variable to point bat to a non-default
+location of the configuration file.

assets/patches/C#.sublime-syntax.patch

@@ -0,0 +1,13 @@
+diff --git syntaxes/01_Packages/C#/C#.sublime-syntax syntaxes/01_Packages/C#/C#.sublime-syntax
+index ed494f8b..01b710e8 100644
+--- syntaxes/01_Packages/C#/C#.sublime-syntax
++++ syntaxes/01_Packages/C#/C#.sublime-syntax
+@@ -1312,7 +1312,7 @@ contexts:
+             2: punctuation.separator.cs
+             3: punctuation.section.brackets.end.cs
+             4: keyword.operator.pointer.cs
+-    - match: \((?=(?:[^,)(]*|\([^\)]*\))*,)
++    - match: \((?=(?:[^,)(]|\([^\)]*\))*,)
+       scope: punctuation.section.group.begin.cs
+       push:
+         - meta_scope: meta.group.tuple.cs

assets/patches/JavaDoc.sublime-syntax.patch

@@ -1,7 +1,7 @@
-diff --git syntaxes/Packages/Java/JavaDoc.sublime-syntax syntaxes/Packages/Java/JavaDoc.sublime-syntax
+diff --git syntaxes/01_Packages/Java/JavaDoc.sublime-syntax syntaxes/01_Packages/Java/JavaDoc.sublime-syntax
 index 422a6a9..40a741e 100644
---- syntaxes/Packages/Java/JavaDoc.sublime-syntax
+--- syntaxes/01_Packages/Java/JavaDoc.sublime-syntax
-+++ syntaxes/Packages/Java/JavaDoc.sublime-syntax
++++ syntaxes/01_Packages/Java/JavaDoc.sublime-syntax
 @@ -13,7 +13,7 @@ variables:
  contexts:
    prototype:

assets/patches/Makefile.sublime-syntax.patch

@@ -0,0 +1,81 @@
+diff --git syntaxes/01_Packages/Makefile/Makefile.sublime-syntax syntaxes/01_Packages/Makefile/Makefile.sublime-syntax
+index 3cc3a97e..0c7a3f24 100644
+--- syntaxes/01_Packages/Makefile/Makefile.sublime-syntax
++++ syntaxes/01_Packages/Makefile/Makefile.sublime-syntax
+@@ -44,64 +44,50 @@ variables:
+   # variable substitutions anywhere. We try to remedy this by hacking in a
+   # regex that matches up to four levels of nested parentheses, and ignores
+   # whatever's inside the parentheses.
+-  nps: '[^()]*'
+-  open: '(?:\('
+-  close: '\))?'       # ignore this invalid.illegal
++  nps_unnested: '[^()]*'
++  nps: '[^()]*(?=[()])'
++  open: '(?:{{nps}}\('
++  close: '\){{nps_unnested}})?'       # ignore this invalid.illegal
+   just_eat: |         # WARNING: INSANITY FOLLOWS!
+-    (?x)              # ignore whitespace in this regex
+-      {{nps}}         #       level 0
++    (?x)(?:              # ignore whitespace in this regex
+       {{open}}        # start level 1                      __
+-        {{nps}}       #       level 1          _______    /*_>-<
+         {{open}}      # start level 2      ___/ _____ \__/ /
+-          {{nps}}     #       level 2     <____/     \____/
+           {{open}}    # start level 3     is like snek... (by Valerie Haecky)
+-            {{nps}}   #       level 3
+             {{open}}  # start level 4
+               {{nps}} #       level 4
+             {{close}} #   end level 4
+-            {{nps}}   #       level 3
+           {{close}}   #   end level 3
+-          {{nps}}     #       level 2
+           {{open}}    # start level 3
+-            {{nps}}   #       level 3
+             {{open}}  # start level 4
+               {{nps}} #       level 4
+             {{close}} #   end level 4
+-            {{nps}}   #       level 3
+           {{close}}   #   end level 3
+-          {{nps}}     #       level 2
++          {{nps}}
+         {{close}}     #   end level 2
+-        {{nps}}       #       level 1
+         {{open}}      # start level 2
+-          {{nps}}     #       level 2
+           {{open}}    # start level 3
+-            {{nps}}   #       level 3
+             {{open}}  # start level 4
+               {{nps}} #       level 4
+             {{close}} #   end level 4
+-            {{nps}}   #       level 3
++          {{nps}}
+           {{close}}   #   end level 3
+-          {{nps}}     #       level 2
+           {{open}}    # start level 3
+-            {{nps}}   #       level 3
+             {{open}}  # start level 4
+               {{nps}} #       level 4
+             {{close}} #   end level 4
+-            {{nps}}   #       level 3
++          {{nps}}
+           {{close}}   #   end level 3
+-          {{nps}}     #       level 2
+           {{open}}    # start level 3
+-            {{nps}}   #       level 3
+             {{open}}  # start level 4
+               {{nps}} #       level 4
+             {{close}} #   end level 4
+-            {{nps}}   #       level 3
++          {{nps}}
+           {{close}}   #   end level 3
+-          {{nps}}     #       level 2
++        {{nps}}
+         {{close}}     #   end level 2
+-        {{nps}}       #       level 1
++      {{nps}}
+       {{close}}       #   end level 1
+-      {{nps}}         #       level 0
++      |{{nps_unnested}})
+   rule_lookahead: '{{just_eat}}{{ruleassign}}{{just_eat}}'
+ 
+   var_lookahead_base: '{{just_eat}}({{varassign}}|{{shellassign}}){{just_eat}}'

assets/patches/Rust.sublime-syntax.patch

@@ -0,0 +1,13 @@
+diff --git syntaxes/01_Packages/Rust/Rust.sublime-syntax syntaxes/01_Packages/Rust/Rust.sublime-syntax
+index 3c354486..24727a4e 100644
+--- syntaxes/01_Packages/Rust/Rust.sublime-syntax
++++ syntaxes/01_Packages/Rust/Rust.sublime-syntax
+@@ -907,6 +907,8 @@ contexts:
+     - include: type-any-identifier
+     - match: ':'
+       scope: punctuation.separator.rust
++    - match: (?=;)
++      pop: true
+ 
+   fn-body:
+     - meta_scope: meta.function.rust

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

@@ -33,7 +33,7 @@ contexts:
       captures:
         1: constant.other.cabal
         2: punctuation.entity.cabal
-    - match: '^(?i)(executable|library|test-suite|benchmark|flag|source-repository)\s+([^\s,]+)\s*$'
+    - match: '^(?i)(executable|library|test-suite|benchmark|flag|source-repository|custom-setup)\s+([^\s,]+)\s*$'
       scope: entity.cabal
       captures:
         1: keyword.entity.cabal

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

@@ -0,0 +1,271 @@
+%YAML 1.2
+---
+# http://www.sublimetext.com/docs/3/syntax.html
+name: CoffeeScript
+comment: "CoffeeScript Syntax: version 1"
+file_extensions:
+  - coffee
+  - Cakefile
+  - coffee.erb
+  - cson
+first_line_match: ^#!.*\bcoffee
+scope: source.coffee
+contexts:
+  main:
+    - match: '(\([^()]*?\))\s*([=-]>)'
+      comment: "match stuff like: a -> …"
+      scope: meta.inline.function.coffee
+      captures:
+        1: variable.parameter.function.coffee
+        2: storage.type.function.coffee
+    - match: (new)\s+(\w+(?:\.\w*)*)
+      scope: meta.class.instance.constructor
+      captures:
+        1: keyword.operator.new.coffee
+        2: support.class.coffee
+    - match: "'''"
+      captures:
+        0: punctuation.definition.string.begin.coffee
+      push:
+        - meta_scope: string.quoted.heredoc.coffee
+        - match: "'''"
+          captures:
+            0: punctuation.definition.string.end.coffee
+          pop: true
+    - match: '"""'
+      captures:
+        0: punctuation.definition.string.begin.coffee
+      push:
+        - meta_scope: string.quoted.double.heredoc.coffee
+        - match: '"""'
+          captures:
+            0: punctuation.definition.string.end.coffee
+          pop: true
+        - match: \\.
+          scope: constant.character.escape.coffee
+        - include: interpolated_coffee
+    - match: "`"
+      captures:
+        0: punctuation.definition.string.begin.coffee
+      push:
+        - meta_scope: string.quoted.script.coffee
+        - match: "`"
+          captures:
+            0: punctuation.definition.string.end.coffee
+          pop: true
+        - match: '\\(x\h{2}|[0-2][0-7]{,2}|3[0-6][0-7]|37[0-7]?|[4-7][0-7]?|.)'
+          scope: constant.character.escape.coffee
+    - match: (?<!#)###(?!#)
+      captures:
+        0: punctuation.definition.comment.coffee
+      push:
+        - meta_scope: comment.block.coffee
+        - match: '###(?:[ \t]*\n)'
+          captures:
+            0: punctuation.definition.comment.coffee
+          pop: true
+        - match: '@\w*'
+          scope: storage.type.annotation.coffeescript
+    - match: '(#)(?!\{).*$\n?'
+      scope: comment.line.number-sign.coffee
+      captures:
+        1: punctuation.definition.comment.coffee
+    - match: "/{3}"
+      push:
+        - meta_scope: string.regexp.coffee
+        - match: "/{3}[imgy]{0,4}"
+          pop: true
+        - include: interpolated_coffee
+        - include: embedded_comment
+    - match: '/(?![\s=/*+{}?]).*?[^\\]/[igmy]{0,4}(?![a-zA-Z0-9])'
+      scope: string.regexp.coffee
+    - match: |-
+        (?x)
+          \b(?<![\.\$])(
+            break|by|catch|continue|else|finally|for|in|of|if|return|switch|
+            then|throw|try|unless|when|while|until|loop|do|(?<=for)\s+own
+          )(?!\s*:)\b
+      scope: keyword.control.coffee
+    - match: |-
+        (?x)
+          and=|or=|!|%|&|\^|\*|\/|(\-)?\-(?!>)|\+\+|\+|~|==|=(?!>)|!=|<=|>=|<<=|>>=|
+          >>>=|<>|<|>|!|&&|\.\.(\.)?|\?|\||\|\||\:|\*=|(?<!\()/=|%=|\+=|\-=|&=|
+          \^=|\b(?<![\.\$])(instanceof|new|delete|typeof|and|or|is|isnt|not|super)\b
+      scope: keyword.operator.coffee
+    - match: '([a-zA-Z\$_](\w|\$|\.)*\s*(?!\::)((:)|(=[^=]))(?!(\s*\(.*\))?\s*((=|-)>)))'
+      scope: variable.assignment.coffee
+      captures:
+        1: variable.assignment.coffee
+        4: punctuation.separator.key-value
+        5: keyword.operator.coffee
+    - match: '(?<=\s|^)([\[\{])(?=.*?[\]\}]\s+[:=])'
+      captures:
+        0: keyword.operator.coffee
+      push:
+        - meta_scope: meta.variable.assignment.destructured.coffee
+        - match: '([\]\}]\s*[:=])'
+          captures:
+            0: keyword.operator.coffee
+          pop: true
+        - include: variable_name
+        - include: instance_variable
+        - include: single_quoted_string
+        - include: double_quoted_string
+        - include: numeric
+    - match: |-
+        (?x)
+          (\s*)
+          (?=[a-zA-Z\$_])
+          (
+            [a-zA-Z\$_](\w|\$|:|\.)*\s*
+            (?=[:=](\s*\(.*\))?\s*([=-]>))
+          )
+      scope: meta.function.coffee
+      captures:
+        2: entity.name.function.coffee
+        3: entity.name.function.coffee
+        4: variable.parameter.function.coffee
+        5: storage.type.function.coffee
+    - match: ^\s*(describe|it|app\.(get|post|put|all|del|delete))
+      comment: Show well-known functions from Express and Mocha in Go To Symbol view
+      push:
+        - meta_scope: meta.function.symbols.coffee
+        - match: $
+          pop: true
+        - include: main
+    - match: "[=-]>"
+      scope: storage.type.function.coffee
+    - match: '\b(?<!\.)(true|on|yes)(?!\s*[:=])\b'
+      scope: constant.language.boolean.true.coffee
+    - match: '\b(?<!\.)(false|off|no)(?!\s*[:=])\b'
+      scope: constant.language.boolean.false.coffee
+    - match: '\b(?<!\.)null(?!\s*[:=])\b'
+      scope: constant.language.null.coffee
+    - match: '\b(?<!\.)(this|extends)(?!\s*[:=])\b'
+      scope: variable.language.coffee
+    - match: '(class\b)\s+(@?[a-zA-Z\$_][\w\.]*)?(?:\s+(extends)\s+(@?[a-zA-Z\$\._][\w\.]*))?'
+      scope: meta.class.coffee
+      captures:
+        1: storage.type.class.coffee
+        2: entity.name.type.class.coffee
+        3: keyword.control.inheritance.coffee
+        4: entity.other.inherited-class.coffee
+    - match: \b(debugger|\\)\b
+      scope: keyword.other.coffee
+    - match: |-
+        (?x)\b(
+          Array|ArrayBuffer|Blob|Boolean|Date|document|event|Function|
+          Int(8|16|32|64)Array|Math|Map|Number|
+          Object|Proxy|RegExp|Set|String|WeakMap|
+          window|Uint(8|16|32|64)Array|XMLHttpRequest
+        )\b
+      scope: support.class.coffee
+    - match: ((?<=console\.)(debug|warn|info|log|error|time|timeEnd|assert))\b
+      scope: support.function.console.coffee
+    - match: |-
+        (?x)\b(
+          decodeURI(Component)?|encodeURI(Component)?|eval|parse(Float|Int)|require
+        )\b
+      scope: support.function.coffee
+    - match: |-
+        (?x)((?<=\.)(
+          apply|call|concat|every|filter|forEach|from|hasOwnProperty|indexOf|
+          isPrototypeOf|join|lastIndexOf|map|of|pop|propertyIsEnumerable|push|
+          reduce(Right)?|reverse|shift|slice|some|sort|splice|to(Locale)?String|
+          unshift|valueOf
+        ))\b
+      scope: support.function.method.array.coffee
+    - match: |-
+        (?x)((?<=Array\.)(
+          isArray
+        ))\b
+      scope: support.function.static.array.coffee
+    - match: |-
+        (?x)((?<=Object\.)(
+          create|definePropert(ies|y)|freeze|getOwnProperty(Descriptors?|Names)|
+          getProperty(Descriptor|Names)|getPrototypeOf|is(Extensible|Frozen|Sealed)?|
+          isnt|keys|preventExtensions|seal
+        ))\b
+      scope: support.function.static.object.coffee
+    - match: |-
+        (?x)((?<=Math\.)(
+          abs|acos|acosh|asin|asinh|atan|atan2|atanh|ceil|cos|cosh|exp|expm1|floor|
+          hypot|log|log10|log1p|log2|max|min|pow|random|round|sign|sin|sinh|sqrt|
+          tan|tanh|trunc
+        ))\b
+      scope: support.function.static.math.coffee
+    - match: |-
+        (?x)((?<=Number\.)(
+          is(Finite|Integer|NaN)|toInteger
+        ))\b
+      scope: support.function.static.number.coffee
+    - match: \b(Infinity|NaN|undefined)\b
+      scope: constant.language.coffee
+    - match: \;
+      scope: punctuation.terminator.statement.coffee
+    - match: ',[ |\t]*'
+      scope: meta.delimiter.object.comma.coffee
+    - match: \.
+      scope: meta.delimiter.method.period.coffee
+    - match: '\{|\}'
+      scope: meta.brace.curly.coffee
+    - match: \(|\)
+      scope: meta.brace.round.coffee
+    - match: '\[|\]\s*'
+      scope: meta.brace.square.coffee
+    - include: instance_variable
+    - include: single_quoted_string
+    - include: double_quoted_string
+    - include: numeric
+  double_quoted_string:
+    - match: '"'
+      captures:
+        0: punctuation.definition.string.begin.coffee
+      push:
+        - meta_scope: string.quoted.double.coffee
+        - match: '"'
+          captures:
+            0: punctuation.definition.string.end.coffee
+          pop: true
+        - match: '\\(x\h{2}|[0-2][0-7]{,2}|3[0-6][0-7]|37[0-7]?|[4-7][0-7]?|.)'
+          scope: constant.character.escape.coffee
+        - include: interpolated_coffee
+  embedded_comment:
+    - match: (?<!\\)(#).*$\n?
+      scope: comment.line.number-sign.coffee
+      captures:
+        1: punctuation.definition.comment.coffee
+  instance_variable:
+    - match: '(@)([a-zA-Z_\$]\w*)?'
+      scope: variable.other.readwrite.instance.coffee
+  interpolated_coffee:
+    - match: '\#\{'
+      captures:
+        0: punctuation.section.embedded.coffee
+      push:
+        - meta_scope: source.coffee.embedded.source
+        - match: '\}'
+          captures:
+            0: punctuation.section.embedded.coffee
+          pop: true
+        - include: main
+  numeric:
+    - match: '(?<!\$)\b((0([box])[0-9a-fA-F]+)|([0-9]+(\.[0-9]+)?(e[+\-]?[0-9]+)?))\b'
+      scope: constant.numeric.coffee
+  single_quoted_string:
+    - match: "'"
+      captures:
+        0: punctuation.definition.string.begin.coffee
+      push:
+        - meta_scope: string.quoted.single.coffee
+        - match: "'"
+          captures:
+            0: punctuation.definition.string.end.coffee
+          pop: true
+        - match: '\\(x\h{2}|[0-2][0-7]{,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)'
+          scope: constant.character.escape.coffee
+  variable_name:
+    - match: '([a-zA-Z\$_]\w*(\.\w+)*)'
+      scope: variable.assignment.coffee
+      captures:
+        1: variable.assignment.coffee

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

@@ -0,0 +1,14 @@
+%YAML 1.2
+---
+# http://www.sublimetext.com/docs/3/syntax.html
+name: CpuInfo
+file_extensions:
+  - cpuinfo
+scope: source.cpuinfo
+
+contexts:
+  main:
+    - match: '^([^:]+)\w*:\w*(.*)$'
+      captures:
+        1: keyword.other.cpuinfo-key
+        2: string.other.cpuinfo-value

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

@@ -131,9 +131,9 @@ contexts:
       scope: keyword.control.pseudo-method.crystal
     - match: '\b(nil|true|false)\b(?![?!])'
       scope: constant.language.crystal
-    - match: '\b(__(DIR|FILE|LINE)__|self)\b(?![?!])'
+    - match: '\b(__(DIR|FILE|LINE|END_LINE)__|self)\b(?![?!])'
       scope: variable.language.crystal
-    - match: '\b(initialize|new|loop|include|extend|raise|getter|setter|property|class_getter|class_setter|class_property|describe|it|with|delegate|def_hash|def_equals|def_equals_and_hash|forward_missing_to|record|assert_responds_to|spawn)\b[!?]?'
+    - match: '\b(initialize|new|loop|include|extend|raise|getter|setter|property|class_getter|class_setter|class_property|describe|context|it|with|delegate|def_hash|def_equals|def_equals_and_hash|forward_missing_to|record|assert_responds_to|spawn|annotation|verbatim)\b[!?]?'
       comment: everything being a method but having a special function is a..
       scope: keyword.control.special-method.crystal
     - match: \b(require)\b
@@ -180,7 +180,7 @@ contexts:
          (?<=^|\s)(def)\s+                                              # the def keyword
          ( (?>[a-zA-Z_\x{80}-\x{10FFFF}][\x{80}-\x{10FFFF}\w]*(?>\.|::))?                                   # a method name prefix
            (?>[a-zA-Z_\x{80}-\x{10FFFF}][\x{80}-\x{10FFFF}\w]*(?>[?!]|=(?!>))?                              # the method name
-           |===?|>[>=]?|<=>|<[<=]?|[%&`/\|]|\*\*?|=?~|[-+]@?|\[\]=?) )  # …or an operator method
+           |===?|>[>=]?|<=>|<[<=]?|[%&`/\|]|\*\*?|=?~|[-+]@?|\[\](?:=|\?)?) )  # …or an operator method
          \s*(\()                                                        # the openning parenthesis for arguments
       comment: the method pattern comes from the symbol pattern, see there for a explaination
       captures:
@@ -201,7 +201,7 @@ contexts:
          (?<=^|\s)(def)\s+                                              # the def keyword
          ( (?>[a-zA-Z_\x{80}-\x{10FFFF}][\w\x{80}-\x{10FFFF}]*(?>\.|::))?                                   # a method name prefix
            (?>[a-zA-Z_\x{80}-\x{10FFFF}][\w\x{80}-\x{10FFFF}]*(?>[?!]|=(?!>))?                              # the method name
-           |===?|>[>=]?|<=>|<[<=]?|[%&`/\|]|\*\*?|=?~|[-+]@?|\[\]=?) )  # …or an operator method
+           |===?|>[>=]?|<=>|<[<=]?|[%&`/\|]|\*\*?|=?~|[-+]@?|\[\](?:=|\?)?) )  # …or an operator method
          [ \t]                                                          # the space separating the arguments
          (?=[ \t]*[^\s#;])                                              # make sure arguments and not a comment follow
       comment: same as the previous rule, but without parentheses around the arguments
@@ -221,7 +221,7 @@ contexts:
          ( \s+                                                               # an optional group of whitespace followed by…
            ( (?>[a-zA-Z_\x{80}-\x{10FFFF}][\w\x{80}-\x{10FFFF}]*(?>\.|::))?                                      # a method name prefix
              (?>[a-zA-Z_\x{80}-\x{10FFFF}][\w\x{80}-\x{10FFFF}]*(?>[?!]|=(?!>))?                                 # the method name
-             |===?|>[>=]?|<=>|<[<=]?|[%&`/\|]|\*\*?|=?~|[-+]@?|\[\]=?) ) )?  # …or an operator method
+             |===?|>[>=]?|<=>|<[<=]?|[%&`/\|]|\*\*?|=?~|[-+]@?|\[\](?:=|\?)?) ) )?  # …or an operator method
       comment: the optional name is just to catch the def also without a method-name
       scope: meta.function.method.without-arguments.crystal
       captures:
@@ -588,7 +588,7 @@ contexts:
           pop: true
         - match: \\.
           comment: Cant be named because its not neccesarily an escape.
-    - match: '(?<!:)(:)(?>[a-zA-Z_\x{80}-\x{10FFFF}][\w\x{80}-\x{10FFFF}]*(?>[?!]|=(?![>=]))?|===?|>[>=]?|<[<=]?|<=>|[%&`/\|]|\*\*?|=?~|[-+]@?|\[\]=?|@@?[a-zA-Z_\x{80}-\x{10FFFF}][\w\x{80}-\x{10FFFF}]*)'
+    - match: '(?<!:)(:)(?>[a-zA-Z_\x{80}-\x{10FFFF}][\w\x{80}-\x{10FFFF}]*(?>[?!]|=(?![>=]))?|===?|>[>=]?|<[<=]?|<=>|[%&`/\|]|\*\*?|=?~|[-+]@?|\[\](?:=|\?)?|@@?[a-zA-Z_\x{80}-\x{10FFFF}][\w\x{80}-\x{10FFFF}]*|!=?(?![?!]))'
       comment: symbols
       scope: constant.other.symbol.crystal
       captures:
@@ -713,14 +713,14 @@ contexts:
       captures:
         0: punctuation.definition.string.begin.crystal
       push:
-        - meta_scope: string.unquoted.embedded.js.jquery.crystal
+        - meta_scope: string.unquoted.embedded.js.crystal
-        - meta_content_scope: text.js.jquery.embedded.crystal
+        - meta_content_scope: text.js.embedded.crystal
         - match: \s*\2$
           captures:
             0: punctuation.definition.string.end.crystal
           pop: true
         - include: heredoc
-        - include: scope:source.js.jquery
+        - include: scope:source.js
         - include: interpolated_crystal
         - include: escaped_char
     - match: '(?><<-("?)((?:[_\w]+_|)(?:SH|SHELL))\b\1)'

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

@@ -11,6 +11,7 @@ file_extensions:
   - .env.example
   - .env.test
   - .env.test.local
+  - .env.testing
   - .env.dev
   - .env.development
   - .env.development.local
@@ -18,6 +19,8 @@ file_extensions:
   - .env.production
   - .env.production.local
   - .env.dusk.local
+  - .flaskenv
+  - .env.staging
 scope: source.env
 contexts:
   main:

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

@@ -0,0 +1,133 @@
+%YAML 1.2
+---
+# http://www.sublimetext.com/docs/3/syntax.html
+name: fstab
+file_extensions:
+  - fstab
+scope: source.fstab
+
+contexts:
+  main:
+    - include: comment
+    - match: '^'
+      push: fstab_device
+      comment: leading spaces
+
+  fstab_device:
+    - include: comment
+    - match: '\s*([^=\s]+=)([^\s]+)\s*'
+      comment: device by uuid or label
+      set: fstab_mountpoint
+      captures:
+        1: punctuation.accessor
+        2: keyword.other.device
+    - match: '\s*(//|\\\\)([^\s]+)\s*'
+      comment: device by samba share
+      set: fstab_mountpoint
+      captures:
+        1: punctuation.accessor
+        2: keyword.other.device
+    - match: '\s*([^\s]+)(:)([^\s]+)\s*'
+      comment: device by server
+      set: fstab_mountpoint
+      captures:
+        1: keyword.other.device
+        2: punctuation.accessor
+        3: keyword.other.device
+    - match: '\s*[^\s/\\]+\s*'
+      comment: device by dev name
+      set: fstab_mountpoint
+      scope: keyword.other.device
+    - match: '\s*(/dev/)([^\s]+)\s*'
+      comment: device by dev path
+      set: fstab_mountpoint
+      captures: 
+        1: punctuation.accessor
+        2: keyword.other.device
+    - match: '\s*([^\s/]*/)*([^\s]+)\s*'
+      comment: device by unknown path
+      set: fstab_mountpoint
+      captures:
+        1: punctuation.accessor
+        2: keyword.other.device
+    - include: clear
+
+  fstab_mountpoint:
+    - include: comment
+    - match: '\s*/[^\s]*\s*'
+      comment: mount point
+      set: fstab_filesystem
+      scope: string.unquoted.mountpoint
+    - match: '\s*[^\s]+\s*'
+      comment: mount point without leading slash (invalid)
+      set: fstab_filesystem
+      scope: invalid.illegal
+    - include: clear
+
+  fstab_filesystem:
+    - include: comment
+    - match: '\s*[^\s]+\s*'
+      comment: filesystem type
+      set: fstab_options
+      scope: variable.parameter.filesystem
+    - include: clear
+
+  fstab_options:
+    - include: comment
+    - match: '([^\s,=]+)(=)([^\s,]+)'
+      comment: key-value option
+      captures:
+       1: entity.name.option
+       2: entity.other.separator
+       3: variable.parameter
+    - match: '[^\s,]+'
+      comment: flag option
+      scope: entity.name.option
+    - match: ','
+      comment: option separator
+      scope: punctuation.separator
+    - match: '\s+'
+      comment: next field
+      set: fstab_dump
+    - include: clear
+
+  fstab_dump:
+    - include: comment
+    - match: '\s*[01]\s*'
+      comment: dump field
+      scope: constant.numeric
+      set: fstab_pass
+    - match: '\s*[^\s]+\s*'
+      comment: invalid dump field
+      scope: invalid.illegal
+      set: fstab_pass
+    - include: clear
+
+  fstab_pass:
+    - include: comment
+    - match: '\s*[01]\s*'
+      comment: pass field
+      scope: constant.numeric
+      set: expected_eol
+    - match: '\s*[^\s]+\s*'
+      comment: invalid pass field
+      scope: invalid.illegal
+      set: expected_eol
+    - include: clear
+
+  expected_eol:
+    - include: comment
+    - include: clear
+    - match: '.*'
+      scope: invalid.illegal
+
+  comment:
+    - match: '\s*#.*$'
+      comment: comment using the number sign
+      scope: comment.line
+
+  clear:
+    - match: '.*$'
+      comment: used for clearing the context
+      pop: true
+

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

@@ -0,0 +1,48 @@
+%YAML 1.2
+---
+# http://www.sublimetext.com/docs/3/syntax.html
+name: group
+file_extensions:
+  - group
+scope: source.group
+
+contexts:
+  main:
+    - comment: name
+      match: ^[^:]+
+      scope: keyword
+
+    - comment: password
+      match: ":"
+      push: password
+
+  password:
+    - comment: uid
+      match: ":"
+      set: gid
+
+    - comment: shadowpassword
+      match: "[^:]+"
+      scope: invalid
+
+  gid:
+    - comment: gid
+      match: ":"
+      set: users
+
+    - comment: number
+      match: "[0-9]+"
+      scope: constant.numeric
+
+  users:
+    - comment: newline
+      match: "\n"
+      pop: true
+
+    - comment: directory
+      match: "[^:\n]+"
+      scope: variable.parameter
+
+    - comment: separator
+      match: ","
+      scope: punctuation

assets/syntaxes/02_Extra/JavaScript (Babel).sublime-syntax

@@ -4,9 +4,11 @@
 name: JavaScript (Babel)
 file_extensions:
   - js
+  - mjs
   - jsx
   - babel
   - es6
+  - cjs
 first_line_match: ^#!\s*/.*\b(node|js)$\n?
 scope: source.js
 contexts:

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

@@ -15,7 +15,7 @@ contexts:
       push: first_line
 
   first_line:
-    - match: '([A-Z0-9]+)(\()([^)]+)(\))'
+    - match: '([A-Z0-9_\-]+)(\()([^)]+)(\))'
       captures:
         1: meta.preprocessor
         2: keyword.operator
@@ -36,9 +36,18 @@ contexts:
     - match: '^\S.*$'
       scope: markup.heading
 
-    - match: '\b([a-z0-9_]+)(\()([^)]*)(\))'
+    - match: '\b([A-Za-z0-9_\-]+)(\()([^)]*)(\))'
       captures:
         1: entity.name.function
         2: keyword.operator
         3: constant.numeric
         4: keyword.operator
+
+    # command-line options like --option=value, --some-flag, or -x
+    - match: '(?:[^a-zA-Z0-9_-]|^|\s)(--?[A-Za-z0-9][A-Za-z0-9-]*)(?:(=)?("?)([A-Za-z0-9]+)("?))?'
+      captures:
+        1: entity.name
+        2: keyword.operator
+        3: punctuation.definition.string.begin
+        4: variable.parameter
+        3: punctuation.definition.string.end

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

@@ -0,0 +1,14 @@
+%YAML 1.2
+---
+# http://www.sublimetext.com/docs/3/syntax.html
+name: MemInfo
+file_extensions:
+  - meminfo
+scope: source.meminfo
+
+contexts:
+  main:
+    - match: '^([^:]+)\w*:\w*(.*)$'
+      captures:
+        1: keyword.other.meminfo-key
+        2: string.other.meminfo-value

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

@@ -0,0 +1,257 @@
+%YAML 1.2
+---
+# http://www.sublimetext.com/docs/3/syntax.html
+name: Nim
+file_extensions:
+  - nim
+  - nims
+scope: source.nim
+contexts:
+  main:
+    - match: '(\#\[\s*(TODO|todo)?)'
+      comment: A multiline comment.
+      captures:
+        1: punctuation.definition.multi-comment.nim
+        2: invalid.illegal.TODO.nim
+      push:
+        - meta_scope: comment.line.number-sign.multi-comment.nim
+        - match: '(.*]\#)'
+          captures:
+            1: punctuation.definition.multi-comment.nim
+            2: invalid.illegal.TODO.nim
+          pop: true
+    - match: (##\s*(TODO|todo)?).+$\n?
+      comment: A documentation comment.
+      scope: comment.line.number-sign.doc-comment.nim
+      captures:
+        1: punctuation.definition.doc-comment.nim
+        2: invalid.illegal.TODO.nim
+    - match: (##\s*)$\n?
+      comment: An empty documentation comment.
+      scope: comment.line.number-sign.doc-comment.empty.nim
+      captures:
+        1: punctuation.definition.doc-comment.empty.nim
+    - match: (#\s*(TODO|todo)?).*$\n?
+      comment: A regular comment
+      scope: comment.line.number-sign.comment.nim
+      captures:
+        1: punctuation.definition.comment.nim
+        2: invalid.illegal.TODO.nim
+    - match: '\{\.'
+      comment: Pragmas
+      push:
+        - meta_scope: pragma
+        - match: '\.?\}'
+          pop: true
+        - match: \"
+          push:
+            - meta_scope: string.something.nim
+            - match: \"
+              pop: true
+        - match: '([\w\x{80}-\x{10FFFF}]+)'
+          scope: entity.other.attribute-name.pragma.nim
+    - match: discard \"\"\"
+      comment: A discarded triple string literal comment
+      push:
+        - meta_scope: comment.line.discarded.nim
+        - match: \"\"\"
+          pop: true
+    - match: '(?<![\w\x{80}-\x{10FFFF}])(\d[_\d]*((\.[_\d]+([eE][\+\-]?\d[_\d]*)?)|([eE][\+\-]?\d[_\d]*)))(''?([fF](32|64|128))|[fFdD])?'
+      comment: A float literal
+      scope: constant.numeric.float.decimal.nim
+    - match: '(?<![\w\x{80}-\x{10FFFF}])(0[xX][0-9A-Fa-f][_0-9A-Fa-f]*)(''?(([iIuUfF](8|16|32|64))|[uUfFdD]))?'
+      comment: A hexadecimal literal
+      scope: constant.numeric.integer.hexadecimal.nim
+    - match: '(?<![\w\x{80}-\x{10FFFF}])(0[ocC][0-7][_0-7]*)(''?(([iIuUfF](8|16|32|64))|[uUfFdD]))?'
+      comment: A base-8 integer literal
+      scope: constant.numeric.integer.octal.nim
+    - match: '(?<![\w\x{80}-\x{10FFFF}])(0(b|B)[01][_01]*)(''?(([iIuUfF](8|16|32|64))|[uUfFdD]))?'
+      comment: A base-2 integer literal
+      scope: constant.numeric.integer.binary.nim
+    - match: '(?<![\w\x{80}-\x{10FFFF}])(\d[_\d]*)(''?(([iIuUfF](8|16|32|64))|[uUfFdD]))?'
+      comment: A base-10 integer literal
+      scope: constant.numeric.integer.decimal.nim
+    - match: '(?<![\w\x{80}-\x{10FFFF}])(true|false|inf|nil)(?![\w\x{80}-\x{10FFFF}])'
+      comment: Language Constants.
+      scope: constant.language.nim
+    - match: (?:^|\s+|=)(when|if)\b
+      comment: Primary branching keywords
+      captures:
+        1: keyword.control.primary.nim
+      push:
+        - match: (?=:)
+          captures:
+            1: control.variable.parameter.nim
+          pop: true
+        - include: scope:source.nim
+    - match: (?:^|\s+|=)(case)\b
+      comment: Primary branching keyword 'case'
+      captures:
+        1: keyword.control.primary.nim
+      push:
+        - match: (?=\bof\b)
+          captures:
+            1: control.variable.parameter.nim
+          pop: true
+        - include: scope:source.nim
+    - match: (?:^|\s+)(of|else|elif)\b
+      comment: Secondary branching keywords and their conditions
+      captures:
+        1: keyword.control.secondary.nim
+      push:
+        - match: (?=:)
+          captures:
+            1: control.variable.parameter.nim
+          pop: true
+        - include: scope:source.nim
+    - match: '(?<![\w\x{80}-\x{10FFFF}])(await|block|break|continue|do|end|except|finally|raise|return|try|while|yield)(?![\w\x{80}-\x{10FFFF}])'
+      comment: Keywords that affect program control flow or scope.
+      scope: keyword.control.nim
+    - match: '((?<![\w\x{80}-\x{10FFFF}])(and|in|is|isnot|not|notin|or|xor)(?![\w\x{80}-\x{10FFFF}]))'
+      comment: Keyword boolean operators for expressions.
+      scope: keyword.operator.boolean.nim
+    - match: '((?<![\w\x{80}-\x{10FFFF}])(addr|as|atomic|bind|cast|const|converter|defer|discard|distinct|div|enum|export|include|let|mixin|object|of|ptr|ref|shl|shr|static|type|var)(?![\w\x{80}-\x{10FFFF}]))'
+      comment: Other keywords.
+      scope: keyword.other.nim
+    - match: (\b()\b|(=|\+|-|\*|/|<|>|@|\$|~|&|%|!|\?|\^|\.|:|\\)+)
+      comment: Generic operators for expressions.
+      scope: keyword.operator.nim
+    - match: (for)\s+
+      comment: in keyword in a 'for' loop
+      captures:
+        1: keyword.control.nim
+      push:
+        - meta_scope: meta.forloop.nim
+        - match: (?=:)
+          captures:
+            1: keyword.control.nim
+          pop: true
+        - match: '\ [\w\x{80}-\x{10FFFF},]+\s+(in)\s+'
+          captures:
+            1: keyword.control.nim
+        - include: scope:source.nim
+    - match: '((import)\s+[\.|\w|\/]+,?)'
+      comment: Import syntax
+      captures:
+        2: keyword.control.nim
+    - match: '(from)\s+[\/\w]+\s+(?=import)'
+      captures:
+        1: keyword.control.nim
+    - match: (var|let)\s*\(
+      comment: Destructure syntax
+      captures:
+        1: keyword.other.nim
+      push:
+        - match: \)
+          captures:
+            1: keyword.other.nim
+          pop: true
+    - match: '((?<![\w\x{80}-\x{10FFFF}])(generic|interface|lambda|out|shared|with|without)(?![\w\x{80}-\x{10FFFF}]))'
+      comment: Invalid and unused keywords.
+      scope: keyword.invalid.nim
+    - match: '(?<![\w\x{80}-\x{10FFFF}])(new|GC_ref|GC_unref|assert|echo|defined|declared|newException|countup|countdown|len|high|low)(?![\w\x{80}-\x{10FFFF}])'
+      comment: Common functions
+      scope: keyword.other.common.function.nim
+    - match: '(?<![\w\x{80}-\x{10FFFF}])(((uint|int|float)(8|16|32|64)?)|clong|culong|cchar|cschar|cshort|cint|csize|clonglong|cfloat|cdouble|clongdouble|cuchar|cushort|cuint|culonglong|cstringArray|bool|string|auto|cstring|char|byte|tobject|typedesc|stmt|expr|any|untyped|typed)(?![\w\x{80}-\x{10FFFF}])'
+      comment: Built-in, concrete types.
+      scope: storage.type.concrete.nim
+    - match: '(?<![\w\x{80}-\x{10FFFF}])(range|array|seq|tuple|natural|set|ref|ptr|pointer)(?![\w\x{80}-\x{10FFFF}])'
+      comment: Built-in, generic types.
+      scope: storage.type.generic.nim
+    - match: '(?<![\w\x{80}-\x{10FFFF}])(proc|iterator|method|template|macro)(?![\w\x{80}-\x{10FFFF}])'
+      comment: Function types
+      scope: storage.type.function.nim
+    - match: '(?<![\w\x{80}-\x{10FFFF}])(openarray|varargs|void)(?![\w\x{80}-\x{10FFFF}])'
+      comment: Special types.
+      scope: storage.type.generic.nim
+    - match: '(?<![\w\x{80}-\x{10FFFF}])([A-Z][A-Z0-9_]+)(?![\w\x{80}-\x{10FFFF}])'
+      comment: Other constants.
+      scope: support.constant.nim
+    - match: '(?<![\w\x{80}-\x{10FFFF}])([A-Z]\w+)(?![\w\x{80}-\x{10FFFF}])'
+      comment: Other types.
+      scope: support.type.nim
+    - match: '(?<![\w\x{80}-\x{10FFFF}])(\w+)(?![\w\x{80}-\x{10FFFF}])(?=\()'
+      comment: Function call.
+      scope: support.function.any-method.nim
+    - match: r?\"\"\"
+      comment: (Raw) Triple Quoted String
+      push:
+        - meta_scope: string.quoted.triple.nim
+        - match: '\"\"\"[^\"]'
+          pop: true
+    - match: r\"
+      comment: Raw Double Quoted String
+      push:
+        - meta_scope: string.quoted.double.raw.nim
+        - match: \"
+          pop: true
+        - match: \"\"
+    - match: \"
+      comment: Double Quoted String
+      push:
+        - meta_scope: string.quoted.double.nim
+        - match: \"
+          pop: true
+        - include: escaped_char
+    - match: \'
+      comment: Single quoted character literal
+      push:
+        - meta_scope: string.quoted.single.nim
+        - match: \'
+          pop: true
+        - match: \\n
+          scope: invalid.illegal.character.nim
+        - include: escaped_char
+        - match: '([^\''][^\'']+?)'
+          scope: invalid.illegal.character.nim
+    - match: '([\w\x{80}-\x{10FFFF}\`]+)\s*(?=\(|\[.+?\]\s*\()'
+      comment: Call syntax
+      captures:
+        1: support.function.any-method.nim
+      push:
+        - match: \)
+          captures:
+            1: support.function.any-method.nim
+          pop: true
+        - include: scope:source.nim
+    - match: '([\w\x{80}-\x{10FFFF}]+)(?=\s+[\w](?![\w\x{80}-\x{10FFFF}]+((?!\n)\s)+))'
+      comment: Command syntax
+      captures:
+        1: support.function.any-method.nim
+    - match: '([\w\x{80}-\x{10FFFF}]+)(?=\s+[\"\''\`])'
+      captures:
+        1: support.function.any-method.nim
+    - match: (tmpl(i)?)(?=( (nim|html|xml|js|css|glsl|md))?\"\"\")
+      comment: tmpl specifier
+      captures:
+        1: storage.type.function.nim
+        2: keyword.operator.nim
+  escaped_char:
+    - match: '\\[nN]'
+      scope: constant.character.escape.newline.nim
+    - match: '\\[cC]|\\[rR]'
+      scope: constant.character.escape.carriagereturn.nim
+    - match: '\\[lL]'
+      scope: constant.character.escape.linefeed.nim
+    - match: '\\[fF]'
+      scope: constant.character.escape.formfeed.nim
+    - match: '\\[tT]'
+      scope: constant.character.escape.tabulator.nim
+    - match: '\\[vV]'
+      scope: constant.character.escape.verticaltabulator.nim
+    - match: \\\"
+      scope: constant.character.escape.double-quote.nim
+    - match: \\'
+      scope: constant.character.escape.single-quote.nim
+    - match: '\\[0-9]+'
+      scope: constant.character.escape.chardecimalvalue.nim
+    - match: '\\[aA]'
+      scope: constant.character.escape.alert.nim
+    - match: '\\[bB]'
+      scope: constant.character.escape.backspace.nim
+    - match: '\\[eE]'
+      scope: constant.character.escape.escape.nim
+    - match: '\\[xX][0-9A-Fa-f]{2}'
+      scope: constant.character.escape.hex.nim
+    - match: \\\\
+      scope: constant.character.escape.backslash.nim

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

@@ -140,7 +140,7 @@ contexts:
       push:
         - match: '(?=([\])};]|\b(else|then)\b))'
           pop: true
-        - match: '(?=(\s*\}|\"|\binherit\b|\b[a-zA-Z\_][a-zA-Z0-9\_\''\-]*(\s*\.|\s*=[^=])))'
+        - match: '(?=(\s*\}|\"|\binherit\b|\b[a-zA-Z\_][a-zA-Z0-9\_\''\-]*(\s*\.|\s*=[^=])|\$\{[a-zA-z0-9\_\''\-]+\}(\s*\.|\s*=[^=])))'
           push:
             - match: '(?=([\])};,]|\b(else|then)\b))'
               pop: true
@@ -563,7 +563,7 @@ contexts:
           pop: true
         - include: string-quoted
         - include: expression-cont
-    - match: '([a-zA-Z0-9\.\_\-\+]*(\/[a-zA-Z0-9\.\_\-\+]+)+)'
+    - match: '(~?[a-zA-Z0-9\.\_\-\+]*(\/[a-zA-Z0-9\.\_\-\+]+)+)'
       captures:
         0: string.unquoted.path.nix
       push:

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

@@ -0,0 +1,71 @@
+%YAML 1.2
+---
+# http://www.sublimetext.com/docs/3/syntax.html
+name: passwd
+file_extensions:
+  - passwd
+scope: source.passwd
+
+contexts:
+  main:
+    - comment: name
+      match: ^[^:]+
+      scope: keyword
+
+    - comment: password
+      match: ":"
+      push: password
+
+  password:
+    - comment: uid
+      match: ":"
+      set: uid
+
+    - comment: shadowpassword
+      match: "[^:]+"
+      scope: invalid
+
+  uid:
+    - comment: gid
+      match: ":"
+      set: gid
+
+    - comment: number
+      match: "[0-9]+"
+      scope: constant.numeric
+
+  gid:
+    - comment: comment
+      match: ":"
+      set: comment
+
+    - comment: number
+      match: "[0-9]+"
+      scope: constant.language
+
+  comment:
+    - comment: directory
+      match: ":"
+      set: directory
+
+    - comment: comment
+      match: "[^:]+"
+      scope: entity.name
+
+  directory:
+    - comment: shell
+      match: ":"
+      set: shell
+
+    - comment: directory
+      match: "[^:]+"
+      scope: string.unquoted
+
+  shell:
+    - comment: newline
+      match: "\n"
+      pop: true
+
+    - comment: directory
+      match: "[^:\n]+"
+      scope: variable.parameter

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

@@ -147,7 +147,7 @@ contexts:
         2: keyword.other.powershell
         3: variable.parameter.powershell
   attribute:
-    - match: '(\[)\s*\b(?i)(cmdletbinding|alias|outputtype|parameter|validatenotnull|validatenotnullorempty|validatecount|validateset|allownull|allowemptycollection|allowemptystring|validatescript|validaterange|validatepattern|validatelength)\b'
+    - match: '(\[)\s*\b(?i)(cmdletbinding|alias|outputtype|parameter|validatenotnull|validatenotnullorempty|validatecount|validateset|allownull|allowemptycollection|allowemptystring|validatescript|validaterange|validatepattern|validatelength|supportswildcards)\b'
       captures:
         1: punctuation.section.bracket.begin.powershell
         2: support.function.attribute.powershell
@@ -165,31 +165,11 @@ contexts:
               captures:
                 0: punctuation.section.group.end.powershell
               pop: true
-            - include: variable
-            - include: variableNoProperty
-            - include: hashtable
-            - include: scriptblock
-            - include: doubleQuotedStringEscapes
-            - include: doubleQuotedString
-            - include: type
-            - include: numericConstant
-            - include: doubleQuotedString
             - include: main
             - match: (?i)\b(mandatory|valuefrompipeline|valuefrompipelinebypropertyname|valuefromremainingarguments|position|parametersetname|defaultparametersetname|supportsshouldprocess|supportspaging|positionalbinding|helpuri|confirmimpact|helpmessage)\b(?:\s+)?(=)?
               captures:
                 1: variable.parameter.attribute.powershell
                 2: keyword.operator.assignment.powershell
-            - match: (?<!')'
-              captures:
-                0: punctuation.definition.string.begin.powershell
-              push:
-                - meta_scope: string.quoted.single.powershell
-                - match: "'(?!')"
-                  captures:
-                    0: punctuation.definition.string.end.powershell
-                  pop: true
-                - match: "''"
-                  scope: constant.character.escape.powershell
   commands:
     - match: '(?:(\p{L}|\d|_|-|\\|\:)*\\)?\b(?i:Add|Approve|Assert|Backup|Block|Build|Checkpoint|Clear|Close|Compare|Complete|Compress|Confirm|Connect|Convert|ConvertFrom|ConvertTo|Copy|Debug|Deny|Deploy|Disable|Disconnect|Dismount|Edit|Enable|Enter|Exit|Expand|Export|Find|Format|Get|Grant|Group|Hide|Import|Initialize|Install|Invoke|Join|Limit|Lock|Measure|Merge|Mount|Move|New|Open|Optimize|Out|Ping|Pop|Protect|Publish|Push|Read|Receive|Redo|Register|Remove|Rename|Repair|Request|Reset|Resize|Resolve|Restart|Restore|Resume|Revoke|Save|Search|Select|Send|Set|Show|Skip|Split|Start|Step|Stop|Submit|Suspend|Switch|Sync|Test|Trace|Unblock|Undo|Uninstall|Unlock|Unprotect|Unpublish|Unregister|Update|Use|Wait|Watch|Write)\-.+?(?:\.(?i:exe|cmd|bat|ps1))?\b'
       comment: "Verb-Noun pattern:"
@@ -242,14 +222,14 @@ contexts:
           pop: true
         - match: '(?i)\b[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,64}\b'
         - include: variableNoProperty
-        - include: variable
         - include: doubleQuotedStringEscapes
         - include: interpolation
         - match: '`\s*$'
           scope: keyword.other.powershell
   doubleQuotedStringEscapes:
-    - match: '`[0abnfrvt"''$`]'
+    - match: '`[`0abefnrtv"''$]'
       scope: constant.character.escape.powershell
+    - include: unicodeEscape
     - match: '""'
       scope: constant.character.escape.powershell
   function:
@@ -362,6 +342,11 @@ contexts:
         - match: '(?!\d+|\.)(?:\p{L}|\p{N}|\.)+'
           scope: storage.type.powershell
         - include: main
+  unicodeEscape:
+    - match: '`u\{(?:(?:10)?([0-9a-fA-F]){1,4}|0?\g<1>{1,5})}'
+      scope: constant.character.escape.powershell
+    - match: '`u(?:\{[0-9a-fA-F]{,6}.)?'
+      scope: invalid.character.escape.powershell
   variable:
     - match: (\$)(?i:(False|Null|True))\b
       comment: These are special constants.
@@ -374,13 +359,13 @@ contexts:
         0: support.constant.variable.powershell
         1: punctuation.definition.variable.powershell
         3: variable.other.member.powershell
-    - match: '(\$)(?i:(\$|\^|\?|_|Args|ConsoleFileName|Event|EventArgs|EventSubscriber|ForEach|Input|LastExitCode|Matches|MyInvocation|NestedPromptLevel|Profile|PSBoundParameters|PsCmdlet|PsCulture|PSDebugContext|PSItem|PSCommandPath|PSScriptRoot|PsUICulture|Pwd|Sender|SourceArgs|SourceEventArgs|StackTrace|Switch|This))((?:\.(?:\p{L}|\d|_)+)*\b)?\b'
+    - match: '(\$)((?:[$^?])|(?i:_|Args|ConsoleFileName|Event|EventArgs|EventSubscriber|ForEach|Input|LastExitCode|Matches|MyInvocation|NestedPromptLevel|Profile|PSBoundParameters|PsCmdlet|PsCulture|PSDebugContext|PSItem|PSCommandPath|PSScriptRoot|PsUICulture|Pwd|Sender|SourceArgs|SourceEventArgs|StackTrace|Switch|This)\b)((?:\.(?:\p{L}|\d|_)+)*\b)?'
       comment: Automatic variables are not constants, but they are read-only. In monokai (default) color schema support.variable doesn't have color, so we use constant.
       captures:
-        0: support.constant.automatic.powershell
+        0: support.variable.automatic.powershell
         1: punctuation.definition.variable.powershell
         3: variable.other.member.powershell
-    - match: '(\$)(?i:(ConfirmPreference|DebugPreference|ErrorActionPreference|ErrorView|FormatEnumerationLimit|MaximumAliasCount|MaximumDriveCount|MaximumErrorCount|MaximumFunctionCount|MaximumHistoryCount|MaximumVariableCount|OFS|OutputEncoding|ProgressPreference|PsCulture|PSDebugContext|PSDefaultParameterValues|PSEmailServer|PSItem|PSModuleAutoloadingPreference|PSSenderInfo|PSSessionApplicationName|PSSessionConfigurationName|PSSessionOption|VerbosePreference|WarningPreference|WhatIfPreference))((?:\.(?:\p{L}|\d|_)+)*\b)?\b'
+    - match: '(\$)(?i:(ConfirmPreference|DebugPreference|ErrorActionPreference|ErrorView|FormatEnumerationLimit|InformationPreference|LogCommandHealthEvent|LogCommandLifecycleEvent|LogEngineHealthEvent|LogEngineLifecycleEvent|LogProviderHealthEvent|LogProviderLifecycleEvent|MaximumAliasCount|MaximumDriveCount|MaximumErrorCount|MaximumFunctionCount|MaximumHistoryCount|MaximumVariableCount|OFS|OutputEncoding|PSCulture|PSDebugContext|PSDefaultParameterValues|PSEmailServer|PSItem|PSModuleAutoLoadingPreference|PSModuleAutoloadingPreference|PSSenderInfo|PSSessionApplicationName|PSSessionConfigurationName|PSSessionOption|ProgressPreference|VerbosePreference|WarningPreference|WhatIfPreference))((?:\.(?:\p{L}|\d|_)+)*\b)?\b'
       comment: Style preference variables as language variables so that they stand out.
       captures:
         0: variable.language.powershell
@@ -426,19 +411,19 @@ contexts:
         0: support.constant.variable.powershell
         1: punctuation.definition.variable.powershell
         3: variable.other.member.powershell
-    - match: (\$)(?i:(\$|\^|\?|_|Args|ConsoleFileName|Event|EventArgs|EventSubscriber|ForEach|Input|LastExitCode|Matches|MyInvocation|NestedPromptLevel|Profile|PSBoundParameters|PsCmdlet|PsCulture|PSDebugContext|PSItem|PSCommandPath|PSScriptRoot|PsUICulture|Pwd|Sender|SourceArgs|SourceEventArgs|StackTrace|Switch|This))\b
+    - match: '(\$)((?:[$^?])|(?i:_|Args|ConsoleFileName|Event|EventArgs|EventSubscriber|ForEach|Input|LastExitCode|Matches|MyInvocation|NestedPromptLevel|Profile|PSBoundParameters|PsCmdlet|PsCulture|PSDebugContext|PSItem|PSCommandPath|PSScriptRoot|PsUICulture|Pwd|Sender|SourceArgs|SourceEventArgs|StackTrace|Switch|This)\b)'
       comment: Automatic variables are not constants, but they are read-only...
       captures:
         0: support.variable.automatic.powershell
         1: punctuation.definition.variable.powershell
         3: variable.other.member.powershell
-    - match: (\$)(?i:(ConfirmPreference|DebugPreference|ErrorActionPreference|ErrorView|FormatEnumerationLimit|MaximumAliasCount|MaximumDriveCount|MaximumErrorCount|MaximumFunctionCount|MaximumHistoryCount|MaximumVariableCount|OFS|OutputEncoding|ProgressPreference|PsCulture|PSDebugContext|PSDefaultParameterValues|PSEmailServer|PSItem|PSModuleAutoloadingPreference|PSSenderInfo|PSSessionApplicationName|PSSessionConfigurationName|PSSessionOption|VerbosePreference|WarningPreference|WhatIfPreference))\b
+    - match: (\$)(?i:(ConfirmPreference|DebugPreference|ErrorActionPreference|ErrorView|FormatEnumerationLimit|InformationPreference|LogCommandHealthEvent|LogCommandLifecycleEvent|LogEngineHealthEvent|LogEngineLifecycleEvent|LogProviderHealthEvent|LogProviderLifecycleEvent|MaximumAliasCount|MaximumDriveCount|MaximumErrorCount|MaximumFunctionCount|MaximumHistoryCount|MaximumVariableCount|OFS|OutputEncoding|PSCulture|PSDebugContext|PSDefaultParameterValues|PSEmailServer|PSItem|PSModuleAutoLoadingPreference|PSModuleAutoloadingPreference|PSSenderInfo|PSSessionApplicationName|PSSessionConfigurationName|PSSessionOption|ProgressPreference|VerbosePreference|WarningPreference|WhatIfPreference))\b
       comment: Style preference variables as language variables so that they stand out.
       captures:
         0: variable.language.powershell
         1: punctuation.definition.variable.powershell
         3: variable.other.member.powershell
-    - match: '(?i:(\$|@)(global|local|private|script|using|workflow):((?:\p{L}|\d|_)+))'
+    - match: '(?i:(\$)(global|local|private|script|using|workflow):((?:\p{L}|\d|_)+))'
       captures:
         0: variable.other.readwrite.powershell
         1: punctuation.definition.variable.powershell

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

@@ -0,0 +1,97 @@
+%YAML 1.2
+---
+# http://www.sublimetext.com/docs/3/syntax.html
+name: Rego
+file_extensions:
+  - rego
+scope: source.rego
+contexts:
+  main:
+    - include: comment
+    - include: keyword
+    - include: operator
+    - include: head
+    - include: term
+  comment:
+    - match: (#).*$\n?
+      scope: comment.line.number-sign.rego
+      captures:
+        1: punctuation.definition.comment.rego
+  call:
+    - match: '([a-zA-Z_][a-zA-Z0-9_]*)\('
+      scope: meta.function-call.rego
+      captures:
+        1: support.function.any-method.rego
+  constant:
+    - match: \b(?:true|false|null)\b
+      scope: constant.language.rego
+  head:
+    - match: "^([[:alpha:]_][[:alnum:]_]*)"
+      captures:
+        1: entity.name.function.declaration
+      push:
+        - meta_scope: meta.function.rego
+        - match: '(=|{|\n)'
+          pop: true
+        - include: term
+  keyword:
+    - match: (^|\s+)(?:(default|not|package|import|as|with|else|some))\s+
+      scope: keyword.other.rego
+  number:
+    - match: |-
+        (?x:         # turn on extended mode
+          -?         # an optional minus
+          (?:
+            0        # a zero
+            |        # ...or...
+            [1-9]    # a 1-9 character
+            \d*      # followed by zero or more digits
+          )
+          (?:
+            (?:
+              \.     # a period
+              \d+    # followed by one or more digits
+            )?
+            (?:
+              [eE]   # an e character
+              [+-]?  # followed by an option +/-
+              \d+    # followed by one or more digits
+            )?       # make exponent optional
+          )?         # make decimal portion optional
+        )
+      scope: constant.numeric.rego
+  operator:
+    - match: \=|\!\=|>|<|<\=|>\=|\+|-|\*|%|/|\||&|:\=
+      scope: keyword.operator.comparison.rego
+  string:
+    - match: '"'
+      captures:
+        0: punctuation.definition.string.begin.rego
+      push:
+        - meta_scope: string.quoted.double.rego
+        - match: '"'
+          captures:
+            0: punctuation.definition.string.end.rego
+          pop: true
+        - match: |-
+            (?x:                # turn on extended mode
+              \\                # a literal backslash
+              (?:               # ...followed by...
+                ["\\/bfnrt]     # one of these characters
+                |               # ...or...
+                u               # a u
+                [0-9a-fA-F]{4}  # and four hex digits
+              )
+            )
+          scope: constant.character.escape.rego
+        - match: \\.
+          scope: invalid.illegal.unrecognized-string-escape.rego
+  term:
+    - include: constant
+    - include: string
+    - include: number
+    - include: call
+    - include: variable
+  variable:
+    - match: '\b[[:alpha:]_][[:alnum:]_]*\b'
+      scope: meta.identifier.rego

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

@@ -0,0 +1,21 @@
+%YAML 1.2
+---
+# http://www.sublimetext.com/docs/3/syntax.html
+name: resolv
+file_extensions:
+  - resolv.conf
+scope: source.resolv
+
+contexts:
+  main:
+    - scope: comment.line.number-sign
+      match: \#.*
+      comment: comment
+
+    - comment: configuration
+      match: "(nameserver|domain|search|sortlist|options)"
+      scope: keyword.control
+
+    - comment: options
+      match: "(debug|ndots|timeout|attempts|rotate|no-check-names|inet6|ip6-bytestring|ip6-dotint|no-ip6-dotint|edns0|single-request|single-request-reopen|no-tld-query|use-vc|no-reload)"
+      scope: entity.name

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

@@ -52,3 +52,6 @@ contexts:
         - meta_scope: keyword.control.robot
         - match: '($|\||\s{2,})'
           pop: true
+    - match: (?i)^\s+(Given|When|and|but|Then)
+      comment: BDD keywords
+      scope: string.robot.bdd

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

@@ -0,0 +1,711 @@
+%YAML 1.2
+---
+# http://www.sublimetext.com/docs/3/syntax.html
+name: Stylus
+file_extensions:
+  - styl
+  - stylus
+scope: source.stylus
+contexts:
+  main:
+    - include: comments
+    - match: '^\s*(@(?:import|charset|css|font-face|(?:-webkit-)?keyframes)(?:\s+([\w-]+))?)\b'
+      captures:
+        1: keyword.control.at-rule.other.stylus
+        2: variable.other.animation-name.stylus
+      push:
+        - match: '$|;|(?=\{)'
+          pop: true
+        - include: string-quoted
+    - match: ^\s*(@media)\s*
+      captures:
+        1: keyword.control.at-rule.media.stylus
+      push:
+        - match: '$|(?=\{)'
+          pop: true
+        - include: media-query
+    - match: |-
+        (?x)
+        (?<=^|;|})
+        \s*
+        (?=
+            [\[\]'".\w$-]+
+            \s*
+            ([?:]?=)
+            (?![^\[]*\])
+        )
+      push:
+        - match: $|;
+          pop: true
+        - include: expression
+    - include: iteration
+    - include: conditionals
+    - include: return
+    - match: |-
+        (?x)            # multi-line regex definition mode
+
+        ^(\s*)          # starts at the beginning of line
+        ([\w$-]+)       # identifier (name)
+        (\()            # start of argument list
+        (?=
+            .*?
+            \)\s*\{     # we see a curly brace afterwards
+        )               # which means this is a function definition
+      captures:
+        2: entity.name.function.stylus
+        3: punctuation.definition.parameters.start.stylus
+      push:
+        - meta_scope: meta.function-call.stylus
+        - match: (\))
+          captures:
+            1: punctuation.definition.parameters.end.stylus
+          pop: true
+        - include: expression
+    - match: |-
+        (?x)                # multi-line regex definition mode
+        (
+
+            (^|;)           # starts at the beginning of line or at a ;
+            \s*
+            (\+?\s*         # for block mixins
+             [\w$-]+)       # identifier (name)
+            (\()            # start of argument list
+            (?=
+                .*?
+                \)\s*;?\s*  # if there are only spaces and semicolons
+                $|;         # then this a
+            )
+        )
+      captures:
+        3: entity.other.attribute-name.mixin.stylus
+        4: punctuation.definition.parameters.start.stylus
+      push:
+        - meta_scope: meta.function-call.stylus
+        - match: (\))
+          captures:
+            1: punctuation.definition.parameters.end.stylus
+          pop: true
+        - include: expression
+    - match: |-
+        (?x) # multi-line regex definition mode
+        (^|(?<=\*/|\}))\s*
+        (?=
+            font(?!
+                \s*:\s
+                |
+                -
+                |
+                .*?
+                (?:
+                    \/|normal|bold|light(er?)|serif|sans|monospace|
+                    \b\d+(?:\b|px|r?em|%)|
+                    var\s*\(|
+                    ['"][^\]]*$
+                )
+            ) | # we need to distinguish between tag and property `cursor`
+            cursor(?!
+                \s*[:;]\s
+                |
+                -
+                |
+                .*?
+                (?:
+                    (?:url\s*\()|
+                    (?:-moz-|-webkit-|-ms-)?
+                    (?:auto|default|none|context-menu|help|pointer|progress|
+                    wait|cell|crosshair|text|vertical-text|alias|copy|
+                    move|no-drop|not-allowed|e-resize|n-resize|ne-resize|
+                    nw-resize|s-resize|se-resize|sw-resize|w-resize|
+                    ew-resize|ns-resize|nesw-resize|nwse-resize|col-resize|
+                    row-resize|all-scroll|zoom-in|zoom-out|grab|grabbing
+                    normal|bold|light(er?)|serif|sans|monospace)
+                )
+            ) | (
+                (
+                altGlyph|altGlyphDef|altGlyphItem|animate|animateColor|
+                animateMotion|animateTransform|circle|clipPath|color-profile|
+                defs|desc|ellipse|feBlend|feColorMatrix|
+                feComponentTransfer|feComposite|feConvolveMatrix|
+                feDiffuseLighting|feDisplacementMap|feDistantLight|feFlood|
+                feFuncA|feFuncB|feFuncG|feFuncR|feGaussianBlur|feImage|feMerge|
+                feMergeNode|feMorphology|feOffset|fePointLight|
+                feSpecularLighting|feSpotLight|feTile|feTurbulence|filter|
+                font-face|font-face-format|font-face-name|font-face-src|
+                font-face-uri|foreignObject|g|glyph|glyphRef|hkern|image|line|
+                linearGradient|marker|mask|metadata|missing-glyph|mpath|path|
+                pattern|polygon|polyline|radialGradient|rect|set|stop|svg|
+                switch|symbol|text|textPath|tref|tspan|use|view|vkern|
+                a|abbr|acronym|address|applet|area|article|aside|audio|b|base|
+                basefont|bdi|bdo|bgsound|big|blink|blockquote|body|br|button|
+                canvas|caption|center|cite|code|col|colgroup|data|
+                datalist|dd|decorator|del|details|dfn|dir|div|dl|dt|element|
+                em|embed|fieldset|figcaption|figure|footer|form|frame|
+                frameset|h1|h2|h3|h4|h5|h6|head|header|hgroup|hr|html|i|iframe|
+                img|input|ins|isindex|kbd|keygen|label|legend|li|link|listing|
+                main|map|mark|marquee|menu|menuitem|meta|meter|nav|nobr|
+                noframes|noscript|object|ol|optgroup|option|output|p|param|
+                plaintext|pre|progress|q|rp|rt|ruby|s|samp|script|section|
+                select|shadow|small|source|spacer|span|strike|strong|style|
+                sub|summary|sup|table|tbody|td|template|textarea|tfoot|th|
+                thead|time|title|tr|track|tt|u|ul|var|video|wbr|xmp)
+
+                \s*([\s,.#\[]|:[^\s]|(?=\{|$))
+
+            ) | (
+                [:~>\[*\/]       # symbols but they are valid for selector
+
+            ) | (
+
+                \+\s*[\w$-]+\b\s*      # are an identifier starting with $
+                (?!\()              # and they can't have anything besides
+
+            ) | (                    # for animtions
+
+                \d+(\.\d+)?%|(from|to)\b
+
+            ) | (                   # Placeholder selectors
+
+                \$[\w$-]+\b\s*      # are an identifier starting with $
+                (?=$|\{)            # and they can't have anything besides
+
+            ) | (                   # CSS class
+
+                \.[a-zA-Z0-9_-]+
+
+            ) | (                   # CSS id
+
+                \#[a-zA-Z0-9_-]+
+
+            ) | (                   # Reference to parent
+
+                ([\w\d_-]+)?        # matching any word right before &
+                (&)             # & itself, escaped because of plist
+                ([\w\d_-]+)?        # matching any word right after &
+            )
+        )
+      push:
+        - meta_scope: meta.selector.stylus
+        - match: |-
+
+            |$|(?=\{\s*\}.*$)|(?=\{.*?[:;])|(?=\{)(?!.+\}.*$)
+          pop: true
+        - include: comma
+        - match: \d+(\.\d+)?%|from|to
+          scope: entity.other.animation-keyframe.stylus
+        - include: selector-components
+        - match: .
+          scope: entity.other.attribute-name.stylus
+    - match: |-
+        (?x)                # multi-line regex definition mode
+        (?<=^|;|{)\s*    # starts after begining of line, '{' or ';''
+        (?=                 # lookahead for
+            (
+             [a-zA-Z0-9_-]  # then a letter
+             |              # or
+             (\{(.*?)\})    # interpolation
+             |              # or
+             (/\*.*?\*/)    # comment
+            )+
+
+            \s*[:\s]\s*     # value is separted by colon or space
+
+            (?!(\s*\{))     # if there are only spaces afterwards
+
+            (?!
+                [^}]*?      # checking for an unclosed curly braces on this
+                \{          # line because if one exists it means that
+                [^}]*       # this is a selector and not a property
+                ($|\})
+            )
+        )
+      push:
+        - match: '(?=\}|;)|(?<!,)\s*\n'
+          pop: true
+        - include: comments
+        - include: interpolation
+        - match: '(?<!^|;|{)\s*(?:(:)|\s)'
+          captures:
+            1: punctuation.separator.key-value.stylus
+          push:
+            - match: '(;)|(?=\})|(?=(?<!\,)\s*\n)'
+              captures:
+                1: punctuation.terminator.rule.stylus
+              pop: true
+            - include: comments
+            - include: expression
+        - match: "-(moz|o|ms|webkit|khtml)-"
+          scope: support.type.vendor-prefix.stylus
+        - match: .
+          scope: meta.property-name.stylus support.type.property-name.stylus
+    - match: '@extends?\s'
+      captures:
+        0: keyword.language.stylus
+      push:
+        - match: (?=$|;)
+          pop: true
+        - include: selector-components
+    - include: string-quoted
+    - include: escape
+    - include: language-constants
+    - include: language-operators
+    - include: language-keywords
+    - include: property-reference
+    - include: function-call
+    - match: '\{'
+      scope: punctuation.section.start.stylus
+    - match: '\}'
+      scope: punctuation.section.end.stylus
+  attribute-selector:
+    - match: '\[(?=[^\]]*\])'
+      captures:
+        0: punctuation.definition.entity.start.stylus
+      push:
+        - meta_scope: meta.attribute-selector.stylus
+        - match: '\]'
+          captures:
+            0: punctuation.definition.entity.end.stylus
+          pop: true
+        - match: '(?<=\[)|(?<=\{)'
+          push:
+            - match: '(?=[|~=\]\s])'
+              pop: true
+            - include: interpolation
+            - match: .
+              captures:
+                0: entity.other.attribute-name.stylus
+        - include: interpolation
+        - match: "([|~]?=)"
+          captures:
+            1: keyword.operator.stylus
+        - include: string-quoted
+        - match: .
+          captures:
+            0: string.unquoted.stylus
+  color-values:
+    - match: \b(aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|purple|red|silver|teal|white|yellow)\b
+      scope: constant.color.w3c-standard-color-name.stylus
+    - match: (hsla?|rgba?)\s*(\()
+      captures:
+        1: keyword.language.function.misc.stylus
+        2: punctuation.definition.parameters.start.stylus
+      push:
+        - match: \)
+          captures:
+            0: punctuation.definition.parameters.end.stylus
+          pop: true
+        - match: |-
+            (?x) # multi-line regex definition mode
+            \b
+            (?:0*((?:1?[0-9]{1,2})|(?:2(?:[0-4][0-9]|5[0-5])))\s*(,)\s*)
+            (?:0*((?:1?[0-9]{1,2})|(?:2(?:[0-4][0-9]|5[0-5])))\s*(,)\s*)
+            (?:0*((?:1?[0-9]{1,2})|(?:2(?:[0-4][0-9]|5[0-5])))\b)
+          captures:
+            1: constant.other.color.rgb-value.stylus constant.other.color.rgb-value.red.stylus
+            2: punctuation.delimiter.comma.stylus
+            3: constant.other.color.rgb-value.stylus constant.other.color.rgb-value.green.stylus
+            4: punctuation.delimiter.comma.stylus
+            5: constant.other.color.rgb-value.stylus constant.other.color.rgb-value.blue.stylus
+        - match: |-
+            (?x) # multi-line regex definition mode
+            \b
+            ((?:[0-9]{1,2}|100)%)(,) # red
+            \s*
+            ((?:[0-9]{1,2}|100)%)(,) # green
+            \s*
+            ((?:[0-9]{1,2}|100)%)    # blue
+          captures:
+            1: constant.other.color.rgb-value.stylus constant.other.color.rgb-value.red.stylus
+            2: punctuation.delimiter.comma.stylus
+            3: constant.other.color.rgb-value.stylus constant.other.color.rgb-value.green.stylus
+            4: punctuation.delimiter.comma.stylus
+            5: constant.other.color.rgb-value.stylus constant.other.color.rgb-value.blue.stylus
+        - match: |-
+            (?x) # multi-line regex definition mode
+            (?:\s*(,)\s*((0?\.[0-9]+)|[0-1]))?
+          captures:
+            1: punctuation.delimiter.comma.stylus
+            2: constant.other.color.rgb-value.stylus constant.other.color.rgb-value.alpha.stylus
+        - include: numeric-values
+    - include: numeric-values
+  comma:
+    - match: \s*,\s*
+      scope: punctuation.delimiter.comma.stylus
+  comments:
+    - include: single-line-comment
+    - match: \/\*
+      captures:
+        0: punctuation.definition.comment.stylus
+      push:
+        - meta_scope: comment.block.stylus
+        - match: \*\/
+          captures:
+            0: punctuation.definition.comment.stylus
+          pop: true
+  conditionals:
+    - match: '(^\s*|\s+)(if|unless|else)(?=[\s({]|$)\s*'
+      captures:
+        2: keyword.control.stylus
+      push:
+        - match: '(?=$|\{)'
+          pop: true
+        - include: expression
+  escape:
+    - match: \\.
+      scope: constant.character.escape.stylus
+  expression:
+    - include: single-line-comment
+    - include: comma
+    - include: iteration
+    - include: conditionals
+    - include: language-operators
+    - include: language-keywords
+    - include: hash-definition
+    - include: color-values
+    - include: url
+    - include: function-call
+    - include: string-quoted
+    - include: escape
+    - include: hash-access
+    - include: language-constants
+    - include: language-property-value-constants
+    - include: property-reference
+    - include: variable
+  function-call:
+    - match: '([\w$-]+)(\()'
+      captures:
+        1: entity.function-name.stylus
+        2: punctuation.definition.parameters.start.stylus
+      push:
+        - meta_scope: meta.function-call.stylus
+        - match: (\))
+          captures:
+            1: punctuation.definition.parameters.end.stylus
+          pop: true
+        - include: expression
+  hash-access:
+    - match: '(?=[\w$-]+(?:\.|\[[^\]=]*\]))'
+      push:
+        - meta_scope: meta.hash-access.stylus
+        - match: '(?=[^''''""\[\]\w.$-]|\s|$)'
+          pop: true
+        - match: \.
+          scope: punctuation.delimiter.hash.stylus
+        - match: '\['
+          scope: punctuation.definition.entity.start.stylus
+        - match: '\]'
+          scope: punctuation.definition.entity.end.stylus
+        - include: string-quoted
+        - include: variable
+  hash-definition:
+    - match: '\{'
+      captures:
+        0: punctuation.section.embedded.start.stylus
+      push:
+        - meta_scope: meta.hash.stylus
+        - match: '\}'
+          captures:
+            0: punctuation.section.embedded.end.stylus
+          pop: true
+        - include: single-line-comment
+        - match: |-
+            (?x)
+            (?:
+                ([\w$-]+)
+                |
+                ('[^']*')
+                |
+                ("[^"]*")
+            )
+            \s*
+            (:)
+            \s*
+          captures:
+            1: support.type.property-name.stylus
+            2: string.quoted.single.stylus
+            3: string.quoted.double.stylus
+            4: punctuation.separator.key-value.stylus
+          push:
+            - match: '(;)|(?=\}|$)'
+              captures:
+                1: punctuation.terminator.statement.stylus
+              pop: true
+            - include: expression
+  interpolation:
+    - match: '\{'
+      captures:
+        0: punctuation.section.embedded.start.stylus
+      push:
+        - meta_scope: stylus.embedded.source
+        - match: '\}'
+          captures:
+            0: punctuation.section.embedded.end.stylus
+          pop: true
+        - include: expression
+  iteration:
+    - match: (^\s*|\s+)(for)\s+(?=.*?\s+in\s+)
+      captures:
+        2: keyword.control.stylus
+      push:
+        - match: '$|\{'
+          pop: true
+        - include: expression
+  language-constants:
+    - match: \b(true|false|null)\b
+      scope: constant.language.stylus
+  language-keywords:
+    - match: (\b|\s)(return|else)\b
+      scope: keyword.control.stylus
+    - match: (\b|\s)(!important|in|is defined|is a)\b
+      scope: keyword.other.stylus
+    - match: \barguments\b
+      scope: variable.language.stylus
+  language-operators:
+    - match: ((?:\?|:|!|~|\+|-|(?:\*)?\*|\/|%|(\.)?\.\.|<|>|(?:=|:|\?|\+|-|\*|\/|%|<|>)?=|!=)|\b(?:in|is(?:nt)?|(?<!:)not)\b)
+      scope: keyword.operator.stylus
+  language-property-value-constants:
+    - match: \b(absolute|all(-scroll)?|always|armenian|auto|avoid|baseline|below|bidi-override|block|bold(er)?|(border|content|padding)-box|both|bottom|break-all|break-word|capitalize|center|char|circle|cjk-ideographic|col-resize|collapse|crosshair|cursive|dashed|decimal-leading-zero|decimal|default|disabled|disc|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|e-resize|ellipsis|fantasy|fixed|geometricPrecision|georgian|groove|hand|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|inactive|inherit|inline-block|inline|inset|inside|inter-ideograph|inter-word|italic|justify|katakana-iroha|katakana|keep-all|left|lighter|line-edge|line-through|line|list-item|loose|lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|medium|middle|move|monospace|n-resize|ne-resize|newspaper|no-drop|no-repeat|nw-resize|none|normal|not-allowed|nowrap|oblique|optimize(Legibility|Quality|Speed)|outset|outside|overline|pointer|pre(-(wrap|line))?|progress|relative|repeat-x|repeat-y|repeat|right|ridge|row-resize|rtl|(sans-)?serif|s-resize|scroll|se-resize|separate|small-caps|solid|square|static|strict|sub|super|sw-resize|table(-(row|cell|footer-group|header-group))?|tb-rl|text-bottom|text-top|text|thick|thin|top|transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|vertical(-(ideographic|text))?|visible(Painted|Fill|Stroke)?|w-resize|wait|whitespace|zero|smaller|larger|((xx?-)?(small(er)?|large(r)?))|painted|fill|stroke)\b
+      scope: constant.property-value.stylus
+  media-query:
+    - match: '\s*(?![{;]|$)'
+      push:
+        - meta_scope: meta.at-rule.media.stylus
+        - match: '\s*(?=[{;]|$)'
+          pop: true
+        - match: '(?i)\s*(only|not)?\s*(all|aural|braille|embossed|handheld|print|projection|screen|tty|tv)?(?![\w\d$-]+)'
+          captures:
+            1: keyword.operator.logic.media.stylus
+            2: support.constant.media.stylus
+          push:
+            - match: '\s*(?:(,)|(?=[{;]|$))'
+              pop: true
+            - include: media-query-list
+        - include: variable
+  media-query-list:
+    - match: \s*(and)?\s*(\()\s*
+      captures:
+        1: keyword.operator.logic.media.stylus
+        2: punctuation.definition.parameters.start.stylus
+      push:
+        - match: \)
+          captures:
+            0: punctuation.definition.parameters.end.stylus
+          pop: true
+        - include: media-query-properties
+        - include: numeric-values
+  media-query-properties:
+    - match: \s*:\s*
+      captures:
+        0: punctuation.separator.key-value.stylus
+    - match: |-
+        (?x)
+        (
+            ((min|max)-)?
+            (
+                ((device-)?(height|width|aspect-ratio))|
+                (color(-index)?)|monochrome|resolution
+            )
+        )|grid|scan|orientation
+      captures:
+        0: support.type.property-name.media.stylus
+    - match: \b(portrait|landscape|progressive|interlace)\b
+      captures:
+        1: support.constant.property-value.stylus
+  numeric-values:
+    - match: |-
+        (?x) # multi-line regex definition mode
+        (\#)(?:
+                ([0-9a-fA-F])
+                ([0-9a-fA-F])
+                ([0-9a-fA-F])
+                ([0-9a-fA-F])?
+        |       ([0-9a-fA-F]{2})
+                ([0-9a-fA-F]{2})
+                ([0-9a-fA-F]{2})
+                ([0-9a-fA-F]{2})?
+        )\b
+      scope: constant.other.color.rgb-value.stylus
+      captures:
+        1: punctuation.definition.constant.stylus
+        2: constant.other.color.rgb-value.red.stylus
+        3: constant.other.color.rgb-value.green.stylus
+        4: constant.other.color.rgb-value.blue.stylus
+        5: constant.other.color.rgb-value.alpha.stylus
+        6: constant.other.color.rgb-value.red.stylus
+        7: constant.other.color.rgb-value.green.stylus
+        8: constant.other.color.rgb-value.blue.stylus
+        9: constant.other.color.rgb-value.alpha.stylus
+    - match: |-
+        (?x)                    # multi-line regex definition mode
+        (?:-|\+)?               # negative / positive
+        (?:
+            (?:
+                [0-9]+          # integer part
+                (?:\.[0-9]+)?   # fraction
+            ) |
+            (?:\.[0-9]+)        # fraction without leading zero
+        )
+        ((?:                    # units
+            px|pt|ch|cm|mm|in|
+            r?em|ex|pc|vw|vh|vmin|vmax|deg|
+            g?rad|turn|dpi|dpcm|dppx|m?s|k?Hz
+        )\b|%)?
+      scope: constant.numeric.stylus
+      captures:
+        1: keyword.other.unit.stylus
+  property-reference:
+    - match: "@[a-z-]+"
+      scope: variable.other.property.stylus
+  pseudo:
+    - match: (:)(active|checked|default|disabled|empty|enabled|first-child|first-of-type|first|fullscreen|focus|hover|indeterminate|in-range|invalid|last-child|last-of-type|left|link|only-child|only-of-type|optional|out-of-range|read-only|read-write|required|right|root|scope|target|valid|visited)\b
+      scope: entity.other.attribute-name.pseudo-class.stylus
+      captures:
+        1: puncutation.definition.entity.stylus
+    - match: (:?:)(before|after)\b
+      scope: entity.other.attribute-name.pseudo-element.stylus
+      captures:
+        1: puncutation.definition.entity.stylus
+    - match: (::)(first-letter|first-number|selection)\b
+      scope: entity.other.attribute-name.pseudo-element.stylus
+      captures:
+        1: puncutation.definition.entity.stylus
+    - match: ((:)dir)\s*(?:(\()(ltr|rtl)?(\)))?
+      captures:
+        1: entity.other.attribute-name.pseudo-element.stylus
+        2: puncutation.definition.entity.stylus
+        3: puncutation.definition.parameters.start.stylus
+        4: constant.language.stylus
+        5: puncutation.definition.parameters.end.stylus
+    - match: ((:)lang)\s*(?:(\()(\w+(-\w+)?)?(\)))?
+      captures:
+        1: entity.other.attribute-name.pseudo-element.stylus
+        2: puncutation.definition.entity.stylus
+        3: puncutation.definition.parameters.start.stylus
+        4: constant.language.stylus
+        5: puncutation.definition.parameters.end.stylus
+    - include: pseudo-nth
+    - include: pseudo-not
+  pseudo-not:
+    - match: ((:)not)\s*(\()
+      captures:
+        1: entity.other.attribute-name.pseudo-element.stylus
+        2: puncutation.definition.entity.stylus
+        3: puncutation.definition.parameters.start.stylus
+      push:
+        - match: \)
+          captures:
+            0: puncutation.definition.parameters.end.stylus
+          pop: true
+        - include: selector-components
+  pseudo-nth:
+    - match: ((:)(?:nth-child|nth-last-child|nth-of-type|nth-last-of-type|nth-match|nth-last-match|nth-column|nth-last-column))\s*(\()
+      captures:
+        1: entity.other.attribute-name.pseudo-class.stylus
+        2: puncutation.definition.entity.stylus
+        3: puncutation.definition.parameters.start.stylus
+      push:
+        - match: \)
+          captures:
+            0: puncutation.definition.parameters.end.stylus
+          pop: true
+        - include: language-operators
+        - include: interpolation
+        - match: \b(odd|even)\b
+          scope: constant.language.stylus
+        - match: \b(\d+)?n\b
+          scope: variable.language.stylus
+          captures:
+            1: constant.numeric.stylus
+        - match: \d+
+          scope: constant.numeric.stylus
+  return:
+    - match: ^\s*(return)
+      captures:
+        1: keyword.control.stylus
+      push:
+        - match: (;)|(?=$)
+          captures:
+            1: punctuation.terminator.statement.stylus
+          pop: true
+        - include: expression
+  selector-components:
+    - include: comments
+    - include: interpolation
+    - include: attribute-selector
+    - include: pseudo
+    - match: '\$[\w$-]+\b'
+      scope: entity.other.placeholder.stylus
+    - match: "[:~>]"
+      scope: keyword.operator.selector.stylus
+    - match: |-
+        (?x) # multi-line regex definition mode
+        \b(
+            altGlyph|altGlyphDef|altGlyphItem|animate|animateColor|
+            animateMotion|animateTransform|circle|clipPath|color-profile|
+            defs|desc|ellipse|feBlend|feColorMatrix|
+            feComponentTransfer|feComposite|feConvolveMatrix|
+            feDiffuseLighting|feDisplacementMap|feDistantLight|feFlood|
+            feFuncA|feFuncB|feFuncG|feFuncR|feGaussianBlur|feImage|feMerge|
+            feMergeNode|feMorphology|feOffset|fePointLight|
+            feSpecularLighting|feSpotLight|feTile|feTurbulence|filter|
+            font-face|font-face-format|font-face-name|font-face-src|
+            font-face-uri|foreignObject|g|glyph|glyphRef|hkern|image|line|
+            linearGradient|marker|mask|metadata|missing-glyph|mpath|path|
+            pattern|polygon|polyline|radialGradient|rect|set|stop|svg|
+            switch|symbol|text|textPath|tref|tspan|use|view|vkern|
+            a|abbr|acronym|address|applet|area|article|aside|audio|b|base|
+            basefont|bdi|bdo|bgsound|big|blink|blockquote|body|br|button|
+            canvas|caption|center|cite|code|col|colgroup|content|data|
+            datalist|dd|decorator|del|details|dfn|dir|div|dl|dt|element|
+            em|embed|fieldset|figcaption|figure|font|footer|form|frame|
+            frameset|h1|h2|h3|h4|h5|h6|head|header|hgroup|hr|html|i|iframe|
+            img|input|ins|isindex|kbd|keygen|label|legend|li|link|listing|
+            main|map|mark|marquee|menu|menuitem|meta|meter|nav|nobr|
+            noframes|noscript|object|ol|optgroup|option|output|p|param|
+            plaintext|pre|progress|q|rp|rt|ruby|s|samp|script|section|
+            select|shadow|small|source|spacer|span|strike|strong|style|
+            sub|summary|sup|table|tbody|td|template|textarea|tfoot|th|
+            thead|time|title|tr|track|tt|u|ul|var|video|wbr|xmp
+        )\b
+      scope: entity.name.tag.stylus
+    - match: '\.[a-zA-Z0-9_-]+'
+      scope: entity.other.attribute-name.class.stylus
+    - match: "#[a-zA-Z0-9_-]+"
+      scope: entity.other.attribute-name.id.stylus
+    - match: |-
+        (?x)            # multi-line regex definition mode
+        ([\w\d_-]+)?    # matching any word right before &
+        (&)         # & itself, escaped because of plist
+        ([\w\d_-]+)?    # matching any word right after &
+      captures:
+        1: entity.other.attribute-name.stylus
+        2: variable.language.stylus
+        3: entity.other.attribute-name.stylus
+  single-line-comment:
+    - match: (\/\/).*$
+      scope: comment.line.stylus
+      captures:
+        1: punctuation.definition.comment.stylus
+  string-quoted:
+    - match: "'[^']*'"
+      scope: string.quoted.single.stylus
+    - match: '"[^"]*"'
+      scope: string.quoted.double.stylus
+  url:
+    - match: (url)\s*(\()
+      captures:
+        1: entity.function-name.stylus
+        2: punctuation.definition.parameters.start.stylus
+      push:
+        - meta_scope: meta.function-call.stylus
+        - match: (\))
+          captures:
+            1: punctuation.definition.parameters.end.stylus
+          pop: true
+        - include: string-quoted
+        - include: language-constants
+        - include: language-property-value-constants
+        - include: property-reference
+        - include: variable
+  variable:
+    - match: '([\w$-]+\b)'
+      scope: variable.other.stylus