b0191cd · bat · git.iko.soy

.gitmodules+3

compare with master

unifiedsplit

@@ -185,3 +185,6 @@

185[submodule "assets/syntaxes/02_Extra/AsciiDoc"]

186 path = assets/syntaxes/02_Extra/AsciiDoc

187 url = https://github.com/asciidoctor/sublimetext-asciidoc.git

188+[submodule "assets/syntaxes/02_Extra/GLSL"]

189+ path = assets/syntaxes/02_Extra/GLSL

190+ url = https://github.com/euler0/sublime-glsl

CHANGELOG.md+1

@@ -9,6 +9,7 @@

9## Syntaxes

10

11- Update AsciiDoc syntax, see #1034 (@rxt1077)

12+- GLSL (@caioalonso)

12

13

13## New themes

14## New themes

14## `bat` as a library

15## `bat` as a library

assets/syntaxes/02_Extra/GLSLnew file+1

Submodule changed.

src/assets.rs+1

@@ -428,6 +428,7 @@ mod tests {

428 assert_eq!(test.syntax_for_file("test.h"), "C++");

429 assert_eq!(test.syntax_for_file("test.sass"), "Sass");

430 assert_eq!(test.syntax_for_file("test.js"), "JavaScript (Babel)");

431+ assert_eq!(test.syntax_for_file("test.fs"), "F#");

431 }

432 }

432

433

433 #[test]

434 #[test]

src/syntax_mapping.rs+1

@@ -23,6 +23,7 @@ impl<'a> SyntaxMapping<'a> {

23 pub fn builtin() -> SyntaxMapping<'a> {

24 let mut mapping = Self::empty();

25 mapping.insert("*.h", MappingTarget::MapTo("C++")).unwrap();

26+ mapping.insert("*.fs", MappingTarget::MapTo("F#")).unwrap();

26 mapping

27 mapping

27 .insert("build", MappingTarget::MapToUnknown)

28 .insert("build", MappingTarget::MapToUnknown)

28 .unwrap();

29 .unwrap();

tests/no_duplicate_extensions.rs+2

@@ -14,6 +14,8 @@ fn no_duplicate_extensions() {

14 // The "Ruby Haml" syntax also comes with a '.sass' extension. However, we make sure

15 // that 'sass' is mapped to the 'Sass' syntax.

16 "sass",

17+ // The '.fs' extension appears in F# and GLSL. We default to F#.

18+ "fs",

17 ];

19 ];

18

20

19 let assets = HighlightingAssets::from_binary();

21 let assets = HighlightingAssets::from_binary();