Skip to content

Commit 7ed1c6a

Browse files
o2sho2sh
authored
Merge pull request #158 from Phundrak/master
Added support for CMake, Emacs Lisp, Fish and Nix
2 parents 3d4e4c2 + 36fcc86 commit 7ed1c6a

File tree

5 files changed

+87
-3
lines changed

5 files changed

+87
-3
lines changed

‎resources/cmake.ascii

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{0} ;e{2}`
2+
{0} ;QD{2}?`
3+
{0} ;B#R{2}1r`
4+
{0} ;WRMK{2}S|r`
5+
{0} :O9KOK{2}S\\*`
6+
{0} :keXPk6{2}Zc7v|`
7+
{0} :ajyoaZe{3}m{2}JJ{]\`
8+
{0} :]z1x}f9{3}@@{2}yujSoc`
9+
{0} "7\/LvU{3}Q@@@{2}XoZemXv`
10+
{0} ,\**v{1}oo{3}qMBBB{2}kmXEkU9z`
11+
{0} ,\*}{1}Sx\||?|cFf{2}okqOdHDx`
12+
{0} ,L]{1}jc\\\||?*>rr^^|zo{2}$MN]`
13+
{0}-v{1}7????*>>rrr^^^;;;;;;^\{2}F^`

‎resources/emacslisp.ascii

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{0} ':r\iv7i|r:'
2+
{0} :LFaZZZaaaoooo2t\:
3+
{0} ^]aZZZZaaw9DN{1}Q@Q{0}gojjv;
4+
{0} ,vaZZZaX69KOHRW#{1}@@@{0}Ouuuu/,
5+
{0} _[ZZaaa{1}Q@@@@QBNMRD{0}dEuuufFFl,
6+
{0}.7aaaooo{1}wB@@#{0}h2jjuuuufFF]]]]|-
7+
{0}:yooooSSS2S${1}gQ@Q{0}8hjfFF]]]][tz"
8+
{0};oooSS2ed#{1}Q@@@@@Q{0}N{0}Do]]][[ttt[:
9+
{0}:uSS2mQ{1}@@@@Q{0}deuF]]]][[ttt[[[z~
10+
{0}-/yjjO{1}@@@@Q{0}uFF]]][[tttt[[]]]?`
11+
{0} ,vuuue&{1}Q@@@QQ#NNggg{0}&D9u[]i'
12+
{0} '/ffFF]]jek99OR{1}#Q@@Q{0}Hj]]|'
13+
{0} `;c]]][uaXUKO$wo]]]]L:`
14+
{0} `,>i1tt[[]]]]ti>,`
15+
{0} `.~;^>??>^;,-`

‎resources/fish.ascii

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{0} ___
2+
{0} ___======____=-{1}-{0}-=)
3+
{0}/T \_{1}--={0}==)
4+
{0}[ \ ({1}0{0}) \~ \_{1}-={0}=)
5+
{0} \ / )J~~ \{1}-={0})
6+
{0} \\___/ )JJ~{1}~~{0} \)
7+
{0} \_____/JJJ~~{1}~~{0} \
8+
{0} / \ {1}, \{0}J~~~{1}~~{0} \
9+
{0} (-{1}\){0}\=|{1}\\\{0}~~{1}~~{0} L_{1}_
10+
{0} (\\) ({1}\{0}\\)_ {1}\==__
11+
{0} \V \\\) ===_____ {1}\\\\{0}\\
12+
{0} \V) \_) \\{1}\\JJ\{0}J\)
13+
{0} /J{1}\J{0}T\JJJJ)
14+
{0} (JJJ| \UUU)
15+
{0} (UU)

‎resources/nix.ascii

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{1} `kdF` `D@@j `O@Q-
2+
{1} :qOe' 2@@DQ@@*
3+
{1} /2yyPOKUf]}{{0}a@@@Q, ;
4+
{1} ;\\\\akEj|||?*{0};Q@@^ `jDo
5+
{0} J@@D- `H@@ {1}XHK:
6+
{0}kkkEE&@@{0}2 a$OOazz1;
7+
{0}999#@@@{0}Z> ?9qjvvvzz;
8+
{0} ^@@Q {0}Ek{` `zk6*
9+
{0} g@M- {1}:E9e{0};ujyy2UDDKoooo*
10+
{0} \ {1}.eKKq{0}ZDDRR@@@QMMMo
11+
{1} :UOXfHH/ ,Q@@>
12+
{1} `PHj` \HDj` `H@Q-

‎src/language.rs

+32-3
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ pub enum Language {
1010
Assembly,
1111
C,
1212
Clojure,
13+
CMake,
1314
CoffeeScript,
1415
#[strum(serialize = "c++")]
1516
Cpp,
@@ -18,9 +19,12 @@ pub enum Language {
1819
CSS,
1920
D,
2021
Dart,
22+
#[strum(serialize = "emacslisp")]
23+
Elisp,
2124
Elixir,
2225
Elm,
2326
Erlang,
27+
Fish,
2428
Forth,
2529
#[strum(serialize = "fortran")]
2630
FortranModern,
@@ -37,10 +41,10 @@ pub enum Language {
3741
Lua,
3842
Markdown,
3943
Nim,
44+
Nix,
4045
#[strum(serialize = "objective-c")]
4146
ObjectiveC,
4247
OCaml,
43-
#[strum(serialize = "org-mode")]
4448
Org,
4549
Perl,
4650
Php,
@@ -69,15 +73,18 @@ impl std::fmt::Display for Language {
6973
Language::Assembly => write!(f, "Assembly"),
7074
Language::C => write!(f, "C"),
7175
Language::Clojure => write!(f, "Clojure"),
76+
Language::CMake => write!(f, "CMake"),
7277
Language::CoffeeScript => write!(f, "CoffeeScript"),
7378
Language::Cpp => write!(f, "C++"),
7479
Language::Csharp => write!(f, "C#"),
7580
Language::CSS => write!(f, "CSS"),
7681
Language::D => write!(f, "D"),
7782
Language::Dart => write!(f, "Dart"),
83+
Language::Elisp => write!(f, "EmacsLisp"),
7884
Language::Elixir => write!(f, "Elixir"),
7985
Language::Elm => write!(f, "Elm"),
8086
Language::Erlang => write!(f, "Erlang"),
87+
Language::Fish => write!(f, "Fish"),
8188
Language::Forth => write!(f, "Forth"),
8289
Language::FortranModern => write!(f, "Fortran"),
8390
Language::FSharp => write!(f, "FSharp"),
@@ -93,9 +100,10 @@ impl std::fmt::Display for Language {
93100
Language::Lua => write!(f, "Lua"),
94101
Language::Markdown => write!(f, "Markdown"),
95102
Language::Nim => write!(f, "Nim"),
103+
Language::Nix => write!(f, "Nix"),
96104
Language::ObjectiveC => write!(f, "Objective-C"),
97105
Language::OCaml => write!(f, "OCaml"),
98-
Language::Org => write!(f, "Org-mode"),
106+
Language::Org => write!(f, "Org"),
99107
Language::PureScript => write!(f, "PureScript"),
100108
Language::Python => write!(f, "Python"),
101109
Language::R => write!(f, "R"),
@@ -126,15 +134,18 @@ impl From<tokei::LanguageType> for Language {
126134
tokei::LanguageType::Assembly => Language::Assembly,
127135
tokei::LanguageType::C => Language::C,
128136
tokei::LanguageType::Clojure => Language::Clojure,
137+
tokei::LanguageType::CMake => Language::CMake,
129138
tokei::LanguageType::CoffeeScript => Language::CoffeeScript,
130139
tokei::LanguageType::Cpp => Language::Cpp,
131140
tokei::LanguageType::CSharp => Language::Csharp,
132141
tokei::LanguageType::Css => Language::CSS,
133142
tokei::LanguageType::D => Language::D,
134143
tokei::LanguageType::Dart => Language::Dart,
144+
tokei::LanguageType::Elisp => Language::Elisp,
135145
tokei::LanguageType::Elixir => Language::Elixir,
136146
tokei::LanguageType::Elm => Language::Elm,
137147
tokei::LanguageType::Erlang => Language::Erlang,
148+
tokei::LanguageType::Fish => Language::Fish,
138149
tokei::LanguageType::Forth => Language::Forth,
139150
tokei::LanguageType::FortranModern => Language::FortranModern,
140151
tokei::LanguageType::FSharp => Language::FSharp,
@@ -150,6 +161,7 @@ impl From<tokei::LanguageType> for Language {
150161
tokei::LanguageType::Lua => Language::Lua,
151162
tokei::LanguageType::Markdown => Language::Markdown,
152163
tokei::LanguageType::Nim => Language::Nim,
164+
tokei::LanguageType::Nix => Language::Nix,
153165
tokei::LanguageType::ObjectiveC => Language::ObjectiveC,
154166
tokei::LanguageType::OCaml => Language::OCaml,
155167
tokei::LanguageType::Org => Language::Org,
@@ -182,15 +194,18 @@ impl Language {
182194
Language::Assembly => include_str!("../resources/assembly.ascii"),
183195
Language::C => include_str!("../resources/c.ascii"),
184196
Language::Clojure => include_str!("../resources/clojure.ascii"),
197+
Language::CMake => include_str!("../resources/cmake.ascii"),
185198
Language::CoffeeScript => include_str!("../resources/coffeescript.ascii"),
186199
Language::Cpp => include_str!("../resources/cpp.ascii"),
187200
Language::Csharp => include_str!("../resources/csharp.ascii"),
188201
Language::CSS => include_str!("../resources/css.ascii"),
189202
Language::D => include_str!("../resources/d.ascii"),
190203
Language::Dart => include_str!("../resources/dart.ascii"),
204+
Language::Elisp => include_str!("../resources/emacslisp.ascii"),
191205
Language::Elixir => include_str!("../resources/elixir.ascii"),
192206
Language::Elm => include_str!("../resources/elm.ascii"),
193207
Language::Erlang => include_str!("../resources/erlang.ascii"),
208+
Language::Fish => include_str!("../resources/fish.ascii"),
194209
Language::Forth => include_str!("../resources/forth.ascii"),
195210
Language::FortranModern => include_str!("../resources/f90.ascii"),
196211
Language::FSharp => include_str!("../resources/fsharp.ascii"),
@@ -206,6 +221,7 @@ impl Language {
206221
Language::Lua => include_str!("../resources/lua.ascii"),
207222
Language::Markdown => include_str!("../resources/markdown.ascii"),
208223
Language::Nim => include_str!("../resources/nim.ascii"),
224+
Language::Nix => include_str!("../resources/nix.ascii"),
209225
Language::ObjectiveC => include_str!("../resources/objectivec.ascii"),
210226
Language::OCaml => include_str!("../resources/ocaml.ascii"),
211227
Language::Org => include_str!("../resources/org.ascii"),
@@ -237,22 +253,30 @@ impl Language {
237253
Language::Assembly => vec![Color::Cyan],
238254
Language::C => vec![Color::BrightBlue, Color::Blue],
239255
Language::Clojure => vec![Color::BrightBlue, Color::BrightGreen],
256+
Language::CMake => vec![
257+
Color::Blue,
258+
Color::BrightGreen,
259+
Color::Red,
260+
Color::BrightBlack,
261+
],
240262
Language::CoffeeScript => vec![Color::Red],
241263
Language::Cpp => vec![Color::Yellow, Color::Cyan],
242264
Language::Csharp => vec![Color::White],
243265
Language::CSS => vec![Color::Blue, Color::White],
244266
Language::D => vec![Color::Red],
245267
Language::Dart => vec![Color::BrightBlue, Color::BrightCyan],
268+
Language::Elisp => vec![Color::BrightMagenta, Color::White],
246269
Language::Elixir => vec![Color::Magenta],
247270
Language::Elm => vec![Color::BrightBlack, Color::Green, Color::Yellow, Color::Cyan],
248271
Language::Erlang => vec![Color::BrightRed],
272+
Language::Fish => vec![Color::Red, Color::Yellow],
249273
Language::Forth => vec![Color::BrightRed],
250274
Language::FortranModern => vec![
251275
Color::BrightWhite,
252276
Color::BrightGreen,
253277
Color::BrightBlue,
254278
Color::BrightYellow,
255-
Color::BrightRed
279+
Color::BrightRed,
256280
],
257281
Language::FSharp => vec![Color::BrightBlue, Color::Cyan],
258282
Language::Go => vec![Color::White],
@@ -273,6 +297,7 @@ impl Language {
273297
Language::Lua => vec![Color::Blue],
274298
Language::Markdown => vec![Color::BrightWhite, Color::BrightRed],
275299
Language::Nim => vec![Color::Yellow, Color::BrightWhite],
300+
Language::Nix => vec![Color::BrightBlue, Color::Blue],
276301
Language::ObjectiveC => vec![Color::BrightBlue, Color::Blue],
277302
Language::OCaml => vec![Color::Yellow],
278303
Language::Org => vec![Color::Green, Color::Red, Color::White],
@@ -358,15 +383,18 @@ fn get_all_language_types() -> Vec<tokei::LanguageType> {
358383
tokei::LanguageType::Assembly,
359384
tokei::LanguageType::C,
360385
tokei::LanguageType::Clojure,
386+
tokei::LanguageType::CMake,
361387
tokei::LanguageType::CoffeeScript,
362388
tokei::LanguageType::Cpp,
363389
tokei::LanguageType::CSharp,
364390
tokei::LanguageType::Css,
365391
tokei::LanguageType::D,
366392
tokei::LanguageType::Dart,
367393
tokei::LanguageType::Elixir,
394+
tokei::LanguageType::Elisp,
368395
tokei::LanguageType::Elm,
369396
tokei::LanguageType::Erlang,
397+
tokei::LanguageType::Fish,
370398
tokei::LanguageType::Forth,
371399
tokei::LanguageType::FortranModern,
372400
tokei::LanguageType::FSharp,
@@ -382,6 +410,7 @@ fn get_all_language_types() -> Vec<tokei::LanguageType> {
382410
tokei::LanguageType::Lua,
383411
tokei::LanguageType::Markdown,
384412
tokei::LanguageType::Nim,
413+
tokei::LanguageType::Nix,
385414
tokei::LanguageType::ObjectiveC,
386415
tokei::LanguageType::OCaml,
387416
tokei::LanguageType::Org,

0 commit comments

Comments
 (0)