Updates for v0.15.4

This reverts commit a265242e6e.

.gitmodules

@@ -70,9 +70,6 @@
 [submodule "assets/syntaxes/JavaScript (Babel)"]
 	path = assets/syntaxes/02_Extra/JavaScript (Babel)
 	url = https://github.com/babel/babel-sublime
-[submodule "assets/syntaxes/Cabal"]
-	path = assets/syntaxes/02_Extra/Cabal
-	url = https://github.com/SublimeHaskell/SublimeHaskell
 [submodule "assets/syntaxes/Dart"]
 	path = assets/syntaxes/02_Extra/Dart
 	url = https://github.com/guillermooo/dart-sublime-bundle

CHANGELOG.md

@@ -8,25 +8,40 @@
 ## `bat` as a library
 ## Packaging
 
-# v0.15.2
+# v0.15.3
 
 ## Bugfixes
 
+- Added missing Solarized themes, see #1027
+- Fixed highlighting bug in Haskell source files, see #1026
+
+# v0.15.3
+
+## Bugfixes
+
+- Cannot run `bat` with relative paths, see #1022
 - bat mishighlights Users that start with digits in SSH config, see #984
-- `--map-syntax` doesn't work with names provided through `--file-name` (@eth-p)
-- Fix syntax detection for files called 'rails', see #1008
-- Fix potential errors with syntax detection for symlinked files, see #1001
-
-## Other
-
-- Add padding above headers when not using a grid, see #968 and #981 (@pt2121)
-- bat now prints an error if an invalid syntax is specified via `-l` or `--map-syntax`, see #1004 (@eth-p)
 
 ## New syntaxes
 
 - SML, see #1005 (@kopecs)
 
-## New themes
+## Other
+
+- Some syntaxes and themes have been updated to the latest version
+
+# v0.15.2
+
+## Bugfixes
+
+- Fix syntax detection for files called 'rails', see #1008
+- Fix potential errors with syntax detection for symlinked files, see #1001
+- `--map-syntax` doesn't work with names provided through `--file-name` (@eth-p)
+
+## Other
+
+- Add padding above headers when not using a grid, see #968 and #981 (@pt2121)
+- bat now prints an error if an invalid syntax is specified via `-l` or `--map-syntax`, see #1004 (@eth-p)
 
 ## `bat` as a library
 

Cargo.lock

@@ -91,7 +91,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "bat"
-version = "0.15.2"
+version = "0.15.4"
 dependencies = [
  "ansi_colours 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "ansi_term 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -107,7 +107,7 @@ dependencies = [
  "globset 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "liquid 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "path-absolutize 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "path_abs 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_yaml 0.8.12 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -734,20 +734,11 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "path-absolutize"
-version = "1.2.0"
+name = "path_abs"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "path-dedot 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "slash-formatter 2.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "path-dedot"
-version = "1.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "std_prelude 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1053,13 +1044,13 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "slash-formatter"
-version = "2.2.6"
+name = "smallvec"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "smallvec"
-version = "1.3.0"
+name = "std_prelude"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -1413,8 +1404,7 @@ dependencies = [
 "checksum onig 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bd91ccd8a02fce2f7e8a86655aec67bc6c171e6f8e704118a0e8c4b866a05a8a"
 "checksum onig_sys 69.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3814583fad89f3c60ae0701d80e87e1fd3028741723deda72d0d4a0ecf0cb0db"
 "checksum opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
-"checksum path-absolutize 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f75bd79ae25b4cd5c4d4b6d11c11863c2ebee5d1eed4f6d687fcdd232df3a8dc"
-"checksum path-dedot 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4cf32f6a3b529384739d9c11c230ad760aeb553061e7834f58de63a7c507f24f"
+"checksum path_abs 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "eb6b8e6dede0bf94e9300e669f335ba92d5fc9fc8be7f4b1ca8a05206489388c"
 "checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
 "checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
 "checksum pest 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53"
@@ -1452,8 +1442,8 @@ dependencies = [
 "checksum serde_yaml 0.8.12 (registry+https://github.com/rust-lang/crates.io-index)" = "16c7a592a1ec97c9c1c68d75b6e537dcbf60c7618e038e7841e00af1d9ccf0c4"
 "checksum sha-1 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df"
 "checksum shell-words 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b6fa3938c99da4914afedd13bf3d79bcb6c277d1b2c398d23257a304d9e1b074"
-"checksum slash-formatter 2.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2f7fb98e76e2022054673f3ebc43a4e12890ec6272530629df6237cafbb70569"
 "checksum smallvec 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "05720e22615919e4734f6a99ceae50d00226c3c5aca406e102ebc33298214e0a"
+"checksum std_prelude 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)" = "8207e78455ffdf55661170876f88daf85356e4edd54e0a3dbc79586ca1e50cbe"
 "checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
 "checksum syn 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)" = "0df0eb663f387145cab623dea85b09c2c5b4b0aef44e945d928e682fce71bb03"
 "checksum syntect 4.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "83b43a6ca1829ccb0c933b615c9ea83ffc8793ae240cecbd15119b13d741161d"

Cargo.toml

@@ -7,7 +7,7 @@ license = "MIT/Apache-2.0"
 name = "bat"
 readme = "README.md"
 repository = "https://github.com/sharkdp/bat"
-version = "0.15.2"
+version = "0.15.4"
 exclude = [
     "assets/syntaxes/*",
     "assets/themes/*",
@@ -51,7 +51,7 @@ globset = "0.4"
 serde = { version = "1.0", features = ["derive"] }
 serde_yaml = "0.8"
 semver = "0.9"
-path-absolutize = "1.2.0"
+path_abs = { version = "0.5", default-features = false }
 
 [dependencies.git2]
 version = "0.13"

README.md

@@ -197,7 +197,7 @@ the most recent release of `bat`, download the latest `.deb` package from the
 [release page](https://github.com/sharkdp/bat/releases) and install it via:
 
 ```bash
-sudo dpkg -i bat_0.15.2_amd64.deb  # adapt version number and architecture
+sudo dpkg -i bat_0.15.4_amd64.deb  # adapt version number and architecture
 ```
 
 ### On Alpine Linux

assets/README.md

@@ -47,4 +47,5 @@ The following files have been manually modified after converting from a `.tmLang
    https://github.com/seanjames777/SML-Language-Definitiona as it is not
    kept in a standalone repository. The file generated is from
    https://github.com/seanjames777/SML-Language-Definition/blob/master/sml.tmLanguage
-
+* `Cabal.sublime_syntax` has been added manually from
+  https://github.com/SublimeHaskell/SublimeHaskell/ - we don't want to include the whole submodule because it includes other syntaxes ("Haskell improved") as well.

diagnostics/.gitattributes

@@ -0,0 +1 @@
+* linguist-vendored

doc/README-ja.md

@@ -180,7 +180,7 @@ apt install bat
 batの最新リリースを実行する場合、または Ubuntu/Debian の古いバージョンを使用している場合は、[release page](https://github.com/sharkdp/bat/releases) から最新の `.deb` パッケージをダウンロードし、
 次の方法でインストールします:
 ```bash
-sudo dpkg -i bat_0.15.2_amd64.deb  # adapt version number and architecture
+sudo dpkg -i bat_0.15.4_amd64.deb  # adapt version number and architecture
 ```
 
 ### On Alpine Linux

doc/README-ko.md

@@ -170,7 +170,7 @@ apt install bat
 만약 최근 릴리즈된 bat을 사용을 원하거나 buntu/Debian 예전 버전을 사용하는 경우, [릴리즈 페이지](https://github.com/sharkdp/bat/releases)에서 다음과 같이 `.deb` 패키지를 받아 설치 할 수도 있습니다:
 
 ```bash
-sudo dpkg -i bat_0.15.2_amd64.deb  # adapt version number and architecture
+sudo dpkg -i bat_0.15.4_amd64.deb  # adapt version number and architecture
 ```
 
 ### On Alpine Linux

src/assets.rs

@@ -8,7 +8,7 @@ use syntect::dumps::{dump_to_file, from_binary, from_reader};
 use syntect::highlighting::{Theme, ThemeSet};
 use syntect::parsing::{SyntaxReference, SyntaxSet, SyntaxSetBuilder};
 
-use path_absolutize::Absolutize;
+use path_abs::PathAbs;
 
 use crate::assets_metadata::AssetsMetadata;
 use crate::error::*;
@@ -220,7 +220,10 @@ impl HighlightingAssets {
             if let Some(path_str) = path_str {
                 // If a path was provided, we try and detect the syntax based on extension mappings.
                 let path = Path::new(path_str);
-                let absolute_path = path.absolutize().ok().unwrap_or_else(|| path.to_owned());
+                let absolute_path = PathAbs::new(path)
+                    .ok()
+                    .map(|p| p.as_path().to_path_buf())
+                    .unwrap_or_else(|| path.to_owned());
 
                 match mapping.get_syntax_for(absolute_path) {
                     Some(MappingTarget::MapToUnknown) => line_syntax.ok_or_else(|| {
@@ -427,7 +430,6 @@ mod tests {
 
         assert_eq!(test.syntax_for_file("test.h"), "C++");
         assert_eq!(test.syntax_for_file("test.sass"), "Sass");
-        assert_eq!(test.syntax_for_file("test.hs"), "Haskell (improved)");
         assert_eq!(test.syntax_for_file("test.js"), "JavaScript (Babel)");
     }
 

tests/.gitattributes

@@ -2,3 +2,4 @@ examples/* linguist-vendored
 snapshots/* linguist-vendored
 benchmarks/* linguist-vendored
 benchmarks/test-src/* linguist-vendored
+scripts/* linguist-vendored

tests/assets.rs

@@ -0,0 +1,35 @@
+use bat::assets::HighlightingAssets;
+
+/// This test ensures that we are not accidentally removing themes due to submodule updates.
+#[test]
+fn all_themes_are_present() {
+    let assets = HighlightingAssets::from_binary();
+
+    let mut themes: Vec<_> = assets.themes().collect();
+    themes.sort();
+
+    assert_eq!(
+        themes,
+        vec![
+            "1337",
+            "DarkNeon",
+            "Dracula",
+            "GitHub",
+            "Monokai Extended",
+            "Monokai Extended Bright",
+            "Monokai Extended Light",
+            "Monokai Extended Origin",
+            "Nord",
+            "OneHalfDark",
+            "OneHalfLight",
+            "Solarized (dark)",
+            "Solarized (light)",
+            "Sublime Snazzy",
+            "TwoDark",
+            "ansi-dark",
+            "ansi-light",
+            "base16",
+            "zenburn"
+        ]
+    );
+}

tests/no_duplicate_extensions.rs

@@ -8,9 +8,6 @@ fn no_duplicate_extensions() {
         // The '.h' extension currently appears in multiple syntaxes: C, C++, Objective C,
         // Objective C++
         "h",
-        // In addition to the standard Haskell syntax in 'Packages', we also ship the 'Cabal'
-        // syntax which comes with a "Haskell (improved)" syntax.
-        "hs",
         // In addition to the standard JavaScript syntax in 'Packages', we also ship the
         // 'Javascript (Babel)' syntax.
         "js",