Merge pull request #62 from SamTebbs33/master

o2sh · web-flow · commit 2c7aa5ba367d · 2019-10-08T10:47:01.000+02:00
Add Zig support
diff --git a/resources/zig.ascii b/resources/zig.ascii
@@ -0,0 +1,15 @@
+
+{1}                                     {0}#####{1}
+{1} {0}###########{1}   {0}#########################{1}   {0}########{1}
+{1} {0}###########{1}   {0}#######################{1}    {0}#########{1}
+{1} {0}#######{1}                   {0}#########{1}        {0}#######{1}
+{1} {0}######{1}                   {0}#######{1}           {0}#######{1}
+{1} {0}######{1]                  {0}#######{1}             {0}######{1}
+{1} {0}######{1}                {0}########{1}              {0}######{1}
+{1} {0}######{1}              {0}########{1}                {0}######{1}
+{1} {0}######{1}             {0}#######{1}                  {0}######{1}
+{1} {0}######{1}          {0}########{1}                    {0}######{1}
+{1} {0}#######{1}        {0}#########{1}                   {0}#######{1}
+{1} {0}#########{1}    {0}#######################{1}   {0}###########{1}
+{1} {0}########{1}   {0}#########################{1}   {0}###########{1}
+{1}          {0}#####{1}
diff --git a/src/main.rs b/src/main.rs
@@ -290,6 +290,7 @@ enum Language {
     JavaScript,
     Perl,
     Php,
+    Zig,
 }
 
 impl fmt::Display for Language {
@@ -323,6 +324,7 @@ impl fmt::Display for Language {
             Language::JavaScript => write!(f, "JavaScript"),
             Language::Perl => write!(f, "Perl"),
             Language::Php => write!(f, "Php"),
+            Language::Zig => write!(f, "Zig"),
         }
     }
 }
@@ -700,6 +702,7 @@ impl From<tokei::LanguageType> for Language {
             tokei::LanguageType::JavaScript => Language::JavaScript,
             tokei::LanguageType::Perl => Language::Perl,
             tokei::LanguageType::Php => Language::Php,
+            tokei::LanguageType::Zig => Language::Zig,
             _ => unimplemented!(),
         }
     }
@@ -735,6 +738,7 @@ fn get_all_language_types() -> Vec<tokei::LanguageType> {
         tokei::LanguageType::JavaScript,
         tokei::LanguageType::Perl,
         tokei::LanguageType::Php,
+        tokei::LanguageType::Zig,
     ]
 }
 
@@ -769,6 +773,7 @@ impl Info {
             Language::JavaScript => include_str!("../resources/javascript.ascii"),
             Language::Perl => include_str!("../resources/perl.ascii"),
             Language::Php => include_str!("../resources/php.ascii"),
+            Language::Zig => include_str!("../resources/zig.ascii"),
             // _ => include_str!("../resources/unknown.ascii"),
         }
     }
@@ -803,6 +808,7 @@ impl Info {
             Language::JavaScript => vec![Color::BrightYellow],
             Language::Perl => vec![Color::BrightBlue],
             Language::Php => vec![Color::BrightWhite],
+            Language::Zig => vec![Color::Yellow],
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -290,6 +290,7 @@ enum Language {`
`290`	`290`	`JavaScript,`
`291`	`291`	`Perl,`
`292`	`292`	`Php,`
	`293`	`+ Zig,`
`293`	`294`	`}`
`294`	`295`
`295`	`296`	`impl fmt::Display for Language {`
`@@ -323,6 +324,7 @@ impl fmt::Display for Language {`
`323`	`324`	`Language::JavaScript => write!(f, "JavaScript"),`
`324`	`325`	`Language::Perl => write!(f, "Perl"),`
`325`	`326`	`Language::Php => write!(f, "Php"),`
	`327`	`+ Language::Zig => write!(f, "Zig"),`
`326`	`328`	`}`
`327`	`329`	`}`
`328`	`330`	`}`
`@@ -700,6 +702,7 @@ impl From<tokei::LanguageType> for Language {`
`700`	`702`	`tokei::LanguageType::JavaScript => Language::JavaScript,`
`701`	`703`	`tokei::LanguageType::Perl => Language::Perl,`
`702`	`704`	`tokei::LanguageType::Php => Language::Php,`
	`705`	`+ tokei::LanguageType::Zig => Language::Zig,`
`703`	`706`	`_ => unimplemented!(),`
`704`	`707`	`}`
`705`	`708`	`}`
`@@ -735,6 +738,7 @@ fn get_all_language_types() -> Vec<tokei::LanguageType> {`
`735`	`738`	`tokei::LanguageType::JavaScript,`
`736`	`739`	`tokei::LanguageType::Perl,`
`737`	`740`	`tokei::LanguageType::Php,`
	`741`	`+ tokei::LanguageType::Zig,`
`738`	`742`	`]`
`739`	`743`	`}`
`740`	`744`
`@@ -769,6 +773,7 @@ impl Info {`
`769`	`773`	`Language::JavaScript => include_str!("../resources/javascript.ascii"),`
`770`	`774`	`Language::Perl => include_str!("../resources/perl.ascii"),`
`771`	`775`	`Language::Php => include_str!("../resources/php.ascii"),`
	`776`	`+ Language::Zig => include_str!("../resources/zig.ascii"),`
`772`	`777`	`// _ => include_str!("../resources/unknown.ascii"),`
`773`	`778`	`}`
`774`	`779`	`}`
`@@ -803,6 +808,7 @@ impl Info {`
`803`	`808`	`Language::JavaScript => vec![Color::BrightYellow],`
`804`	`809`	`Language::Perl => vec![Color::BrightBlue],`
`805`	`810`	`Language::Php => vec![Color::BrightWhite],`
	`811`	`+ Language::Zig => vec![Color::Yellow],`
`806`	`812`	`}`
`807`	`813`	`}`
`808`	`814`	`}`