Add --plain

Bump version
Move theme_preview file to constant
2026-08-05 19:11:42 +00:00 · 2018-08-28 23:37:49 +02:00 · 2018-08-28 23:21:35 +02:00 · 2018-08-28 22:16:42 +02:00 · 2018-08-28 22:08:34 +02:00 · 2018-08-28 21:04:41 +02:00
30 changed files with 4405 additions and 543 deletions
@@ -46,3 +46,18 @@
 [submodule "assets/syntaxes/Nix"]
 	path = assets/syntaxes/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
 	url = https://github.com/vkostyukov/kotlin-sublime-package
 [submodule "assets/syntaxes/Elm"]
 	path = assets/syntaxes/Elm
 	url = https://github.com/elm-community/SublimeElmLanguageSupport
 [submodule "assets/syntaxes/TypeScript"]
 	path = assets/syntaxes/TypeScript
 	url = https://github.com/Microsoft/TypeScript-Sublime-Plugin
 [submodule "assets/syntaxes/Puppet"]
 	path = assets/syntaxes/Puppet
 	url = https://github.com/russCloak/SublimePuppet
@@ -1,9 +1,9 @@
 [[package]]
 name = "aho-corasick"
-version = "0.6.6"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -29,13 +29,13 @@ name = "base64"
 version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "byteorder 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "safemem 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "bat"
-version = "0.5.0"
+version = "0.6.0"
 dependencies = [
 "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -54,23 +54,23 @@ name = "bincode"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "byteorder 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.71 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.75 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "bitflags"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "byteorder"
-version = "1.2.4"
+version = "1.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "cc"
-version = "1.0.18"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
@@ -80,7 +80,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "chrono"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -95,7 +95,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "term_size 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -118,7 +118,7 @@ name = "cmake"
 version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.22 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -169,7 +169,7 @@ name = "fuchsia-zircon"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -183,7 +183,7 @@ name = "git2"
 version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
 "libgit2-sys 0.7.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -195,7 +195,7 @@ name = "idna"
 version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "matches 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "unicode-normalization 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -237,11 +237,11 @@ name = "libgit2-sys"
 version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.22 (registry+https://github.com/rust-lang/crates.io-index)",
 "cmake 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
 "libz-sys 1.0.20 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -249,10 +249,10 @@ name = "libz-sys"
 version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.22 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "vcpkg 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -279,12 +279,12 @@ dependencies = [
 [[package]]
 name = "matches"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "memchr"
-version = "2.0.1"
+version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -295,7 +295,7 @@ name = "miniz-sys"
 version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.22 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -317,7 +317,7 @@ name = "onig"
 version = "3.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
 "onig_sys 68.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -328,9 +328,9 @@ name = "onig_sys"
 version = "68.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.22 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -357,7 +357,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -368,7 +368,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "pkg-config"
-version = "0.3.13"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
@@ -377,15 +377,15 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "base64 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "byteorder 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "chrono 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.71 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.75 (registry+https://github.com/rust-lang/crates.io-index)",
 "xml-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "proc-macro2"
-version = "0.4.13"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -393,10 +393,10 @@ dependencies = [
 [[package]]
 name = "quote"
-version = "0.6.6"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -427,11 +427,11 @@ name = "regex"
 version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "aho-corasick 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "aho-corasick 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "regex-syntax 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "utf8-ranges 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "utf8-ranges 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -457,7 +457,7 @@ dependencies = [
 [[package]]
 name = "ryu"
-version = "0.2.4"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
@@ -467,10 +467,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "same-file"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -480,17 +480,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "serde"
-version = "1.0.71"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "serde_derive"
-version = "1.0.71"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.14.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.14.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -499,13 +499,13 @@ version = "1.0.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "itoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "ryu 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ryu 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.71 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.75 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "smallvec"
-version = "0.6.4"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -523,11 +523,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "syn"
-version = "0.14.8"
+version = "0.14.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -537,17 +537,17 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "bincode 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "flate2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "onig 3.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "plist 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "regex-syntax 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.71 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.75 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.71 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.75 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_json 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
- "walkdir 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "walkdir 2.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "yaml-rust 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -625,7 +625,7 @@ name = "unicode-bidi"
 version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "matches 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -657,18 +657,18 @@ version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "matches 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "utf8-ranges"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "vcpkg"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
@@ -683,11 +683,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "walkdir"
-version = "2.2.0"
+version = "2.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "same-file 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "same-file 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -714,6 +715,14 @@ name = "winapi-i686-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "winapi-util"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
@@ -724,7 +733,7 @@ name = "xml-rs"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -736,16 +745,16 @@ dependencies = [
 ]
 [metadata]
-"checksum aho-corasick 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c1c6d463cbe7ed28720b5b489e7c083eeb8f90d08be2a0d6bb9e1ffea9ce1afa"
+"checksum aho-corasick 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)" = "68f56c7353e5a9547cbd76ed90f7bb5ffc3ba09d4ea9bd1d8c06c8b1142eeb5a"
 "checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
 "checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652"
 "checksum base64 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7c4a342b450b268e1be8036311e2c613d7f8a7ed31214dff1cc3b60852a3168d"
 "checksum bincode 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9f2fb9e29e72fd6bc12071533d5dc7664cb01480c59406f656d7ac25c7bd8ff7"
-"checksum bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d0c54bb8f454c567f21197eefcdbf5679d0bd99f2ddbe52e84c77061952e6789"
+"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
-"checksum byteorder 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8389c509ec62b9fe8eca58c502a0acaf017737355615243496cde4994f8fa4f9"
+"checksum byteorder 1.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "90492c5858dd7d2e78691cfb89f90d273a2800fc11d98f60786e5d87e2f83781"
-"checksum cc 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)" = "2119ea4867bd2b8ed3aecab467709720b2d55b1bcfe09f772fd68066eaf15275"
+"checksum cc 1.0.22 (registry+https://github.com/rust-lang/crates.io-index)" = "4a6007c146fdd28d4512a794b07ffe9d8e89e6bf86e2e0c4ddff2e1fb54a0007"
 "checksum cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0c4e7bb64a8ebb0d856483e1e682ea3422f883c5f5615a90d51a2c82fe87fdd3"
-"checksum chrono 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e48d85528df61dc964aa43c5f6ca681a19cfa74939b2348d204bd08a981f2fb0"
+"checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878"
 "checksum clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b957d88f4b6a63b9d70d5f454ac8011819c6efa7727858f458ab71c756ce2d3e"
 "checksum clicolors-control 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1f84dec9bc083ce2503908cd305af98bd363da6f54bf8d4bf0ac14ee749ad5d1"
 "checksum cmake 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)" = "704fbf3bb5149daab0afb255dbea24a1f08d2f4099cedb9baab6d470d4c5eefb"
@@ -768,8 +777,8 @@ dependencies = [
 "checksum linked-hash-map 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "70fb39025bc7cdd76305867c4eccf2f2dcf6e9a57f5b21a93e1c2d86cd03ec9e"
 "checksum lock_api 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "949826a5ccf18c1b3a7c3d57692778d21768b79e46eb9dd07bfc4c2160036c54"
 "checksum log 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cba860f648db8e6f269df990180c2217f333472b4a6e901e97446858487971e2"
-"checksum matches 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "835511bab37c34c47da5cb44844bea2cfde0236db0b506f90ea4224482c9774a"
+"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
-"checksum memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "796fba70e76612589ed2ce7f45282f5af869e0fdd7cc6199fa1aa1f1d591ba9d"
+"checksum memchr 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a3b4142ab8738a78c51896f704f83c11df047ff1bda9a92a661aa6361552d93d"
 "checksum miniz-sys 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "609ce024854aeb19a0ef7567d348aaa5a746b32fb72e336df7fcc16869d7e2b4"
 "checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea"
 "checksum num-traits 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "630de1ef5cc79d0cdd78b7e33b81f083cbfe90de0f4b2b2f07f905867c70e9fe"
@@ -779,10 +788,10 @@ dependencies = [
 "checksum parking_lot 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "69376b761943787ebd5cc85a5bc95958651a22609c5c1c2b65de21786baec72b"
 "checksum parking_lot_core 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "4db1a8ccf734a7bce794cc19b3df06ed87ab2f3907036b693c68f56b4d4537fa"
 "checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
-"checksum pkg-config 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "104630aa1c83213cbc76db0703630fcb0421dac3585063be4ce9a8a2feeaa745"
+"checksum pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "676e8eb2b1b4c9043511a9b7bea0915320d7e502b0a079fb03f9635a5252b18c"
 "checksum plist 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c61ac2afed2856590ae79d6f358a24b85ece246d2aa134741a66d589519b7503"
-"checksum proc-macro2 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)" = "ee5697238f0d893c7f0ecc59c0999f18d2af85e424de441178bcacc9f9e6cf67"
+"checksum proc-macro2 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)" = "b331c6ad3411474cd55540398dc7ad89fc41488e64ec71fdecc9c9b86de96fb0"
-"checksum quote 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ed7d650913520df631972f21e104a4fa2f9c82a14afc65d17b388a2e29731e7c"
+"checksum quote 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)" = "dd636425967c33af890042c483632d33fa7a18f19ad1d7ea72e8998c6ef8dea5"
 "checksum rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8356f47b32624fef5b3301c1be97e5944ecdd595409cc5da11d05f211db6cfbd"
 "checksum redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "c214e91d3ecf43e9a4e41e578973adeb14b474f2bee858742d127af75a0112b1"
 "checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
@@ -790,17 +799,17 @@ dependencies = [
 "checksum regex-syntax 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8e931c58b93d86f080c734bfd2bce7dd0079ae2331235818133c8be7f422e20e"
 "checksum regex-syntax 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7d707a4fa2637f2dca2ef9fd02225ec7661fe01a53623c1e6515b6916511f7a7"
 "checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5"
-"checksum ryu 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "fd0568787116e13c652377b6846f5931454a363a8fdf8ae50463ee40935b278b"
+"checksum ryu 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7153dd96dade874ab973e098cb62fcdbb89a03682e46b144fd09550998d4a4a7"
 "checksum safemem 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e27a8b19b835f7aea908818e871f5cc3a5a186550c30773be987e155e8163d8f"
-"checksum same-file 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "cfb6eded0b06a0b512c8ddbcf04089138c9b4362c2f696f3c3d76039d68f3637"
+"checksum same-file 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "10f7794e2fda7f594866840e95f5c5962e886e228e68b6505885811a94dd728c"
 "checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
-"checksum serde 1.0.71 (registry+https://github.com/rust-lang/crates.io-index)" = "6dfad05c8854584e5f72fb859385ecdfa03af69c3fd0572f0da2d4c95f060bdb"
+"checksum serde 1.0.75 (registry+https://github.com/rust-lang/crates.io-index)" = "22d340507cea0b7e6632900a176101fea959c7065d93ba555072da90aaaafc87"
-"checksum serde_derive 1.0.71 (registry+https://github.com/rust-lang/crates.io-index)" = "b719c6d5e9f73fbc37892246d5852333f040caa617b8873c6aced84bcb28e7bb"
+"checksum serde_derive 1.0.75 (registry+https://github.com/rust-lang/crates.io-index)" = "234fc8b737737b148ccd625175fc6390f5e4dacfdaa543cb93a3430d984a9119"
 "checksum serde_json 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)" = "44dd2cfde475037451fa99b7e5df77aa3cfd1536575fa8e7a538ab36dcde49ae"
-"checksum smallvec 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "211a489e65e94b103926d2054ae515a1cdb5d515ea0ef414fee23b7e043ce748"
+"checksum smallvec 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "153ffa32fd170e9944f7e0838edf824a754ec4c1fc64746fcc9fe1f8fa602e5d"
 "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
 "checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550"
-"checksum syn 0.14.8 (registry+https://github.com/rust-lang/crates.io-index)" = "b7bfcbb0c068d0f642a0ffbd5c604965a360a61f99e8add013cef23a838614f3"
+"checksum syn 0.14.9 (registry+https://github.com/rust-lang/crates.io-index)" = "261ae9ecaa397c42b960649561949d69311f08eeaea86a65696e6e46517cf741"
 "checksum syntect 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dc8a6f0db88d4afc340522c20d260411e746b2225b257c6b238a75de9d7cec78"
 "checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
 "checksum term_size 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9e5b9a66db815dcfd2da92db471106457082577c3c278d4138ab3e3b4e189327"
@@ -816,15 +825,16 @@ dependencies = [
 "checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
 "checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
 "checksum url 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2a321979c09843d272956e73700d12c4e7d3d92b2ee112b31548aef0d4efc5a6"
-"checksum utf8-ranges 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "662fab6525a98beff2921d7f61a39e7d59e0b425ebc7d0d9e66d316e55124122"
+"checksum utf8-ranges 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fd70f467df6810094968e2fce0ee1bd0e87157aceb026a8c083bcf5e25b9efe4"
-"checksum vcpkg 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a51475940ea5ed2f7ba8e7b867c42d6cb7f06fafb9c1673ed8e768c675c771cc"
+"checksum vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "def296d3eb3b12371b2c7d0e83bfe1403e4db2d7a0bba324a12b21c4ee13143d"
 "checksum version_check 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7716c242968ee87e5542f8021178248f267f295a5c4803beae8b8b7fd9bc6051"
 "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
-"checksum walkdir 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f1b768ba943161a9226ccd59b26bcd901e5d60e6061f4fcad3034784e0c7372b"
+"checksum walkdir 2.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "af464bc7be7b785c7ac72e266a6b67c4c9070155606f51655a650a6686204e35"
 "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
 "checksum winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "773ef9dcc5f24b7d850d0ff101e542ff24c3b090a9768e03ff889fdef41f00fd"
 "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
 "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 "checksum winapi-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "afc5508759c5bf4285e61feb862b6083c8480aec864fa17a81fdec6f69b461ab"
 "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 "checksum xml-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3c1cb601d29fe2c2ac60a2b2e5e293994d87a1f6fa9687a31a15270f909be9c2"
 "checksum yaml-rust 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "57ab38ee1a4a266ed033496cf9af1828d8d6e6c1cfa5f643a2809effcae4d628"
@@ -7,7 +7,7 @@ license = "MIT/Apache-2.0"
 name = "bat"
 readme = "README.md"
 repository = "https://github.com/sharkdp/bat"
-version = "0.5.0"
+version = "0.6.0"
 exclude = [
    "assets/syntaxes/*",
    "assets/themes/*",
@@ -31,7 +31,7 @@ default-features = false
 features = ["parsing", "yaml-load", "dump-load", "dump-create"]
 [dependencies.clap]
-version = "2"
+version = "2.32"
 default-features = false
 features = ["suggestions", "color", "wrap_help"]
@@ -76,20 +76,32 @@ bat f - g  # output 'f', then stdin, then 'g'.
 ## Installation
-### From binaries
+### On Ubuntu
 *... and other Debian-based Linux distributions.*
-Check out the [Release page](https://github.com/sharkdp/bat/releases) for
+Download the latest `.deb` package from the [release page](https://github.com/sharkdp/bat/releases)
-binary builds and Debian packages.
+and install it via:
 ``` bash
 sudo dpkg -i bat_0.6.0_amd64.deb  # adapt version number and architecture
 ```
-#### On Arch Linux
+### On Arch Linux
-You can install via Pacman:
+You can install [the `bat` package](https://www.archlinux.org/packages/community/x86_64/bat/)
 from the official sources:
 ```bash
 pacman -S bat
 ```
-#### On FreeBSD
+### On Void Linux
 You can install `bat` via xbps-install:
 ```
 xbps-install -S bat
 ```
 ### On FreeBSD
 You can install a precompiled [`bat` package](https://www.freshports.org/textproc/bat) with pkg:
@@ -104,7 +116,7 @@ cd /usr/ports/textproc/bat
 make install
 ```
-#### On macOS
+### On macOS
 You can install `bat` with [Homebrew](http://braumeister.org/formula/bat):
@@ -112,9 +124,14 @@ You can install `bat` with [Homebrew](http://braumeister.org/formula/bat):
 brew install bat
 ```
 ### From binaries
 Check out the [Release page](https://github.com/sharkdp/bat/releases) for
 prebuilt versions of `bat` for many different architectures.
 ### From source
-If you want to build to compile `bat` from source, you need Rust 1.26 or
+If you want to build `bat` from source, you need Rust 1.26 or
 higher. You can then use `cargo` to build everything:
 ```bash
@@ -188,18 +205,12 @@ cd "$BAT_CONFIG_DIR/themes"
 # Download a theme in '.tmTheme' format, for example:
 git clone https://github.com/greggb/sublime-snazzy
 # Create a link to specify the new default theme
 ln -sf "sublime-snazzy/Sublime Snazzy.tmTheme" Default.tmTheme
 # Update the binary cache
 bat cache --init
 ```
 Finally, use `bat --list-themes` to check if the new themes are available.
 **Note:** Unlike for syntax definitions, adding custom themes currently *removes all default
 themes*. If you want to go back to the default themes, call `bat cache --clear`.
 ### Using a different pager
 `bat` uses the pager that is specified in the `PAGER` environment variable. If this variable is not
@@ -214,6 +225,41 @@ script as a wrapper, for example:
 less --tabs 4 -RF "$@"
 ```
 ## Troubleshooting
 ### Terminals & colors
 `bat` handles terminals *with* and *without* truecolor support. However, the colors in the syntax
 highlighting themes are not optimized for 8-bit colors and it is therefore strongly recommended
 that you use a terminal with 24-bit truecolor support (`terminator`, `konsole`, `iTerm2`, ...).
 See [this article](https://gist.github.com/XVilka/8346728) for more details and a full list of
 terminals with truecolor support.
 Make sure that your truecolor terminal sets the `COLORTERM` variable to either `truecolor` or
 `24bit`. Otherwise, `bat` will not be able to determine whether or not 24-bit escape sequences
 are supported (and fall back to 8-bit colors).
 ## Development
 ```bash
 # Recursive clone to retrieve all submodules
 git clone --recursive https://github.com/sharkdp/bat
 # Build (debug version)
 cd bat
 cargo build
 # Run unit tests and integration tests
 cargo test
 # Install (release version)
 cargo install
 # Build a bat binary with modified syntaxes and themes
 bash assets/create.sh
 cargo install -f
 ```
 ## Project goals and alternatives
 `bat` tries to achieve the following goals:
@@ -2,4 +2,4 @@
 ASSET_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-bat cache --init --source="$ASSET_DIR" --target="$ASSET_DIR"
+bat cache --init --blank --source="$ASSET_DIR" --target="$ASSET_DIR"
@@ -0,0 +1,398 @@
 %YAML 1.2
 ---
 # http://www.sublimetext.com/docs/3/syntax.html
 name: Kotlin
 file_extensions:
  - kt
  - kts
 scope: source.Kotlin
 contexts:
  main:
    - include: comments
    - match: '^\s*(package)\b(?:\s*([^ ;$]+)\s*)?'
      captures:
        1: keyword.other.kotlin
        2: entity.name.package.kotlin
    - include: imports
    - include: statements
  classes:
    - match: (?<!::)(?=\b(?:companion|class|object|interface)\b)
      push:
        - match: '(?=$|\})'
          pop: true
        - include: comments
        - match: \b(companion\s*)?(class|object|interface)\b
          captures:
            1: storage.modifier.kotlin
            2: storage.modifier.kotlin
          push:
            - match: '(?=<|\{|\(|:|$)'
              pop: true
            - include: comments
            - match: \w+
              scope: entity.name.type.class.kotlin
        - match: <
          push:
            - match: ">"
              pop: true
            - include: generics
        - match: \(
          push:
            - match: \)
              pop: true
            - include: parameters
        - match: (:)
          captures:
            1: keyword.operator.declaration.kotlin
          push:
            - match: "(?={|$)"
              pop: true
            - match: \w+
              scope: entity.other.inherited-class.kotlin
            - match: \(
              push:
                - match: \)
                  pop: true
                - include: expressions
        - match: '\{'
          push:
            - match: '\}'
              pop: true
            - include: statements
  comments:
    - match: /\*
      captures:
        0: punctuation.definition.comment.kotlin
      push:
        - meta_scope: comment.block.kotlin
        - match: \*/
          captures:
            0: punctuation.definition.comment.kotlin
          pop: true
    - match: \s*((//).*$\n?)
      captures:
        1: comment.line.double-slash.kotlin
        2: punctuation.definition.comment.kotlin
  constants:
    - match: \b(true|false|null|this|super)\b
      scope: constant.language.kotlin
    - match: '\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\.?[0-9]*)|(\.[0-9]+))((e|E)(\+|-)?[0-9]+)?)([LlFf])?\b'
      scope: constant.numeric.kotlin
    - match: '\b([A-Z][A-Z0-9_]+)\b'
      scope: constant.other.kotlin
  expressions:
    - match: \(
      push:
        - match: \)
          pop: true
        - include: expressions
    - include: types
    - include: strings
    - include: constants
    - include: comments
    - include: keywords
  functions:
    - match: (?=\s*\b(?:fun)\b)
      push:
        - match: '(?=$|\})'
          pop: true
        - match: \b(fun)\b
          captures:
            1: keyword.other.kotlin
          push:
            - match: (?=\()
              pop: true
            - match: <
              push:
                - match: ">"
                  pop: true
                - include: generics
            - match: '([\.<\?>\w]+\.)?(\w+)'
              captures:
                2: entity.name.function.kotlin
        - match: \(
          push:
            - match: \)
              pop: true
            - include: parameters
        - match: (:)
          captures:
            1: keyword.operator.declaration.kotlin
          push:
            - match: "(?={|=|$)"
              pop: true
            - include: types
        - match: '\{'
          push:
            - match: '(?=\})'
              pop: true
            - include: statements
        - match: (=)
          captures:
            1: keyword.operator.assignment.kotlin
          push:
            - match: (?=$)
              pop: true
            - include: expressions
  generics:
    - match: (:)
      captures:
        1: keyword.operator.declaration.kotlin
      push:
        - match: (?=,|>)
          pop: true
        - include: types
    - include: keywords
    - match: \w+
      scope: storage.type.generic.kotlin
  getters-and-setters:
    - match: \b(get)\b\s*\(\s*\)
      captures:
        1: entity.name.function.kotlin
      push:
        - match: '\}|(?=\bset\b)|$'
          pop: true
        - match: (=)
          captures:
            1: keyword.operator.assignment.kotlin
          push:
            - match: (?=$|\bset\b)
              pop: true
            - include: expressions
        - match: '\{'
          push:
            - match: '\}'
              pop: true
            - include: expressions
    - match: \b(set)\b\s*(?=\()
      captures:
        1: entity.name.function.kotlin
      push:
        - match: '\}|(?=\bget\b)|$'
          pop: true
        - match: \(
          push:
            - match: \)
              pop: true
            - include: parameters
        - match: (=)
          captures:
            1: keyword.operator.assignment.kotlin
          push:
            - match: (?=$|\bset\b)
              pop: true
            - include: expressions
        - match: '\{'
          push:
            - match: '\}'
              pop: true
            - include: expressions
  imports:
    - match: '^\s*(import)\s+[^ $]+\s+(as)?'
      captures:
        1: keyword.other.kotlin
        2: keyword.other.kotlin
  keywords:
    - match: \b(var|val|public|private|protected|abstract|final|sealed|enum|open|attribute|annotation|override|inline|vararg|in|out|internal|data|tailrec|operator|infix|const|yield|typealias|typeof|reified|suspend)\b
      scope: storage.modifier.kotlin
    - match: \b(try|catch|finally|throw)\b
      scope: keyword.control.catch-exception.kotlin
    - match: \b(if|else|while|for|do|return|when|where|break|continue)\b
      scope: keyword.control.kotlin
    - match: \b(in|is|!in|!is|as|as\?|assert)\b
      scope: keyword.operator.kotlin
    - match: (==|!=|===|!==|<=|>=|<|>)
      scope: keyword.operator.comparison.kotlin
    - match: (=)
      scope: keyword.operator.assignment.kotlin
    - match: (::)
      scope: keyword.operator.kotlin
    - match: (:)
      scope: keyword.operator.declaration.kotlin
    - match: \b(by)\b
      scope: keyword.other.by.kotlin
    - match: (\?\.)
      scope: keyword.operator.safenav.kotlin
    - match: (\.)
      scope: keyword.operator.dot.kotlin
    - match: (\?:)
      scope: keyword.operator.elvis.kotlin
    - match: (\-\-|\+\+)
      scope: keyword.operator.increment-decrement.kotlin
    - match: (\+=|\-=|\*=|\/=)
      scope: keyword.operator.arithmetic.assign.kotlin
    - match: (\.\.)
      scope: keyword.operator.range.kotlin
    - match: (\-|\+|\*|\/|%)
      scope: keyword.operator.arithmetic.kotlin
    - match: (!|&&|\|\|)
      scope: keyword.operator.logical.kotlin
    - match: (;)
      scope: punctuation.terminator.kotlin
  namespaces:
    - match: \b(namespace)\b
      scope: keyword.other.kotlin
    - match: '\{'
      push:
        - match: '\}'
          pop: true
        - include: statements
  parameters:
    - match: (:)
      captures:
        1: keyword.operator.declaration.kotlin
      push:
        - match: (?=,|\)|=)
          pop: true
        - include: types
    - match: (=)
      captures:
        1: keyword.operator.declaration.kotlin
      push:
        - match: (?=,|\))
          pop: true
        - include: expressions
    - include: keywords
    - match: \w+
      scope: variable.parameter.function.kotlin
  statements:
    - include: namespaces
    - include: typedefs
    - include: classes
    - include: functions
    - include: variables
    - include: getters-and-setters
    - include: expressions
  strings:
    - match: '"""'
      captures:
        0: punctuation.definition.string.begin.kotlin
      push:
        - meta_scope: string.quoted.third.kotlin
        - match: '"""'
          captures:
            0: punctuation.definition.string.end.kotlin
          pop: true
        - match: '(\$\w+|\$\{[^\}]+\})'
          scope: variable.parameter.template.kotlin
        - match: \\.
          scope: constant.character.escape.kotlin
    - match: '"'
      captures:
        0: punctuation.definition.string.begin.kotlin
      push:
        - meta_scope: string.quoted.double.kotlin
        - match: '"'
          captures:
            0: punctuation.definition.string.end.kotlin
          pop: true
        - match: '(\$\w+|\$\{[^\}]+\})'
          scope: variable.parameter.template.kotlin
        - match: \\.
          scope: constant.character.escape.kotlin
    - match: "'"
      captures:
        0: punctuation.definition.string.begin.kotlin
      push:
        - meta_scope: string.quoted.single.kotlin
        - match: "'"
          captures:
            0: punctuation.definition.string.end.kotlin
          pop: true
        - match: \\.
          scope: constant.character.escape.kotlin
    - match: "`"
      captures:
        0: punctuation.definition.string.begin.kotlin
      push:
        - meta_scope: string.quoted.single.kotlin
        - match: "`"
          captures:
            0: punctuation.definition.string.end.kotlin
          pop: true
  typedefs:
    - match: (?=\s*(?:type))
      push:
        - match: (?=$)
          pop: true
        - match: \b(type)\b
          scope: keyword.other.kotlin
        - match: <
          push:
            - match: ">"
              pop: true
            - include: generics
        - include: expressions
  types:
    - match: \b(Nothing|Any|Unit|String|CharSequence|Int|Boolean|Char|Long|Double|Float|Short|Byte|dynamic)\b
      scope: storage.type.buildin.kotlin
    - match: \b(IntArray|BooleanArray|CharArray|LongArray|DoubleArray|FloatArray|ShortArray|ByteArray)\b
      scope: storage.type.buildin.array.kotlin
    - match: \b(Array|Collection|List|Map|Set|MutableList|MutableMap|MutableSet|Sequence)<\b
      captures:
        1: storage.type.buildin.collection.kotlin
      push:
        - match: ">"
          pop: true
        - include: types
        - include: keywords
    - match: \w+<
      push:
        - match: ">"
          pop: true
        - include: types
        - include: keywords
    - match: '\{'
      push:
        - match: '\}'
          pop: true
        - include: statements
    - match: \(
      push:
        - match: \)
          pop: true
        - include: types
    - match: (->)
      scope: keyword.operator.declaration.kotlin
  variables:
    - match: (?=\s*\b(?:var|val)\b)
      push:
        - match: (?=:|=|(\b(by)\b)|$)
          pop: true
        - match: \b(var|val)\b
          captures:
            1: keyword.other.kotlin
          push:
            - match: (?=:|=|(\b(by)\b)|$)
              pop: true
            - match: <
              push:
                - match: ">"
                  pop: true
                - include: generics
            - match: '([\.<\?>\w]+\.)?(\w+)'
              captures:
                2: entity.name.variable.kotlin
        - match: (:)
          captures:
            1: keyword.operator.declaration.kotlin
          push:
            - match: (?==|$)
              pop: true
            - include: types
            - include: getters-and-setters
        - match: \b(by)\b
          captures:
            1: keyword.other.kotlin
          push:
            - match: (?=$)
              pop: true
            - include: expressions
        - match: (=)
          captures:
            1: keyword.operator.assignment.kotlin
          push:
            - match: (?=$)
              pop: true
            - include: expressions
            - include: getters-and-setters
@@ -0,0 +1,5 @@
  // Output the square of a number.
  fn print_square(num: f64) {
      let result = f64::powf(num, 2.0);
      println!("The square of {:.2} is {:.2}.", num, result);
  }
@@ -1 +0,0 @@
 sublime-monokai-extended/Monokai Extended.tmTheme
@@ -30,7 +30,8 @@ pack() {
    cp "target/$TARGET/release/$PROJECT_NAME" "$tempdir/$package_name/"
    "${gcc_prefix}"strip "$tempdir/$package_name/$PROJECT_NAME"
-    # readme and license
+    # manpage, readme and license
    cp "doc/$PROJECT_NAME.1" "$tempdir/$package_name"
    cp README.md "$tempdir/$package_name"
    cp LICENSE-MIT "$tempdir/$package_name"
    cp LICENSE-APACHE "$tempdir/$package_name"
@@ -76,6 +77,10 @@ make_deb() {
    install -Dm755 "target/$TARGET/release/$PROJECT_NAME" "$tempdir/usr/bin/$PROJECT_NAME"
    strip "$tempdir/usr/bin/$PROJECT_NAME"
    # manpage
    install -Dm644 "doc/$PROJECT_NAME.1" "$tempdir/usr/share/man/man1/$PROJECT_NAME.1"
    gzip --best "$tempdir/usr/share/man/man1/$PROJECT_NAME.1"
    # readme and license
    install -Dm644 README.md "$tempdir/usr/share/doc/$PROJECT_NAME/README.md"
    install -Dm644 LICENSE-MIT "$tempdir/usr/share/doc/$PROJECT_NAME/LICENSE-MIT"
@@ -93,6 +98,7 @@ Architecture: $architecture
 Provides: $PROJECT_NAME
 Conflicts: $conflictname
 Description: A cat(1) clone with wings.
 A cat(1) clone with syntax highlighting and Git integration.
 EOF
    fakeroot dpkg-deb --build "$tempdir" "${dpkgname}_${version}_${architecture}.deb"
@@ -0,0 +1,109 @@
 .TH BAT "1"
 .SH NAME
 bat \- manual page for bat
 .SH DESCRIPTION
 bat - a cat(1) clone with syntax highlighting and Git integration.
 .SH "USAGE"
 .IP
 bat [OPTIONS] [FILE]...
 .IP
 bat <SUBCOMMAND>
 .SH "OPTIONS"
 .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\-\-list\-languages\fR
 .IP
 Display a list of supported languages for syntax highlighting.
 .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, export the BAT_THEME environment
 variable (e.g.: export BAT_THEME="TwoDark").
 .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') [default: auto]
 [possible values: auto, full, plain, changes, header, grid, numbers]
 .HP
 \fB\-p\fR
 .IP
 Only show plain style, no decorations. This is an alias for '\-\-style=plain'
 .HP
 \fB\-n\fR, \fB\-\-number\fR
 .IP
 Only show line numbers, no other decorations. This is an alias for
 \&'\-\-style=numbers'
 .HP
 \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\-\-color\fR <when>
 .IP
 Specify when to use colored output. The automatic mode only enables colors if
 an interactive terminal is detected. [default: auto]  [possible values: auto,
 never, always]
 .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. [default: auto]  [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). The default
 pager is 'less'. To disable the pager permanently, set BAT_PAGER to an empty
 string. [default: auto]  [possible values: auto, never, always]
 .HP
 \fB\-\-wrap\fR <mode>
 .IP
 Specify the text\-wrapping mode. [default: character]
 [possible values: character, never]
 .HP
 \fB\-u\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 "ARGS"
 .IP
 <FILE>...
 .IP
 File(s) to print / concatenate. Use a dash ('\-') or no argument at all to read
 from standard input.
 .SH "SUBCOMMANDS"
 .IP
 cache
 .IP
 Modify the syntax\-definition and theme cache. See "bat cache --help" for more information
@@ -1,14 +1,82 @@
 use atty::{self, Stream};
 use clap::{App as ClapApp, AppSettings, Arg, ArgGroup, ArgMatches, SubCommand};
 use console::Term;
 use errors::*;
 use std::collections::HashSet;
 use std::env;
-use style::{OutputComponent, OutputComponents, OutputWrap};
+
 use atty::{self, Stream};
 use clap::{App as ClapApp, AppSettings, Arg, ArgGroup, ArgMatches, SubCommand};
 use console::Term;
 #[cfg(windows)]
 use ansi_term;
 use assets::BAT_THEME_DEFAULT;
 use errors::*;
 use line_range::LineRange;
 use style::{OutputComponent, OutputComponents, OutputWrap};
 #[derive(Debug, Clone, Copy)]
 pub enum PagingMode {
    Always,
    QuitIfOneScreen,
    Never,
 }
 #[derive(Debug, Clone, Copy, PartialEq)]
 pub enum InputFile<'a> {
    StdIn,
    Ordinary(&'a str),
    ThemePreviewFile,
 }
 #[derive(Clone)]
 pub struct Config<'a> {
    /// List of files to print
    pub files: Vec<InputFile<'a>>,
    /// The explicitly configured language, if any
    pub language: Option<&'a str>,
    /// The character width of the terminal
    pub term_width: usize,
    /// Whether or not to simply loop through all input (`cat` mode)
    pub loop_through: bool,
    /// Whether or not the output should be colorized
    pub colored_output: bool,
    /// Whether or not the output terminal supports true color
    pub true_color: bool,
    /// Style elements (grid, line numbers, ...)
    pub output_components: OutputComponents,
    /// Text wrapping mode
    pub output_wrap: OutputWrap,
    /// Pager or STDOUT
    pub paging_mode: PagingMode,
    /// The range lines that should be printed, if specified
    pub line_range: Option<LineRange>,
    /// The syntax highlighting theme
    pub theme: String,
 }
 fn is_truecolor_terminal() -> bool {
    env::var("COLORTERM")
        .map(|colorterm| colorterm == "truecolor" || colorterm == "24bit")
        .unwrap_or(false)
 }
 /// Helper function that should might appear in Rust stable at some point
 /// (https://doc.rust-lang.org/stable/std/option/enum.Option.html#method.transpose)
 fn transpose<T>(opt: Option<Result<T>>) -> Result<Option<T>> {
    opt.map_or(Ok(None), |res| res.map(Some))
 }
 pub struct App {
    pub matches: ArgMatches<'static>,
    interactive_output: bool,
@@ -49,26 +117,50 @@ impl App {
                "A cat(1) clone with wings.\n\n\
                 Use '--help' instead of '-h' to see a more detailed version of the help text.",
            ).long_about("A cat(1) clone with syntax highlighting and Git integration.")
            .arg(
                Arg::with_name("FILE")
                    .help("File(s) to print / concatenate. Use '-' for standard input.")
                    .long_help(
                        "File(s) to print / concatenate. Use a dash ('-') or no argument at all \
                         to read from standard input.",
                    ).multiple(true)
                    .empty_values(false),
                    )
            .arg(
                Arg::with_name("language")
                    .short("l")
                    .long("language")
                    .overrides_with("language")
-                    .help("Set the language for highlighting")
+                    .help("Set the language for syntax highlighting.")
                    .long_help(
-                        "Set the language for syntax highlighting. The language can be \
+                        "Explicitly set the language for syntax highlighting. The language can be \
-                         specified as a name (like 'C++' or 'LaTeX') or possible file \
+                        specified as a name (like 'C++' or 'LaTeX') or possible file extension \
-                         extension (like 'cpp', 'hpp' or 'md'). Use '--list-languages' \
+                        (like 'cpp', 'hpp' or 'md'). Use '--list-languages' to show all supported \
-                         to show all supported language names and file extensions",
+                        language names and file extensions."
                    ).takes_value(true),
            ).arg(
-                Arg::with_name("FILE")
+                Arg::with_name("list-languages")
-                    .help("File(s) to print / concatenate. Use '-' for standard input.")
+                    .long("list-languages")
                    .conflicts_with("list-themes")
                    .help("Display all supported languages.")
                    .long_help("Display a list of supported languages for syntax highlighting."),
            ).arg(
                Arg::with_name("theme")
                    .long("theme")
                    .overrides_with("theme")
                    .takes_value(true)
                    .help("Set the color theme for syntax highlighting.")
                    .long_help(
-                        "File(s) to print. Use no argument or '-' to read from standard \
+                        "Set the theme for syntax highlighting. Use '--list-themes' to \
-                         input",
+                         see all available themes. To set a default theme, export the \
-                    ).multiple(true)
+                         BAT_THEME environment variable (e.g.: export \
-                    .empty_values(false),
+                         BAT_THEME=\"TwoDark\").",
                    ),
            ).arg(
                Arg::with_name("list-themes")
                    .long("list-themes")
                    .help("Display all supported highlighting themes.")
                    .long_help("Display a list of supported themes for syntax highlighting."),
            ).arg(
                Arg::with_name("style")
                    .long("style")
@@ -78,7 +170,7 @@ impl App {
                    .possible_values(&[
                        "auto", "full", "plain", "changes", "header", "grid", "numbers",
                    ]).default_value("auto")
-                    .help("Comma-separated list of style elements to display")
+                    .help("Comma-separated list of style elements to display.")
                    .long_help(
                        "Configure which elements (line numbers, file headers, grid \
                         borders, Git modifications, ..) to display in addition to the \
@@ -86,6 +178,43 @@ impl App {
                         components to display (e.g. 'numbers,changes,grid') or a \
                         pre-defined style ('full')",
                    ),
            ).arg(
                Arg::with_name("plain")
                    .overrides_with("plain")
                    .short("p")
                    .long("plain")
                    .conflicts_with("style")
                    .conflicts_with("number")
                    .help("Show plain style (alias for '--style=plain').")
                    .long_help(
                        "Only show plain style, no decorations. This is an alias for \
                         '--style=plain'",
                    ),
            ).arg(
                Arg::with_name("number")
                    .long("number")
                    .overrides_with("number")
                    .short("n")
                    .conflicts_with("style")
                    .help("Show line numbers (alias for '--style=numbers').")
                    .long_help(
                        "Only show line numbers, no other decorations. This is an alias for \
                         '--style=numbers'",
                    ),
            ).arg(
                Arg::with_name("line-range")
                    .long("line-range")
                    .overrides_with("line-range")
                    .takes_value(true)
                    .value_name("N:M")
                    .help("Only print the lines from N to M.")
                    .long_help(
                        "Only print the specified range of lines for each file. \
                         For example:\n  \
                         '--line-range 30:40' prints lines 30 to 40\n  \
                         '--line-range :40' prints lines 1 to 40\n  \
                         '--line-range 40:' prints lines 40 to the end of the file",
                    ),
            ).arg(
                Arg::with_name("color")
                    .long("color")
@@ -94,7 +223,21 @@ impl App {
                    .value_name("when")
                    .possible_values(&["auto", "never", "always"])
                    .default_value("auto")
-                    .help("When to use colors"),
+                    .help("When to use colors.")
                    .long_help("Specify when to use colored output. The automatic mode \
                                only enables colors if an interactive terminal is detected."),
            ).arg(
                Arg::with_name("decorations")
                    .long("decorations")
                    .overrides_with("decorations")
                    .takes_value(true)
                    .value_name("when")
                    .possible_values(&["auto", "never", "always"])
                    .default_value("auto")
                    .help("When to show the decorations specified by '--style'.")
                    .long_help("Specify when to use the decorations that have been specified \
                                via '--style'. The automatic mode only enables decorations if \
                                an interactive terminal is detected."),
            ).arg(
                Arg::with_name("paging")
                    .long("paging")
@@ -103,8 +246,12 @@ impl App {
                    .value_name("when")
                    .possible_values(&["auto", "never", "always"])
                    .default_value("auto")
-                    .help("When to use the pager")
+                    .help("Specify when to use the pager.")
-                    .long_help("Specify when to use the pager (less)"),
+                    .long_help("Specify when to use the pager. To control which pager \
                                is used, set the PAGER or BAT_PAGER environment \
                                variables (the latter takes precedence). The default \
                                pager is 'less'. To disable the pager permanently, set \
                                BAT_PAGER to an empty string."),
            ).arg(
                Arg::with_name("wrap")
                    .long("wrap")
@@ -113,56 +260,12 @@ impl App {
                    .value_name("mode")
                    .possible_values(&["character", "never"])
                    .default_value("character")
-                    .help("When to wrap text"),
+                    .help("Specify the text-wrapping mode.")
-            ).arg(
+                    .long_help("Specify the text-wrapping mode."),
                Arg::with_name("list-languages")
                    .long("list-languages")
                    .help("Displays supported languages")
                    .long_help("Display a list of supported languages"),
            ).arg(
                Arg::with_name("theme")
                    .long("theme")
                    .overrides_with("theme")
                    .takes_value(true)
                    .help("Set the theme for highlighting")
                    .long_help(
                        "Set the theme for syntax highlighting. Use '--list-themes' to \
                         see all available themes",
                    ),
            ).arg(
                Arg::with_name("line-range")
                    .long("line-range")
                    .overrides_with("line-range")
                    .takes_value(true)
                    .value_name("n:m")
                    .help("Only print the lines from n to m")
                    .long_help(
                        "Print a specified range or ranges of lines from the files. \
                         For example: '--line-range 30:40' will print lines 30 to 40 \n\
                         '--line-range :40' will print lines 1 to 40 \n\
                         '--line-range 40:' will print lines 40 to the end of the file",
                    ),
            ).arg(
                Arg::with_name("list-themes")
                    .long("list-themes")
                    .help("Displays supported themes")
                    .help("Display a list of supported themes for syntax highlighting"),
            ).arg(
                Arg::with_name("number")
                    .long("number")
                    .overrides_with("number")
                    .short("n")
                    .conflicts_with("style")
                    .help("Show line numbers (alias for '--style=numbers')")
                    .long_help(
                        "Show line numbers (no other decorations). This is an alias for \
                         '--style=numbers'",
                    ),
            ).arg(
                Arg::with_name("unbuffered")
                    .short("u")
-                    .help("(ignored)")
+                    .hidden_short_help(true)
                    // TODO: use '.hidden_short_help(true)' when the next clap version is released
                    .long_help(
                        "This option exists for POSIX-compliance reasons ('u' is for \
                         'unbuffered'). The output is always unbuffered - this option \
@@ -175,21 +278,21 @@ impl App {
                        Arg::with_name("init")
                            .long("init")
                            .short("i")
-                            .help("Initialize the syntax/theme cache")
+                            .help("Initialize the syntax/theme cache.")
                            .long_help(
                                "Initialize the syntax/theme cache by loading from the \
-                                 source directory (default: the configuration directory)",
+                                 source directory (default: the configuration directory).",
                            ),
                    ).arg(
                        Arg::with_name("clear")
                            .long("clear")
                            .short("c")
-                            .help("Reset the cache"),
+                            .help("Remove the cached syntax definitions and themes."),
                    ).arg(
                        Arg::with_name("config-dir")
                            .long("config-dir")
                            .short("d")
-                            .help("Show the configuration directory"),
+                            .help("Show bat's configuration directory."),
                    ).group(
                        ArgGroup::with_name("cache-actions")
                            .args(&["init", "clear", "config-dir"])
@@ -200,7 +303,7 @@ impl App {
                            .requires("init")
                            .takes_value(true)
                            .value_name("dir")
-                            .help("Use a different source for loading syntaxes and themes from"),
+                            .help("Use a different directory to load syntaxes and themes from."),
                    ).arg(
                        Arg::with_name("target")
                            .long("target")
@@ -208,8 +311,14 @@ impl App {
                            .takes_value(true)
                            .value_name("dir")
                            .help(
-                                "Use a different source to store the cached syntax and theme set",
+                                "Use a different directory to store the cached syntax and theme set.",
                            ),
                    ).arg(
                        Arg::with_name("blank")
                            .long("blank")
                            .requires("init")
                            .help("Create completely new syntax and theme sets \
                                   (instead of appending to the default sets).")
                    ),
            ).help_message("Print this help message.")
            .version_message("Show version information.")
@@ -241,7 +350,7 @@ impl App {
            paging_mode: match self.matches.value_of("paging") {
                Some("always") => PagingMode::Always,
                Some("never") => PagingMode::Never,
-                Some("auto") | _ => if files.contains(&None) {
+                Some("auto") | _ => if files.contains(&InputFile::StdIn) {
                    // If we are reading from stdin, only enable paging if we write to an
                    // interactive terminal and if we do not *read* from an interactive
                    // terminal.
@@ -259,145 +368,53 @@ impl App {
                },
            },
            term_width: Term::stdout().size().1 as usize,
            loop_through: !(self.interactive_output
                || self.matches.value_of("color") == Some("always")
                || self.matches.value_of("decorations") == Some("always")),
            files,
            theme: self
                .matches
                .value_of("theme")
                .map(String::from)
                .or_else(|| env::var("BAT_THEME").ok())
-                .unwrap_or(String::from("Default")),
+                .unwrap_or(String::from(BAT_THEME_DEFAULT)),
            line_range: transpose(self.matches.value_of("line-range").map(LineRange::from))?,
        })
    }
-    fn files(&self) -> Vec<Option<&str>> {
+    fn files(&self) -> Vec<InputFile> {
        self.matches
            .values_of("FILE")
            .map(|values| {
                values
                    .map(|filename| {
                        if filename == "-" {
-                            None
+                            InputFile::StdIn
                        } else {
-                            Some(filename)
+                            InputFile::Ordinary(filename)
                        }
                    }).collect()
-            }).unwrap_or_else(|| vec![None]) // read from stdin (None) if no args are given
+            }).unwrap_or_else(|| vec![InputFile::StdIn])
    }
    fn output_components(&self) -> Result<OutputComponents> {
        let matches = &self.matches;
-        Ok(OutputComponents(if matches.is_present("number") {
+        Ok(OutputComponents(
-            [OutputComponent::Numbers].iter().cloned().collect()
+            if matches.value_of("decorations") == Some("never") {
-        } else {
+                HashSet::new()
-            values_t!(matches.values_of("style"), OutputComponent)?
+            } else if matches.is_present("number") {
-                .into_iter()
+                [OutputComponent::Numbers].iter().cloned().collect()
-                .map(|style| style.components(self.interactive_output))
+            } else if matches.is_present("plain") {
-                .fold(HashSet::new(), |mut acc, components| {
+                [OutputComponent::Plain].iter().cloned().collect()
-                    acc.extend(components.iter().cloned());
+            } else {
-                    acc
+                values_t!(matches.values_of("style"), OutputComponent)?
-                })
+                    .into_iter()
-        }))
+                    .map(|style| style.components(self.interactive_output))
                    .fold(HashSet::new(), |mut acc, components| {
                        acc.extend(components.iter().cloned());
                        acc
                    })
            },
        ))
    }
 }
 #[derive(Debug, Clone, Copy)]
 pub enum PagingMode {
    Always,
    QuitIfOneScreen,
    Never,
 }
 pub struct Config<'a> {
    pub true_color: bool,
    pub output_wrap: OutputWrap,
    pub output_components: OutputComponents,
    pub language: Option<&'a str>,
    pub colored_output: bool,
    pub paging_mode: PagingMode,
    pub term_width: usize,
    pub files: Vec<Option<&'a str>>,
    pub theme: String,
    pub line_range: Option<LineRange>,
 }
 fn is_truecolor_terminal() -> bool {
    env::var("COLORTERM")
        .map(|colorterm| colorterm == "truecolor" || colorterm == "24bit")
        .unwrap_or(false)
 }
 pub struct LineRange {
    pub lower: usize,
    pub upper: usize,
 }
 impl LineRange {
    pub fn from(range_raw: &str) -> Result<LineRange> {
        LineRange::parse_range(range_raw)
    }
    pub fn new() -> LineRange {
        LineRange {
            lower: usize::min_value(),
            upper: usize::max_value(),
        }
    }
    pub fn parse_range(range_raw: &str) -> Result<LineRange> {
        let mut new_range = LineRange::new();
        if range_raw.bytes().nth(0).ok_or("Empty line range")? == b':' {
            new_range.upper = range_raw[1..].parse()?;
            return Ok(new_range);
        } else if range_raw.bytes().last().ok_or("Empty line range")? == b':' {
            new_range.lower = range_raw[..range_raw.len() - 1].parse()?;
            return Ok(new_range);
        }
        let line_numbers: Vec<&str> = range_raw.split(':').collect();
        if line_numbers.len() == 2 {
            new_range.lower = line_numbers[0].parse()?;
            new_range.upper = line_numbers[1].parse()?;
            return Ok(new_range);
        }
        Err("expected single ':' character".into())
    }
 }
 #[test]
 fn test_parse_line_range_full() {
    let range = LineRange::from("40:50").expect("Shouldn't fail on test!");
    assert_eq!(40, range.lower);
    assert_eq!(50, range.upper);
 }
 #[test]
 fn test_parse_line_range_partial_min() {
    let range = LineRange::from(":50").expect("Shouldn't fail on test!");
    assert_eq!(usize::min_value(), range.lower);
    assert_eq!(50, range.upper);
 }
 #[test]
 fn test_parse_line_range_partial_max() {
    let range = LineRange::from("40:").expect("Shouldn't fail on test!");
    assert_eq!(40, range.lower);
    assert_eq!(usize::max_value(), range.upper);
 }
 #[test]
 fn test_parse_line_range_fail() {
    let range = LineRange::from("40:50:80");
    assert!(range.is_err());
    let range = LineRange::from("40::80");
    assert!(range.is_err());
    let range = LineRange::from(":40:");
    assert!(range.is_err());
    let range = LineRange::from("40");
    assert!(range.is_err());
 }
 fn transpose<T>(opt: Option<Result<T>>) -> Result<Option<T>> {
    opt.map_or(Ok(None), |res| res.map(Some))
 }
@@ -1,6 +1,7 @@
 use directories::ProjectDirs;
 use errors::*;
 use std::borrow::Cow;
 use std::collections::BTreeMap;
 use std::fs::{self, File};
 use std::path::{Path, PathBuf};
 use syntect::dumps::{dump_to_file, from_binary, from_reader};
@@ -10,11 +11,15 @@ use syntect::parsing::{SyntaxDefinition, SyntaxSet};
 #[cfg(unix)]
 use std::os::unix::fs::FileTypeExt;
 use app::InputFile;
 lazy_static! {
    static ref PROJECT_DIRS: ProjectDirs =
        ProjectDirs::from("", "", crate_name!()).expect("Could not get home directory");
 }
 pub const BAT_THEME_DEFAULT: &str = "Monokai Extended";
 pub struct HighlightingAssets {
    pub syntax_set: SyntaxSet,
    pub theme_set: ThemeSet,
@@ -25,18 +30,32 @@ impl HighlightingAssets {
        Self::from_cache().unwrap_or_else(|_| Self::from_binary())
    }
-    pub fn from_files(dir: Option<&Path>) -> Result<Self> {
+    fn empty() -> Self {
        let mut syntax_set = SyntaxSet::new();
        syntax_set.load_plain_text_syntax();
        let theme_set = ThemeSet {
            themes: BTreeMap::new(),
        };
        HighlightingAssets {
            syntax_set,
            theme_set,
        }
    }
    pub fn from_files(dir: Option<&Path>, start_empty: bool) -> Result<Self> {
        let source_dir = dir.unwrap_or_else(|| PROJECT_DIRS.config_dir());
-        let mut assets = Self::from_binary_unlinked();
+        let mut assets = if start_empty {
            Self::empty()
        } else {
            Self::from_binary_unlinked()
        };
        let theme_dir = source_dir.join("themes");
-        if let Ok(theme_set) = ThemeSet::load_from_folder(&theme_dir) {
+        let res = extend_theme_set(&mut assets.theme_set, &theme_dir);
-            // TODO: If syntect would support this, it would be great to
+        if !res.is_ok() {
            // load the new themes in addition to the ones in the binary.
            assets.theme_set = theme_set;
        } else {
            println!(
                "No themes were found in '{}', using the default set",
                theme_dir.to_string_lossy()
@@ -142,15 +161,15 @@ impl HighlightingAssets {
                    Yellow.paint("[bat warning]"),
                    theme
                );
-                &self.theme_set.themes["Default"]
+                &self.theme_set.themes[BAT_THEME_DEFAULT]
            }
        }
    }
-    pub fn get_syntax(&self, language: Option<&str>, filename: Option<&str>) -> &SyntaxDefinition {
+    pub fn get_syntax(&self, language: Option<&str>, filename: InputFile) -> &SyntaxDefinition {
        let syntax = match (language, filename) {
            (Some(language), _) => self.syntax_set.find_syntax_by_token(language),
-            (None, Some(filename)) => {
+            (None, InputFile::Ordinary(filename)) => {
                #[cfg(not(unix))]
                let may_read_from_file = true;
@@ -169,13 +188,29 @@ impl HighlightingAssets {
                    None
                }
            }
-            (None, None) => None,
+            (None, InputFile::StdIn) => None,
            (_, InputFile::ThemePreviewFile) => self.syntax_set.find_syntax_by_name("Rust"),
        };
        syntax.unwrap_or_else(|| self.syntax_set.find_syntax_plain_text())
    }
 }
 // TODO: this function will soon be part of syntect's `ThemeSet`.
 fn extend_theme_set<P: AsRef<Path>>(theme_set: &mut ThemeSet, folder: P) -> Result<()> {
    let paths = ThemeSet::discover_theme_paths(folder)?;
    for p in &paths {
        let theme = ThemeSet::get_theme(p)?;
        let basename = p
            .file_stem()
            .and_then(|x| x.to_str())
            .ok_or("Could not get theme basename")?;
        theme_set.themes.insert(basename.to_owned(), theme);
    }
    Ok(())
 }
 fn theme_set_path() -> PathBuf {
    PROJECT_DIRS.cache_dir().join("themes.bin")
 }
@@ -0,0 +1,104 @@
 use std::fs::File;
 use std::io::{self, BufRead, BufReader, Write};
 use app::{Config, InputFile};
 use assets::HighlightingAssets;
 use errors::*;
 use line_range::LineRange;
 use output::OutputType;
 use printer::{InteractivePrinter, Printer, SimplePrinter};
 const THEME_PREVIEW_FILE: &[u8] = include_bytes!("../assets/theme_preview.rs");
 pub struct Controller<'a> {
    config: &'a Config<'a>,
    assets: &'a HighlightingAssets,
 }
 impl<'b> Controller<'b> {
    pub fn new<'a>(config: &'a Config, assets: &'a HighlightingAssets) -> Controller<'a> {
        Controller { config, assets }
    }
    pub fn run(&self) -> Result<bool> {
        let mut output_type = OutputType::from_mode(self.config.paging_mode);
        let writer = output_type.handle()?;
        let mut no_errors: bool = true;
        for filename in &self.config.files {
            let result = if self.config.loop_through {
                let mut printer = SimplePrinter::new();
                self.print_file(&mut printer, writer, *filename)
            } else {
                let mut printer = InteractivePrinter::new(&self.config, &self.assets, *filename);
                self.print_file(&mut printer, writer, *filename)
            };
            if let Err(error) = result {
                handle_error(&error);
                no_errors = false;
            }
        }
        Ok(no_errors)
    }
    fn print_file<'a, P: Printer>(
        &self,
        printer: &mut P,
        writer: &mut Write,
        filename: InputFile<'a>,
    ) -> Result<()> {
        let stdin = io::stdin();
        {
            let reader: Box<BufRead> = match filename {
                InputFile::StdIn => Box::new(stdin.lock()),
                InputFile::Ordinary(filename) => Box::new(BufReader::new(File::open(filename)?)),
                InputFile::ThemePreviewFile => Box::new(THEME_PREVIEW_FILE),
            };
            printer.print_header(writer, filename)?;
            self.print_file_ranges(printer, writer, reader, &self.config.line_range)?;
            printer.print_footer(writer)?;
        }
        Ok(())
    }
    fn print_file_ranges<'a, P: Printer>(
        &self,
        printer: &mut P,
        writer: &mut Write,
        mut reader: Box<BufRead + 'a>,
        line_ranges: &Option<LineRange>,
    ) -> Result<()> {
        let mut line_buffer = Vec::new();
        let mut line_number: usize = 1;
        while reader.read_until(b'\n', &mut line_buffer)? > 0 {
            {
                match line_ranges {
                    &Some(ref range) => {
                        if line_number < range.lower {
                            // Call the printer in case we need to call the syntax highlighter
                            // for this line. However, set `out_of_range` to `true`.
                            printer.print_line(true, writer, line_number, &line_buffer)?;
                        } else if line_number > range.upper {
                            // no more lines in range, exit early
                            break;
                        } else {
                            printer.print_line(false, writer, line_number, &line_buffer)?;
                        }
                    }
                    &None => {
                        printer.print_line(false, writer, line_number, &line_buffer)?;
                    }
                }
                line_number += 1;
            }
            line_buffer.clear();
        }
        Ok(())
    }
 }
@@ -1,6 +1,6 @@
 use ansi_term::Style;
 use diff::LineChange;
-use printer::{Colors, Printer};
+use printer::{Colors, InteractivePrinter};
 #[derive(Clone)]
 pub struct DecorationText {
@@ -9,12 +9,15 @@ pub struct DecorationText {
 }
 pub trait Decoration {
-    fn generate(&self, line_number: usize, continuation: bool, printer: &Printer)
+    fn generate(
-        -> DecorationText;
+        &self,
        line_number: usize,
        continuation: bool,
        printer: &InteractivePrinter,
    ) -> DecorationText;
    fn width(&self) -> usize;
 }
 // Line number decoration.
 pub struct LineNumberDecoration {
    color: Style,
    cached_wrap: DecorationText,
@@ -39,7 +42,7 @@ impl Decoration for LineNumberDecoration {
        &self,
        line_number: usize,
        continuation: bool,
-        _printer: &Printer,
+        _printer: &InteractivePrinter,
    ) -> DecorationText {
        if continuation {
            if line_number > self.cached_wrap_invalid_at {
@@ -65,7 +68,6 @@ impl Decoration for LineNumberDecoration {
    }
 }
 // Line changes decoration.
 pub struct LineChangesDecoration {
    cached_none: DecorationText,
    cached_added: DecorationText,
@@ -99,7 +101,7 @@ impl Decoration for LineChangesDecoration {
        &self,
        line_number: usize,
        continuation: bool,
-        printer: &Printer,
+        printer: &InteractivePrinter,
    ) -> DecorationText {
        if !continuation {
            if let Some(ref changes) = printer.line_changes {
@@ -121,7 +123,6 @@ impl Decoration for LineChangesDecoration {
    }
 }
 // Grid border decoration.
 pub struct GridBorderDecoration {
    cached: DecorationText,
 }
@@ -142,7 +143,7 @@ impl Decoration for GridBorderDecoration {
        &self,
        _line_number: usize,
        _continuation: bool,
-        _printer: &Printer,
+        _printer: &InteractivePrinter,
    ) -> DecorationText {
        self.cached.clone()
    }
@@ -1,138 +0,0 @@
 use ansi_term::Colour::Green;
 use app::{Config, LineRange};
 use assets::HighlightingAssets;
 use diff::get_git_diff;
 use errors::*;
 use output::OutputType;
 use printer::Printer;
 use std::fs::File;
 use std::io::{self, BufRead, BufReader};
 use syntect::easy::HighlightLines;
 use syntect::highlighting::Theme;
 use syntect::parsing::SyntaxDefinition;
 pub fn list_languages(assets: &HighlightingAssets, term_width: usize) {
    let mut languages = assets
        .syntax_set
        .syntaxes()
        .iter()
        .filter(|syntax| !syntax.hidden && !syntax.file_extensions.is_empty())
        .collect::<Vec<_>>();
    languages.sort_by_key(|lang| lang.name.to_uppercase());
    let longest = languages
        .iter()
        .map(|syntax| syntax.name.len())
        .max()
        .unwrap_or(32); // Fallback width if they have no language definitions.
    let comma_separator = ", ";
    let separator = " ";
    // Line-wrapping for the possible file extension overflow.
    let desired_width = term_width - longest - separator.len();
    for lang in languages {
        print!("{:width$}{}", lang.name, separator, width = longest);
        // Number of characters on this line so far, wrap before `desired_width`
        let mut num_chars = 0;
        let mut extension = lang.file_extensions.iter().peekable();
        while let Some(word) = extension.next() {
            // If we can't fit this word in, then create a line break and align it in.
            let new_chars = word.len() + comma_separator.len();
            if num_chars + new_chars >= desired_width {
                num_chars = 0;
                print!("\n{:width$}{}", "", separator, width = longest);
            }
            num_chars += new_chars;
            print!("{}", Green.paint(&word[..]));
            if extension.peek().is_some() {
                print!("{}", comma_separator);
            }
        }
        println!();
    }
 }
 pub fn print_files(assets: &HighlightingAssets, config: &Config) -> Result<bool> {
    let theme = assets.get_theme(&config.theme);
    let mut output_type = OutputType::from_mode(config.paging_mode);
    let handle = output_type.handle()?;
    let mut printer = Printer::new(handle, &config, &theme);
    let mut no_errors: bool = true;
    for file in &config.files {
        printer.ansi_prefix_sgr.clear();
        printer.line_changes = file.and_then(|filename| get_git_diff(filename));
        let syntax = assets.get_syntax(config.language, *file);
        let result = print_file(theme, &syntax, &mut printer, *file);
        if let Err(error) = result {
            handle_error(&error);
            no_errors = false;
        }
    }
    Ok(no_errors)
 }
 fn print_file(
    theme: &Theme,
    syntax: &SyntaxDefinition,
    printer: &mut Printer,
    filename: Option<&str>,
 ) -> Result<()> {
    let stdin = io::stdin(); // TODO: this is not always needed
    {
        let reader: Box<BufRead> = match filename {
            None => Box::new(stdin.lock()),
            Some(filename) => Box::new(BufReader::new(File::open(filename)?)),
        };
        let highlighter = HighlightLines::new(syntax, theme);
        printer.print_header(filename)?;
        print_file_ranges(printer, reader, highlighter, &printer.config.line_range)?;
        printer.print_footer()?;
    }
    Ok(())
 }
 fn print_file_ranges<'a>(
    printer: &mut Printer,
    mut reader: Box<BufRead + 'a>,
    mut highlighter: HighlightLines,
    line_ranges: &Option<LineRange>,
 ) -> Result<()> {
    let mut buffer = Vec::new();
    while reader.read_until(b'\n', &mut buffer)? > 0 {
        {
            let line = String::from_utf8_lossy(&buffer);
            let regions = highlighter.highlight(line.as_ref());
            match line_ranges {
                &Some(ref range) => {
                    if printer.line_number + 1 < range.lower {
                        // skip line
                        printer.line_number += 1;
                    } else if printer.line_number >= range.upper {
                        // no more lines in range
                        break;
                    } else {
                        printer.print_line(&regions)?;
                    }
                }
                &None => {
                    printer.print_line(&regions)?;
                }
            }
        }
        buffer.clear();
    }
    Ok(())
 }
@@ -0,0 +1,74 @@
 use errors::*;
 #[derive(Clone)]
 pub struct LineRange {
    pub lower: usize,
    pub upper: usize,
 }
 impl LineRange {
    pub fn from(range_raw: &str) -> Result<LineRange> {
        LineRange::parse_range(range_raw)
    }
    pub fn new() -> LineRange {
        LineRange {
            lower: usize::min_value(),
            upper: usize::max_value(),
        }
    }
    pub fn parse_range(range_raw: &str) -> Result<LineRange> {
        let mut new_range = LineRange::new();
        if range_raw.bytes().nth(0).ok_or("Empty line range")? == b':' {
            new_range.upper = range_raw[1..].parse()?;
            return Ok(new_range);
        } else if range_raw.bytes().last().ok_or("Empty line range")? == b':' {
            new_range.lower = range_raw[..range_raw.len() - 1].parse()?;
            return Ok(new_range);
        }
        let line_numbers: Vec<&str> = range_raw.split(':').collect();
        if line_numbers.len() == 2 {
            new_range.lower = line_numbers[0].parse()?;
            new_range.upper = line_numbers[1].parse()?;
            return Ok(new_range);
        }
        Err("expected single ':' character".into())
    }
 }
 #[test]
 fn test_parse_full() {
    let range = LineRange::from("40:50").expect("Shouldn't fail on test!");
    assert_eq!(40, range.lower);
    assert_eq!(50, range.upper);
 }
 #[test]
 fn test_parse_partial_min() {
    let range = LineRange::from(":50").expect("Shouldn't fail on test!");
    assert_eq!(usize::min_value(), range.lower);
    assert_eq!(50, range.upper);
 }
 #[test]
 fn test_parse_partial_max() {
    let range = LineRange::from("40:").expect("Shouldn't fail on test!");
    assert_eq!(40, range.lower);
    assert_eq!(usize::max_value(), range.upper);
 }
 #[test]
 fn test_parse_fail() {
    let range = LineRange::from("40:50:80");
    assert!(range.is_err());
    let range = LineRange::from("40::80");
    assert!(range.is_err());
    let range = LineRange::from(":40:");
    assert!(range.is_err());
    let range = LineRange::from("40");
    assert!(range.is_err());
 }
@@ -19,21 +19,27 @@ extern crate syntect;
 mod app;
 mod assets;
 mod controller;
 mod decorations;
 mod diff;
-mod features;
+mod line_range;
 mod output;
 mod printer;
 mod style;
 mod terminal;
 use std::collections::HashSet;
 use std::io;
 use std::path::Path;
 use std::process;
-use app::App;
+use ansi_term::Colour::Green;
 use ansi_term::Style;
 use app::{App, Config, InputFile};
 use assets::{clear_assets, config_dir, HighlightingAssets};
-use features::{list_languages, print_files};
+use controller::Controller;
 use style::{OutputComponent, OutputComponents};
 mod errors {
    error_chain! {
@@ -62,6 +68,84 @@ mod errors {
 use errors::*;
 fn run_cache_subcommand(matches: &clap::ArgMatches) -> Result<()> {
    if matches.is_present("init") {
        let source_dir = matches.value_of("source").map(Path::new);
        let target_dir = matches.value_of("target").map(Path::new);
        let blank = matches.is_present("blank");
        let assets = HighlightingAssets::from_files(source_dir, blank)?;
        assets.save(target_dir)?;
    } else if matches.is_present("clear") {
        clear_assets();
    } else if matches.is_present("config-dir") {
        println!("{}", config_dir());
    }
    Ok(())
 }
 pub fn list_languages(assets: &HighlightingAssets, term_width: usize) {
    let mut languages = assets
        .syntax_set
        .syntaxes()
        .iter()
        .filter(|syntax| !syntax.hidden && !syntax.file_extensions.is_empty())
        .collect::<Vec<_>>();
    languages.sort_by_key(|lang| lang.name.to_uppercase());
    let longest = languages
        .iter()
        .map(|syntax| syntax.name.len())
        .max()
        .unwrap_or(32); // Fallback width if they have no language definitions.
    let comma_separator = ", ";
    let separator = " ";
    // Line-wrapping for the possible file extension overflow.
    let desired_width = term_width - longest - separator.len();
    for lang in languages {
        print!("{:width$}{}", lang.name, separator, width = longest);
        // Number of characters on this line so far, wrap before `desired_width`
        let mut num_chars = 0;
        let mut extension = lang.file_extensions.iter().peekable();
        while let Some(word) = extension.next() {
            // If we can't fit this word in, then create a line break and align it in.
            let new_chars = word.len() + comma_separator.len();
            if num_chars + new_chars >= desired_width {
                num_chars = 0;
                print!("\n{:width$}{}", "", separator, width = longest);
            }
            num_chars += new_chars;
            print!("{}", Green.paint(&word[..]));
            if extension.peek().is_some() {
                print!("{}", comma_separator);
            }
        }
        println!();
    }
 }
 pub fn list_themes(assets: &HighlightingAssets, cfg: &Config) {
    let themes = &assets.theme_set.themes;
    let mut config = cfg.clone();
    let mut style = HashSet::new();
    style.insert(OutputComponent::Plain);
    config.files = vec![InputFile::ThemePreviewFile];
    config.output_components = OutputComponents(style);
    for (theme, _) in themes.iter() {
        println!("Theme: {}\n", Style::new().bold().paint(theme.to_string()));
        config.theme = theme.to_string();
        let _controller = Controller::new(&config, &assets).run();
        println!()
    }
 }
 /// Returns `Err(..)` upon fatal errors. Otherwise, returns `Some(true)` on full success and
 /// `Some(false)` if any intermediate errors occurred (were printed).
 fn run() -> Result<bool> {
@@ -69,19 +153,8 @@ fn run() -> Result<bool> {
    match app.matches.subcommand() {
        ("cache", Some(cache_matches)) => {
-            if cache_matches.is_present("init") {
+            run_cache_subcommand(cache_matches)?;
-                let source_dir = cache_matches.value_of("source").map(Path::new);
+            Ok(true)
                let target_dir = cache_matches.value_of("target").map(Path::new);
                let assets = HighlightingAssets::from_files(source_dir)?;
                assets.save(target_dir)?;
            } else if cache_matches.is_present("clear") {
                clear_assets();
            } else if cache_matches.is_present("config-dir") {
                println!("{}", config_dir());
            }
            return Ok(true);
        }
        _ => {
            let config = app.config()?;
@@ -89,18 +162,16 @@ fn run() -> Result<bool> {
            if app.matches.is_present("list-languages") {
                list_languages(&assets, config.term_width);
                return Ok(true);
            }
-            if app.matches.is_present("list-themes") {
+                Ok(true)
-                let themes = &assets.theme_set.themes;
+            } else if app.matches.is_present("list-themes") {
-                for (theme, _) in themes.iter() {
+                list_themes(&assets, &config);
                    println!("{}", theme);
                }
                return Ok(true);
            }
-            print_files(&assets, &config)
+                Ok(true)
            } else {
                let controller = Controller::new(&config, &assets);
                controller.run()
            }
        }
    }
 }
@@ -1,9 +1,10 @@
 use app::PagingMode;
 use errors::*;
 use std::env;
 use std::io::{self, Write};
 use std::process::{Child, Command, Stdio};
 use app::PagingMode;
 use errors::*;
 pub enum OutputType {
    Pager(Child),
    Stdout(io::Stdout),
@@ -1,30 +1,81 @@
 use ansi_term::Colour::{Fixed, Green, Red, Yellow};
 use ansi_term::Style;
 use app::Config;
 use console::AnsiCodeIterator;
 use decorations::{Decoration, GridBorderDecoration, LineChangesDecoration, LineNumberDecoration};
 use diff::LineChanges;
 use errors::*;
 use std::boxed::Box;
 use std::io::Write;
 use std::vec::Vec;
 use ansi_term::Colour::{Fixed, Green, Red, Yellow};
 use ansi_term::Style;
 use console::AnsiCodeIterator;
 use syntect::easy::HighlightLines;
 use syntect::highlighting::Theme;
 use app::{Config, InputFile};
 use assets::HighlightingAssets;
 use decorations::{Decoration, GridBorderDecoration, LineChangesDecoration, LineNumberDecoration};
 use diff::get_git_diff;
 use diff::LineChanges;
 use errors::*;
 use style::OutputWrap;
 use syntect::highlighting::{self, Theme};
 use terminal::{as_terminal_escaped, to_ansi_color};
-pub struct Printer<'a> {
+pub trait Printer {
-    handle: &'a mut Write,
+    fn print_header(&mut self, handle: &mut Write, file: InputFile) -> Result<()>;
-    colors: Colors,
+    fn print_footer(&mut self, handle: &mut Write) -> Result<()>;
-    pub config: &'a Config<'a>,
+    fn print_line(
-    decorations: Vec<Box<Decoration>>,
+        &mut self,
-    panel_width: usize,
+        out_of_range: bool,
-    pub ansi_prefix_sgr: String,
+        handle: &mut Write,
-    pub line_number: usize,
+        line_number: usize,
-    pub line_changes: Option<LineChanges>,
+        line_buffer: &[u8],
    ) -> Result<()>;
 }
-impl<'a> Printer<'a> {
+pub struct SimplePrinter;
-    pub fn new(handle: &'a mut Write, config: &'a Config, theme: &Theme) -> Self {
+
 impl SimplePrinter {
    pub fn new() -> Self {
        SimplePrinter {}
    }
 }
 impl Printer for SimplePrinter {
    fn print_header(&mut self, _handle: &mut Write, _file: InputFile) -> Result<()> {
        Ok(())
    }
    fn print_footer(&mut self, _handle: &mut Write) -> Result<()> {
        Ok(())
    }
    fn print_line(
        &mut self,
        out_of_range: bool,
        handle: &mut Write,
        _line_number: usize,
        line_buffer: &[u8],
    ) -> Result<()> {
        if !out_of_range {
            handle.write(line_buffer)?;
        }
        Ok(())
    }
 }
 pub struct InteractivePrinter<'a> {
    colors: Colors,
    config: &'a Config<'a>,
    decorations: Vec<Box<Decoration>>,
    panel_width: usize,
    ansi_prefix_sgr: String,
    pub line_changes: Option<LineChanges>,
    highlighter: HighlightLines<'a>,
 }
 impl<'a> InteractivePrinter<'a> {
    pub fn new(config: &'a Config, assets: &'a HighlightingAssets, file: InputFile) -> Self {
        let theme = assets.get_theme(&config.theme);
        let colors = if config.colored_output {
            Colors::colored(theme, config.true_color)
        } else {
@@ -61,31 +112,55 @@ impl<'a> Printer<'a> {
            panel_width = 0;
        }
-        // Create printer.
+        // Get the Git modifications
-        Printer {
+        let line_changes = match file {
            InputFile::Ordinary(filename) => get_git_diff(filename),
            _ => None,
        };
        // Determine the type of syntax for highlighting
        let syntax = assets.get_syntax(config.language, file);
        let highlighter = HighlightLines::new(syntax, theme);
        InteractivePrinter {
            panel_width,
            handle,
            colors,
            config,
            decorations,
            ansi_prefix_sgr: String::new(),
-            line_number: 0,
+            line_changes,
-            line_changes: None,
+            highlighter,
        }
    }
-    pub fn print_header(&mut self, filename: Option<&str>) -> Result<()> {
+    fn print_horizontal_line(&mut self, handle: &mut Write, grid_char: char) -> Result<()> {
-        self.line_number = 0;
+        if self.panel_width == 0 {
            writeln!(
                handle,
                "{}",
                self.colors.grid.paint("─".repeat(self.config.term_width))
            )?;
        } else {
            let hline = "─".repeat(self.config.term_width - (self.panel_width + 1));
            let hline = format!("{}{}{}", "─".repeat(self.panel_width), grid_char, hline);
            writeln!(handle, "{}", self.colors.grid.paint(hline))?;
        }
        Ok(())
    }
 }
 impl<'a> Printer for InteractivePrinter<'a> {
    fn print_header(&mut self, handle: &mut Write, file: InputFile) -> Result<()> {
        if !self.config.output_components.header() {
            return Ok(());
        }
        if self.config.output_components.grid() {
-            self.print_horizontal_line('┬')?;
+            self.print_horizontal_line(handle, '┬')?;
            write!(
-                self.handle,
+                handle,
                "{}{}",
                " ".repeat(self.panel_width),
                self.colors
@@ -93,33 +168,45 @@ impl<'a> Printer<'a> {
                    .paint(if self.panel_width > 0 { "│ " } else { "" }),
            )?;
        } else {
-            write!(self.handle, "{}", " ".repeat(self.panel_width))?;
+            write!(handle, "{}", " ".repeat(self.panel_width))?;
        }
-        writeln!(
+        let (prefix, name) = match file {
-            self.handle,
+            InputFile::Ordinary(filename) => ("File: ", filename),
-            "{}{}",
+            _ => ("", "STDIN"),
-            filename.map_or("", |_| "File: "),
+        };
-            self.colors.filename.paint(filename.unwrap_or("STDIN"))
+
-        )?;
+        writeln!(handle, "{}{}", prefix, self.colors.filename.paint(name))?;
        if self.config.output_components.grid() {
-            self.print_horizontal_line('┼')?;
+            self.print_horizontal_line(handle, '┼')?;
        }
        Ok(())
    }
-    pub fn print_footer(&mut self) -> Result<()> {
+    fn print_footer(&mut self, handle: &mut Write) -> Result<()> {
        if self.config.output_components.grid() {
-            self.print_horizontal_line('┴')
+            self.print_horizontal_line(handle, '┴')
        } else {
            Ok(())
        }
    }
-    pub fn print_line(&mut self, regions: &[(highlighting::Style, &str)]) -> Result<()> {
+    fn print_line(
-        self.line_number += 1;
+        &mut self,
        out_of_range: bool,
        handle: &mut Write,
        line_number: usize,
        line_buffer: &[u8],
    ) -> Result<()> {
        let line = String::from_utf8_lossy(&line_buffer);
        let regions = self.highlighter.highlight(line.as_ref());
        if out_of_range {
            return Ok(());
        }
        let mut cursor: usize = 0;
        let mut cursor_max: usize = self.config.term_width;
        let mut panel_wrap: Option<String> = None;
@@ -129,11 +216,11 @@ impl<'a> Printer<'a> {
            let decorations = self
                .decorations
                .iter()
-                .map(|ref d| d.generate(self.line_number, false, self))
+                .map(|ref d| d.generate(line_number, false, self))
                .collect::<Vec<_>>();
            for deco in decorations {
-                write!(self.handle, "{} ", deco.text)?;
+                write!(handle, "{} ", deco.text)?;
                cursor_max -= deco.width + 1;
            }
        }
@@ -144,7 +231,7 @@ impl<'a> Printer<'a> {
            let colored_output = self.config.colored_output;
            write!(
-                self.handle,
+                handle,
                "{}",
                regions
                    .iter()
@@ -191,7 +278,7 @@ impl<'a> Printer<'a> {
                                    cursor += remaining;
                                    write!(
-                                        self.handle,
+                                        handle,
                                        "{}",
                                        as_terminal_escaped(
                                            style,
@@ -214,7 +301,7 @@ impl<'a> Printer<'a> {
                                            self.decorations
                                                .iter()
                                                .map(|ref d| d
-                                                    .generate(self.line_number, true, self)
+                                                    .generate(line_number, true, self)
                                                    .text).collect::<Vec<String>>()
                                                .join(" ")
                                        ))
@@ -229,7 +316,7 @@ impl<'a> Printer<'a> {
                                remaining -= available;
                                write!(
-                                    self.handle,
+                                    handle,
                                    "{}\n{}",
                                    as_terminal_escaped(
                                        style,
@@ -251,23 +338,7 @@ impl<'a> Printer<'a> {
                }
            }
-            write!(self.handle, "\n")?;
+            write!(handle, "\n")?;
        }
        Ok(())
    }
    fn print_horizontal_line(&mut self, grid_char: char) -> Result<()> {
        if self.panel_width == 0 {
            writeln!(
                self.handle,
                "{}",
                self.colors.grid.paint("─".repeat(self.config.term_width))
            )?;
        } else {
            let hline = "─".repeat(self.config.term_width - (self.panel_width + 1));
            let hline = format!("{}{}{}", "─".repeat(self.panel_width), grid_char, hline);
            writeln!(self.handle, "{}", self.colors.grid.paint(hline))?;
        }
        Ok(())
@@ -1,7 +1,8 @@
 use errors::*;
 use std::collections::HashSet;
 use std::str::FromStr;
 use errors::*;
 #[derive(Debug, Eq, PartialEq, Copy, Clone, Hash)]
 pub enum OutputComponent {
    Auto,
@@ -58,6 +59,7 @@ impl FromStr for OutputComponent {
    }
 }
 #[derive(Clone)]
 pub struct OutputComponents(pub HashSet<OutputComponent>);
 impl OutputComponents {
@@ -1,5 +1,6 @@
 use ansi_term::Colour::{Fixed, RGB};
 use ansi_term::{self, Style};
 use syntect::highlighting::{self, FontStyle};
 /// Approximate a 24 bit color value by a 8 bit ANSI code
@@ -41,8 +41,11 @@ impl BatTester {
    pub fn test_snapshot(&self, style: &str) {
        let output = Command::new(&self.exe)
            .current_dir(self.temp_dir.path())
-            .args(&["sample.rs", &format!("--style={}", style)])
+            .args(&[
-            .output()
+                "sample.rs",
                "--decorations=always",
                &format!("--style={}", style),
            ]).output()
            .expect("bat failed");
        // have to do the replace because the filename in the header changes based on the current working directory
Author	SHA1	Message	Date
sharkdp	acdea97e71	Add --plain	2018-08-28 23:37:49 +02:00
sharkdp	839e4ee611	Bump version	2018-08-28 23:21:35 +02:00
sharkdp	c7afcdebf8	Move theme_preview file to constant	2018-08-28 22:16:42 +02:00
sharkdp	08e6db1581	Add Troubleshooting section see #220	2018-08-28 22:08:34 +02:00
sharkdp	4d08ecd828	Fix headline levels	2018-08-28 21:04:41 +02:00
sharkdp	28e1d0e613	Add development section to README	2018-08-28 21:03:03 +02:00
sharkdp	d11839ad03	Update install instructions	2018-08-28 20:55:15 +02:00
sharkdp	8cacd9b432	Include theme_preview file in binary	2018-08-28 20:24:13 +02:00
sharkdp	6f67444c99	Run cargo fmt	2018-08-28 20:24:13 +02:00
sharkdp	fd2b376ea0	Small style changes to --list-themes	2018-08-28 20:24:13 +02:00
sharkdp	cda54e4f61	Fix build for Rust 1.26	2018-08-28 20:24:13 +02:00
ms2300	3b90ada735	Mutation done correctly	2018-08-28 20:24:13 +02:00
ms2300	1837d364fe	Added bold to theme titles	2018-08-28 20:24:13 +02:00
ms2300	4ea3e6bbb7	Changed preview code	2018-08-28 20:24:13 +02:00
ms2300	38544ed735	Changed to plain style	2018-08-28 20:24:13 +02:00
ms2300	5444b0dfed	Fixes mut issue	2018-08-28 20:24:13 +02:00
ms2300	f3dde0185d	Modifying changing config for efficiency	2018-08-28 20:24:13 +02:00
ms2300	2e3784aa30	#213 : output hello world for each theme when --list-theme is flagged	2018-08-28 20:24:13 +02:00
sharkdp	1088455702	Add syntaxes for Elm, Kotlin, Puppet, TypeScript closes #215 closes #216 closes #217 closes #218	2018-08-28 19:36:31 +02:00
Colin Dean	4f812c32ab	Adds zenburn theme submodule Work towards #224 but @sharkdp is going to rebuild themes.bin	2018-08-28 07:37:27 +02:00
sharkdp	b6c59a5bd4	Add man page to releases	2018-08-27 23:10:14 +02:00
sharkdp	b682679776	Add initial version of man page, see #52	2018-08-27 22:57:47 +02:00
ms2300	81771432fb	#212 : added -p as an alias for --style=plain	2018-08-27 17:56:50 +02:00
sharkdp	627181bcb6	Always call the syntax highlighter	2018-08-23 23:35:57 +02:00
sharkdp	226d9a573a	Add simple loop-through mode Use a loop-through mode that simply copies input to output if a non-interactive terminal is detected. see #150	2018-08-23 23:13:24 +02:00
sharkdp	246cf79dbd	Split into Controller and Printer	2018-08-23 22:37:27 +02:00
sharkdp	ea955c734d	Refactoring, introduce Printer trait	2018-08-23 19:44:14 +02:00
sharkdp	6223ad6d52	Document Config struct	2018-08-22 22:36:59 +02:00
sharkdp	31a9335bd5	Document Config struct	2018-08-22 22:36:37 +02:00
sharkdp	9316f2a758	Major refactoring and cleanup	2018-08-22 22:29:12 +02:00
sharkdp	c884c3cc12	Re-order options in help texts	2018-08-22 19:34:30 +02:00
sharkdp	08850f0474	Update the `--help` text	2018-08-22 19:27:11 +02:00
Tim Sampson	8e6c5bc562	doc: mention BAT_THEME in help output	2018-08-22 18:14:01 +02:00
sharkdp	052425b12f	Load customized themes in addition to defaults - New themes in `$BAT_CONFIG_DIR/themes` are now loaded in addition to the default themes (they may also override). - The `Default.tmTheme` symlink is not necessary anymore. This relates to #172	2018-08-20 21:39:21 +02:00
sharkdp	2df3305b94	Add new '--blank' option for 'bat cache --init' closes #206	2018-08-20 21:34:08 +02:00
sharkdp	6882fc1512	Clean up help messages	2018-08-20 21:34:08 +02:00
`@@ -2,4 +2,4 @@`

	`ASSET_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"`	`ASSET_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"`

	`bat cache --init --source="$ASSET_DIR" --target="$ASSET_DIR"`	`bat cache --init --blank --source="$ASSET_DIR" --target="$ASSET_DIR"`
		`@@ -1 +0,0 @@`
			`sublime-monokai-extended/Monokai Extended.tmTheme`