Merge pull request #68 from MaxJohansen/html-css

Add HTML/CSS language support
o2sh · Oct 12, 2019 · 7e4fd0f · 7e4fd0f
2 parents d9bfb73 + 22ed5a2
commit 7e4fd0f
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 0 deletions.
diff --git a/resources/css.ascii b/resources/css.ascii
@@ -0,0 +1,21 @@
+{1}    ####    ####    ####   
+{1}   ##  ##  ##      ##      
+{1}   ##       ####    ####   
+{1}   ##  ##      ##      ##  
+{1}    ####    ####    ####   
+
+{0} ##########################
+{0} ##########################
+{0} ##########################
+{0} #####                #####
+{0} #############        #####
+{0} ##########      ######### 
+{0}  #####        ########### 
+{0}  #####              ##### 
+{0}  ###############    ##### 
+{0}  #####    ######    ##### 
+{0}  #####              ####  
+{0}   #####            #####  
+{0}   ######################  
+{0}    ####################   
+{0}       ##############      
diff --git a/resources/html.ascii b/resources/html.ascii
@@ -0,0 +1,21 @@
+{1} ##  ##  ######  ##   ##  ##    
+{1} ##  ##    ##    ### ###  ##    
+{1} ######    ##    ## # ##  ##    
+{1} ##  ##    ##    ##   ##  ##    
+{1} ##  ##    ##    ##   ##  ######
+
+{0}  ############################  
+{0}   ##########################   
+{0}   #####                #####   
+{0}   #####                #####   
+{0}   #####    #################   
+{0}   #####    #################   
+{0}    ####                ####    
+{0}    ####                ####    
+{0}    ################    ####    
+{0}    #####    ######     ####    
+{0}     ####              ####     
+{0}     #####            #####     
+{0}     ######################     
+{0}     ######################     
+{0}           ##########           
diff --git a/src/main.rs b/src/main.rs
@@ -275,11 +275,13 @@ enum Language {
     Clojure,
     Cpp,
     Csharp,
+    CSS,
     Dart,
     Erlang,
     Forth,
     Go,
     Haskell,
+    HTML,
     Idris,
     Java,
     Kotlin,
@@ -311,11 +313,13 @@ impl fmt::Display for Language {
             Language::Clojure => write!(f, "Clojure"),
             Language::Cpp => write!(f, "C++"),
             Language::Csharp => write!(f, "C#"),
+            Language::CSS => write!(f, "CSS"),
             Language::Dart => write!(f, "Dart"),
             Language::Erlang => write!(f, "Erlang"),
             Language::Forth => write!(f, "Forth"),
             Language::Go => write!(f, "Go"),
             Language::Haskell => write!(f, "Haskell"),
+            Language::HTML => write!(f, "HTML"),
             Language::Idris => write!(f, "Idris"),
             Language::Java => write!(f, "Java"),
             Language::Kotlin => write!(f, "Kotlin"),
@@ -710,11 +714,13 @@ impl From<tokei::LanguageType> for Language {
             tokei::LanguageType::Clojure => Language::Clojure,
             tokei::LanguageType::Cpp => Language::Cpp,
             tokei::LanguageType::CSharp => Language::Csharp,
+            tokei::LanguageType::Css => Language::CSS,
             tokei::LanguageType::Dart => Language::Dart,
             tokei::LanguageType::Erlang => Language::Erlang,
             tokei::LanguageType::Forth => Language::Forth,
             tokei::LanguageType::Go => Language::Go,
             tokei::LanguageType::Haskell => Language::Haskell,
+            tokei::LanguageType::Html => Language::HTML,
             tokei::LanguageType::Idris => Language::Idris,
             tokei::LanguageType::Java => Language::Java,
             tokei::LanguageType::Kotlin => Language::Kotlin,
@@ -748,11 +754,13 @@ fn get_all_language_types() -> Vec<tokei::LanguageType> {
         tokei::LanguageType::Clojure,
         tokei::LanguageType::Cpp,
         tokei::LanguageType::CSharp,
+        tokei::LanguageType::Css,
         tokei::LanguageType::Dart,
         tokei::LanguageType::Erlang,
         tokei::LanguageType::Forth,
         tokei::LanguageType::Go,
         tokei::LanguageType::Haskell,
+        tokei::LanguageType::Html,
         tokei::LanguageType::Idris,
         tokei::LanguageType::Java,
         tokei::LanguageType::Kotlin,
@@ -785,11 +793,13 @@ impl Info {
             Language::Clojure => include_str!("../resources/clojure.ascii"),
             Language::Cpp => include_str!("../resources/cpp.ascii"),
             Language::Csharp => include_str!("../resources/csharp.ascii"),
+            Language::CSS => include_str!("../resources/css.ascii"),
             Language::Dart => include_str!("../resources/dart.ascii"),
             Language::Erlang => include_str!("../resources/erlang.ascii"),
             Language::Forth => include_str!("../resources/forth.ascii"),
             Language::Go => include_str!("../resources/go.ascii"),
             Language::Haskell => include_str!("../resources/haskell.ascii"),
+            Language::HTML => include_str!("../resources/html.ascii"),
             Language::Idris => include_str!("../resources/idris.ascii"),
             Language::Java => include_str!("../resources/java.ascii"),
             Language::Kotlin => include_str!("../resources/kotlin.ascii"),
@@ -822,11 +832,13 @@ impl Info {
             Language::Clojure => vec![Color::BrightBlue, Color::BrightGreen],
             Language::Cpp => vec![Color::Yellow, Color::Cyan],
             Language::Csharp => vec![Color::White],
+            Language::CSS => vec![Color::Blue, Color::White],
             Language::Dart => vec![Color::Blue, Color::Cyan],
             Language::Erlang => vec![Color::BrightRed],
             Language::Forth => vec![Color::BrightRed],
             Language::Go => vec![Color::White],
             Language::Haskell => vec![Color::BrightBlue, Color::BrightMagenta, Color::Blue],
+            Language::HTML => vec![Color::Red, Color::White],
             Language::Idris => vec![Color::Red],
             Language::Java => vec![Color::BrightBlue, Color::Red],
             Language::Kotlin => vec![Color::Blue, Color::Yellow, Color::Magenta],