Merge pull request #49 from hoop33/master

Add support for Objective-C
o2sh · Oct 3, 2019 · 6474be0 · 6474be0
2 parents 39b3f05 + 6df25cd
commit 6474be0
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 5 deletions.
diff --git a/resources/objectivec.ascii b/resources/objectivec.ascii
@@ -0,0 +1,13 @@
+{0}(((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((
+{0}(((***,/(((((((((((((((((((((((((((((((((((((((((((((((((((,***,(((
+{0}((//*/((((((/*...,/(((((,,/((((((((,,((((((((((((*...,/((((((,(*(((
+{0}((//*/((((/.  .*,.  .(((  *(((((((/  (((((((((/   .,,   /((((,(*(((
+{0}((//*/(((,  (((((((, .((  ,...*(((/..((((((((/  /((((((  /(((,(*(((
+{0}((//*/(((  .((((((((. *(   ,/*  ,(/  ((((((((. ,(((((((((((((,(*(((
+{0}((//*/(((  ,((((((((. *(  *(((/  */  (/*****(. *(((((((((((((,(*(((
+{0}((//*/(((,  (((((((* .((  *(((/  */  (/,,,,*(/  /((((((  ,(((,(*(((
+{0}((//*/((((,  ,/((/   (((   (((  .(/  (((((((((.  *(((*  .((((,(*(((
+{0}((//*/((((((/,.  .*(((((..*.  *(((/  (((((((((((/..  .*((((((,(*(((
+{0}((//(/*/(((((((((((((((((((((((((/.  ((((((((((((((((((((((,//(*(((
+{0}((((((((((((((((((((((((((((((((/..,(((((((((((((((((((((((((((((((
+{0}(((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((
diff --git a/src/main.rs b/src/main.rs
@@ -275,6 +275,7 @@ enum Language {
     Lisp,
     Lua,
     Nim,
+    ObjectiveC,
     Python,
     R,
     Ruby,
@@ -297,14 +298,15 @@ impl fmt::Display for Language {
             Language::Cpp => write!(f, "C++"),
             Language::Csharp => write!(f, "C#"),
             Language::Dart => write!(f, "Dart"),
-	        Language::Forth => write!(f, "Forth"),
+            Language::Forth => write!(f, "Forth"),
             Language::Go => write!(f, "Go"),
             Language::Haskell => write!(f, "Haskell"),
             Language::Java => write!(f, "Java"),
             Language::Kotlin => write!(f, "Kotlin"),
             Language::Lisp => write!(f, "Lisp"),
             Language::Lua => write!(f, "Lua"),
             Language::Nim => write!(f, "Nim"),
+            Language::ObjectiveC => write!(f, "Objective-C"),
             Language::Python => write!(f, "Python"),
             Language::R => write!(f, "R"),
             Language::Ruby => write!(f, "Ruby"),
@@ -641,14 +643,15 @@ impl From<tokei::LanguageType> for Language {
             tokei::LanguageType::Cpp => Language::Cpp,
             tokei::LanguageType::CSharp => Language::Csharp,
             tokei::LanguageType::Dart => Language::Dart,
-	        tokei::LanguageType::Forth => Language::Forth,
+            tokei::LanguageType::Forth => Language::Forth,
             tokei::LanguageType::Go => Language::Go,
             tokei::LanguageType::Haskell => Language::Haskell,
             tokei::LanguageType::Java => Language::Java,
             tokei::LanguageType::Kotlin => Language::Kotlin,
             tokei::LanguageType::Lisp => Language::Lisp,
             tokei::LanguageType::Lua => Language::Lua,
             tokei::LanguageType::Nim => Language::Nim,
+            tokei::LanguageType::ObjectiveC => Language::ObjectiveC,
             tokei::LanguageType::Python => Language::Python,
             tokei::LanguageType::R => Language::R,
             tokei::LanguageType::Ruby => Language::Ruby,
@@ -673,14 +676,15 @@ fn get_all_language_types() -> Vec<tokei::LanguageType> {
         tokei::LanguageType::Cpp,
         tokei::LanguageType::CSharp,
         tokei::LanguageType::Dart,
-	    tokei::LanguageType::Forth,
+        tokei::LanguageType::Forth,
         tokei::LanguageType::Go,
         tokei::LanguageType::Haskell,
         tokei::LanguageType::Java,
         tokei::LanguageType::Kotlin,
         tokei::LanguageType::Lisp,
         tokei::LanguageType::Lua,
         tokei::LanguageType::Nim,
+        tokei::LanguageType::ObjectiveC,
         tokei::LanguageType::Python,
         tokei::LanguageType::R,
         tokei::LanguageType::Ruby,
@@ -704,14 +708,15 @@ impl Info {
             Language::Cpp => include_str!("../resources/cpp.ascii"),
             Language::Csharp => include_str!("../resources/csharp.ascii"),
             Language::Dart => include_str!("../resources/dart.ascii"),
-	        Language::Forth => include_str!("../resources/forth.ascii"),
+            Language::Forth => include_str!("../resources/forth.ascii"),
             Language::Go => include_str!("../resources/go.ascii"),
             Language::Haskell => include_str!("../resources/haskell.ascii"),
             Language::Java => include_str!("../resources/java.ascii"),
             Language::Kotlin => include_str!("../resources/kotlin.ascii"),
             Language::Lisp => include_str!("../resources/lisp.ascii"),
             Language::Lua => include_str!("../resources/lua.ascii"),
             Language::Nim => include_str!("../resources/nim.ascii"),
+            Language::ObjectiveC => include_str!("../resources/objectivec.ascii"),
             Language::Python => include_str!("../resources/python.ascii"),
             Language::R => include_str!("../resources/r.ascii"),
             Language::Ruby => include_str!("../resources/ruby.ascii"),
@@ -735,14 +740,15 @@ impl Info {
             Language::Cpp => vec![Color::Yellow, Color::Cyan],
             Language::Csharp => vec![Color::White],
             Language::Dart => vec![Color::Blue, Color::Cyan],
-	        Language::Forth => vec![Color::BrightRed],
+            Language::Forth => vec![Color::BrightRed],
             Language::Go => vec![Color::White],
             Language::Haskell => vec![Color::BrightBlue, Color::BrightMagenta, Color::Blue],
             Language::Java => vec![Color::BrightBlue, Color::Red],
             Language::Kotlin => vec![Color::Blue, Color::Yellow, Color::Magenta],
             Language::Lisp => vec![Color::Yellow],
             Language::Lua => vec![Color::Blue],
             Language::Nim => vec![Color::Yellow, Color::BrightWhite],
+            Language::ObjectiveC => vec![Color::BrightBlue, Color::Blue],
             Language::Python => vec![Color::Blue, Color::Yellow],
             Language::R => vec![Color::White, Color::Blue],
             Language::Ruby => vec![Color::Magenta],