handle merge conflicts

cgag · Oct 25, 2016 · 22451a1 · 22451a1
2 parents cd787a3 + 252d94b
commit 22451a1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -42,6 +42,7 @@ Erlang
 Forth
 FortranLegacy
 FortranModern
+GLSL
 Go
 Handlebars
 Haskell

diff --git a/src/lib.rs b/src/lib.rs
@@ -87,6 +87,7 @@ pub enum Lang {
     Forth,
     FortranLegacy,
     FortranModern,
+    Glsl,
     Go,
     Handlebars,
     Haskell,
@@ -181,6 +182,7 @@ impl Lang {
             Forth => "Forth",
             FortranLegacy => "FORTRAN Legacy",
             FortranModern => "FORTRAN Modern",
+            Glsl => "GLSL",
             Go => "Go",
             Handlebars => "Handlebars",
             Haskell => "Haskell",
@@ -289,6 +291,7 @@ pub fn lang_from_ext(filepath: &str) -> Lang {
         "dts" | "dtsi" => DeviceTree,
         "el" | "lisp" | "lsp" => Lisp,
         "erl" | "hrl" => Erlang,
+        "vert" | "tesc" | "tese" | "geom" | "frag" | "comp" => Glsl,
         "go" => Go,
         "h" | "hh" | "hpp" | "hxx" => CCppHeader,
         "hbs" | "handlebars" => Handlebars,
@@ -442,10 +445,9 @@ pub fn counter_config_for_lang<'a>(lang: &Lang) -> LineConfig<'a> {
 
         // TODO(cgag): not 100% sure that yacc belongs here.
         C | CCppHeader | Rust | Yacc | ActionScript | ColdFusionScript | Css | Cpp | CSharp |
-        Dart | DeviceTree | Go | Jai | Java | JavaScript | Jsx | Kotlin | Less | LinkerScript |
-        ObjectiveC | ObjectiveCpp | Qcl | Sass | Scala | Swift | TypeScript | UnrealScript => {
-            c_style
-        }
+        Dart | DeviceTree | Glsl | Go | Jai | Java | JavaScript | Jsx | Kotlin | Less |
+        LinkerScript | ObjectiveC | ObjectiveCpp | Qcl | Sass | Scala | Swift | TypeScript |
+        UnrealScript => c_style,
 
         Unrecognized => unreachable!(),
     };
-Original file line number
+Diff line change
@@ Expand Up / @@ -42,6 +42,7 @@ Erlang @@
     Forth
     FortranLegacy
     FortranModern
+    GLSL
     Go
     Handlebars
     Haskell
@@ Expand Down @@