From d98133347eb7fbb4d60f11fb9bd40ac8b31c421d Mon Sep 17 00:00:00 2001 From: Sven-Hendrik Haase Date: Sat, 15 Oct 2016 17:47:59 +0200 Subject: [PATCH] Added GLSL support (#72) --- CONTRIBUTORS.md | 1 + README.md | 1 + src/lib/language/language_type.rs | 5 +++++ src/lib/language/languages.rs | 1 + 4 files changed, 8 insertions(+) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 8e0a9d3..1801c64 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -5,6 +5,7 @@ The list of contributors is sorted alphabetical based on the last names. The list of languages is sorted alphabetical. ## Code +* Sven-Hendrik Haase (https://github.com/svenstaro) * Chris Palmer (https://github.com/PhnxRbrn) * Aaron Power (https://github.com/Aaronepower) * Luthaf (https://github.com/Luthaf) diff --git a/README.md b/README.md index ea83c28..c0ec474 100644 --- a/README.md +++ b/README.md @@ -189,6 +189,7 @@ Erlang Forth FORTRAN Legacy FORTRAN Modern +GLSL Go Handlebars Haskell diff --git a/src/lib/language/language_type.rs b/src/lib/language/language_type.rs index 690c271..7d46056 100644 --- a/src/lib/language/language_type.rs +++ b/src/lib/language/language_type.rs @@ -67,6 +67,8 @@ pub enum LanguageType { FortranLegacy, /// FortranModern FortranModern, + /// GLSL + Glsl, /// Go Go, /// Handlebars @@ -223,6 +225,7 @@ impl LanguageType { Forth => "Forth", FortranLegacy => "FORTRAN Legacy", FortranModern => "FORTRAN Modern", + Glsl => "GLSL", Go => "Go", Handlebars => "Handlebars", Haskell => "Haskell", @@ -320,6 +323,7 @@ impl LanguageType { "ft" => Some(Forth), "f" | "for" | "ftn" | "f77" | "pfo" => Some(FortranLegacy), "f03" | "f08" | "f90" | "f95" => Some(FortranModern), + "vert" | "tesc" | "tese" | "geom" | "frag" | "comp" => Some(Glsl), "go" => Some(Go), "h" => Some(CHeader), "hbs" | "handlebars" => Some(Handlebars), @@ -429,6 +433,7 @@ impl<'a> From<&'a str> for LanguageType { "Forth" => Forth, "FortranLegacy" => FortranLegacy, "FortranModern" => FortranModern, + "GLSL" => Glsl, "Go" => Go, "Handlebars" => Handlebars, "Haskell" => Haskell, diff --git a/src/lib/language/languages.rs b/src/lib/language/languages.rs index 1106105..04e7f4c 100644 --- a/src/lib/language/languages.rs +++ b/src/lib/language/languages.rs @@ -292,6 +292,7 @@ impl Languages { .set_quotes(vec![("\"", "\""), ("'", "'")]), FortranModern => Language::new_single(vec!["!"]) .set_quotes(vec![("\"", "\""), ("'", "'")]), + Glsl => Language::new_c(), Go => Language::new_c(), Handlebars => Language::new_multi(vec![(""), ("{{!", "}}")]) .set_quotes(vec![("\"", "\""), ("'", "'")]),