XAMPPRocky · glazari · Aug 14, 2023
diff --git a/build.rs b/build.rs
@@ -134,6 +134,8 @@ use super::*;
             let contents = fs::read_to_string("{1}").unwrap();
 
             println!("{{}} {1}", name);
+            assert_eq!(get_language!(contents), name);
+            println!("{{}} LANGUAGE MATCHES", name);
             assert_eq!(get_digit!(LINES, contents), language.lines());
             println!("{{}} LINES MATCH", name);
             assert_eq!(get_digit!(CODE, contents), language.code);

diff --git a/tests/accuracy.rs b/tests/accuracy.rs
@@ -6,12 +6,13 @@ use std::fs;
 
 use once_cell::sync::Lazy;
 use regex::Regex;
-use tokei::{Config, Languages};
+use tokei::{Config, Languages, LanguageType};
 
 static LINES: Lazy<Regex> = Lazy::new(|| Regex::new(r"\d+ lines").unwrap());
 static CODE: Lazy<Regex> = Lazy::new(|| Regex::new(r"\d+ code").unwrap());
 static COMMENTS: Lazy<Regex> = Lazy::new(|| Regex::new(r"\d+ comments").unwrap());
 static BLANKS: Lazy<Regex> = Lazy::new(|| Regex::new(r"\d+ blanks").unwrap());
+static LANGUAGE: Lazy<Regex> = Lazy::new(|| Regex::new(r#"language: "([^"]+)"#).unwrap());
 
 macro_rules! get_digit {
     ($regex:expr, $text:expr) => {{
@@ -26,6 +27,13 @@ macro_rules! get_digit {
     }};
 }
 
+macro_rules! get_language {
+    ($text:expr) => {{
+        let matched = LANGUAGE.captures(&$text).expect("Couldn't find language");
+        matched.get(1).unwrap().as_str().parse::<LanguageType>().unwrap()
+    }};
+}
+
 mod config {
     use tokei::*;
 

diff --git a/tests/data/Daml.daml b/tests/data/Daml.daml
@@ -1,4 +1,4 @@
--- ! 42 lines 24 code 9 comments 9 blanks
+-- ! language: "daml" 42 lines 24 code 9 comments 9 blanks
 
 {-
 This code is derived from https://github.com/digital-asset/ex-secure-daml-infra/blob/master/daml/BobTrigger.daml

diff --git a/tests/data/Dockerfile b/tests/data/Dockerfile
@@ -1,4 +1,4 @@
-# 17 lines 7 code 3 comments 7 blanks
+# language: "dockerfile" 17 lines 7 code 3 comments 7 blanks
 
 FROM netbsd:7.0.2
 

diff --git a/tests/data/MSBuild.csproj b/tests/data/MSBuild.csproj
@@ -1,4 +1,4 @@
-<!-- 12 lines 10 code 1 comments 1 blanks -->
+<!-- language: "msbuild" 12 lines 10 code 1 comments 1 blanks -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>

diff --git a/tests/data/Makefile b/tests/data/Makefile
@@ -1,4 +1,4 @@
-# 24 lines 11 code 5 comments 8 blanks
+# language: "makefile" 24 lines 11 code 5 comments 8 blanks
 
 ##				     ##
 ## IMPORTANT COMMENT ##

diff --git a/tests/data/NuGet.Config b/tests/data/NuGet.Config
@@ -1,4 +1,4 @@
-<!-- 24 lines 13 code 8 comments 3 blanks -->
+<!-- language: "nuget config" 24 lines 13 code 8 comments 3 blanks -->
 
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>

diff --git a/tests/data/Rakefile b/tests/data/Rakefile
@@ -1,4 +1,4 @@
-# 10 lines 4 code 2 comments 4 blanks
+# language: "rakefile" 10 lines 4 code 2 comments 4 blanks
 
 # this is a rakefile
 

diff --git a/tests/data/SConstruct b/tests/data/SConstruct
@@ -1,5 +1,5 @@
 #!python
-# 10 lines 3 code 3 comments 4 blanks
+# language: "scons" 10 lines 3 code 3 comments 4 blanks
 
 # this is a comment
 

diff --git a/tests/data/Tera.tera b/tests/data/Tera.tera
@@ -1,4 +1,4 @@
-{# 42 lines 26 code 11 comments 5 blanks #}
+{# language: "tera" 42 lines 26 code 11 comments 5 blanks #}
 <!DOCTYPE html>
 <html>
     <head>

diff --git a/tests/data/abnf.abnf b/tests/data/abnf.abnf
@@ -1,4 +1,4 @@
-; 11 lines 3 code 5 comments 3 blanks
+; language: "abnf" 11 lines 3 code 5 comments 3 blanks
 ; comment line 0
 ; comment line 1
 

diff --git a/tests/data/alloy.als b/tests/data/alloy.als
@@ -1,4 +1,4 @@
-// 18 lines 10 code 3 comments 5 blanks
+// language: "alloy" 18 lines 10 code 3 comments 5 blanks
 
 sig Node {
     edge: set Node

diff --git a/tests/data/arduino.ino b/tests/data/arduino.ino
@@ -1,4 +1,4 @@
-// 23 lines 13 code 6 comments 4 blanks
+// language: "arduino c++" 23 lines 13 code 6 comments 4 blanks
 
 int led = 13;
 

diff --git a/tests/data/asciidoc.adoc b/tests/data/asciidoc.adoc
@@ -1,4 +1,4 @@
-// 20 lines 5 code 8 comments 7 blanks
+// language: "asciidoc" 20 lines 5 code 8 comments 7 blanks
 
 = AsciiDoc title
 

diff --git a/tests/data/asn1.asn1 b/tests/data/asn1.asn1
@@ -1,4 +1,4 @@
--- 34 lines 16 code 11 comments 7 blanks
+-- language: "asn.1" 34 lines 16 code 11 comments 7 blanks
 PKCS-12 {
     iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-12(12)
         modules(0) pkcs-12(1) }

diff --git a/tests/data/ats.dats b/tests/data/ats.dats
@@ -1,4 +1,4 @@
-//! 42 lines 25 code 9 comments 8 blanks
+//! language: "ats" 42 lines 25 code 9 comments 8 blanks
 
 (*************
     Reference:

diff --git a/tests/data/awk.awk b/tests/data/awk.awk
@@ -1,5 +1,5 @@
 #!/bin/awk -f
-# 5 lines 1 code 3 comments 1 blanks
+# language: "awk" 5 lines 1 code 3 comments 1 blanks
 
 # This is a comment
 { print $0 }
diff --git a/tests/data/bazel.bzl b/tests/data/bazel.bzl
@@ -1,4 +1,4 @@
-# 18 lines 13 code 3 comments 2 blanks
+# language: "bazel" 18 lines 13 code 3 comments 2 blanks
 
 # build hello-greet
 cc_library(
@@ -15,4 +15,4 @@ cc_binary(
         ":hello-greet",
         "//lib:hello-time",
     ],
-)
+)
diff --git a/tests/data/bean.bean b/tests/data/bean.bean
@@ -1,4 +1,4 @@
-; 27 lines 13 code 6 comments 8 blanks
+; language: "bean" 27 lines 13 code 6 comments 8 blanks
 
 option "operating_currency" "EUR"
 

diff --git a/tests/data/bitbake.bb b/tests/data/bitbake.bb
@@ -1,4 +1,4 @@
-# 23 lines 13 code 5 comments 5 blanks
+# language: "bitbake" 23 lines 13 code 5 comments 5 blanks
 #
 # This file was derived from the 'Hello World!' example recipe in the
 # Yocto Project Development Manual.

diff --git a/tests/data/brightscript.brs b/tests/data/brightscript.brs
@@ -1,4 +1,4 @@
-' 26 lines 10 code 13 comments 3 blanks
+' language: "brightscript" 26 lines 10 code 13 comments 3 blanks
 ' /**
 '  * @member difference
 '  * @memberof module:rodash
@@ -23,4 +23,4 @@ Function rodash_difference_(first, second)
   end for
 
   return result
-End Function
+End Function
diff --git a/tests/data/c.c b/tests/data/c.c
@@ -1,4 +1,4 @@
-// 50 lines 33 code 8 comments 9 blanks
+// language: "c" 50 lines 33 code 8 comments 9 blanks
 
 /* /* we can't nest block comments in c, but we can start one */
 int main(void) {

diff --git a/tests/data/clojure.clj b/tests/data/clojure.clj
@@ -1,4 +1,4 @@
-; 19 lines 13 code 3 comments 3 blanks
+; language: "clojure" 19 lines 13 code 3 comments 3 blanks
 
 (ns clojure)
 

diff --git a/tests/data/clojurec.cljc b/tests/data/clojurec.cljc
@@ -1,4 +1,4 @@
-; 19 lines 13 code 3 comments 3 blanks
+; language: "clojurec" 19 lines 13 code 3 comments 3 blanks
 
 (ns clojure)
 

diff --git a/tests/data/clojurescript.cljs b/tests/data/clojurescript.cljs
@@ -1,4 +1,4 @@
-; 19 lines 13 code 3 comments 3 blanks
+; language: "clojurescript" 19 lines 13 code 3 comments 3 blanks
 
 (ns clojure)
 

diff --git a/tests/data/cmake.cmake b/tests/data/cmake.cmake
@@ -1,4 +1,4 @@
-# 25 lines 16 code 3 comments 6 blanks
+# language: "cmake" 25 lines 16 code 3 comments 6 blanks
 
 SET(_POSSIBLE_XYZ_INCLUDE include include/xyz)
 SET(_POSSIBLE_XYZ_EXECUTABLE xyz)

diff --git a/tests/data/codeql.ql b/tests/data/codeql.ql
@@ -1,4 +1,4 @@
-//! 40 lines 17 code 15 comments 8 blanks
+//! language: "codeql" 40 lines 17 code 15 comments 8 blanks
 
 /** 
  * @name fu 

diff --git a/tests/data/cogent.cogent b/tests/data/cogent.cogent
@@ -1,4 +1,4 @@
--- 7 lines 2 code 2 comments 3 blanks
+-- language: "cogent" 7 lines 2 code 2 comments 3 blanks
 
 type A -- uncounted comment
 

diff --git a/tests/data/cpp.cpp b/tests/data/cpp.cpp
@@ -1,4 +1,4 @@
-/* 46 lines 37 code 3 comments 6 blanks */
+/* language: "c++" 46 lines 37 code 3 comments 6 blanks */
 
 #include <stdio.h>
 

diff --git a/tests/data/crystal.cr b/tests/data/crystal.cr
@@ -1,4 +1,4 @@
-# 20 lines 14 code 2 comments 4 blanks
+# language: "crystal" 20 lines 14 code 2 comments 4 blanks
 x = 3
 if x < 2
   p = "Smaller"

diff --git a/tests/data/csharp.cs b/tests/data/csharp.cs
@@ -1,4 +1,4 @@
-// 26 lines 14 code 9 comments 3 blanks
+// language: "c#" 26 lines 14 code 9 comments 3 blanks
 namespace Ns
 {
     /*

diff --git a/tests/data/cuda.cu b/tests/data/cuda.cu
@@ -1,4 +1,4 @@
-/* 7 lines 4 code 2 comments 1 blanks */
+/* language: "cuda" 7 lines 4 code 2 comments 1 blanks */
 
 // add vector
 __host__ void add(const int* a, const int* b, int* c) {

diff --git a/tests/data/cython.pyx b/tests/data/cython.pyx
@@ -1,4 +1,4 @@
-# 29 lines, 21 code, 3 comments, 5 blanks
+# language: "cython" 29 lines, 21 code, 3 comments, 5 blanks
 
 
 def add(x, y):

diff --git a/tests/data/d.d b/tests/data/d.d
@@ -1,4 +1,4 @@
-/* 8 lines 5 code 1 comments 2 blanks */
+/* language: "d" 8 lines 5 code 1 comments 2 blanks */
 
 void main() {
     auto x = 5; /+ a /+ nested +/ comment /* +/

diff --git a/tests/data/dhall.dhall b/tests/data/dhall.dhall
@@ -1,4 +1,4 @@
--- 16 lines 9 code 5 comments 2 blanks
+-- language: "dhall" 16 lines 9 code 5 comments 2 blanks
 {- A comment within the interior of a multi-line literal counts as part of the
    literal
 -}

diff --git a/tests/data/dreammaker.dm b/tests/data/dreammaker.dm
@@ -1,4 +1,4 @@
-// 17 lines 7 code 6 comments 4 blanks
+// language: "dream maker" 17 lines 7 code 6 comments 4 blanks
 /*
  * /* Hello! */
  */

diff --git a/tests/data/dust.dust b/tests/data/dust.dust
@@ -1,4 +1,4 @@
-{! 10 lines 2 code 5 comments 3 blanks !}
+{! language: "dust.js" 10 lines 2 code 5 comments 3 blanks !}
 
 {! All Dust comments are multiline comments.  And there's no quoting
    comment openers and closers.  Instead there are escape sequences

diff --git a/tests/data/ebuild.ebuild b/tests/data/ebuild.ebuild
@@ -1,4 +1,4 @@
-# 16 lines 9 code 2 comments 5 blanks
+# language: "ebuild" 16 lines 9 code 2 comments 5 blanks
 
 # test comment
 

diff --git a/tests/data/edgeql.edgeql b/tests/data/edgeql.edgeql
@@ -1,4 +1,4 @@
-# 28 lines 21 code 3 comments 4 blanks
+# language: "edgeql" 28 lines 21 code 3 comments 4 blanks
 
 select User {
     name,

diff --git a/tests/data/edn.edn b/tests/data/edn.edn
@@ -1,4 +1,4 @@
-; 11 lines 6 code 2 comments 3 blanks
+; language: "edn" 11 lines 6 code 2 comments 3 blanks
 
 ; Just some random data
 

diff --git a/tests/data/elvish.elv b/tests/data/elvish.elv
@@ -1,4 +1,4 @@
-# 16 lines, 9 code, 5 blanks, 2 comments
+# language: "elvish" 16 lines, 9 code, 5 blanks, 2 comments
 echo "This is a
 multiline string
 # with a hash

diff --git a/tests/data/emacs_dev_env.ede b/tests/data/emacs_dev_env.ede
@@ -1,4 +1,4 @@
-;; 16 lines 6 code 7 comments 3 blanks
+;; language: "emacs dev env" 16 lines 6 code 7 comments 3 blanks
 
 ;; This is an EDE Project file
 

diff --git a/tests/data/emacs_lisp.el b/tests/data/emacs_lisp.el
@@ -1,4 +1,4 @@
-;; 21 lines 11 code 6 comments 4 blanks
+;; language: "Emacs Lisp" 21 lines 11 code 6 comments 4 blanks
 
                                         ; This is a comment line
 ;; This too!

diff --git a/tests/data/emojicode.🍇 b/tests/data/emojicode.🍇
@@ -1,4 +1,4 @@
-💭 24 lines 10 code 10 comments 4 blanks
+💭 language: "emojicode" 24 lines 10 code 10 comments 4 blanks
 
 📘
   This package is neat.

diff --git a/tests/data/esdl.esdl b/tests/data/esdl.esdl
@@ -1,4 +1,4 @@
-# 20 lines 13 code 4 comments 3 blanks
+# language: "edgedb schema definition" 20 lines 13 code 4 comments 3 blanks
 
 # no module block
 type default::Movie {

diff --git a/tests/data/example.umpl b/tests/data/example.umpl
@@ -1,4 +1,4 @@
-! 68 lines 58 code 2 comments 8 blanks
+! language: "umpl" 68 lines 58 code 2 comments 8 blanks
 
 create yum with 5
 create num with ((plus 7 6 6 yum))>

diff --git a/tests/data/factor.factor b/tests/data/factor.factor
@@ -1,4 +1,4 @@
-! 14 lines, 5 code, 6 comments, 3 blanks
+! language: "factor" 14 lines, 5 code, 6 comments, 3 blanks
 
 /* we can use some dependencies */
 USING: math multiline sequences ;

diff --git a/tests/data/fennel.fnl b/tests/data/fennel.fnl
@@ -1,4 +1,4 @@
-;; 18 lines 8 code 5 comments 5 blanks
+;; language: "fennel" 18 lines 8 code 5 comments 5 blanks
 
 ; this is a ; single comment
 ;;;; this is also a single comment ;;;;;;

diff --git a/tests/data/flatbuffers.fbs b/tests/data/flatbuffers.fbs
@@ -1,4 +1,4 @@
-// 34 lines 21 code 6 comments 7 blanks
+// language: "FlatBuffers Schema" 34 lines 21 code 6 comments 7 blanks
 
 include "another_schema.fbs";
 

diff --git a/tests/data/forgecfg.cfg b/tests/data/forgecfg.cfg
@@ -1,4 +1,4 @@
-# 79 lines 20 code 40 comments 19 blanks
+# language: "Forge Config" 79 lines 20 code 40 comments 19 blanks
 
 # Configuration file
 

diff --git a/tests/data/fsharp.fs b/tests/data/fsharp.fs
@@ -1,4 +1,4 @@
-(* 15 lines 6 code 5 comments 4 blanks *)
+(* language: "f#" 15 lines 6 code 5 comments 4 blanks *)
 
 // Comment
 

diff --git a/tests/data/fstar.fst b/tests/data/fstar.fst
@@ -1,4 +1,4 @@
-(* 11 lines 3 code 5 comments 3 blanks *)
+(* language: "f*" 11 lines 3 code 5 comments 3 blanks *)
 
 module Hello
 

diff --git a/tests/data/ftl.ftl b/tests/data/ftl.ftl
@@ -1,4 +1,4 @@
-<#-- 10 lines 5 code 3 comments 2 blanks -->
+<#-- language: "freemarker" 10 lines 5 code 3 comments 2 blanks -->
 <#ftl output_format="plainText"/>
 
 <#-- Define the print macro -->

diff --git a/tests/data/futhark.fut b/tests/data/futhark.fut
@@ -1,4 +1,4 @@
--- 8 lines 2 code 3 comments 3 blanks
+-- language: "futhark" 8 lines 2 code 3 comments 3 blanks
 
 -- this is a test file
 

diff --git a/tests/data/gas.S b/tests/data/gas.S
@@ -1,4 +1,4 @@
-// 67 lines 46 code 10 comments 11 blanks
+// language: "gnu style assembly" 67 lines 46 code 10 comments 11 blanks
 #include "config.h"
 
 /* BIG FAT WARNING GOES HERE */

diff --git a/tests/data/gdb.gdb b/tests/data/gdb.gdb
@@ -1,4 +1,4 @@
-# 15 lines 7 code 5 comments 3 blanks
+# language: "gdb script" 15 lines 7 code 5 comments 3 blanks
 #
 # This is a comment line. We don't have multi-comment lines
 #

diff --git a/tests/data/gherkin.feature b/tests/data/gherkin.feature
@@ -1,4 +1,4 @@
-# 13 lines 8 code 3 comments 2 blanks
+# language: "gherkin (cucumber)" 13 lines 8 code 3 comments 2 blanks
 Feature: Guess the word
 
   # The first example has two steps

diff --git a/tests/data/gleam.gleam b/tests/data/gleam.gleam
@@ -1,4 +1,4 @@
-//// 34 lines 24 code 4 comments 6 blanks
+//// language: "gleam" 34 lines 24 code 4 comments 6 blanks
 
 import gleam/option.{Option, None}
 import gleam/io