changes to improve detection accuracy

classifier.go

@@ -31,8 +31,10 @@ func (c *classifier) Classify(content []byte, candidates map[string]float64) map
 		languages = make(map[string]float64, len(candidates))
 		for candidate, weight := range candidates {
 			if lang, ok := GetLanguageByAlias(candidate); ok {
-				languages[lang] = weight
+				candidate = lang
 			}
+
+			languages[candidate] = weight
 		}
 	}
 

common.go

@@ -78,8 +78,32 @@ func GetLanguageByExtension(filename string) (lang string, safe bool) {
 // GetLanguagesByExtension returns a slice of possible languages for the given filename, content will be ignored.
 // It accomplish the signature to be a Strategy type.
 func GetLanguagesByExtension(filename string, content []byte) []string {
-	ext := strings.ToLower(filepath.Ext(filename))
-	return languagesByExtension[ext]
+	if !strings.Contains(filename, ".") {
+		return nil
+	}
+
+	filename = strings.ToLower(filename)
+	dots := getDotIndexes(filename)
+	for _, dot := range dots {
+		ext := filename[dot:]
+		languages, ok := languagesByExtension[ext]
+		if ok {
+			return languages
+		}
+	}
+
+	return nil
+}
+
+func getDotIndexes(filename string) []int {
+	dots := make([]int, 0, 2)
+	for i, letter := range filename {
+		if letter == rune('.') {
+			dots = append(dots, i)
+		}
+	}
+
+	return dots
 }
 
 // GetLanguageByContent returns a language based on the filename and heuristics applies to the content,

content.go

@@ -507,7 +507,7 @@ var (
 	m_Matlab_Matcher_0                     = regexp.MustCompile(`(?m)^\s*%`)
 	m_Limbo_Matcher_0                      = regexp.MustCompile(`(?m)^\w+\s*:\s*module\s*{`)
 	md_Markdown_Matcher_0                  = regexp.MustCompile(`(?mi)(^[-a-z0-9=#!\*\[|>])|<\/`)
-	md_Markdown_Matcher_1                  = regexp.MustCompile(`(?m)^$`)
+	md_Markdown_Matcher_1                  = regexp.MustCompile(`^$`)
 	md_GCCMachineDescription_Matcher_0     = regexp.MustCompile(`(?m)^(;;|\(define_)`)
 	ml_OCaml_Matcher_0                     = regexp.MustCompile(`(?m)(^\s*module)|let rec |match\s+(\S+\s)+with`)
 	ml_StandardML_Matcher_0                = regexp.MustCompile(`(?m)=> |case\s+(\S+\s)+of`)

extension.go

@@ -28,9 +28,6 @@ var languagesByExtension = map[string][]string{
 	".8xp":                 {"TI Program"},
 	".8xp.txt":             {"TI Program"},
 	".9":                   {"Roff"},
-	".E":                   {"E"},
-	".JSON-tmLanguage":     {"JSON"},
-	".ML":                  {"Standard ML"},
 	"._coffee":             {"CoffeeScript"},
 	"._js":                 {"JavaScript"},
 	"._ls":                 {"LiveScript"},
@@ -228,7 +225,7 @@ var languagesByExtension = map[string][]string{
 	".dyalog":              {"APL"},
 	".dyl":                 {"Dylan"},
 	".dylan":               {"Dylan"},
-	".e":                   {"Eiffel"},
+	".e":                   {"E", "Eiffel"},
 	".eam.fs":              {"Formatted"},
 	".ebnf":                {"EBNF"},
 	".ebuild":              {"Gentoo Ebuild"},
@@ -415,6 +412,7 @@ var languagesByExtension = map[string][]string{
 	".jsfl":                {"JavaScript"},
 	".jsm":                 {"JavaScript"},
 	".json":                {"JSON"},
+	".json-tmlanguage":     {"JSON"},
 	".json5":               {"JSON5"},
 	".jsonld":              {"JSONLD"},
 	".jsp":                 {"Java Server Pages"},
@@ -508,7 +506,7 @@ var languagesByExtension = map[string][]string{
 	".mkii":                {"TeX"},
 	".mkiv":                {"TeX"},
 	".mkvi":                {"TeX"},
-	".ml":                  {"OCaml"},
+	".ml":                  {"OCaml", "Standard ML"},
 	".ml4":                 {"OCaml"},
 	".mli":                 {"OCaml"},
 	".mll":                 {"OCaml"},
@@ -807,11 +805,11 @@ var languagesByExtension = map[string][]string{
 	".ss":                  {"Scheme"},
 	".ssjs":                {"JavaScript"},
 	".st":                  {"HTML", "Smalltalk"},
-	".stTheme":             {"XML"},
 	".stan":                {"Stan"},
 	".sthlp":               {"Stata"},
 	".ston":                {"STON"},
 	".storyboard":          {"XML"},
+	".sttheme":             {"XML"},
 	".sty":                 {"TeX"},
 	".styl":                {"Stylus"},
 	".sublime-build":       {"Sublime Text Config"},
@@ -853,13 +851,13 @@ var languagesByExtension = map[string][]string{
 	".tl":                  {"Type Language"},
 	".tla":                 {"TLA"},
 	".tm":                  {"Tcl"},
-	".tmCommand":           {"XML"},
-	".tmLanguage":          {"XML"},
-	".tmPreferences":       {"XML"},
-	".tmSnippet":           {"XML"},
-	".tmTheme":             {"XML"},
 	".tmac":                {"Roff"},
+	".tmcommand":           {"XML"},
 	".tml":                 {"XML"},
+	".tmlanguage":          {"XML"},
+	".tmpreferences":       {"XML"},
+	".tmsnippet":           {"XML"},
+	".tmtheme":             {"XML"},
 	".tmux":                {"Shell"},
 	".toc":                 {"TeX", "World of Warcraft Addon Data"},
 	".toml":                {"TOML"},
@@ -1099,7 +1097,7 @@ var extensionsByLanguage = map[string][]string{
 	"Dockerfile":     {".dockerfile"},
 	"Dogescript":     {".djs"},
 	"Dylan":          {".dylan", ".dyl", ".intr", ".lid"},
-	"E":              {".E"},
+	"E":              {".e"},
 	"EBNF":           {".ebnf"},
 	"ECL":            {".ecl", ".eclxml"},
 	"ECLiPSe":        {".ecl"},
@@ -1182,7 +1180,7 @@ var extensionsByLanguage = map[string][]string{
 	"Isabelle":                 {".thy"},
 	"J":                        {".ijs"},
 	"JFlex":                    {".flex", ".jflex"},
-	"JSON":                     {".json", ".geojson", ".JSON-tmLanguage", ".topojson"},
+	"JSON":                     {".json", ".geojson", ".json-tmlanguage", ".topojson"},
 	"JSON5":                    {".json5"},
 	"JSONLD":                   {".jsonld"},
 	"JSONiq":                   {".jq"},
@@ -1379,7 +1377,7 @@ var extensionsByLanguage = map[string][]string{
 	"Spline Font Database":         {".sfd"},
 	"Squirrel":                     {".nut"},
 	"Stan":                         {".stan"},
-	"Standard ML":                  {".ML", ".fun", ".sig", ".sml"},
+	"Standard ML":                  {".ml", ".fun", ".sig", ".sml"},
 	"Stata":                        {".do", ".ado", ".doh", ".ihlp", ".mata", ".matah", ".sthlp"},
 	"Stylus":                       {".styl"},
 	"SubRip Text":                  {".srt"},
@@ -1426,7 +1424,7 @@ var extensionsByLanguage = map[string][]string{
 	"World of Warcraft Addon Data": {".toc"},
 	"X10":              {".x10"},
 	"XC":               {".xc"},
-	"XML":              {".xml", ".adml", ".admx", ".ant", ".axml", ".builds", ".ccxml", ".clixml", ".cproject", ".csl", ".csproj", ".ct", ".dita", ".ditamap", ".ditaval", ".dll.config", ".dotsettings", ".filters", ".fsproj", ".fxml", ".glade", ".gml", ".grxml", ".iml", ".ivy", ".jelly", ".jsproj", ".kml", ".launch", ".mdpolicy", ".mjml", ".mm", ".mod", ".mxml", ".nproj", ".nuspec", ".odd", ".osm", ".pkgproj", ".plist", ".pluginspec", ".props", ".ps1xml", ".psc1", ".pt", ".rdf", ".resx", ".rss", ".sch", ".scxml", ".sfproj", ".srdf", ".storyboard", ".stTheme", ".sublime-snippet", ".targets", ".tmCommand", ".tml", ".tmLanguage", ".tmPreferences", ".tmSnippet", ".tmTheme", ".ts", ".tsx", ".ui", ".urdf", ".ux", ".vbproj", ".vcxproj", ".vsixmanifest", ".vssettings", ".vstemplate", ".vxml", ".wixproj", ".wsdl", ".wsf", ".wxi", ".wxl", ".wxs", ".x3d", ".xacro", ".xaml", ".xib", ".xlf", ".xliff", ".xmi", ".xml.dist", ".xproj", ".xsd", ".xul", ".zcml"},
+	"XML":              {".xml", ".adml", ".admx", ".ant", ".axml", ".builds", ".ccxml", ".clixml", ".cproject", ".csl", ".csproj", ".ct", ".dita", ".ditamap", ".ditaval", ".dll.config", ".dotsettings", ".filters", ".fsproj", ".fxml", ".glade", ".gml", ".grxml", ".iml", ".ivy", ".jelly", ".jsproj", ".kml", ".launch", ".mdpolicy", ".mjml", ".mm", ".mod", ".mxml", ".nproj", ".nuspec", ".odd", ".osm", ".pkgproj", ".plist", ".pluginspec", ".props", ".ps1xml", ".psc1", ".pt", ".rdf", ".resx", ".rss", ".sch", ".scxml", ".sfproj", ".srdf", ".storyboard", ".sttheme", ".sublime-snippet", ".targets", ".tmcommand", ".tml", ".tmlanguage", ".tmpreferences", ".tmsnippet", ".tmtheme", ".ts", ".tsx", ".ui", ".urdf", ".ux", ".vbproj", ".vcxproj", ".vsixmanifest", ".vssettings", ".vstemplate", ".vxml", ".wixproj", ".wsdl", ".wsf", ".wxi", ".wxl", ".wxs", ".x3d", ".xacro", ".xaml", ".xib", ".xlf", ".xliff", ".xmi", ".xml.dist", ".xproj", ".xsd", ".xul", ".zcml"},
 	"XPages":           {".xsp-config", ".xsp.metadata"},
 	"XProc":            {".xpl", ".xproc"},
 	"XQuery":           {".xquery", ".xq", ".xql", ".xqm", ".xqy"},

filename.go

@@ -16,22 +16,39 @@ var languagesByFilename = map[string][]string{
 	".bashrc":            {"Shell"},
 	".clang-format":      {"YAML"},
 	".classpath":         {"XML"},
+	".cproject":          {"XML"},
+	".cshrc":             {"Shell"},
+	".editorconfig":      {"INI"},
 	".emacs":             {"Emacs Lisp"},
 	".emacs.desktop":     {"Emacs Lisp"},
 	".factor-boot-rc":    {"Factor"},
 	".factor-rc":         {"Factor"},
 	".gclient":           {"Python"},
+	".gemrc":             {"YAML"},
+	".gitconfig":         {"INI"},
+	".gn":                {"GN"},
 	".gnus":              {"Emacs Lisp"},
+	".gvimrc":            {"Vim script"},
+	".htaccess":          {"ApacheConf"},
 	".irbrc":             {"Ruby"},
 	".jshintrc":          {"JSON"},
+	".login":             {"Shell"},
 	".nvimrc":            {"Vim script"},
+	".php":               {"PHP"},
 	".php_cs":            {"PHP"},
 	".php_cs.dist":       {"PHP"},
+	".profile":           {"Shell"},
 	".project":           {"XML"},
 	".pryrc":             {"Ruby"},
 	".spacemacs":         {"Emacs Lisp"},
 	".vimrc":             {"Vim script"},
 	".viper":             {"Emacs Lisp"},
+	".zlogin":            {"Shell"},
+	".zlogout":           {"Shell"},
+	".zprofile":          {"Shell"},
+	".zshenv":            {"Shell"},
+	".zshrc":             {"Shell"},
+	"9fs":                {"Shell"},
 	"APKBUILD":           {"Alpine Abuild"},
 	"App.config":         {"XML"},
 	"Appraisals":         {"Ruby"},
@@ -43,8 +60,10 @@ var languagesByFilename = map[string][]string{
 	"Buildfile":          {"Ruby"},
 	"CMakeLists.txt":     {"CMake"},
 	"COPYING":            {"Text"},
+	"COPYING.regex":      {"Text"},
 	"COPYRIGHT.regex":    {"Text"},
 	"Cakefile":           {"CoffeeScript"},
+	"Capfile":            {"Ruby"},
 	"Cask":               {"Emacs Lisp"},
 	"Dangerfile":         {"Ruby"},
 	"Deliverfile":        {"Ruby"},
@@ -105,21 +124,31 @@ var languagesByFilename = map[string][]string{
 	"_emacs":             {"Emacs Lisp"},
 	"_vimrc":             {"Vim script"},
 	"abbrev_defs":        {"Emacs Lisp"},
+	"ack":                {"Perl"},
 	"ant.xml":            {"Ant Build System"},
+	"apache2.conf":       {"ApacheConf"},
+	"bash_logout":        {"Shell"},
+	"bash_profile":       {"Shell"},
+	"bashrc":             {"Shell"},
 	"build.xml":          {"Ant Build System"},
 	"buildfile":          {"Ruby"},
 	"click.me":           {"Text"},
 	"composer.lock":      {"JSON"},
 	"configure.ac":       {"M4Sugar"},
+	"cshrc":              {"Shell"},
 	"delete.me":          {"Text"},
 	"descrip.mmk":        {"Module Management System"},
 	"descrip.mms":        {"Module Management System"},
+	"expr-dist":          {"R"},
 	"gradlew":            {"Shell"},
 	"gvimrc":             {"Vim script"},
+	"httpd.conf":         {"ApacheConf"},
 	"keep.me":            {"Text"},
 	"ld.script":          {"Linker Script"},
+	"login":              {"Shell"},
 	"makefile":           {"Makefile"},
 	"makefile.sco":       {"Makefile"},
+	"man":                {"Shell"},
 	"mcmod.info":         {"JSON"},
 	"meson.build":        {"Meson"},
 	"meson_options.txt":  {"Meson"},
@@ -129,15 +158,25 @@ var languagesByFilename = map[string][]string{
 	"mmt":                {"Roff"},
 	"nginx.conf":         {"Nginx"},
 	"nvimrc":             {"Vim script"},
+	"owh":                {"Tcl"},
 	"packages.config":    {"XML"},
 	"pom.xml":            {"Maven POM"},
+	"profile":            {"Shell"},
 	"read.me":            {"Text"},
+	"readme.1st":         {"Text"},
 	"rebar.config":       {"Erlang"},
 	"rebar.config.lock":  {"Erlang"},
 	"rebar.lock":         {"Erlang"},
 	"riemann.config":     {"Clojure"},
+	"script":             {"C"},
+	"starfield":          {"Tcl"},
 	"test.me":            {"Text"},
 	"vimrc":              {"Vim script"},
 	"wscript":            {"Python"},
 	"xcompose":           {"XCompose"},
+	"zlogin":             {"Shell"},
+	"zlogout":            {"Shell"},
+	"zprofile":           {"Shell"},
+	"zshenv":             {"Shell"},
+	"zshrc":              {"Shell"},
 }

internal/code-generator/generator/aliases.go

@@ -3,28 +3,34 @@ package generator
 import (
 	"bytes"
 	"io"
+	"io/ioutil"
 	"strings"
 	"text/template"
 
 	yaml "gopkg.in/yaml.v2"
 )
 
-// Aliases reads from buf and builds source file from aliasesTmplPath.
-func Aliases(data []byte, aliasesTmplPath, aliasesTmplName, commit string) ([]byte, error) {
+// Aliases reads from fileToParse and builds source file from tmplPath. It's comply with type File signature.
+func Aliases(fileToParse, samplesDir, outPath, tmplPath, tmplName, commit string) error {
+	data, err := ioutil.ReadFile(fileToParse)
+	if err != nil {
+		return err
+	}
+
 	languages := make(map[string]*languageInfo)
 	if err := yaml.Unmarshal(data, &languages); err != nil {
-		return nil, err
+		return err
 	}
 
 	orderedLangList := getAlphabeticalOrderedKeys(languages)
 	languagesByAlias := buildAliasLanguageMap(languages, orderedLangList)
 
 	buf := &bytes.Buffer{}
-	if err := executeAliasesTemplate(buf, languagesByAlias, aliasesTmplPath, aliasesTmplName, commit); err != nil {
-		return nil, err
+	if err := executeAliasesTemplate(buf, languagesByAlias, tmplPath, tmplName, commit); err != nil {
+		return err
 	}
 
-	return buf.Bytes(), nil
+	return formatedWrite(outPath, buf.Bytes())
 }
 
 func buildAliasLanguageMap(languages map[string]*languageInfo, orderedLangList []string) map[string]string {

internal/code-generator/generator/documentation.go

@@ -3,32 +3,38 @@ package generator
 import (
 	"bytes"
 	"io"
+	"io/ioutil"
 	"text/template"
 
 	yaml "gopkg.in/yaml.v2"
 )
 
-// Documentation reads from buf and builds source file from documentationTmplPath.
-func Documentation(data []byte, documentationTmplPath, documentationTmplName, commit string) ([]byte, error) {
+// Documentation reads from fileToParse and builds source file from tmplPath. It's comply with type File signature.
+func Documentation(fileToParse, samplesDir, outPath, tmplPath, tmplName, commit string) error {
+	data, err := ioutil.ReadFile(fileToParse)
+	if err != nil {
+		return err
+	}
+
 	var regexpList []string
 	if err := yaml.Unmarshal(data, &regexpList); err != nil {
-		return nil, err
+		return err
 	}
 
 	buf := &bytes.Buffer{}
-	if err := executeDocumentationTemplate(buf, regexpList, documentationTmplPath, documentationTmplName, commit); err != nil {
-		return nil, err
+	if err := executeDocumentationTemplate(buf, regexpList, tmplPath, tmplName, commit); err != nil {
+		return err
 	}
 
-	return buf.Bytes(), nil
+	return formatedWrite(outPath, buf.Bytes())
 }
 
-func executeDocumentationTemplate(out io.Writer, regexpList []string, documentationTmplPath, documentationTmpl, commit string) error {
+func executeDocumentationTemplate(out io.Writer, regexpList []string, tmplPath, tmplName, commit string) error {
 	fmap := template.FuncMap{
 		"getCommit": func() string { return commit },
 	}
 
-	t := template.Must(template.New(documentationTmpl).Funcs(fmap).ParseFiles(documentationTmplPath))
+	t := template.Must(template.New(tmplName).Funcs(fmap).ParseFiles(tmplPath))
 	if err := t.Execute(out, regexpList); err != nil {
 		return err
 	}

internal/code-generator/generator/extensions.go

@@ -3,6 +3,7 @@ package generator
 import (
 	"bytes"
 	"io"
+	"io/ioutil"
 	"strings"
 	"text/template"
 
@@ -14,24 +15,45 @@ type extensionsInfo struct {
 	ExtensionsByLanguage map[string][]string
 }
 
-// Extensions reads from buf and builds source file from extensionsTmplPath.
-func Extensions(data []byte, extensionsTmplPath, extensionsTmplName, commit string) ([]byte, error) {
-	languages := make(map[string]*languageInfo)
-	if err := yaml.Unmarshal(data, &languages); err != nil {
-		return nil, err
+// Extensions reads from fileToParse and builds source file from tmplPath. It's comply with type File signature.
+func Extensions(fileToParse, samplesDir, outPath, tmplPath, tmplName, commit string) error {
+	data, err := ioutil.ReadFile(fileToParse)
+	if err != nil {
+		return err
 	}
 
+	languages := make(map[string]*languageInfo)
+	if err := yaml.Unmarshal(data, &languages); err != nil {
+		return err
+	}
+
+	extensionsToLower(languages)
 	extInfo := &extensionsInfo{}
 	orderedKeyList := getAlphabeticalOrderedKeys(languages)
 	extInfo.LanguagesByExtension = buildExtensionLanguageMap(languages, orderedKeyList)
 	extInfo.ExtensionsByLanguage = buildLanguageExtensionsMap(languages)
 
 	buf := &bytes.Buffer{}
-	if err := executeExtensionsTemplate(buf, extInfo, extensionsTmplPath, extensionsTmplName, commit); err != nil {
-		return nil, err
+	if err := executeExtensionsTemplate(buf, extInfo, tmplPath, tmplName, commit); err != nil {
+		return err
 	}
 
-	return buf.Bytes(), nil
+	return formatedWrite(outPath, buf.Bytes())
+}
+
+func extensionsToLower(languages map[string]*languageInfo) {
+	for _, info := range languages {
+		info.Extensions = stringSliceToLower(info.Extensions)
+	}
+}
+
+func stringSliceToLower(slice []string) []string {
+	toLower := make([]string, 0, len(slice))
+	for _, s := range slice {
+		toLower = append(toLower, strings.ToLower(s))
+	}
+
+	return toLower
 }
 
 func buildExtensionLanguageMap(languages map[string]*languageInfo, orderedKeyList []string) map[string][]string {
@@ -57,13 +79,13 @@ func buildLanguageExtensionsMap(languages map[string]*languageInfo) map[string][
 	return langExtensionMap
 }
 
-func executeExtensionsTemplate(out io.Writer, extInfo *extensionsInfo, extensionsTmplPath, extensionsTmpl, commit string) error {
+func executeExtensionsTemplate(out io.Writer, extInfo *extensionsInfo, tmplPath, tmplName, commit string) error {
 	fmap := template.FuncMap{
 		"getCommit":         func() string { return commit },
 		"formatStringSlice": func(slice []string) string { return `"` + strings.Join(slice, `","`) + `"` },
 	}
 
-	t := template.Must(template.New(extensionsTmpl).Funcs(fmap).ParseFiles(extensionsTmplPath))
+	t := template.Must(template.New(tmplName).Funcs(fmap).ParseFiles(tmplPath))
 	if err := t.Execute(out, extInfo); err != nil {
 		return err
 	}

internal/code-generator/generator/filenames.go

@@ -3,27 +3,79 @@ package generator
 import (
 	"bytes"
 	"io"
+	"io/ioutil"
+	"os"
+	"path/filepath"
 	"strings"
 	"text/template"
 
 	yaml "gopkg.in/yaml.v2"
 )
 
-// Filenames reads from buf and builds source file from filenamesTmplPath.
-func Filenames(data []byte, filenamesTmplPath, filenamesTmplName, commit string) ([]byte, error) {
+// Filenames reads from fileToParse and builds source file from tmplPath. It's comply with type File signature.
+func Filenames(fileToParse, samplesDir, outPath, tmplPath, tmplName, commit string) error {
+	data, err := ioutil.ReadFile(fileToParse)
+	if err != nil {
+		return err
+	}
+
 	languages := make(map[string]*languageInfo)
 	if err := yaml.Unmarshal(data, &languages); err != nil {
-		return nil, err
+		return err
+	}
+
+	if err := walkSamplesFilenames(samplesDir, languages); err != nil {
+		return err
 	}
 
 	languagesByFilename := buildFilenameLanguageMap(languages)
 
 	buf := &bytes.Buffer{}
-	if err := executeFilenamesTemplate(buf, languagesByFilename, filenamesTmplPath, filenamesTmplName, commit); err != nil {
-		return nil, err
+	if err := executeFilenamesTemplate(buf, languagesByFilename, tmplPath, tmplName, commit); err != nil {
+		return err
 	}
 
-	return buf.Bytes(), nil
+	return formatedWrite(outPath, buf.Bytes())
+}
+
+func walkSamplesFilenames(samplesDir string, languages map[string]*languageInfo) error {
+	const filenamesDir = "filenames"
+	var language string
+	err := filepath.Walk(samplesDir, func(path string, f os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+
+		if f.IsDir() {
+			if f.Name() != filenamesDir {
+				language = f.Name()
+			}
+
+			return nil
+		}
+
+		parentDir := filepath.Base(filepath.Dir(path))
+		if parentDir != filenamesDir {
+			return nil
+		}
+
+		info, ok := languages[language]
+		if !ok {
+			info = &languageInfo{Filenames: []string{}}
+		}
+
+		for _, filename := range info.Filenames {
+			if filename == f.Name() {
+				return nil
+			}
+		}
+
+		info.Filenames = append(info.Filenames, f.Name())
+
+		return nil
+	})
+
+	return err
 }
 
 func buildFilenameLanguageMap(languages map[string]*languageInfo) map[string][]string {
@@ -37,13 +89,13 @@ func buildFilenameLanguageMap(languages map[string]*languageInfo) map[string][]s
 	return filenameLangMap
 }
 
-func executeFilenamesTemplate(out io.Writer, languagesByFilename map[string][]string, filenamesTmplPath, filenamesTmpl, commit string) error {
+func executeFilenamesTemplate(out io.Writer, languagesByFilename map[string][]string, tmplPath, tmplName, commit string) error {
 	fmap := template.FuncMap{
 		"getCommit":         func() string { return commit },
 		"formatStringSlice": func(slice []string) string { return `"` + strings.Join(slice, `","`) + `"` },
 	}
 
-	t := template.Must(template.New(filenamesTmpl).Funcs(fmap).ParseFiles(filenamesTmplPath))
+	t := template.Must(template.New(tmplName).Funcs(fmap).ParseFiles(tmplPath))
 	if err := t.Execute(out, languagesByFilename); err != nil {
 		return err
 	}

internal/code-generator/generator/generator.go

@@ -5,24 +5,8 @@ import (
 	"io/ioutil"
 )
 
-// Func is the function's type that generate source file from a data to be parsed and a template.
-type Func func(dataToParse []byte, templatePath string, template string, commit string) ([]byte, error)
-
-// FromFile read data to parse from a file named fileToParse and write the generated source code to a file named outPath. The generated
-// source code is formated with gofmt and tagged with commit.
-func FromFile(fileToParse, outPath, tmplPath, tmplName, commit string, generate Func) error {
-	buf, err := ioutil.ReadFile(fileToParse)
-	if err != nil {
-		return err
-	}
-
-	source, err := generate(buf, tmplPath, tmplName, commit)
-	if err != nil {
-		return err
-	}
-
-	return formatedWrite(outPath, source)
-}
+// File is the function's type that generate source file from a file to be parsed, linguist's samples dir and a template.
+type File func(fileToParse, samplesDir, outPath, tmplPath, tmplName, commit string) error
 
 func formatedWrite(outPath string, source []byte) error {
 	formatedSource, err := format.Source(source)

internal/code-generator/generator/generator_test.go

@@ -14,59 +14,54 @@ import (
 
 const (
 	lingustURL    = "https://github.com/github/linguist.git"
-	commitTree = "60f864a138650dd17fafc94814be9ee2d3aaef8c"
-	commitTest = "0123456789abcdef0123456789abcdef01234567"
+	commit        = "b6460f8ed6b249281ada099ca28bd8f1230b8892"
+	samplesDir    = "samples"
+	languagesFile = "lib/linguist/languages.yml"
 
 	// Extensions test
-	extensionsTestFile     = "test_files/extensions.test.yml"
-	extensionsGold         = "test_files/extensions.gold"
-	extensionsTestTmplPath = "../assets/extensions.go.tmpl"
-	extensionsTestTmplName = "extensions.go.tmpl"
+	extensionGold         = "test_files/extension.gold"
+	extensionTestTmplPath = "../assets/extension.go.tmpl"
+	extensionTestTmplName = "extension.go.tmpl"
 
 	// Heuristics test
-	heuristicsTestFile  = "test_files/heuristics.test.rb"
+	heuristicsTestFile  = "lib/linguist/heuristics.rb"
 	contentGold         = "test_files/content.gold"
 	contentTestTmplPath = "../assets/content.go.tmpl"
 	contentTestTmplName = "content.go.tmpl"
 
 	// Vendor test
-	vendorTestFile     = "test_files/vendor.test.yml"
+	vendorTestFile     = "lib/linguist/vendor.yml"
 	vendorGold         = "test_files/vendor.gold"
 	vendorTestTmplPath = "../assets/vendor.go.tmpl"
 	vendorTestTmplName = "vendor.go.tmpl"
 
 	// Documentation test
-	documentationTestFile     = "test_files/documentation.test.yml"
+	documentationTestFile     = "lib/linguist/documentation.yml"
 	documentationGold         = "test_files/documentation.gold"
 	documentationTestTmplPath = "../assets/documentation.go.tmpl"
 	documentationTestTmplName = "documentation.go.tmpl"
 
 	// Types test
-	typesTestFile     = "test_files/types.test.yml"
-	typesGold         = "test_files/types.gold"
-	typesTestTmplPath = "../assets/types.go.tmpl"
-	typesTestTmplName = "types.go.tmpl"
+	typeGold         = "test_files/type.gold"
+	typeTestTmplPath = "../assets/type.go.tmpl"
+	typeTestTmplName = "type.go.tmpl"
 
 	// Interpreters test
-	interpretersTestFile     = "test_files/interpreters.test.yml"
-	interpretersGold         = "test_files/interpreters.gold"
-	interpretersTestTmplPath = "../assets/interpreters.go.tmpl"
-	interpretersTestTmplName = "interpreters.go.tmpl"
+	interpreterGold         = "test_files/interpreter.gold"
+	interpreterTestTmplPath = "../assets/interpreter.go.tmpl"
+	interpreterTestTmplName = "interpreter.go.tmpl"
 
 	// Filenames test
-	filenamesTestFile     = "test_files/filenames.test.yml"
-	filenamesGold         = "test_files/filenames.gold"
-	filenamesTestTmplPath = "../assets/filenames.go.tmpl"
-	filenamesTestTmplName = "filenames.go.tmpl"
+	filenameGold         = "test_files/filename.gold"
+	filenameTestTmplPath = "../assets/filename.go.tmpl"
+	filenameTestTmplName = "filename.go.tmpl"
 
 	// Aliases test
-	aliasesTestFile     = "test_files/aliases.test.yml"
-	aliasesGold         = "test_files/aliases.gold"
-	aliasesTestTmplPath = "../assets/aliases.go.tmpl"
-	aliasesTestTmplName = "aliases.go.tmpl"
+	aliasGold         = "test_files/alias.gold"
+	aliasTestTmplPath = "../assets/alias.go.tmpl"
+	aliasTestTmplName = "alias.go.tmpl"
 
 	// Frequencies test
-	frequenciesTestDir      = "/samples"
 	frequenciesGold         = "test_files/frequencies.gold"
 	frequenciesTestTmplPath = "../assets/frequencies.go.tmpl"
 	frequenciesTestTmplName = "frequencies.go.tmpl"
@@ -96,7 +91,7 @@ func (g *GeneratorTestSuite) SetupSuite() {
 	err = os.Chdir(tmpLinguist)
 	assert.NoError(g.T(), err)
 
-	cmd = exec.Command("git", "checkout", commitTree)
+	cmd = exec.Command("git", "checkout", commit)
 	err = cmd.Run()
 	assert.NoError(g.T(), err)
 
@@ -109,87 +104,105 @@ func (g *GeneratorTestSuite) TearDownSuite() {
 	assert.NoError(g.T(), err)
 }
 
-func (g *GeneratorTestSuite) TestFromFile() {
+func (g *GeneratorTestSuite) TestGenerationFiles() {
 	tests := []struct {
 		name        string
 		fileToParse string
+		samplesDir  string
 		tmplPath    string
 		tmplName    string
 		commit      string
-		generate    Func
+		generate    File
 		wantOut     string
 	}{
 		{
-			name:        "TestFromFile_Extensions",
-			fileToParse: extensionsTestFile,
-			tmplPath:    extensionsTestTmplPath,
-			tmplName:    extensionsTestTmplName,
-			commit:      commitTest,
+			name:        "Extensions()",
+			fileToParse: filepath.Join(g.tmpLinguist, languagesFile),
+			samplesDir:  "",
+			tmplPath:    extensionTestTmplPath,
+			tmplName:    extensionTestTmplName,
+			commit:      commit,
 			generate:    Extensions,
-			wantOut:     extensionsGold,
+			wantOut:     extensionGold,
 		},
 		{
-			name:        "TestFromFile_Heuristics",
-			fileToParse: heuristicsTestFile,
+			name:        "Heuristics()",
+			fileToParse: filepath.Join(g.tmpLinguist, heuristicsTestFile),
+			samplesDir:  "",
 			tmplPath:    contentTestTmplPath,
 			tmplName:    contentTestTmplName,
-			commit:      commitTest,
+			commit:      commit,
 			generate:    Heuristics,
 			wantOut:     contentGold,
 		},
 		{
-			name:        "TestFromFile_Vendor",
-			fileToParse: vendorTestFile,
+			name:        "Vendor()",
+			fileToParse: filepath.Join(g.tmpLinguist, vendorTestFile),
+			samplesDir:  "",
 			tmplPath:    vendorTestTmplPath,
 			tmplName:    vendorTestTmplName,
-			commit:      commitTest,
+			commit:      commit,
 			generate:    Vendor,
 			wantOut:     vendorGold,
 		},
 		{
-			name:        "TestFromFile_Documentation",
-			fileToParse: documentationTestFile,
+			name:        "Documentation()",
+			fileToParse: filepath.Join(g.tmpLinguist, documentationTestFile),
+			samplesDir:  "",
 			tmplPath:    documentationTestTmplPath,
 			tmplName:    documentationTestTmplName,
-			commit:      commitTest,
+			commit:      commit,
 			generate:    Documentation,
 			wantOut:     documentationGold,
 		},
 		{
-			name:        "TestFromFile_Types",
-			fileToParse: typesTestFile,
-			tmplPath:    typesTestTmplPath,
-			tmplName:    typesTestTmplName,
-			commit:      commitTest,
+			name:        "Types()",
+			fileToParse: filepath.Join(g.tmpLinguist, languagesFile),
+			samplesDir:  "",
+			tmplPath:    typeTestTmplPath,
+			tmplName:    typeTestTmplName,
+			commit:      commit,
 			generate:    Types,
-			wantOut:     typesGold,
+			wantOut:     typeGold,
 		},
 		{
-			name:        "TestFromFile_Interpreters",
-			fileToParse: interpretersTestFile,
-			tmplPath:    interpretersTestTmplPath,
-			tmplName:    interpretersTestTmplName,
-			commit:      commitTest,
+			name:        "Interpreters()",
+			fileToParse: filepath.Join(g.tmpLinguist, languagesFile),
+			samplesDir:  "",
+			tmplPath:    interpreterTestTmplPath,
+			tmplName:    interpreterTestTmplName,
+			commit:      commit,
 			generate:    Interpreters,
-			wantOut:     interpretersGold,
+			wantOut:     interpreterGold,
 		},
 		{
-			name:        "TestFromFile_Filenames",
-			fileToParse: filenamesTestFile,
-			tmplPath:    filenamesTestTmplPath,
-			tmplName:    filenamesTestTmplName,
-			commit:      commitTest,
+			name:        "Filenames()",
+			fileToParse: filepath.Join(g.tmpLinguist, languagesFile),
+			samplesDir:  filepath.Join(g.tmpLinguist, samplesDir),
+			tmplPath:    filenameTestTmplPath,
+			tmplName:    filenameTestTmplName,
+			commit:      commit,
 			generate:    Filenames,
-			wantOut:     filenamesGold,
+			wantOut:     filenameGold,
 		},
 		{
-			name:        "TestFromFile_Aliases",
-			fileToParse: aliasesTestFile,
-			tmplPath:    aliasesTestTmplPath,
-			tmplName:    aliasesTestTmplName,
-			commit:      commitTest,
+			name:        "Aliases()",
+			fileToParse: filepath.Join(g.tmpLinguist, languagesFile),
+			samplesDir:  "",
+			tmplPath:    aliasTestTmplPath,
+			tmplName:    aliasTestTmplName,
+			commit:      commit,
 			generate:    Aliases,
-			wantOut:     aliasesGold,
+			wantOut:     aliasGold,
+		},
+		{
+			name:       "Frequencies()",
+			samplesDir: filepath.Join(g.tmpLinguist, samplesDir),
+			tmplPath:   frequenciesTestTmplPath,
+			tmplName:   frequenciesTestTmplName,
+			commit:     commit,
+			generate:   Frequencies,
+			wantOut:    frequenciesGold,
 		},
 	}
 
@@ -201,45 +214,10 @@ func (g *GeneratorTestSuite) TestFromFile() {
 		assert.NoError(g.T(), err)
 		defer os.Remove(outPath.Name())
 
-		err = FromFile(test.fileToParse, outPath.Name(), test.tmplPath, test.tmplName, test.commit, test.generate)
+		err = test.generate(test.fileToParse, test.samplesDir, outPath.Name(), test.tmplPath, test.tmplName, test.commit)
 		assert.NoError(g.T(), err)
 		out, err := ioutil.ReadFile(outPath.Name())
 		assert.NoError(g.T(), err)
-		assert.EqualValues(g.T(), gold, out, fmt.Sprintf("%v: %v, expected: %v", test.name, string(out), string(test.wantOut)))
-	}
-}
-
-func (g *GeneratorTestSuite) TestFrequencies() {
-	tests := []struct {
-		name       string
-		samplesDir string
-		tmplPath   string
-		tmplName   string
-		commit     string
-		wantOut    string
-	}{
-		{
-			name:       "Frequencies_1",
-			samplesDir: filepath.Join(g.tmpLinguist, frequenciesTestDir),
-			tmplPath:   frequenciesTestTmplPath,
-			tmplName:   frequenciesTestTmplName,
-			commit:     commitTree,
-			wantOut:    frequenciesGold,
-		},
-	}
-
-	for _, test := range tests {
-		gold, err := ioutil.ReadFile(test.wantOut)
-		assert.NoError(g.T(), err)
-
-		outPath, err := ioutil.TempFile("/tmp", "frequencies-test-")
-		assert.NoError(g.T(), err)
-		defer os.Remove(outPath.Name())
-
-		err = Frequencies(test.samplesDir, test.tmplPath, test.tmplName, test.commit, outPath.Name())
-		assert.NoError(g.T(), err)
-		out, err := ioutil.ReadFile(outPath.Name())
-		assert.NoError(g.T(), err)
-		assert.EqualValues(g.T(), gold, out, fmt.Sprintf("%v: %v, expected: %v", test.name, string(out), string(test.wantOut)))
+		assert.EqualValues(g.T(), gold, out, fmt.Sprintf("%v: %v, expected: %v", test.name, string(out), string(gold)))
 	}
 }

internal/code-generator/generator/heuristics.go

@@ -5,30 +5,37 @@ import (
 	"bytes"
 	"fmt"
 	"io"
+	"io/ioutil"
 	"regexp"
 	"strconv"
 	"strings"
 	"text/template"
 )
 
-// Heuristics reads from buf and builds source file from contentTmplPath.
-func Heuristics(heuristics []byte, contentTmplPath, contentTmplName, commit string) ([]byte, error) {
-	disambiguators, err := getDisambiguators(heuristics)
+// Heuristics reads from fileToParse and builds source file from tmplPath. It's comply with type File signature.
+func Heuristics(fileToParse, samplesDir, outPath, tmplPath, tmplName, commit string) error {
+	data, err := ioutil.ReadFile(fileToParse)
 	if err != nil {
-		return nil, err
+		return err
+	}
+
+	disambiguators, err := getDisambiguators(data)
+	if err != nil {
+		return err
 	}
 
 	buf := &bytes.Buffer{}
-	if err := executeContentTemplate(buf, disambiguators, contentTmplPath, contentTmplName, commit); err != nil {
-		return nil, err
+	if err := executeContentTemplate(buf, disambiguators, tmplPath, tmplName, commit); err != nil {
+		return err
 	}
 
-	return buf.Bytes(), nil
-	// fmt.Println(string(buf.Bytes()))
-	// return nil, nil
+	return formatedWrite(outPath, buf.Bytes())
 }
 
-const unknownLanguage = "OtherLanguage"
+const (
+	unknownLanguage = "OtherLanguage"
+	emptyFile       = "^$"
+)
 
 var (
 	disambLine       = regexp.MustCompile(`^(\s*)disambiguate`)
@@ -297,7 +304,7 @@ func getHeuristics(line string) []*heuristic {
 		}
 
 		if strings.Contains(v, ".empty?") {
-			reg = `^$`
+			reg = emptyFile
 		}
 
 		if reg != "" {
@@ -340,6 +347,10 @@ func convertToValidRegexp(reg string) string {
 		rubyMultiLine     = "m"
 	)
 
+	if reg == emptyFile {
+		return reg
+	}
+
 	reg = strings.TrimPrefix(reg, `/`)
 	flags := "(?m"
 	lastSlash := strings.LastIndex(reg, `/`)
@@ -415,7 +426,7 @@ func buildLanguagesHeuristics(langsList [][]string, heuristicsList [][]*heuristi
 	return langsHeuristics
 }
 
-func executeContentTemplate(out io.Writer, disambiguators []*disambiguator, contentTmplPath, contentTmpl, commit string) error {
+func executeContentTemplate(out io.Writer, disambiguators []*disambiguator, tmplPath, tmplName, commit string) error {
 	fmap := template.FuncMap{
 		"getCommit":        func() string { return commit },
 		"getAllHeuristics": getAllHeuristics,
@@ -430,7 +441,7 @@ func executeContentTemplate(out io.Writer, disambiguators []*disambiguator, cont
 		"avoidLanguage":   avoidLanguage,
 	}
 
-	t := template.Must(template.New(contentTmpl).Funcs(fmap).ParseFiles(contentTmplPath))
+	t := template.Must(template.New(tmplName).Funcs(fmap).ParseFiles(tmplPath))
 	if err := t.Execute(out, disambiguators); err != nil {
 		return err
 	}

internal/code-generator/generator/interpreters.go

@@ -3,28 +3,34 @@ package generator
 import (
 	"bytes"
 	"io"
+	"io/ioutil"
 	"strings"
 	"text/template"
 
 	"gopkg.in/yaml.v2"
 )
 
-// Interpreters reads from buf and builds source file from interpretersTmplPath.
-func Interpreters(data []byte, interpretersTmplPath, interpretersTmplName, commit string) ([]byte, error) {
+// Interpreters reads from fileToParse and builds source file from tmplPath. It's comply with type File signature.
+func Interpreters(fileToParse, samplesDir, outPath, tmplPath, tmplName, commit string) error {
+	data, err := ioutil.ReadFile(fileToParse)
+	if err != nil {
+		return err
+	}
+
 	languages := make(map[string]*languageInfo)
 	if err := yaml.Unmarshal(data, &languages); err != nil {
-		return nil, err
+		return err
 	}
 
 	orderedKeys := getAlphabeticalOrderedKeys(languages)
 	languagesByInterpreter := buildInterpreterLanguagesMap(languages, orderedKeys)
 
 	buf := &bytes.Buffer{}
-	if err := executeInterpretersTemplate(buf, languagesByInterpreter, interpretersTmplPath, interpretersTmplName, commit); err != nil {
-		return nil, err
+	if err := executeInterpretersTemplate(buf, languagesByInterpreter, tmplPath, tmplName, commit); err != nil {
+		return err
 	}
 
-	return buf.Bytes(), nil
+	return formatedWrite(outPath, buf.Bytes())
 }
 
 func buildInterpreterLanguagesMap(languages map[string]*languageInfo, orderedKeys []string) map[string][]string {
@@ -39,13 +45,13 @@ func buildInterpreterLanguagesMap(languages map[string]*languageInfo, orderedKey
 	return interpreterLangsMap
 }
 
-func executeInterpretersTemplate(out io.Writer, languagesByInterpreter map[string][]string, interpretersTmplPath, interpretersTmpl, commit string) error {
+func executeInterpretersTemplate(out io.Writer, languagesByInterpreter map[string][]string, tmplPath, tmplName, commit string) error {
 	fmap := template.FuncMap{
 		"getCommit":         func() string { return commit },
 		"formatStringSlice": func(slice []string) string { return `"` + strings.Join(slice, `","`) + `"` },
 	}
 
-	t := template.Must(template.New(interpretersTmpl).Funcs(fmap).ParseFiles(interpretersTmplPath))
+	t := template.Must(template.New(tmplName).Funcs(fmap).ParseFiles(tmplPath))
 	if err := t.Execute(out, languagesByInterpreter); err != nil {
 		return err
 	}

internal/code-generator/generator/samplesfreq.go

@@ -16,8 +16,6 @@ import (
 	"gopkg.in/src-d/enry.v1/internal/tokenizer"
 )
 
-const samplesSubDir = "filenames"
-
 type samplesFrequencies struct {
 	LanguageTotal  int                       `json:"language_total,omitempty"`
 	Languages      map[string]int            `json:"languages,omitempty"`
@@ -27,15 +25,15 @@ type samplesFrequencies struct {
 }
 
 // Frequencies reads directories in samplesDir, retrieves information about frequencies of languages and tokens, and write
-// the file outPath using frequenciesTmplName as a template.
-func Frequencies(samplesDir, frequenciesTmplPath, frequenciesTmplName, commit, outPath string) error {
+// the file outPath using tmplName as a template.
+func Frequencies(fileToParse, samplesDir, outPath, tmplPath, tmplName, commit string) error {
 	freqs, err := getFrequencies(samplesDir)
 	if err != nil {
 		return err
 	}
 
 	buf := &bytes.Buffer{}
-	if err := executeFrequenciesTemplate(buf, freqs, frequenciesTmplPath, frequenciesTmplName, commit); err != nil {
+	if err := executeFrequenciesTemplate(buf, freqs, tmplPath, tmplName, commit); err != nil {
 		return err
 	}
 
@@ -96,6 +94,7 @@ func getFrequencies(samplesDir string) (*samplesFrequencies, error) {
 }
 
 func getSamples(samplesDir string, langDir os.FileInfo) ([]string, error) {
+	const samplesSubDir = "filenames"
 	samples := []string{}
 	path := filepath.Join(samplesDir, langDir.Name())
 	entries, err := ioutil.ReadDir(path)
@@ -156,7 +155,7 @@ func getTokens(samples []string) ([]string, error) {
 	return tokens, anyError
 }
 
-func executeFrequenciesTemplate(out io.Writer, freqs *samplesFrequencies, frequenciesTmplPath, frequenciesTmpl, commit string) error {
+func executeFrequenciesTemplate(out io.Writer, freqs *samplesFrequencies, tmplPath, tmplName, commit string) error {
 	fmap := template.FuncMap{
 		"getCommit": func() string { return commit },
 		"toFloat64": func(num int) string { return fmt.Sprintf("%f", float64(num)) },
@@ -189,7 +188,7 @@ func executeFrequenciesTemplate(out io.Writer, freqs *samplesFrequencies, freque
 		"quote": strconv.Quote,
 	}
 
-	t := template.Must(template.New(frequenciesTmpl).Funcs(fmap).ParseFiles(frequenciesTmplPath))
+	t := template.Must(template.New(tmplName).Funcs(fmap).ParseFiles(tmplPath))
 	if err := t.Execute(out, freqs); err != nil {
 		return err
 	}

internal/code-generator/generator/test_files/alias.gold

@@ -0,0 +1,647 @@
+package slinguist
+
+// CODE GENERATED AUTOMATICALLY WITH gopkg.in/src-d/enry.v1/internal/code-generator
+// THIS FILE SHOULD NOT BE EDITED BY HAND
+// Extracted from github/linguist commit: b6460f8ed6b249281ada099ca28bd8f1230b8892
+
+// languagesByAlias keeps alias for different languages and use the name of the languages as an alias too.
+// All the keys (alias or not) are written in lower case and the whitespaces has been replaced by underscores.
+var languagesByAlias = map[string]string{
+	"1c_enterprise":    "1C Enterprise",
+	"abap":             "ABAP",
+	"abl":              "OpenEdge ABL",
+	"abnf":             "ABNF",
+	"abuild":           "Alpine Abuild",
+	"aconf":            "ApacheConf",
+	"actionscript":     "ActionScript",
+	"actionscript3":    "ActionScript",
+	"actionscript_3":   "ActionScript",
+	"ada":              "Ada",
+	"ada2005":          "Ada",
+	"ada95":            "Ada",
+	"advpl":            "xBase",
+	"afdko":            "OpenType Feature File",
+	"agda":             "Agda",
+	"ags":              "AGS Script",
+	"ags_script":       "AGS Script",
+	"ahk":              "AutoHotkey",
+	"alloy":            "Alloy",
+	"alpine_abuild":    "Alpine Abuild",
+	"ampl":             "AMPL",
+	"ant_build_system": "Ant Build System",
+	"antlr":            "ANTLR",
+	"apache":           "ApacheConf",
+	"apacheconf":       "ApacheConf",
+	"apex":             "Apex",
+	"api_blueprint":    "API Blueprint",
+	"apkbuild":         "Alpine Abuild",
+	"apl":              "APL",
+	"apollo_guidance_computer": "Apollo Guidance Computer",
+	"applescript":              "AppleScript",
+	"arc":                      "Arc",
+	"arduino":                  "Arduino",
+	"arexx":                    "REXX",
+	"as3":                      "ActionScript",
+	"asciidoc":                 "AsciiDoc",
+	"asn.1":                    "ASN.1",
+	"asp":                      "ASP",
+	"aspectj":                  "AspectJ",
+	"aspx":                     "ASP",
+	"aspx-vb":                  "ASP",
+	"assembly":                 "Assembly",
+	"ats":                      "ATS",
+	"ats2":                     "ATS",
+	"au3":                      "AutoIt",
+	"augeas":                   "Augeas",
+	"autoconf":                 "M4Sugar",
+	"autohotkey":               "AutoHotkey",
+	"autoit":                   "AutoIt",
+	"autoit3":                  "AutoIt",
+	"autoitscript":             "AutoIt",
+	"awk":                      "Awk",
+	"b3d":                      "BlitzBasic",
+	"bash":                     "Shell",
+	"bash_session":             "ShellSession",
+	"bat":                      "Batchfile",
+	"batch":                    "Batchfile",
+	"batchfile":                "Batchfile",
+	"befunge":                  "Befunge",
+	"bison":                    "Bison",
+	"bitbake":                  "BitBake",
+	"blade":                    "Blade",
+	"blitz3d":                  "BlitzBasic",
+	"blitzbasic":               "BlitzBasic",
+	"blitzmax":                 "BlitzMax",
+	"blitzplus":                "BlitzBasic",
+	"bluespec":                 "Bluespec",
+	"bmax":                     "BlitzMax",
+	"boo":                      "Boo",
+	"bplus":                    "BlitzBasic",
+	"brainfuck":                "Brainfuck",
+	"brightscript":             "Brightscript",
+	"bro":                      "Bro",
+	"bsdmake":                  "Makefile",
+	"byond":                    "DM",
+	"c":                        "C",
+	"c#":                       "C#",
+	"c++":                      "C++",
+	"c++-objdump":              "Cpp-ObjDump",
+	"c-objdump":                "C-ObjDump",
+	"c2hs":                     "C2hs Haskell",
+	"c2hs_haskell":             "C2hs Haskell",
+	"cap'n_proto":              "Cap'n Proto",
+	"carto":                    "CartoCSS",
+	"cartocss":                 "CartoCSS",
+	"ceylon":                   "Ceylon",
+	"cfc":                      "ColdFusion CFC",
+	"cfm":                      "ColdFusion",
+	"cfml":                     "ColdFusion",
+	"chapel":                   "Chapel",
+	"charity":                  "Charity",
+	"chpl":                     "Chapel",
+	"chuck":                    "ChucK",
+	"cirru":                    "Cirru",
+	"clarion":                  "Clarion",
+	"clean":                    "Clean",
+	"click":                    "Click",
+	"clipper":                  "xBase",
+	"clips":                    "CLIPS",
+	"clojure":                  "Clojure",
+	"closure_templates":        "Closure Templates",
+	"cmake":                    "CMake",
+	"cobol":                    "COBOL",
+	"coffee":                   "CoffeeScript",
+	"coffee-script":            "CoffeeScript",
+	"coffeescript":             "CoffeeScript",
+	"coldfusion":               "ColdFusion",
+	"coldfusion_cfc":           "ColdFusion CFC",
+	"coldfusion_html":          "ColdFusion",
+	"collada":                  "COLLADA",
+	"common_lisp":              "Common Lisp",
+	"component_pascal":         "Component Pascal",
+	"console":                  "ShellSession",
+	"cool":                     "Cool",
+	"coq":                      "Coq",
+	"cpp":                      "C++",
+	"cpp-objdump":              "Cpp-ObjDump",
+	"creole":                   "Creole",
+	"crystal":                  "Crystal",
+	"csharp":                   "C#",
+	"cson":                     "CSON",
+	"csound":                   "Csound",
+	"csound-csd":               "Csound Document",
+	"csound-orc":               "Csound",
+	"csound-sco":               "Csound Score",
+	"csound_document":          "Csound Document",
+	"csound_score":             "Csound Score",
+	"css":                      "CSS",
+	"csv":                      "CSV",
+	"cucumber":                 "Gherkin",
+	"cuda":                     "Cuda",
+	"cweb":                     "CWeb",
+	"cycript":                  "Cycript",
+	"cython":                   "Cython",
+	"d":                        "D",
+	"d-objdump":                "D-ObjDump",
+	"darcs_patch":              "Darcs Patch",
+	"dart":                     "Dart",
+	"dcl":                      "DIGITAL Command Language",
+	"delphi":                   "Component Pascal",
+	"desktop":                  "desktop",
+	"diff":                     "Diff",
+	"digital_command_language": "DIGITAL Command Language",
+	"django":                   "HTML+Django",
+	"dm":                       "DM",
+	"dns_zone":                 "DNS Zone",
+	"dockerfile":               "Dockerfile",
+	"dogescript":               "Dogescript",
+	"dosbatch":                 "Batchfile",
+	"dosini":                   "INI",
+	"dpatch":                   "Darcs Patch",
+	"dtrace":                   "DTrace",
+	"dtrace-script":            "DTrace",
+	"dylan":                    "Dylan",
+	"e":                        "E",
+	"eagle":                    "Eagle",
+	"ebnf":                     "EBNF",
+	"ec":                       "eC",
+	"ecere_projects":           "Ecere Projects",
+	"ecl":                      "ECL",
+	"eclipse":                  "ECLiPSe",
+	"ecr":                      "HTML+ECR",
+	"edn":                      "edn",
+	"eex":                      "HTML+EEX",
+	"eiffel":                   "Eiffel",
+	"ejs":                      "EJS",
+	"elisp":                    "Emacs Lisp",
+	"elixir":                   "Elixir",
+	"elm":                      "Elm",
+	"emacs":                    "Emacs Lisp",
+	"emacs_lisp":               "Emacs Lisp",
+	"emberscript":              "EmberScript",
+	"eq":                       "EQ",
+	"erb":                      "HTML+ERB",
+	"erlang":                   "Erlang",
+	"f#":                       "F#",
+	"factor":                   "Factor",
+	"fancy":                    "Fancy",
+	"fantom":                   "Fantom",
+	"filebench_wml":            "Filebench WML",
+	"filterscript":             "Filterscript",
+	"fish":                     "fish",
+	"flex":                     "Lex",
+	"flux":                     "FLUX",
+	"formatted":                "Formatted",
+	"forth":                    "Forth",
+	"fortran":                  "Fortran",
+	"foxpro":                   "xBase",
+	"freemarker":               "FreeMarker",
+	"frege":                    "Frege",
+	"fsharp":                   "F#",
+	"ftl":                      "FreeMarker",
+	"fundamental":              "Text",
+	"g-code":                   "G-code",
+	"game_maker_language":      "Game Maker Language",
+	"gams":                     "GAMS",
+	"gap":                      "GAP",
+	"gcc_machine_description": "GCC Machine Description",
+	"gdb":                     "GDB",
+	"gdscript":                "GDScript",
+	"genie":                   "Genie",
+	"genshi":                  "Genshi",
+	"gentoo_ebuild":           "Gentoo Ebuild",
+	"gentoo_eclass":           "Gentoo Eclass",
+	"gettext_catalog":         "Gettext Catalog",
+	"gf":                      "Grammatical Framework",
+	"gherkin":                 "Gherkin",
+	"glsl":                    "GLSL",
+	"glyph":                   "Glyph",
+	"gn":                      "GN",
+	"gnuplot":                 "Gnuplot",
+	"go":                      "Go",
+	"golang":                  "Go",
+	"golo":                    "Golo",
+	"gosu":                    "Gosu",
+	"grace":                   "Grace",
+	"gradle":                  "Gradle",
+	"grammatical_framework":   "Grammatical Framework",
+	"graph_modeling_language": "Graph Modeling Language",
+	"graphql":                 "GraphQL",
+	"graphviz_(dot)":          "Graphviz (DOT)",
+	"groovy":                  "Groovy",
+	"groovy_server_pages":     "Groovy Server Pages",
+	"gsp":                      "Groovy Server Pages",
+	"hack":                     "Hack",
+	"haml":                     "Haml",
+	"handlebars":               "Handlebars",
+	"harbour":                  "Harbour",
+	"haskell":                  "Haskell",
+	"haxe":                     "Haxe",
+	"hbs":                      "Handlebars",
+	"hcl":                      "HCL",
+	"hlsl":                     "HLSL",
+	"html":                     "HTML",
+	"html+django":              "HTML+Django",
+	"html+django/jinja":        "HTML+Django",
+	"html+ecr":                 "HTML+ECR",
+	"html+eex":                 "HTML+EEX",
+	"html+erb":                 "HTML+ERB",
+	"html+jinja":               "HTML+Django",
+	"html+php":                 "HTML+PHP",
+	"html+ruby":                "RHTML",
+	"htmlbars":                 "Handlebars",
+	"htmldjango":               "HTML+Django",
+	"http":                     "HTTP",
+	"hy":                       "Hy",
+	"hylang":                   "Hy",
+	"hyphy":                    "HyPhy",
+	"i7":                       "Inform 7",
+	"idl":                      "IDL",
+	"idris":                    "Idris",
+	"igor":                     "IGOR Pro",
+	"igor_pro":                 "IGOR Pro",
+	"igorpro":                  "IGOR Pro",
+	"inc":                      "PHP",
+	"inform7":                  "Inform 7",
+	"inform_7":                 "Inform 7",
+	"ini":                      "INI",
+	"inno_setup":               "Inno Setup",
+	"io":                       "Io",
+	"ioke":                     "Ioke",
+	"ipython_notebook":         "Jupyter Notebook",
+	"irc":                      "IRC log",
+	"irc_log":                  "IRC log",
+	"irc_logs":                 "IRC log",
+	"isabelle":                 "Isabelle",
+	"isabelle_root":            "Isabelle ROOT",
+	"j":                        "J",
+	"jasmin":                   "Jasmin",
+	"java":                     "Java",
+	"java_server_page":         "Groovy Server Pages",
+	"java_server_pages":        "Java Server Pages",
+	"javascript":               "JavaScript",
+	"jflex":                    "JFlex",
+	"jison":                    "Jison",
+	"jison_lex":                "Jison Lex",
+	"jolie":                    "Jolie",
+	"jruby":                    "Ruby",
+	"js":                       "JavaScript",
+	"json":                     "JSON",
+	"json5":                    "JSON5",
+	"jsoniq":                   "JSONiq",
+	"jsonld":                   "JSONLD",
+	"jsp":                      "Java Server Pages",
+	"jsx":                      "JSX",
+	"julia":                    "Julia",
+	"jupyter_notebook":         "Jupyter Notebook",
+	"kicad":                    "KiCad",
+	"kit":                      "Kit",
+	"kotlin":                   "Kotlin",
+	"krl":                      "KRL",
+	"labview":                  "LabVIEW",
+	"lasso":                    "Lasso",
+	"lassoscript":              "Lasso",
+	"latex":                    "TeX",
+	"latte":                    "Latte",
+	"lean":                     "Lean",
+	"less":                     "Less",
+	"lex":                      "Lex",
+	"lfe":                      "LFE",
+	"lhaskell":                 "Literate Haskell",
+	"lhs":                      "Literate Haskell",
+	"lilypond":                 "LilyPond",
+	"limbo":                    "Limbo",
+	"linker_script":            "Linker Script",
+	"linux_kernel_module":      "Linux Kernel Module",
+	"liquid":                   "Liquid",
+	"lisp":                     "Common Lisp",
+	"litcoffee":                "Literate CoffeeScript",
+	"literate_agda":            "Literate Agda",
+	"literate_coffeescript":    "Literate CoffeeScript",
+	"literate_haskell":         "Literate Haskell",
+	"live-script":              "LiveScript",
+	"livescript":               "LiveScript",
+	"llvm":                     "LLVM",
+	"logos":                    "Logos",
+	"logtalk":                  "Logtalk",
+	"lolcode":                  "LOLCODE",
+	"lookml":                   "LookML",
+	"loomscript":               "LoomScript",
+	"ls":                       "LiveScript",
+	"lsl":                      "LSL",
+	"lua":                      "Lua",
+	"m":                        "M",
+	"m4":                       "M4",
+	"m4sugar":                  "M4Sugar",
+	"macruby":                  "Ruby",
+	"make":                     "Makefile",
+	"makefile":                 "Makefile",
+	"mako":                     "Mako",
+	"markdown":                 "Markdown",
+	"marko":                    "Marko",
+	"markojs":                  "Marko",
+	"mask":                     "Mask",
+	"mathematica":              "Mathematica",
+	"matlab":                   "Matlab",
+	"maven_pom":                "Maven POM",
+	"max":                      "Max",
+	"max/msp":                  "Max",
+	"maxmsp":                   "Max",
+	"maxscript":                "MAXScript",
+	"mediawiki":                "MediaWiki",
+	"mercury":                  "Mercury",
+	"meson":                    "Meson",
+	"metal":                    "Metal",
+	"mf":                       "Makefile",
+	"minid":                    "MiniD",
+	"mirah":                    "Mirah",
+	"mma":                      "Mathematica",
+	"modelica":                 "Modelica",
+	"modula-2":                 "Modula-2",
+	"module_management_system": "Module Management System",
+	"monkey":                   "Monkey",
+	"moocode":                  "Moocode",
+	"moonscript":               "MoonScript",
+	"mql4":                     "MQL4",
+	"mql5":                     "MQL5",
+	"mtml":                     "MTML",
+	"muf":                      "MUF",
+	"mumps":                    "M",
+	"mupad":                    "mupad",
+	"myghty":                   "Myghty",
+	"nasm":                     "Assembly",
+	"ncl":                      "NCL",
+	"nemerle":                  "Nemerle",
+	"nesc":                     "nesC",
+	"netlinx":                  "NetLinx",
+	"netlinx+erb":              "NetLinx+ERB",
+	"netlogo":                  "NetLogo",
+	"newlisp":                  "NewLisp",
+	"nginx":                    "Nginx",
+	"nginx_configuration_file": "Nginx",
+	"nim":                   "Nim",
+	"ninja":                 "Ninja",
+	"nit":                   "Nit",
+	"nix":                   "Nix",
+	"nixos":                 "Nix",
+	"njk":                   "HTML+Django",
+	"nl":                    "NL",
+	"node":                  "JavaScript",
+	"nroff":                 "Roff",
+	"nsis":                  "NSIS",
+	"nu":                    "Nu",
+	"numpy":                 "NumPy",
+	"nunjucks":              "HTML+Django",
+	"nush":                  "Nu",
+	"nvim":                  "Vim script",
+	"obj-c":                 "Objective-C",
+	"obj-c++":               "Objective-C++",
+	"obj-j":                 "Objective-J",
+	"objc":                  "Objective-C",
+	"objc++":                "Objective-C++",
+	"objdump":               "ObjDump",
+	"objective-c":           "Objective-C",
+	"objective-c++":         "Objective-C++",
+	"objective-j":           "Objective-J",
+	"objectivec":            "Objective-C",
+	"objectivec++":          "Objective-C++",
+	"objectivej":            "Objective-J",
+	"objectpascal":          "Component Pascal",
+	"objj":                  "Objective-J",
+	"ocaml":                 "OCaml",
+	"octave":                "Matlab",
+	"omgrofl":               "Omgrofl",
+	"ooc":                   "ooc",
+	"opa":                   "Opa",
+	"opal":                  "Opal",
+	"opencl":                "OpenCL",
+	"openedge":              "OpenEdge ABL",
+	"openedge_abl":          "OpenEdge ABL",
+	"openrc":                "OpenRC runscript",
+	"openrc_runscript":      "OpenRC runscript",
+	"openscad":              "OpenSCAD",
+	"opentype_feature_file": "OpenType Feature File",
+	"org":                            "Org",
+	"osascript":                      "AppleScript",
+	"ox":                             "Ox",
+	"oxygene":                        "Oxygene",
+	"oz":                             "Oz",
+	"p4":                             "P4",
+	"pan":                            "Pan",
+	"pandoc":                         "Markdown",
+	"papyrus":                        "Papyrus",
+	"parrot":                         "Parrot",
+	"parrot_assembly":                "Parrot Assembly",
+	"parrot_internal_representation": "Parrot Internal Representation",
+	"pascal":                "Pascal",
+	"pasm":                  "Parrot Assembly",
+	"pawn":                  "PAWN",
+	"pep8":                  "Pep8",
+	"perl":                  "Perl",
+	"perl6":                 "Perl6",
+	"php":                   "PHP",
+	"pic":                   "Pic",
+	"pickle":                "Pickle",
+	"picolisp":              "PicoLisp",
+	"piglatin":              "PigLatin",
+	"pike":                  "Pike",
+	"pir":                   "Parrot Internal Representation",
+	"plpgsql":               "PLpgSQL",
+	"plsql":                 "PLSQL",
+	"pod":                   "Pod",
+	"pogoscript":            "PogoScript",
+	"pony":                  "Pony",
+	"posh":                  "PowerShell",
+	"postscr":               "PostScript",
+	"postscript":            "PostScript",
+	"pot":                   "Gettext Catalog",
+	"pov-ray":               "POV-Ray SDL",
+	"pov-ray_sdl":           "POV-Ray SDL",
+	"povray":                "POV-Ray SDL",
+	"powerbuilder":          "PowerBuilder",
+	"powershell":            "PowerShell",
+	"processing":            "Processing",
+	"progress":              "OpenEdge ABL",
+	"prolog":                "Prolog",
+	"propeller_spin":        "Propeller Spin",
+	"protobuf":              "Protocol Buffer",
+	"protocol_buffer":       "Protocol Buffer",
+	"protocol_buffers":      "Protocol Buffer",
+	"public_key":            "Public Key",
+	"pug":                   "Pug",
+	"puppet":                "Puppet",
+	"pure_data":             "Pure Data",
+	"purebasic":             "PureBasic",
+	"purescript":            "PureScript",
+	"pycon":                 "Python console",
+	"pyrex":                 "Cython",
+	"python":                "Python",
+	"python_console":        "Python console",
+	"python_traceback":      "Python traceback",
+	"qmake":                 "QMake",
+	"qml":                   "QML",
+	"r":                     "R",
+	"racket":                "Racket",
+	"ragel":                 "Ragel",
+	"ragel-rb":              "Ragel",
+	"ragel-ruby":            "Ragel",
+	"rake":                  "Ruby",
+	"raml":                  "RAML",
+	"rascal":                "Rascal",
+	"raw":                   "Raw token data",
+	"raw_token_data":        "Raw token data",
+	"rb":                    "Ruby",
+	"rbx":                   "Ruby",
+	"rdoc":                  "RDoc",
+	"realbasic":             "REALbasic",
+	"reason":                "Reason",
+	"rebol":                 "Rebol",
+	"red":                   "Red",
+	"red/system":            "Red",
+	"redcode":               "Redcode",
+	"regex":                 "Regular Expression",
+	"regexp":                "Regular Expression",
+	"regular_expression":    "Regular Expression",
+	"ren'py":                "Ren'Py",
+	"renderscript":          "RenderScript",
+	"renpy":                 "Ren'Py",
+	"restructuredtext":      "reStructuredText",
+	"rexx":                  "REXX",
+	"rhtml":                 "RHTML",
+	"rmarkdown":             "RMarkdown",
+	"robotframework":        "RobotFramework",
+	"roff":                  "Roff",
+	"rouge":                 "Rouge",
+	"rpm_spec":              "RPM Spec",
+	"rscript":               "R",
+	"rss":                   "XML",
+	"rst":                   "reStructuredText",
+	"ruby":                  "Ruby",
+	"runoff":                "RUNOFF",
+	"rust":                  "Rust",
+	"rusthon":               "Python",
+	"sage":                  "Sage",
+	"salt":                  "SaltStack",
+	"saltstack":             "SaltStack",
+	"saltstate":             "SaltStack",
+	"sas":                   "SAS",
+	"sass":                  "Sass",
+	"scala":                 "Scala",
+	"scaml":                 "Scaml",
+	"scheme":                "Scheme",
+	"scilab":                "Scilab",
+	"scss":                  "SCSS",
+	"self":                  "Self",
+	"sh":                    "Shell",
+	"shaderlab":             "ShaderLab",
+	"shell":                 "Shell",
+	"shell-script":          "Shell",
+	"shellsession":          "ShellSession",
+	"shen":                  "Shen",
+	"slash":                 "Slash",
+	"slim":                  "Slim",
+	"smali":                 "Smali",
+	"smalltalk":             "Smalltalk",
+	"smarty":                "Smarty",
+	"sml":                   "Standard ML",
+	"smt":                   "SMT",
+	"sourcemod":             "SourcePawn",
+	"sourcepawn":            "SourcePawn",
+	"sparql":                "SPARQL",
+	"specfile":              "RPM Spec",
+	"spline_font_database":  "Spline Font Database",
+	"splus":                 "R",
+	"sqf":                   "SQF",
+	"sql":                   "SQL",
+	"sqlpl":                 "SQLPL",
+	"squeak":                "Smalltalk",
+	"squirrel":              "Squirrel",
+	"srecode_template":      "SRecode Template",
+	"stan":                  "Stan",
+	"standard_ml":           "Standard ML",
+	"stata":                 "Stata",
+	"ston":                  "STON",
+	"stylus":                "Stylus",
+	"sublime_text_config":   "Sublime Text Config",
+	"subrip_text":           "SubRip Text",
+	"supercollider":         "SuperCollider",
+	"svg":                   "SVG",
+	"swift":                 "Swift",
+	"systemverilog":         "SystemVerilog",
+	"tcl":                   "Tcl",
+	"tcsh":                  "Tcsh",
+	"tea":                   "Tea",
+	"terra":                 "Terra",
+	"tex":                   "TeX",
+	"text":                  "Text",
+	"textile":               "Textile",
+	"thrift":                "Thrift",
+	"ti_program":            "TI Program",
+	"tl":                    "Type Language",
+	"tla":                   "TLA",
+	"toml":                  "TOML",
+	"ts":                    "TypeScript",
+	"turing":                "Turing",
+	"turtle":                "Turtle",
+	"twig":                  "Twig",
+	"txl":                   "TXL",
+	"type_language":         "Type Language",
+	"typescript":            "TypeScript",
+	"udiff":                 "Diff",
+	"unified_parallel_c":    "Unified Parallel C",
+	"unity3d_asset":         "Unity3D Asset",
+	"unix_assembly":         "Unix Assembly",
+	"uno":                   "Uno",
+	"unrealscript":          "UnrealScript",
+	"ur":                    "UrWeb",
+	"ur/web":                "UrWeb",
+	"urweb":                 "UrWeb",
+	"vala":                  "Vala",
+	"vb.net":                "Visual Basic",
+	"vbnet":                 "Visual Basic",
+	"vcl":                   "VCL",
+	"verilog":               "Verilog",
+	"vhdl":                  "VHDL",
+	"vim":                   "Vim script",
+	"vim_script":            "Vim script",
+	"viml":                  "Vim script",
+	"visual_basic":          "Visual Basic",
+	"volt":                  "Volt",
+	"vue":                   "Vue",
+	"wasm":                  "WebAssembly",
+	"wast":                  "WebAssembly",
+	"wavefront_material":    "Wavefront Material",
+	"wavefront_object":      "Wavefront Object",
+	"web_ontology_language": "Web Ontology Language",
+	"webassembly":           "WebAssembly",
+	"webidl":                "WebIDL",
+	"winbatch":              "Batchfile",
+	"wisp":                  "wisp",
+	"world_of_warcraft_addon_data": "World of Warcraft Addon Data",
+	"wsdl":       "XML",
+	"x10":        "X10",
+	"xbase":      "xBase",
+	"xc":         "XC",
+	"xcompose":   "XCompose",
+	"xhtml":      "HTML",
+	"xml":        "XML",
+	"xml+genshi": "Genshi",
+	"xml+kid":    "Genshi",
+	"xojo":       "Xojo",
+	"xpages":     "XPages",
+	"xproc":      "XProc",
+	"xquery":     "XQuery",
+	"xs":         "XS",
+	"xsd":        "XML",
+	"xsl":        "XSLT",
+	"xslt":       "XSLT",
+	"xten":       "X10",
+	"xtend":      "Xtend",
+	"yacc":       "Yacc",
+	"yaml":       "YAML",
+	"yang":       "YANG",
+	"yml":        "YAML",
+	"zephir":     "Zephir",
+	"zimpl":      "Zimpl",
+	"zsh":        "Shell",
+}

internal/code-generator/generator/test_files/aliases.gold

@@ -1,42 +0,0 @@
-package enry
-
-// CODE GENERATED AUTOMATICALLY WITH gopkg.in/src-d/enry.v1/internal/code-generator
-// THIS FILE SHOULD NOT BE EDITED BY HAND
-// Extracted from github/linguist commit: 0123456789abcdef0123456789abcdef01234567
-
-// languagesByAlias keeps alias for different languages and use the name of the languages as an alias too.
-// All the keys (alias or not) are written in lower case and the whitespaces has been replaced by underscores.
-var languagesByAlias = map[string]string{
-	"asp":               "ASP",
-	"aspx":              "ASP",
-	"aspx-vb":           "ASP",
-	"au3":               "AutoIt",
-	"autoit":            "AutoIt",
-	"autoit3":           "AutoIt",
-	"autoitscript":      "AutoIt",
-	"bat":               "Batchfile",
-	"batch":             "Batchfile",
-	"batchfile":         "Batchfile",
-	"bsdmake":           "Makefile",
-	"c++":               "C++",
-	"cpp":               "C++",
-	"django":            "HTML+Django",
-	"dosbatch":          "Batchfile",
-	"go":                "Go",
-	"golang":            "Go",
-	"gradle":            "Gradle",
-	"html+django":       "HTML+Django",
-	"html+django/jinja": "HTML+Django",
-	"html+jinja":        "HTML+Django",
-	"htmldjango":        "HTML+Django",
-	"make":              "Makefile",
-	"makefile":          "Makefile",
-	"mf":                "Makefile",
-	"njk":               "HTML+Django",
-	"nunjucks":          "HTML+Django",
-	"obj-c":             "Objective-C",
-	"objc":              "Objective-C",
-	"objective-c":       "Objective-C",
-	"objectivec":        "Objective-C",
-	"winbatch":          "Batchfile",
-}

internal/code-generator/generator/test_files/aliases.test.yml

@@ -1,42 +0,0 @@
----
-ASP:
-  aliases:
-  - aspx
-  - aspx-vb
-AutoIt:
-  aliases:
-  - au3
-  - AutoIt3
-  - AutoItScript
-Batchfile:
-  aliases:
-  - bat
-  - batch
-  - dosbatch
-  - winbatch
-C++:
-  aliases:
-  - cpp
-Go:
-  aliases:
-  - golang
-Gradle:
-  type: data
-HTML+Django:
-  aliases:
-  - django
-  - html+django/jinja
-  - html+jinja
-  - htmldjango
-  - njk
-  - nunjucks
-Makefile:
-  aliases:
-  - bsdmake
-  - make
-  - mf
-Objective-C:
-  aliases:
-  - obj-c
-  - objc
-  - objectivec

internal/code-generator/generator/test_files/content.gold

@@ -2,7 +2,7 @@ package enry
 
 // CODE GENERATED AUTOMATICALLY WITH gopkg.in/src-d/enry.v1/internal/code-generator
 // THIS FILE SHOULD NOT BE EDITED BY HAND
-// Extracted from github/linguist commit: 0123456789abcdef0123456789abcdef01234567
+// Extracted from github/linguist commit: b6460f8ed6b249281ada099ca28bd8f1230b8892
 
 import (
 	"regexp"
@@ -22,13 +22,128 @@ var contentMatchers = map[string]languageMatcher{
 
 		return nil
 	},
+	".bb": func(i []byte) []string {
+		if bb_BlitzBasic_Matcher_0.Match(i) || bb_BlitzBasic_Matcher_1.Match(i) {
+			return []string{"BlitzBasic"}
+		} else if bb_BitBake_Matcher_0.Match(i) {
+			return []string{"BitBake"}
+		}
+
+		return nil
+	},
+	".builds": func(i []byte) []string {
+		if builds_XML_Matcher_0.Match(i) {
+			return []string{"XML"}
+		}
+
+		return []string{"Text"}
+	},
+	".ch": func(i []byte) []string {
+		if ch_xBase_Matcher_0.Match(i) {
+			return []string{"xBase"}
+		}
+
+		return nil
+	},
+	".cl": func(i []byte) []string {
+		if cl_CommonLisp_Matcher_0.Match(i) {
+			return []string{"Common Lisp"}
+		} else if cl_Cool_Matcher_0.Match(i) {
+			return []string{"Cool"}
+		} else if cl_OpenCL_Matcher_0.Match(i) {
+			return []string{"OpenCL"}
+		}
+
+		return nil
+	},
+	".cls": func(i []byte) []string {
+		if cls_TeX_Matcher_0.Match(i) {
+			return []string{"TeX"}
+		}
+
+		return nil
+	},
+	".cs": func(i []byte) []string {
+		if cs_Smalltalk_Matcher_0.Match(i) {
+			return []string{"Smalltalk"}
+		} else if cs_CSharp_Matcher_0.Match(i) || cs_CSharp_Matcher_1.Match(i) {
+			return []string{"C#"}
+		}
+
+		return nil
+	},
+	".d": func(i []byte) []string {
+		if d_D_Matcher_0.Match(i) {
+			return []string{"D"}
+		} else if d_DTrace_Matcher_0.Match(i) {
+			return []string{"DTrace"}
+		} else if d_Makefile_Matcher_0.Match(i) {
+			return []string{"Makefile"}
+		}
+
+		return nil
+	},
+	".ecl": func(i []byte) []string {
+		if ecl_ECLiPSe_Matcher_0.Match(i) {
+			return []string{"ECLiPSe"}
+		} else if ecl_ECL_Matcher_0.Match(i) {
+			return []string{"ECL"}
+		}
+
+		return nil
+	},
+	".es": func(i []byte) []string {
+		if es_Erlang_Matcher_0.Match(i) {
+			return []string{"Erlang"}
+		}
+
+		return nil
+	},
 	".f": func(i []byte) []string {
 		if f_Forth_Matcher_0.Match(i) {
 			return []string{"Forth"}
 		} else if f_FilebenchWML_Matcher_0.Match(i) {
 			return []string{"Filebench WML"}
-		} else if f_FORTRAN_Matcher_0.Match(i) {
-			return []string{"FORTRAN"}
+		} else if f_Fortran_Matcher_0.Match(i) {
+			return []string{"Fortran"}
+		}
+
+		return nil
+	},
+	".for": func(i []byte) []string {
+		if for_Forth_Matcher_0.Match(i) {
+			return []string{"Forth"}
+		} else if for_Fortran_Matcher_0.Match(i) {
+			return []string{"Fortran"}
+		}
+
+		return nil
+	},
+	".fr": func(i []byte) []string {
+		if fr_Forth_Matcher_0.Match(i) {
+			return []string{"Forth"}
+		} else if fr_Frege_Matcher_0.Match(i) {
+			return []string{"Frege"}
+		}
+
+		return []string{"Text"}
+	},
+	".fs": func(i []byte) []string {
+		if fs_Forth_Matcher_0.Match(i) {
+			return []string{"Forth"}
+		} else if fs_FSharp_Matcher_0.Match(i) {
+			return []string{"F#"}
+		} else if fs_GLSL_Matcher_0.Match(i) {
+			return []string{"GLSL"}
+		} else if fs_Filterscript_Matcher_0.Match(i) {
+			return []string{"Filterscript"}
+		}
+
+		return nil
+	},
+	".gs": func(i []byte) []string {
+		if gs_Gosu_Matcher_0.Match(i) {
+			return []string{"Gosu"}
 		}
 
 		return nil
@@ -42,6 +157,35 @@ var contentMatchers = map[string]languageMatcher{
 
 		return nil
 	},
+	".inc": func(i []byte) []string {
+		if inc_PHP_Matcher_0.Match(i) {
+			return []string{"PHP"}
+		} else if inc_POVDashRaySDL_Matcher_0.Match(i) {
+			return []string{"POV-Ray SDL"}
+		}
+
+		return nil
+	},
+	".l": func(i []byte) []string {
+		if l_CommonLisp_Matcher_0.Match(i) {
+			return []string{"Common Lisp"}
+		} else if l_Lex_Matcher_0.Match(i) {
+			return []string{"Lex"}
+		} else if l_Roff_Matcher_0.Match(i) {
+			return []string{"Roff"}
+		} else if l_PicoLisp_Matcher_0.Match(i) {
+			return []string{"PicoLisp"}
+		}
+
+		return nil
+	},
+	".ls": func(i []byte) []string {
+		if ls_LoomScript_Matcher_0.Match(i) {
+			return []string{"LoomScript"}
+		}
+
+		return []string{"LiveScript"}
+	},
 	".lsp": func(i []byte) []string {
 		if lsp_CommonLisp_Matcher_0.Match(i) {
 			return []string{"Common Lisp"}
@@ -60,21 +204,42 @@ var contentMatchers = map[string]languageMatcher{
 
 		return nil
 	},
+	".m": func(i []byte) []string {
+		if m_ObjectiveDashC_Matcher_0.Match(i) {
+			return []string{"Objective-C"}
+		} else if m_Mercury_Matcher_0.Match(i) {
+			return []string{"Mercury"}
+		} else if m_MUF_Matcher_0.Match(i) {
+			return []string{"MUF"}
+		} else if m_M_Matcher_0.Match(i) {
+			return []string{"M"}
+		} else if m_Mathematica_Matcher_0.Match(i) {
+			return []string{"Mathematica"}
+		} else if m_Matlab_Matcher_0.Match(i) {
+			return []string{"Matlab"}
+		} else if m_Limbo_Matcher_0.Match(i) {
+			return []string{"Limbo"}
+		}
+
+		return nil
+	},
 	".md": func(i []byte) []string {
 		if md_Markdown_Matcher_0.Match(i) || md_Markdown_Matcher_1.Match(i) {
 			return []string{"Markdown"}
-		} else if md_GCCmachinedescription_Matcher_0.Match(i) {
-			return []string{"GCC machine description"}
+		} else if md_GCCMachineDescription_Matcher_0.Match(i) {
+			return []string{"GCC Machine Description"}
 		}
 
 		return []string{"Markdown"}
 	},
-	".ms": func(i []byte) []string {
-		if ms_Groff_Matcher_0.Match(i) {
-			return []string{"Groff"}
+	".ml": func(i []byte) []string {
+		if ml_OCaml_Matcher_0.Match(i) {
+			return []string{"OCaml"}
+		} else if ml_StandardML_Matcher_0.Match(i) {
+			return []string{"Standard ML"}
 		}
 
-		return []string{"MAXScript"}
+		return nil
 	},
 	".mod": func(i []byte) []string {
 		if mod_XML_Matcher_0.Match(i) {
@@ -85,6 +250,72 @@ var contentMatchers = map[string]languageMatcher{
 
 		return []string{"Linux Kernel Module", "AMPL"}
 	},
+	".ms": func(i []byte) []string {
+		if ms_Roff_Matcher_0.Match(i) {
+			return []string{"Roff"}
+		}
+
+		return []string{"MAXScript"}
+	},
+	".n": func(i []byte) []string {
+		if n_Roff_Matcher_0.Match(i) {
+			return []string{"Roff"}
+		} else if n_Nemerle_Matcher_0.Match(i) {
+			return []string{"Nemerle"}
+		}
+
+		return nil
+	},
+	".ncl": func(i []byte) []string {
+		if ncl_Text_Matcher_0.Match(i) {
+			return []string{"Text"}
+		}
+
+		return nil
+	},
+	".nl": func(i []byte) []string {
+		if nl_NL_Matcher_0.Match(i) {
+			return []string{"NL"}
+		}
+
+		return []string{"NewLisp"}
+	},
+	".php": func(i []byte) []string {
+		if php_Hack_Matcher_0.Match(i) {
+			return []string{"Hack"}
+		} else if php_PHP_Matcher_0.Match(i) {
+			return []string{"PHP"}
+		}
+
+		return nil
+	},
+	".pl": func(i []byte) []string {
+		if pl_Prolog_Matcher_0.Match(i) {
+			return []string{"Prolog"}
+		} else if pl_Perl_Matcher_0.Match(i) {
+			return []string{"Perl"}
+		} else if pl_Perl6_Matcher_0.Match(i) {
+			return []string{"Perl6"}
+		}
+
+		return nil
+	},
+	".pm": func(i []byte) []string {
+		if pm_Perl6_Matcher_0.Match(i) {
+			return []string{"Perl6"}
+		} else if pm_Perl_Matcher_0.Match(i) {
+			return []string{"Perl"}
+		}
+
+		return nil
+	},
+	".pod": func(i []byte) []string {
+		if pod_Pod_Matcher_0.Match(i) {
+			return []string{"Pod"}
+		}
+
+		return []string{"Perl"}
+	},
 	".pro": func(i []byte) []string {
 		if pro_Prolog_Matcher_0.Match(i) {
 			return []string{"Prolog"}
@@ -98,6 +329,33 @@ var contentMatchers = map[string]languageMatcher{
 
 		return nil
 	},
+	".props": func(i []byte) []string {
+		if props_XML_Matcher_0.Match(i) {
+			return []string{"XML"}
+		} else if props_INI_Matcher_0.Match(i) {
+			return []string{"INI"}
+		}
+
+		return nil
+	},
+	".r": func(i []byte) []string {
+		if r_Rebol_Matcher_0.Match(i) {
+			return []string{"Rebol"}
+		} else if r_R_Matcher_0.Match(i) {
+			return []string{"R"}
+		}
+
+		return nil
+	},
+	".rno": func(i []byte) []string {
+		if rno_RUNOFF_Matcher_0.Match(i) {
+			return []string{"RUNOFF"}
+		} else if rno_Roff_Matcher_0.Match(i) {
+			return []string{"Roff"}
+		}
+
+		return nil
+	},
 	".rpy": func(i []byte) []string {
 		if rpy_Python_Matcher_0.Match(i) {
 			return []string{"Python"}
@@ -105,15 +363,123 @@ var contentMatchers = map[string]languageMatcher{
 
 		return []string{"Ren'Py"}
 	},
+	".rs": func(i []byte) []string {
+		if rs_Rust_Matcher_0.Match(i) {
+			return []string{"Rust"}
+		} else if rs_RenderScript_Matcher_0.Match(i) {
+			return []string{"RenderScript"}
+		}
+
+		return nil
+	},
+	".sc": func(i []byte) []string {
+		if sc_SuperCollider_Matcher_0.Match(i) || sc_SuperCollider_Matcher_1.Match(i) || sc_SuperCollider_Matcher_2.Match(i) {
+			return []string{"SuperCollider"}
+		} else if sc_Scala_Matcher_0.Match(i) || sc_Scala_Matcher_1.Match(i) || sc_Scala_Matcher_2.Match(i) {
+			return []string{"Scala"}
+		}
+
+		return nil
+	},
+	".sql": func(i []byte) []string {
+		if sql_PLpgSQL_Matcher_0.Match(i) || sql_PLpgSQL_Matcher_1.Match(i) || sql_PLpgSQL_Matcher_2.Match(i) {
+			return []string{"PLpgSQL"}
+		} else if sql_SQLPL_Matcher_0.Match(i) || sql_SQLPL_Matcher_1.Match(i) {
+			return []string{"SQLPL"}
+		} else if sql_PLSQL_Matcher_0.Match(i) || sql_PLSQL_Matcher_1.Match(i) {
+			return []string{"PLSQL"}
+		} else if sql_SQL_Matcher_0.Match(i) {
+			return []string{"SQL"}
+		}
+
+		return nil
+	},
+	".srt": func(i []byte) []string {
+		if srt_SubRipText_Matcher_0.Match(i) {
+			return []string{"SubRip Text"}
+		}
+
+		return nil
+	},
+	".t": func(i []byte) []string {
+		if t_Turing_Matcher_0.Match(i) {
+			return []string{"Turing"}
+		} else if t_Perl6_Matcher_0.Match(i) {
+			return []string{"Perl6"}
+		} else if t_Perl_Matcher_0.Match(i) {
+			return []string{"Perl"}
+		}
+
+		return nil
+	},
+	".toc": func(i []byte) []string {
+		if toc_WorldofWarcraftAddonData_Matcher_0.Match(i) {
+			return []string{"World of Warcraft Addon Data"}
+		} else if toc_TeX_Matcher_0.Match(i) {
+			return []string{"TeX"}
+		}
+
+		return nil
+	},
+	".ts": func(i []byte) []string {
+		if ts_XML_Matcher_0.Match(i) {
+			return []string{"XML"}
+		}
+
+		return []string{"TypeScript"}
+	},
+	".tst": func(i []byte) []string {
+		if tst_GAP_Matcher_0.Match(i) {
+			return []string{"GAP"}
+		}
+
+		return []string{"Scilab"}
+	},
+	".tsx": func(i []byte) []string {
+		if tsx_TypeScript_Matcher_0.Match(i) {
+			return []string{"TypeScript"}
+		} else if tsx_XML_Matcher_0.Match(i) {
+			return []string{"XML"}
+		}
+
+		return nil
+	},
 }
 
 var (
 	asc_PublicKey_Matcher_0                = regexp.MustCompile(`(?m)^(----[- ]BEGIN|ssh-(rsa|dss)) `)
 	asc_AsciiDoc_Matcher_0                 = regexp.MustCompile(`(?m)^[=-]+(\s|\n)|{{[A-Za-z]`)
 	asc_AGSScript_Matcher_0                = regexp.MustCompile(`(?m)^(\/\/.+|((import|export)\s+)?(function|int|float|char)\s+((room|repeatedly|on|game)_)?([A-Za-z]+[A-Za-z_0-9]+)\s*[;\(])`)
+	bb_BlitzBasic_Matcher_0                = regexp.MustCompile(`(?m)^\s*; `)
+	bb_BlitzBasic_Matcher_1                = regexp.MustCompile(`(?m)End Function`)
+	bb_BitBake_Matcher_0                   = regexp.MustCompile(`(?m)^\s*(# |include|require)\b`)
+	builds_XML_Matcher_0                   = regexp.MustCompile(`(?mi)^(\s*)(<Project|<Import|<Property|<?xml|xmlns)`)
+	ch_xBase_Matcher_0                     = regexp.MustCompile(`(?mi)^\s*#\s*(if|ifdef|ifndef|define|command|xcommand|translate|xtranslate|include|pragma|undef)\b`)
+	cl_CommonLisp_Matcher_0                = regexp.MustCompile(`(?mi)^\s*\((defun|in-package|defpackage) `)
+	cl_Cool_Matcher_0                      = regexp.MustCompile(`(?m)^class`)
+	cl_OpenCL_Matcher_0                    = regexp.MustCompile(`(?m)\/\* |\/\/ |^\}`)
+	cls_TeX_Matcher_0                      = regexp.MustCompile(`(?m)\\\w+{`)
+	cs_Smalltalk_Matcher_0                 = regexp.MustCompile(`(?m)![\w\s]+methodsFor: `)
+	cs_CSharp_Matcher_0                    = regexp.MustCompile(`(?m)^\s*namespace\s*[\w\.]+\s*{`)
+	cs_CSharp_Matcher_1                    = regexp.MustCompile(`(?m)^\s*\/\/`)
+	d_D_Matcher_0                          = regexp.MustCompile(`(?m)^module\s+[\w.]*\s*;|import\s+[\w\s,.:]*;|\w+\s+\w+\s*\(.*\)(?:\(.*\))?\s*{[^}]*}|unittest\s*(?:\(.*\))?\s*{[^}]*}`)
+	d_DTrace_Matcher_0                     = regexp.MustCompile(`(?m)^(\w+:\w*:\w*:\w*|BEGIN|END|provider\s+|(tick|profile)-\w+\s+{[^}]*}|#pragma\s+D\s+(option|attributes|depends_on)\s|#pragma\s+ident\s)`)
+	d_Makefile_Matcher_0                   = regexp.MustCompile(`(?m)([\/\\].*:\s+.*\s\\$|: \\$|^ : |^[\w\s\/\\.]+\w+\.\w+\s*:\s+[\w\s\/\\.]+\w+\.\w+)`)
+	ecl_ECLiPSe_Matcher_0                  = regexp.MustCompile(`(?m)^[^#]+:-`)
+	ecl_ECL_Matcher_0                      = regexp.MustCompile(`(?m):=`)
+	es_Erlang_Matcher_0                    = regexp.MustCompile(`(?m)^\s*(?:%%|main\s*\(.*?\)\s*->)`)
 	f_Forth_Matcher_0                      = regexp.MustCompile(`(?m)^: `)
 	f_FilebenchWML_Matcher_0               = regexp.MustCompile(`(?m)flowop`)
-	f_FORTRAN_Matcher_0                = regexp.MustCompile(`(?mi)^([c*][^abd-z]|      (subroutine|program|end|data)\s|\s*!)`)
+	f_Fortran_Matcher_0                    = regexp.MustCompile(`(?mi)^([c*][^abd-z]|      (subroutine|program|end|data)\s|\s*!)`)
+	for_Forth_Matcher_0                    = regexp.MustCompile(`(?m)^: `)
+	for_Fortran_Matcher_0                  = regexp.MustCompile(`(?mi)^([c*][^abd-z]|      (subroutine|program|end|data)\s|\s*!)`)
+	fr_Forth_Matcher_0                     = regexp.MustCompile(`(?m)^(: |also |new-device|previous )`)
+	fr_Frege_Matcher_0                     = regexp.MustCompile(`(?m)^\s*(import|module|package|data|type) `)
+	fs_Forth_Matcher_0                     = regexp.MustCompile(`(?m)^(: |new-device)`)
+	fs_FSharp_Matcher_0                    = regexp.MustCompile(`(?m)^\s*(#light|import|let|module|namespace|open|type)`)
+	fs_GLSL_Matcher_0                      = regexp.MustCompile(`(?m)^\s*(#version|precision|uniform|varying|vec[234])`)
+	fs_Filterscript_Matcher_0              = regexp.MustCompile(`(?m)#include|#pragma\s+(rs|version)|__attribute__`)
+	gs_Gosu_Matcher_0                      = regexp.MustCompile(`(?m)^uses java\.`)
 	h_ObjectiveDashC_Matcher_0             = regexp.MustCompile(`(?m)^\s*(@(interface|class|protocol|property|end|synchronised|selector|implementation)\b|#import\s+.+\.h[">])`)
 	h_CPlusPlus_Matcher_0                  = regexp.MustCompile(`(?m)^\s*#\s*include <(cstdint|string|vector|map|list|array|bitset|queue|stack|forward_list|unordered_map|unordered_set|(i|o|io)stream)>`)
 	h_CPlusPlus_Matcher_1                  = regexp.MustCompile(`(?m)^\s*template\s*<`)
@@ -122,21 +488,81 @@ var (
 	h_CPlusPlus_Matcher_4                  = regexp.MustCompile(`(?m)^[ \t]*(class|(using[ \t]+)?namespace)\s+\w+`)
 	h_CPlusPlus_Matcher_5                  = regexp.MustCompile(`(?m)^[ \t]*(private|public|protected):$`)
 	h_CPlusPlus_Matcher_6                  = regexp.MustCompile(`(?m)std::\w+`)
+	inc_PHP_Matcher_0                      = regexp.MustCompile(`(?m)^<\?(?:php)?`)
+	inc_POVDashRaySDL_Matcher_0            = regexp.MustCompile(`(?m)^\s*#(declare|local|macro|while)\s`)
+	l_CommonLisp_Matcher_0                 = regexp.MustCompile(`(?m)\(def(un|macro)\s`)
+	l_Lex_Matcher_0                        = regexp.MustCompile(`(?m)^(%[%{}]xs|<.*>)`)
+	l_Roff_Matcher_0                       = regexp.MustCompile(`(?mi)^\.[a-z][a-z](\s|$)`)
+	l_PicoLisp_Matcher_0                   = regexp.MustCompile(`(?m)^\((de|class|rel|code|data|must)\s`)
+	ls_LoomScript_Matcher_0                = regexp.MustCompile(`(?m)^\s*package\s*[\w\.\/\*\s]*\s*{`)
 	lsp_CommonLisp_Matcher_0               = regexp.MustCompile(`(?mi)^\s*\((defun|in-package|defpackage) `)
 	lsp_NewLisp_Matcher_0                  = regexp.MustCompile(`(?m)^\s*\(define `)
 	lisp_CommonLisp_Matcher_0              = regexp.MustCompile(`(?mi)^\s*\((defun|in-package|defpackage) `)
 	lisp_NewLisp_Matcher_0                 = regexp.MustCompile(`(?m)^\s*\(define `)
+	m_ObjectiveDashC_Matcher_0             = regexp.MustCompile(`(?m)^\s*(@(interface|class|protocol|property|end|synchronised|selector|implementation)\b|#import\s+.+\.h[">])`)
+	m_Mercury_Matcher_0                    = regexp.MustCompile(`(?m):- module`)
+	m_MUF_Matcher_0                        = regexp.MustCompile(`(?m)^: `)
+	m_M_Matcher_0                          = regexp.MustCompile(`(?m)^\s*;`)
+	m_Mathematica_Matcher_0                = regexp.MustCompile(`(?m)\*\)$`)
+	m_Matlab_Matcher_0                     = regexp.MustCompile(`(?m)^\s*%`)
+	m_Limbo_Matcher_0                      = regexp.MustCompile(`(?m)^\w+\s*:\s*module\s*{`)
 	md_Markdown_Matcher_0                  = regexp.MustCompile(`(?mi)(^[-a-z0-9=#!\*\[|>])|<\/`)
-	md_Markdown_Matcher_1              = regexp.MustCompile(`(?m)^$`)
-	md_GCCmachinedescription_Matcher_0 = regexp.MustCompile(`(?m)^(;;|\(define_)`)
-	ms_Groff_Matcher_0                 = regexp.MustCompile(`(?mi)^[.'][a-z][a-z](\s|$)`)
+	md_Markdown_Matcher_1                  = regexp.MustCompile(`^$`)
+	md_GCCMachineDescription_Matcher_0     = regexp.MustCompile(`(?m)^(;;|\(define_)`)
+	ml_OCaml_Matcher_0                     = regexp.MustCompile(`(?m)(^\s*module)|let rec |match\s+(\S+\s)+with`)
+	ml_StandardML_Matcher_0                = regexp.MustCompile(`(?m)=> |case\s+(\S+\s)+of`)
 	mod_XML_Matcher_0                      = regexp.MustCompile(`(?m)<!ENTITY `)
 	mod_ModulaDash2_Matcher_0              = regexp.MustCompile(`(?mi)^\s*MODULE [\w\.]+;`)
 	mod_ModulaDash2_Matcher_1              = regexp.MustCompile(`(?mi)^\s*END [\w\.]+;`)
+	ms_Roff_Matcher_0                      = regexp.MustCompile(`(?mi)^[.'][a-z][a-z](\s|$)`)
+	n_Roff_Matcher_0                       = regexp.MustCompile(`(?m)^[.']`)
+	n_Nemerle_Matcher_0                    = regexp.MustCompile(`(?m)^(module|namespace|using)\s`)
+	ncl_Text_Matcher_0                     = regexp.MustCompile(`(?m)THE_TITLE`)
+	nl_NL_Matcher_0                        = regexp.MustCompile(`(?m)^(b|g)[0-9]+ `)
+	php_Hack_Matcher_0                     = regexp.MustCompile(`(?m)<\?hh`)
+	php_PHP_Matcher_0                      = regexp.MustCompile(`(?m)<?[^h]`)
+	pl_Prolog_Matcher_0                    = regexp.MustCompile(`(?m)^[^#]*:-`)
+	pl_Perl_Matcher_0                      = regexp.MustCompile(`(?m)use strict|use\s+v?5\.`)
+	pl_Perl6_Matcher_0                     = regexp.MustCompile(`(?m)^(use v6|(my )?class|module)`)
+	pm_Perl6_Matcher_0                     = regexp.MustCompile(`(?m)^\s*(?:use\s+v6\s*;|(?:\bmy\s+)?class|module)\b`)
+	pm_Perl_Matcher_0                      = regexp.MustCompile(`(?m)\buse\s+(?:strict\b|v?5\.)`)
+	pod_Pod_Matcher_0                      = regexp.MustCompile(`(?m)^=\w+\b`)
 	pro_Prolog_Matcher_0                   = regexp.MustCompile(`(?m)^[^#]+:-`)
 	pro_INI_Matcher_0                      = regexp.MustCompile(`(?m)last_client=`)
 	pro_QMake_Matcher_0                    = regexp.MustCompile(`(?m)HEADERS`)
 	pro_QMake_Matcher_1                    = regexp.MustCompile(`(?m)SOURCES`)
 	pro_IDL_Matcher_0                      = regexp.MustCompile(`(?m)^\s*function[ \w,]+$`)
+	props_XML_Matcher_0                    = regexp.MustCompile(`(?mi)^(\s*)(<Project|<Import|<Property|<?xml|xmlns)`)
+	props_INI_Matcher_0                    = regexp.MustCompile(`(?mi)\w+\s*=\s*`)
+	r_Rebol_Matcher_0                      = regexp.MustCompile(`(?mi)\bRebol\b`)
+	r_R_Matcher_0                          = regexp.MustCompile(`(?m)<-|^\s*#`)
+	rno_RUNOFF_Matcher_0                   = regexp.MustCompile(`(?mi)^\.!|^\.end lit(?:eral)?\b`)
+	rno_Roff_Matcher_0                     = regexp.MustCompile(`(?m)^\.\\" `)
 	rpy_Python_Matcher_0                   = regexp.MustCompile(`(?ms)(^(import|from|class|def)\s)`)
+	rs_Rust_Matcher_0                      = regexp.MustCompile(`(?m)^(use |fn |mod |pub |macro_rules|impl|#!?\[)`)
+	rs_RenderScript_Matcher_0              = regexp.MustCompile(`(?m)#include|#pragma\s+(rs|version)|__attribute__`)
+	sc_SuperCollider_Matcher_0             = regexp.MustCompile(`(?m)\^(this|super)\.`)
+	sc_SuperCollider_Matcher_1             = regexp.MustCompile(`(?m)^\s*(\+|\*)\s*\w+\s*{`)
+	sc_SuperCollider_Matcher_2             = regexp.MustCompile(`(?m)^\s*~\w+\s*=\.`)
+	sc_Scala_Matcher_0                     = regexp.MustCompile(`(?m)^\s*import (scala|java)\.`)
+	sc_Scala_Matcher_1                     = regexp.MustCompile(`(?m)^\s*val\s+\w+\s*=`)
+	sc_Scala_Matcher_2                     = regexp.MustCompile(`(?m)^\s*class\b`)
+	sql_PLpgSQL_Matcher_0                  = regexp.MustCompile(`(?mi)^\\i\b|AS \$\$|LANGUAGE '?plpgsql'?`)
+	sql_PLpgSQL_Matcher_1                  = regexp.MustCompile(`(?mi)SECURITY (DEFINER|INVOKER)`)
+	sql_PLpgSQL_Matcher_2                  = regexp.MustCompile(`(?mi)BEGIN( WORK| TRANSACTION)?;`)
+	sql_SQLPL_Matcher_0                    = regexp.MustCompile(`(?mi)(alter module)|(language sql)|(begin( NOT)+ atomic)`)
+	sql_SQLPL_Matcher_1                    = regexp.MustCompile(`(?mi)signal SQLSTATE '[0-9]+'`)
+	sql_PLSQL_Matcher_0                    = regexp.MustCompile(`(?mi)\$\$PLSQL_|XMLTYPE|sysdate|systimestamp|\.nextval|connect by|AUTHID (DEFINER|CURRENT_USER)`)
+	sql_PLSQL_Matcher_1                    = regexp.MustCompile(`(?mi)constructor\W+function`)
+	sql_SQL_Matcher_0                      = regexp.MustCompile(`(?mi)! /begin|boolean|package|exception`)
+	srt_SubRipText_Matcher_0               = regexp.MustCompile(`(?m)^(\d{2}:\d{2}:\d{2},\d{3})\s*(-->)\s*(\d{2}:\d{2}:\d{2},\d{3})$`)
+	t_Turing_Matcher_0                     = regexp.MustCompile(`(?m)^\s*%[ \t]+|^\s*var\s+\w+\s*:=\s*\w+`)
+	t_Perl6_Matcher_0                      = regexp.MustCompile(`(?m)^\s*(?:use\s+v6\s*;|\bmodule\b|\b(?:my\s+)?class\b)`)
+	t_Perl_Matcher_0                       = regexp.MustCompile(`(?m)\buse\s+(?:strict\b|v?5\.)`)
+	toc_WorldofWarcraftAddonData_Matcher_0 = regexp.MustCompile(`(?m)^## |@no-lib-strip@`)
+	toc_TeX_Matcher_0                      = regexp.MustCompile(`(?m)^\\(contentsline|defcounter|beamer|boolfalse)`)
+	ts_XML_Matcher_0                       = regexp.MustCompile(`(?m)<TS`)
+	tst_GAP_Matcher_0                      = regexp.MustCompile(`(?m)gap> `)
+	tsx_TypeScript_Matcher_0               = regexp.MustCompile(`(?m)^\s*(import.+(from\s+|require\()['"]react|\/\/\/\s*<reference\s)`)
+	tsx_XML_Matcher_0                      = regexp.MustCompile(`(?mi)^\s*<\?xml\s+version`)
 )

internal/code-generator/generator/test_files/documentation.gold

@@ -2,7 +2,7 @@ package enry
 
 // CODE GENERATED AUTOMATICALLY WITH gopkg.in/src-d/enry.v1/internal/code-generator
 // THIS FILE SHOULD NOT BE EDITED BY HAND
-// Extracted from github/linguist commit: 0123456789abcdef0123456789abcdef01234567
+// Extracted from github/linguist commit: b6460f8ed6b249281ada099ca28bd8f1230b8892
 
 import "gopkg.in/toqueteos/substring.v1"
 

internal/code-generator/generator/test_files/documentation.test.yml

@@ -1,22 +0,0 @@
-## Documentation directories ##
-
-- ^[Dd]ocs?/
-- (^|/)[Dd]ocumentation/
-- (^|/)[Jj]avadoc/
-- ^[Mm]an/
-- ^[Ee]xamples/
-- ^[Dd]emos?/
-
-## Documentation files ##
-
-- (^|/)CHANGE(S|LOG)?(\.|$)
-- (^|/)CONTRIBUTING(\.|$)
-- (^|/)COPYING(\.|$)
-- (^|/)INSTALL(\.|$)
-- (^|/)LICEN[CS]E(\.|$)
-- (^|/)[Ll]icen[cs]e(\.|$)
-- (^|/)README(\.|$)
-- (^|/)[Rr]eadme(\.|$)
-
-# Samples folders
-- ^[Ss]amples?/

internal/code-generator/generator/test_files/extensions.gold

@@ -1,18 +0,0 @@
-package enry
-
-// CODE GENERATED AUTOMATICALLY WITH gopkg.in/src-d/enry.v1/internal/code-generator
-// THIS FILE SHOULD NOT BE EDITED BY HAND
-// Extracted from github/linguist commit: 0123456789abcdef0123456789abcdef01234567
-
-var languagesByExtension = map[string][]string{
-	".abap": {"ABAP"},
-	".abnf": {"ABNF"},
-	".bsl":  {"1C Enterprise"},
-	".os":   {"1C Enterprise"},
-}
-
-var extensionsByLanguage = map[string][]string{
-	"1C Enterprise": {".bsl", ".os"},
-	"ABAP":          {".abap"},
-	"ABNF":          {".abnf"},
-}

internal/code-generator/generator/test_files/extensions.test.yml

@@ -1,11 +0,0 @@
----
-1C Enterprise:
-  extensions:
-  - ".bsl"
-  - ".os"
-ABAP:
-  extensions:
-  - ".abap"
-ABNF:
-  extensions:
-  - ".abnf"

internal/code-generator/generator/test_files/filename.gold

@@ -0,0 +1,182 @@
+package slinguist
+
+// CODE GENERATED AUTOMATICALLY WITH gopkg.in/src-d/enry.v1/internal/code-generator
+// THIS FILE SHOULD NOT BE EDITED BY HAND
+// Extracted from github/linguist commit: b6460f8ed6b249281ada099ca28bd8f1230b8892
+
+var languagesByFilename = map[string][]string{
+	".Rprofile":          {"R"},
+	".XCompose":          {"XCompose"},
+	".abbrev_defs":       {"Emacs Lisp"},
+	".arcconfig":         {"JSON"},
+	".babelrc":           {"JSON5"},
+	".bash_history":      {"Shell"},
+	".bash_logout":       {"Shell"},
+	".bash_profile":      {"Shell"},
+	".bashrc":            {"Shell"},
+	".clang-format":      {"YAML"},
+	".classpath":         {"XML"},
+	".cproject":          {"XML"},
+	".cshrc":             {"Shell"},
+	".editorconfig":      {"INI"},
+	".emacs":             {"Emacs Lisp"},
+	".emacs.desktop":     {"Emacs Lisp"},
+	".factor-boot-rc":    {"Factor"},
+	".factor-rc":         {"Factor"},
+	".gclient":           {"Python"},
+	".gemrc":             {"YAML"},
+	".gitconfig":         {"INI"},
+	".gn":                {"GN"},
+	".gnus":              {"Emacs Lisp"},
+	".gvimrc":            {"Vim script"},
+	".htaccess":          {"ApacheConf"},
+	".irbrc":             {"Ruby"},
+	".jshintrc":          {"JSON"},
+	".login":             {"Shell"},
+	".nvimrc":            {"Vim script"},
+	".php":               {"PHP"},
+	".php_cs":            {"PHP"},
+	".php_cs.dist":       {"PHP"},
+	".profile":           {"Shell"},
+	".project":           {"XML"},
+	".pryrc":             {"Ruby"},
+	".spacemacs":         {"Emacs Lisp"},
+	".vimrc":             {"Vim script"},
+	".viper":             {"Emacs Lisp"},
+	".zlogin":            {"Shell"},
+	".zlogout":           {"Shell"},
+	".zprofile":          {"Shell"},
+	".zshenv":            {"Shell"},
+	".zshrc":             {"Shell"},
+	"9fs":                {"Shell"},
+	"APKBUILD":           {"Alpine Abuild"},
+	"App.config":         {"XML"},
+	"Appraisals":         {"Ruby"},
+	"BSDmakefile":        {"Makefile"},
+	"BUCK":               {"Python"},
+	"BUILD":              {"Python"},
+	"Berksfile":          {"Ruby"},
+	"Brewfile":           {"Ruby"},
+	"Buildfile":          {"Ruby"},
+	"CMakeLists.txt":     {"CMake"},
+	"COPYING":            {"Text"},
+	"COPYING.regex":      {"Text"},
+	"COPYRIGHT.regex":    {"Text"},
+	"Cakefile":           {"CoffeeScript"},
+	"Capfile":            {"Ruby"},
+	"Cask":               {"Emacs Lisp"},
+	"Dangerfile":         {"Ruby"},
+	"Deliverfile":        {"Ruby"},
+	"Dockerfile":         {"Dockerfile"},
+	"Emakefile":          {"Erlang"},
+	"FONTLOG":            {"Text"},
+	"Fakefile":           {"Fancy"},
+	"Fastfile":           {"Ruby"},
+	"GNUmakefile":        {"Makefile"},
+	"Gemfile":            {"Ruby"},
+	"Gemfile.lock":       {"Ruby"},
+	"Guardfile":          {"Ruby"},
+	"INSTALL":            {"Text"},
+	"INSTALL.mysql":      {"Text"},
+	"Jakefile":           {"JavaScript"},
+	"Jarfile":            {"Ruby"},
+	"Jenkinsfile":        {"Groovy"},
+	"Kbuild":             {"Makefile"},
+	"LICENSE":            {"Text"},
+	"LICENSE.mysql":      {"Text"},
+	"Makefile":           {"Makefile"},
+	"Makefile.am":        {"Makefile"},
+	"Makefile.boot":      {"Makefile"},
+	"Makefile.frag":      {"Makefile"},
+	"Makefile.in":        {"Makefile"},
+	"Makefile.inc":       {"Makefile"},
+	"Makefile.wat":       {"Makefile"},
+	"Mavenfile":          {"Ruby"},
+	"Modulefile":         {"Puppet"},
+	"NEWS":               {"Text"},
+	"Notebook":           {"Jupyter Notebook"},
+	"NuGet.config":       {"XML"},
+	"Nukefile":           {"Nu"},
+	"PKGBUILD":           {"Shell"},
+	"Phakefile":          {"PHP"},
+	"Podfile":            {"Ruby"},
+	"Project.ede":        {"Emacs Lisp"},
+	"Puppetfile":         {"Ruby"},
+	"README.1ST":         {"Text"},
+	"README.me":          {"Text"},
+	"README.mysql":       {"Text"},
+	"ROOT":               {"Isabelle ROOT"},
+	"Rakefile":           {"Ruby"},
+	"Rexfile":            {"Perl6"},
+	"SConscript":         {"Python"},
+	"SConstruct":         {"Python"},
+	"Settings.StyleCop":  {"XML"},
+	"Slakefile":          {"LiveScript"},
+	"Snakefile":          {"Python"},
+	"Snapfile":           {"Ruby"},
+	"Thorfile":           {"Ruby"},
+	"Vagrantfile":        {"Ruby"},
+	"WORKSPACE":          {"Python"},
+	"Web.Debug.config":   {"XML"},
+	"Web.Release.config": {"XML"},
+	"Web.config":         {"XML"},
+	"XCompose":           {"XCompose"},
+	"_emacs":             {"Emacs Lisp"},
+	"_vimrc":             {"Vim script"},
+	"abbrev_defs":        {"Emacs Lisp"},
+	"ack":                {"Perl"},
+	"ant.xml":            {"Ant Build System"},
+	"apache2.conf":       {"ApacheConf"},
+	"bash_logout":        {"Shell"},
+	"bash_profile":       {"Shell"},
+	"bashrc":             {"Shell"},
+	"build.xml":          {"Ant Build System"},
+	"buildfile":          {"Ruby"},
+	"click.me":           {"Text"},
+	"composer.lock":      {"JSON"},
+	"configure.ac":       {"M4Sugar"},
+	"cshrc":              {"Shell"},
+	"delete.me":          {"Text"},
+	"descrip.mmk":        {"Module Management System"},
+	"descrip.mms":        {"Module Management System"},
+	"expr-dist":          {"R"},
+	"gradlew":            {"Shell"},
+	"gvimrc":             {"Vim script"},
+	"httpd.conf":         {"ApacheConf"},
+	"keep.me":            {"Text"},
+	"ld.script":          {"Linker Script"},
+	"login":              {"Shell"},
+	"makefile":           {"Makefile"},
+	"makefile.sco":       {"Makefile"},
+	"man":                {"Shell"},
+	"mcmod.info":         {"JSON"},
+	"meson.build":        {"Meson"},
+	"meson_options.txt":  {"Meson"},
+	"mix.lock":           {"Elixir"},
+	"mkfile":             {"Makefile"},
+	"mmn":                {"Roff"},
+	"mmt":                {"Roff"},
+	"nginx.conf":         {"Nginx"},
+	"nvimrc":             {"Vim script"},
+	"owh":                {"Tcl"},
+	"packages.config":    {"XML"},
+	"pom.xml":            {"Maven POM"},
+	"profile":            {"Shell"},
+	"read.me":            {"Text"},
+	"readme.1st":         {"Text"},
+	"rebar.config":       {"Erlang"},
+	"rebar.config.lock":  {"Erlang"},
+	"rebar.lock":         {"Erlang"},
+	"riemann.config":     {"Clojure"},
+	"script":             {"C"},
+	"starfield":          {"Tcl"},
+	"test.me":            {"Text"},
+	"vimrc":              {"Vim script"},
+	"wscript":            {"Python"},
+	"xcompose":           {"XCompose"},
+	"zlogin":             {"Shell"},
+	"zlogout":            {"Shell"},
+	"zprofile":           {"Shell"},
+	"zshenv":             {"Shell"},
+	"zshrc":              {"Shell"},
+}

internal/code-generator/generator/test_files/filenames.gold

@@ -1,12 +0,0 @@
-package enry
-
-// CODE GENERATED AUTOMATICALLY WITH gopkg.in/src-d/enry.v1/internal/code-generator
-// THIS FILE SHOULD NOT BE EDITED BY HAND
-// Extracted from github/linguist commit: 0123456789abcdef0123456789abcdef01234567
-
-var languagesByFilename = map[string][]string{
-	"APKBUILD":       {"Alpine Abuild"},
-	"CMakeLists.txt": {"CMake"},
-	"Cakefile":       {"CoffeeScript"},
-	"mix.lock":       {"Elixir"},
-}

internal/code-generator/generator/test_files/filenames.test.yml

@@ -1,13 +0,0 @@
----
-Alpine Abuild:
-  filenames:
-  - APKBUILD
-CMake:
-  filenames:
-  - CMakeLists.txt
-CoffeeScript:
-  filenames:
-  - Cakefile
-Elixir:
-  filenames:
-  - mix.lock

internal/code-generator/generator/test_files/heuristics.test.rb

@@ -1,91 +0,0 @@
-    # Common heuristics
-    ObjectiveCRegex = /^\s*(@(interface|class|protocol|property|end|synchronised|selector|implementation)\b|#import\s+.+\.h[">])/
-
-    disambiguate ".asc" do |data|
-      if /^(----[- ]BEGIN|ssh-(rsa|dss)) /.match(data)
-        Language["Public Key"]
-      elsif /^[=-]+(\s|\n)|{{[A-Za-z]/.match(data)
-        Language["AsciiDoc"]
-      elsif /^(\/\/.+|((import|export)\s+)?(function|int|float|char)\s+((room|repeatedly|on|game)_)?([A-Za-z]+[A-Za-z_0-9]+)\s*[;\(])/.match(data)
-        Language["AGS Script"]
-      end
-    end
-
-    fortran_rx = /^([c*][^abd-z]|      (subroutine|program|end|data)\s|\s*!)/i
-
-    disambiguate ".f" do |data|
-      if /^: /.match(data)
-        Language["Forth"]
-      elsif data.include?("flowop")
-        Language["Filebench WML"]
-      elsif fortran_rx.match(data)
-        Language["FORTRAN"]
-      end
-    end
-
-    disambiguate ".h" do |data|
-      if ObjectiveCRegex.match(data)
-        Language["Objective-C"]
-      elsif (/^\s*#\s*include <(cstdint|string|vector|map|list|array|bitset|queue|stack|forward_list|unordered_map|unordered_set|(i|o|io)stream)>/.match(data) ||
-        /^\s*template\s*</.match(data) || /^[ \t]*try/.match(data) || /^[ \t]*catch\s*\(/.match(data) || /^[ \t]*(class|(using[ \t]+)?namespace)\s+\w+/.match(data) || /^[ \t]*(private|public|protected):$/.match(data) || /std::\w+/.match(data))
-        Language["C++"]
-      end
-    end
-
-    disambiguate ".lsp", ".lisp" do |data|
-      if /^\s*\((defun|in-package|defpackage) /i.match(data)
-        Language["Common Lisp"]
-      elsif /^\s*\(define /.match(data)
-        Language["NewLisp"]
-      end
-    end
-
-    disambiguate ".md" do |data|
-      if /(^[-a-z0-9=#!\*\[|>])|<\//i.match(data) || data.empty?
-        Language["Markdown"]
-      elsif /^(;;|\(define_)/.match(data)
-        Language["GCC machine description"]
-      else
-        Language["Markdown"]
-      end
-    end
-
-    disambiguate ".ms" do |data|
-      if /^[.'][a-z][a-z](\s|$)/i.match(data)
-        Language["Groff"]
-      elsif /(?<!\S)\.(include|globa?l)\s/.match(data) || /(?<!\/\*)(\A|\n)\s*\.[A-Za-z]/.match(data.gsub(/"([^\\"]|\\.)*"|'([^\\']|\\.)*'|\\\s*(?:--.*)?\n/, ""))
-        Language["GAS"]
-      else
-        Language["MAXScript"]
-      end
-    end
-
-    disambiguate ".mod" do |data|
-      if data.include?('<!ENTITY ')
-        Language["XML"]
-      elsif /^\s*MODULE [\w\.]+;/i.match(data) || /^\s*END [\w\.]+;/i.match(data)
-        Language["Modula-2"]
-      else
-        [Language["Linux Kernel Module"], Language["AMPL"]]
-      end
-    end
-
-    disambiguate ".pro" do |data|
-      if /^[^#]+:-/.match(data)
-        Language["Prolog"]
-      elsif data.include?("last_client=")
-        Language["INI"]
-      elsif data.include?("HEADERS") && data.include?("SOURCES")
-        Language["QMake"]
-      elsif /^\s*function[ \w,]+$/.match(data)
-        Language["IDL"]
-      end
-    end
-
-    disambiguate ".rpy" do |data|
-      if /(^(import|from|class|def)\s)/m.match(data)
-        Language["Python"]
-      else
-        Language["Ren'Py"]
-      end
-    end

internal/code-generator/generator/test_files/interpreter.gold

@@ -0,0 +1,99 @@
+package slinguist
+
+// CODE GENERATED AUTOMATICALLY WITH gopkg.in/src-d/enry.v1/internal/code-generator
+// THIS FILE SHOULD NOT BE EDITED BY HAND
+// Extracted from github/linguist commit: b6460f8ed6b249281ada099ca28bd8f1230b8892
+
+var languagesByInterpreter = map[string][]string{
+	"Rscript":     {"R"},
+	"apl":         {"APL"},
+	"aplx":        {"APL"},
+	"awk":         {"Awk"},
+	"bash":        {"Shell"},
+	"bigloo":      {"Scheme"},
+	"boolector":   {"SMT"},
+	"ccl":         {"Common Lisp"},
+	"chicken":     {"Scheme"},
+	"clisp":       {"Common Lisp"},
+	"coffee":      {"CoffeeScript"},
+	"crystal":     {"Crystal"},
+	"csi":         {"Scheme"},
+	"cvc4":        {"SMT"},
+	"dart":        {"Dart"},
+	"dtrace":      {"DTrace"},
+	"dyalog":      {"APL"},
+	"ecl":         {"Common Lisp"},
+	"elixir":      {"Elixir"},
+	"escript":     {"Erlang"},
+	"fish":        {"fish"},
+	"gawk":        {"Awk"},
+	"gn":          {"GN"},
+	"gnuplot":     {"Gnuplot"},
+	"gosh":        {"Scheme"},
+	"groovy":      {"Groovy"},
+	"guile":       {"Scheme"},
+	"instantfpc":  {"Pascal"},
+	"io":          {"Io"},
+	"ioke":        {"Ioke"},
+	"jconsole":    {"J"},
+	"jolie":       {"Jolie"},
+	"jruby":       {"Ruby"},
+	"julia":       {"Julia"},
+	"lisp":        {"Common Lisp"},
+	"lsl":         {"LSL"},
+	"lua":         {"Lua", "Terra"},
+	"macruby":     {"Ruby"},
+	"make":        {"Makefile"},
+	"mathsat5":    {"SMT"},
+	"mawk":        {"Awk"},
+	"mmi":         {"Mercury"},
+	"moon":        {"MoonScript"},
+	"nawk":        {"Awk"},
+	"newlisp":     {"NewLisp"},
+	"node":        {"JavaScript"},
+	"nush":        {"Nu"},
+	"ocaml":       {"OCaml", "Reason"},
+	"ocamlrun":    {"OCaml"},
+	"ocamlscript": {"OCaml"},
+	"openrc-run":  {"OpenRC runscript"},
+	"opensmt":     {"SMT"},
+	"osascript":   {"AppleScript"},
+	"parrot":      {"Parrot Assembly", "Parrot Internal Representation"},
+	"perl":        {"Perl"},
+	"perl6":       {"Perl6"},
+	"php":         {"PHP"},
+	"picolisp":    {"PicoLisp"},
+	"pike":        {"Pike"},
+	"pil":         {"PicoLisp"},
+	"python":      {"Python"},
+	"python2":     {"Python"},
+	"python3":     {"Python"},
+	"qmake":       {"QMake"},
+	"r6rs":        {"Scheme"},
+	"racket":      {"Racket"},
+	"rake":        {"Ruby"},
+	"rbx":         {"Ruby"},
+	"rc":          {"Shell"},
+	"regina":      {"REXX"},
+	"rexx":        {"REXX"},
+	"ruby":        {"Ruby"},
+	"rune":        {"E"},
+	"runhaskell":  {"Haskell"},
+	"sbcl":        {"Common Lisp"},
+	"scala":       {"Scala"},
+	"sclang":      {"SuperCollider"},
+	"scsynth":     {"SuperCollider"},
+	"sh":          {"Shell"},
+	"smt-rat":     {"SMT"},
+	"smtinterpol": {"SMT"},
+	"stp":         {"SMT"},
+	"swipl":       {"Prolog"},
+	"tcc":         {"C"},
+	"tclsh":       {"Tcl"},
+	"verit":       {"SMT"},
+	"wish":        {"Tcl"},
+	"yap":         {"Prolog"},
+	"yices2":      {"SMT"},
+	"z3":          {"SMT"},
+	"zsh":         {"Shell"},
+}

internal/code-generator/generator/test_files/interpreters.gold

@@ -1,16 +0,0 @@
-package enry
-
-// CODE GENERATED AUTOMATICALLY WITH gopkg.in/src-d/enry.v1/internal/code-generator
-// THIS FILE SHOULD NOT BE EDITED BY HAND
-// Extracted from github/linguist commit: 0123456789abcdef0123456789abcdef01234567
-
-var languagesByInterpreter = map[string][]string{
-	"bash":    {"Shell"},
-	"nush":    {"Nu"},
-	"python":  {"Python"},
-	"python2": {"Python"},
-	"python3": {"Python"},
-	"rc":      {"Shell"},
-	"sh":      {"Shell"},
-	"zsh":     {"Shell"},
-}

internal/code-generator/generator/test_files/interpreters.test.yml

@@ -1,15 +0,0 @@
----
-Nu:
-  interpreters:
-  - nush
-Shell:
-  interpreters:
-  - bash
-  - rc
-  - sh
-  - zsh
-Python:
-  interpreters:
-  - python
-  - python2
-  - python3

internal/code-generator/generator/test_files/type.gold

@@ -0,0 +1,459 @@
+package slinguist
+
+// CODE GENERATED AUTOMATICALLY WITH gopkg.in/src-d/enry.v1/internal/code-generator
+// THIS FILE SHOULD NOT BE EDITED BY HAND
+// Extracted from github/linguist commit: b6460f8ed6b249281ada099ca28bd8f1230b8892
+
+var languagesType = map[string]Type{
+	"1C Enterprise":    Programming,
+	"ABAP":             Programming,
+	"ABNF":             Data,
+	"AGS Script":       Programming,
+	"AMPL":             Programming,
+	"ANTLR":            Programming,
+	"API Blueprint":    Markup,
+	"APL":              Programming,
+	"ASN.1":            Data,
+	"ASP":              Programming,
+	"ATS":              Programming,
+	"ActionScript":     Programming,
+	"Ada":              Programming,
+	"Agda":             Programming,
+	"Alloy":            Programming,
+	"Alpine Abuild":    Programming,
+	"Ant Build System": Data,
+	"ApacheConf":       Markup,
+	"Apex":             Programming,
+	"Apollo Guidance Computer": Programming,
+	"AppleScript":              Programming,
+	"Arc":                      Programming,
+	"Arduino":                  Programming,
+	"AsciiDoc":                 Prose,
+	"AspectJ":                  Programming,
+	"Assembly":                 Programming,
+	"Augeas":                   Programming,
+	"AutoHotkey":               Programming,
+	"AutoIt":                   Programming,
+	"Awk":                      Programming,
+	"Batchfile":                Programming,
+	"Befunge":                  Programming,
+	"Bison":                    Programming,
+	"BitBake":                  Programming,
+	"Blade":                    Markup,
+	"BlitzBasic":               Programming,
+	"BlitzMax":                 Programming,
+	"Bluespec":                 Programming,
+	"Boo":                      Programming,
+	"Brainfuck":                Programming,
+	"Brightscript":             Programming,
+	"Bro":                      Programming,
+	"C":                        Programming,
+	"C#":                       Programming,
+	"C++":                      Programming,
+	"C-ObjDump":                Data,
+	"C2hs Haskell":             Programming,
+	"CLIPS":                    Programming,
+	"CMake":                    Programming,
+	"COBOL":                    Programming,
+	"COLLADA":                  Data,
+	"CSON":                     Data,
+	"CSS":                      Markup,
+	"CSV":                      Data,
+	"CWeb":                     Programming,
+	"Cap'n Proto":              Programming,
+	"CartoCSS":                 Programming,
+	"Ceylon":                   Programming,
+	"Chapel":                   Programming,
+	"Charity":                  Programming,
+	"ChucK":                    Programming,
+	"Cirru":                    Programming,
+	"Clarion":                  Programming,
+	"Clean":                    Programming,
+	"Click":                    Programming,
+	"Clojure":                  Programming,
+	"Closure Templates":        Markup,
+	"CoffeeScript":             Programming,
+	"ColdFusion":               Programming,
+	"ColdFusion CFC":           Programming,
+	"Common Lisp":              Programming,
+	"Component Pascal":         Programming,
+	"Cool":                     Programming,
+	"Coq":                      Programming,
+	"Cpp-ObjDump":              Data,
+	"Creole":                   Prose,
+	"Crystal":                  Programming,
+	"Csound":                   Programming,
+	"Csound Document":          Programming,
+	"Csound Score":             Programming,
+	"Cuda":                     Programming,
+	"Cycript":                  Programming,
+	"Cython":                   Programming,
+	"D":                        Programming,
+	"D-ObjDump":                Data,
+	"DIGITAL Command Language": Programming,
+	"DM":             Programming,
+	"DNS Zone":       Data,
+	"DTrace":         Programming,
+	"Darcs Patch":    Data,
+	"Dart":           Programming,
+	"Diff":           Data,
+	"Dockerfile":     Data,
+	"Dogescript":     Programming,
+	"Dylan":          Programming,
+	"E":              Programming,
+	"EBNF":           Data,
+	"ECL":            Programming,
+	"ECLiPSe":        Programming,
+	"EJS":            Markup,
+	"EQ":             Programming,
+	"Eagle":          Markup,
+	"Ecere Projects": Data,
+	"Eiffel":         Programming,
+	"Elixir":         Programming,
+	"Elm":            Programming,
+	"Emacs Lisp":     Programming,
+	"EmberScript":    Programming,
+	"Erlang":         Programming,
+	"F#":             Programming,
+	"FLUX":           Programming,
+	"Factor":         Programming,
+	"Fancy":          Programming,
+	"Fantom":         Programming,
+	"Filebench WML":  Programming,
+	"Filterscript":   Programming,
+	"Formatted":      Data,
+	"Forth":          Programming,
+	"Fortran":        Programming,
+	"FreeMarker":     Programming,
+	"Frege":          Programming,
+	"G-code":         Data,
+	"GAMS":           Programming,
+	"GAP":            Programming,
+	"GCC Machine Description": Programming,
+	"GDB":      Programming,
+	"GDScript": Programming,
+	"GLSL":     Programming,
+	"GN":       Data,
+	"Game Maker Language":     Programming,
+	"Genie":                   Programming,
+	"Genshi":                  Programming,
+	"Gentoo Ebuild":           Programming,
+	"Gentoo Eclass":           Programming,
+	"Gettext Catalog":         Prose,
+	"Gherkin":                 Programming,
+	"Glyph":                   Programming,
+	"Gnuplot":                 Programming,
+	"Go":                      Programming,
+	"Golo":                    Programming,
+	"Gosu":                    Programming,
+	"Grace":                   Programming,
+	"Gradle":                  Data,
+	"Grammatical Framework":   Programming,
+	"Graph Modeling Language": Data,
+	"GraphQL":                 Data,
+	"Graphviz (DOT)":          Data,
+	"Groovy":                  Programming,
+	"Groovy Server Pages":     Programming,
+	"HCL":                      Programming,
+	"HLSL":                     Programming,
+	"HTML":                     Markup,
+	"HTML+Django":              Markup,
+	"HTML+ECR":                 Markup,
+	"HTML+EEX":                 Markup,
+	"HTML+ERB":                 Markup,
+	"HTML+PHP":                 Markup,
+	"HTTP":                     Data,
+	"Hack":                     Programming,
+	"Haml":                     Markup,
+	"Handlebars":               Markup,
+	"Harbour":                  Programming,
+	"Haskell":                  Programming,
+	"Haxe":                     Programming,
+	"Hy":                       Programming,
+	"HyPhy":                    Programming,
+	"IDL":                      Programming,
+	"IGOR Pro":                 Programming,
+	"INI":                      Data,
+	"IRC log":                  Data,
+	"Idris":                    Programming,
+	"Inform 7":                 Programming,
+	"Inno Setup":               Programming,
+	"Io":                       Programming,
+	"Ioke":                     Programming,
+	"Isabelle":                 Programming,
+	"Isabelle ROOT":            Programming,
+	"J":                        Programming,
+	"JFlex":                    Programming,
+	"JSON":                     Data,
+	"JSON5":                    Data,
+	"JSONLD":                   Data,
+	"JSONiq":                   Programming,
+	"JSX":                      Programming,
+	"Jasmin":                   Programming,
+	"Java":                     Programming,
+	"Java Server Pages":        Programming,
+	"JavaScript":               Programming,
+	"Jison":                    Programming,
+	"Jison Lex":                Programming,
+	"Jolie":                    Programming,
+	"Julia":                    Programming,
+	"Jupyter Notebook":         Markup,
+	"KRL":                      Programming,
+	"KiCad":                    Programming,
+	"Kit":                      Markup,
+	"Kotlin":                   Programming,
+	"LFE":                      Programming,
+	"LLVM":                     Programming,
+	"LOLCODE":                  Programming,
+	"LSL":                      Programming,
+	"LabVIEW":                  Programming,
+	"Lasso":                    Programming,
+	"Latte":                    Markup,
+	"Lean":                     Programming,
+	"Less":                     Markup,
+	"Lex":                      Programming,
+	"LilyPond":                 Programming,
+	"Limbo":                    Programming,
+	"Linker Script":            Data,
+	"Linux Kernel Module":      Data,
+	"Liquid":                   Markup,
+	"Literate Agda":            Programming,
+	"Literate CoffeeScript":    Programming,
+	"Literate Haskell":         Programming,
+	"LiveScript":               Programming,
+	"Logos":                    Programming,
+	"Logtalk":                  Programming,
+	"LookML":                   Programming,
+	"LoomScript":               Programming,
+	"Lua":                      Programming,
+	"M":                        Programming,
+	"M4":                       Programming,
+	"M4Sugar":                  Programming,
+	"MAXScript":                Programming,
+	"MQL4":                     Programming,
+	"MQL5":                     Programming,
+	"MTML":                     Markup,
+	"MUF":                      Programming,
+	"Makefile":                 Programming,
+	"Mako":                     Programming,
+	"Markdown":                 Prose,
+	"Marko":                    Markup,
+	"Mask":                     Markup,
+	"Mathematica":              Programming,
+	"Matlab":                   Programming,
+	"Maven POM":                Data,
+	"Max":                      Programming,
+	"MediaWiki":                Prose,
+	"Mercury":                  Programming,
+	"Meson":                    Programming,
+	"Metal":                    Programming,
+	"MiniD":                    Programming,
+	"Mirah":                    Programming,
+	"Modelica":                 Programming,
+	"Modula-2":                 Programming,
+	"Module Management System": Programming,
+	"Monkey":                   Programming,
+	"Moocode":                  Programming,
+	"MoonScript":               Programming,
+	"Myghty":                   Programming,
+	"NCL":                      Programming,
+	"NL":                       Data,
+	"NSIS":                     Programming,
+	"Nemerle":                  Programming,
+	"NetLinx":                  Programming,
+	"NetLinx+ERB":              Programming,
+	"NetLogo":                  Programming,
+	"NewLisp":                  Programming,
+	"Nginx":                    Markup,
+	"Nim":                      Programming,
+	"Ninja":                    Data,
+	"Nit":                      Programming,
+	"Nix":                      Programming,
+	"Nu":                       Programming,
+	"NumPy":                    Programming,
+	"OCaml":                    Programming,
+	"ObjDump":                  Data,
+	"Objective-C":              Programming,
+	"Objective-C++":            Programming,
+	"Objective-J":              Programming,
+	"Omgrofl":                  Programming,
+	"Opa":                      Programming,
+	"Opal":                     Programming,
+	"OpenCL":                   Programming,
+	"OpenEdge ABL":             Programming,
+	"OpenRC runscript":         Programming,
+	"OpenSCAD":                 Programming,
+	"OpenType Feature File":    Data,
+	"Org":                            Prose,
+	"Ox":                             Programming,
+	"Oxygene":                        Programming,
+	"Oz":                             Programming,
+	"P4":                             Programming,
+	"PAWN":                           Programming,
+	"PHP":                            Programming,
+	"PLSQL":                          Programming,
+	"PLpgSQL":                        Programming,
+	"POV-Ray SDL":                    Programming,
+	"Pan":                            Programming,
+	"Papyrus":                        Programming,
+	"Parrot":                         Programming,
+	"Parrot Assembly":                Programming,
+	"Parrot Internal Representation": Programming,
+	"Pascal":                       Programming,
+	"Pep8":                         Programming,
+	"Perl":                         Programming,
+	"Perl6":                        Programming,
+	"Pic":                          Markup,
+	"Pickle":                       Data,
+	"PicoLisp":                     Programming,
+	"PigLatin":                     Programming,
+	"Pike":                         Programming,
+	"Pod":                          Prose,
+	"PogoScript":                   Programming,
+	"Pony":                         Programming,
+	"PostScript":                   Markup,
+	"PowerBuilder":                 Programming,
+	"PowerShell":                   Programming,
+	"Processing":                   Programming,
+	"Prolog":                       Programming,
+	"Propeller Spin":               Programming,
+	"Protocol Buffer":              Markup,
+	"Public Key":                   Data,
+	"Pug":                          Markup,
+	"Puppet":                       Programming,
+	"Pure Data":                    Programming,
+	"PureBasic":                    Programming,
+	"PureScript":                   Programming,
+	"Python":                       Programming,
+	"Python console":               Programming,
+	"Python traceback":             Data,
+	"QML":                          Programming,
+	"QMake":                        Programming,
+	"R":                            Programming,
+	"RAML":                         Markup,
+	"RDoc":                         Prose,
+	"REALbasic":                    Programming,
+	"REXX":                         Programming,
+	"RHTML":                        Markup,
+	"RMarkdown":                    Prose,
+	"RPM Spec":                     Data,
+	"RUNOFF":                       Markup,
+	"Racket":                       Programming,
+	"Ragel":                        Programming,
+	"Rascal":                       Programming,
+	"Raw token data":               Data,
+	"Reason":                       Programming,
+	"Rebol":                        Programming,
+	"Red":                          Programming,
+	"Redcode":                      Programming,
+	"Regular Expression":           Data,
+	"Ren'Py":                       Programming,
+	"RenderScript":                 Programming,
+	"RobotFramework":               Programming,
+	"Roff":                         Markup,
+	"Rouge":                        Programming,
+	"Ruby":                         Programming,
+	"Rust":                         Programming,
+	"SAS":                          Programming,
+	"SCSS":                         Markup,
+	"SMT":                          Programming,
+	"SPARQL":                       Data,
+	"SQF":                          Programming,
+	"SQL":                          Data,
+	"SQLPL":                        Programming,
+	"SRecode Template":             Markup,
+	"STON":                         Data,
+	"SVG":                          Data,
+	"Sage":                         Programming,
+	"SaltStack":                    Programming,
+	"Sass":                         Markup,
+	"Scala":                        Programming,
+	"Scaml":                        Markup,
+	"Scheme":                       Programming,
+	"Scilab":                       Programming,
+	"Self":                         Programming,
+	"ShaderLab":                    Programming,
+	"Shell":                        Programming,
+	"ShellSession":                 Programming,
+	"Shen":                         Programming,
+	"Slash":                        Programming,
+	"Slim":                         Markup,
+	"Smali":                        Programming,
+	"Smalltalk":                    Programming,
+	"Smarty":                       Programming,
+	"SourcePawn":                   Programming,
+	"Spline Font Database":         Data,
+	"Squirrel":                     Programming,
+	"Stan":                         Programming,
+	"Standard ML":                  Programming,
+	"Stata":                        Programming,
+	"Stylus":                       Markup,
+	"SubRip Text":                  Data,
+	"Sublime Text Config":          Data,
+	"SuperCollider":                Programming,
+	"Swift":                        Programming,
+	"SystemVerilog":                Programming,
+	"TI Program":                   Programming,
+	"TLA":                          Programming,
+	"TOML":                         Data,
+	"TXL":                          Programming,
+	"Tcl":                          Programming,
+	"Tcsh":                         Programming,
+	"TeX":                          Markup,
+	"Tea":                          Markup,
+	"Terra":                        Programming,
+	"Text":                         Prose,
+	"Textile":                      Prose,
+	"Thrift":                       Programming,
+	"Turing":                       Programming,
+	"Turtle":                       Data,
+	"Twig":                         Markup,
+	"Type Language":                Data,
+	"TypeScript":                   Programming,
+	"Unified Parallel C":           Programming,
+	"Unity3D Asset":                Data,
+	"Unix Assembly":                Programming,
+	"Uno":                          Programming,
+	"UnrealScript":                 Programming,
+	"UrWeb":                        Programming,
+	"VCL":                          Programming,
+	"VHDL":                         Programming,
+	"Vala":                         Programming,
+	"Verilog":                      Programming,
+	"Vim script":                   Programming,
+	"Visual Basic":                 Programming,
+	"Volt":                         Programming,
+	"Vue":                          Markup,
+	"Wavefront Material":           Data,
+	"Wavefront Object":             Data,
+	"Web Ontology Language":        Markup,
+	"WebAssembly":                  Programming,
+	"WebIDL":                       Programming,
+	"World of Warcraft Addon Data": Data,
+	"X10":              Programming,
+	"XC":               Programming,
+	"XCompose":         Data,
+	"XML":              Data,
+	"XPages":           Programming,
+	"XProc":            Programming,
+	"XQuery":           Programming,
+	"XS":               Programming,
+	"XSLT":             Programming,
+	"Xojo":             Programming,
+	"Xtend":            Programming,
+	"YAML":             Data,
+	"YANG":             Data,
+	"Yacc":             Programming,
+	"Zephir":           Programming,
+	"Zimpl":            Programming,
+	"desktop":          Data,
+	"eC":               Programming,
+	"edn":              Data,
+	"fish":             Programming,
+	"mupad":            Programming,
+	"nesC":             Programming,
+	"ooc":              Programming,
+	"reStructuredText": Prose,
+	"wisp":             Programming,
+	"xBase":            Programming,
+}

internal/code-generator/generator/test_files/types.gold

@@ -1,12 +0,0 @@
-package enry
-
-// CODE GENERATED AUTOMATICALLY WITH gopkg.in/src-d/enry.v1/internal/code-generator
-// THIS FILE SHOULD NOT BE EDITED BY HAND
-// Extracted from github/linguist commit: 0123456789abcdef0123456789abcdef01234567
-
-var languagesType = map[string]Type{
-	"Scaml":  Markup,
-	"Scheme": Programming,
-	"Scilab": Programming,
-	"Self":   Programming,
-}

internal/code-generator/generator/test_files/types.test.yml

@@ -1,11 +0,0 @@
----
-Scaml:
-  type: markup
-Scheme:
-  type: programming
-Scilab:
-  type: programming
-Self:
-  type: programming
-
-  

internal/code-generator/generator/test_files/vendor.gold

@@ -2,7 +2,7 @@ package enry
 
 // CODE GENERATED AUTOMATICALLY WITH gopkg.in/src-d/enry.v1/internal/code-generator
 // THIS FILE SHOULD NOT BE EDITED BY HAND
-// Extracted from github/linguist commit: 0123456789abcdef0123456789abcdef01234567
+// Extracted from github/linguist commit: b6460f8ed6b249281ada099ca28bd8f1230b8892
 
 import "gopkg.in/toqueteos/substring.v1"
 
@@ -21,4 +21,136 @@ var vendorMatchers = substring.Or(
 	substring.Regexp(`(^|/)ltsugar.m4`),
 	substring.Regexp(`(^|/)ltversion.m4`),
 	substring.Regexp(`(^|/)lt~obsolete.m4`),
+	substring.Regexp(`cpplint.py`),
+	substring.Regexp(`node_modules/`),
+	substring.Regexp(`bower_components/`),
+	substring.Regexp(`^rebar$`),
+	substring.Regexp(`erlang.mk`),
+	substring.Regexp(`Godeps/_workspace/`),
+	substring.Regexp(`.indent.pro`),
+	substring.Regexp(`(\.|-)min\.(js|css)$`),
+	substring.Regexp(`([^\s]*)import\.(css|less|scss|styl)$`),
+	substring.Regexp(`(^|/)bootstrap([^.]*)\.(js|css|less|scss|styl)$`),
+	substring.Regexp(`(^|/)custom\.bootstrap([^\s]*)(js|css|less|scss|styl)$`),
+	substring.Regexp(`(^|/)font-awesome\.(css|less|scss|styl)$`),
+	substring.Regexp(`(^|/)foundation\.(css|less|scss|styl)$`),
+	substring.Regexp(`(^|/)normalize\.(css|less|scss|styl)$`),
+	substring.Regexp(`(^|/)[Bb]ourbon/.*\.(css|less|scss|styl)$`),
+	substring.Regexp(`(^|/)animate\.(css|less|scss|styl)$`),
+	substring.Regexp(`third[-_]?party/`),
+	substring.Regexp(`3rd[-_]?party/`),
+	substring.Regexp(`vendors?/`),
+	substring.Regexp(`extern(al)?/`),
+	substring.Regexp(`(^|/)[Vv]+endor/`),
+	substring.Regexp(`^debian/`),
+	substring.Regexp(`run.n$`),
+	substring.Regexp(`bootstrap-datepicker/`),
+	substring.Regexp(`(^|/)jquery([^.]*)\.js$`),
+	substring.Regexp(`(^|/)jquery\-\d\.\d+(\.\d+)?\.js$`),
+	substring.Regexp(`(^|/)jquery\-ui(\-\d\.\d+(\.\d+)?)?(\.\w+)?\.(js|css)$`),
+	substring.Regexp(`(^|/)jquery\.(ui|effects)\.([^.]*)\.(js|css)$`),
+	substring.Regexp(`jquery.fn.gantt.js`),
+	substring.Regexp(`jquery.fancybox.(js|css)`),
+	substring.Regexp(`fuelux.js`),
+	substring.Regexp(`(^|/)jquery\.fileupload(-\w+)?\.js$`),
+	substring.Regexp(`(^|/)slick\.\w+.js$`),
+	substring.Regexp(`(^|/)Leaflet\.Coordinates-\d+\.\d+\.\d+\.src\.js$`),
+	substring.Regexp(`leaflet.draw-src.js`),
+	substring.Regexp(`leaflet.draw.css`),
+	substring.Regexp(`Control.FullScreen.css`),
+	substring.Regexp(`Control.FullScreen.js`),
+	substring.Regexp(`leaflet.spin.js`),
+	substring.Regexp(`wicket-leaflet.js`),
+	substring.Regexp(`.sublime-project`),
+	substring.Regexp(`.sublime-workspace`),
+	substring.Regexp(`(^|/)prototype(.*)\.js$`),
+	substring.Regexp(`(^|/)effects\.js$`),
+	substring.Regexp(`(^|/)controls\.js$`),
+	substring.Regexp(`(^|/)dragdrop\.js$`),
+	substring.Regexp(`(.*?)\.d\.ts$`),
+	substring.Regexp(`(^|/)mootools([^.]*)\d+\.\d+.\d+([^.]*)\.js$`),
+	substring.Regexp(`(^|/)dojo\.js$`),
+	substring.Regexp(`(^|/)MochiKit\.js$`),
+	substring.Regexp(`(^|/)yahoo-([^.]*)\.js$`),
+	substring.Regexp(`(^|/)yui([^.]*)\.js$`),
+	substring.Regexp(`(^|/)ckeditor\.js$`),
+	substring.Regexp(`(^|/)tiny_mce([^.]*)\.js$`),
+	substring.Regexp(`(^|/)tiny_mce/(langs|plugins|themes|utils)`),
+	substring.Regexp(`(^|/)ace-builds/`),
+	substring.Regexp(`(^|/)fontello(.*?)\.css$`),
+	substring.Regexp(`(^|/)MathJax/`),
+	substring.Regexp(`(^|/)Chart\.js$`),
+	substring.Regexp(`(^|/)[Cc]ode[Mm]irror/(\d+\.\d+/)?(lib|mode|theme|addon|keymap|demo)`),
+	substring.Regexp(`(^|/)shBrush([^.]*)\.js$`),
+	substring.Regexp(`(^|/)shCore\.js$`),
+	substring.Regexp(`(^|/)shLegacy\.js$`),
+	substring.Regexp(`(^|/)angular([^.]*)\.js$`),
+	substring.Regexp(`(^|\/)d3(\.v\d+)?([^.]*)\.js$`),
+	substring.Regexp(`(^|/)react(-[^.]*)?\.js$`),
+	substring.Regexp(`(^|/)modernizr\-\d\.\d+(\.\d+)?\.js$`),
+	substring.Regexp(`(^|/)modernizr\.custom\.\d+\.js$`),
+	substring.Regexp(`(^|/)knockout-(\d+\.){3}(debug\.)?js$`),
+	substring.Regexp(`(^|/)docs?/_?(build|themes?|templates?|static)/`),
+	substring.Regexp(`(^|/)admin_media/`),
+	substring.Regexp(`(^|/)env/`),
+	substring.Regexp(`^fabfile\.py$`),
+	substring.Regexp(`^waf$`),
+	substring.Regexp(`^.osx$`),
+	substring.Regexp(`\.xctemplate/`),
+	substring.Regexp(`\.imageset/`),
+	substring.Regexp(`^Carthage/`),
+	substring.Regexp(`^Pods/`),
+	substring.Regexp(`(^|/)Sparkle/`),
+	substring.Regexp(`Crashlytics.framework/`),
+	substring.Regexp(`Fabric.framework/`),
+	substring.Regexp(`BuddyBuildSDK.framework/`),
+	substring.Regexp(`Realm.framework`),
+	substring.Regexp(`RealmSwift.framework`),
+	substring.Regexp(`gitattributes$`),
+	substring.Regexp(`gitignore$`),
+	substring.Regexp(`gitmodules$`),
+	substring.Regexp(`(^|/)gradlew$`),
+	substring.Regexp(`(^|/)gradlew\.bat$`),
+	substring.Regexp(`(^|/)gradle/wrapper/`),
+	substring.Regexp(`-vsdoc\.js$`),
+	substring.Regexp(`\.intellisense\.js$`),
+	substring.Regexp(`(^|/)jquery([^.]*)\.validate(\.unobtrusive)?\.js$`),
+	substring.Regexp(`(^|/)jquery([^.]*)\.unobtrusive\-ajax\.js$`),
+	substring.Regexp(`(^|/)[Mm]icrosoft([Mm]vc)?([Aa]jax|[Vv]alidation)(\.debug)?\.js$`),
+	substring.Regexp(`^[Pp]ackages\/.+\.\d+\/`),
+	substring.Regexp(`(^|/)extjs/.*?\.js$`),
+	substring.Regexp(`(^|/)extjs/.*?\.xml$`),
+	substring.Regexp(`(^|/)extjs/.*?\.txt$`),
+	substring.Regexp(`(^|/)extjs/.*?\.html$`),
+	substring.Regexp(`(^|/)extjs/.*?\.properties$`),
+	substring.Regexp(`(^|/)extjs/.sencha/`),
+	substring.Regexp(`(^|/)extjs/docs/`),
+	substring.Regexp(`(^|/)extjs/builds/`),
+	substring.Regexp(`(^|/)extjs/cmd/`),
+	substring.Regexp(`(^|/)extjs/examples/`),
+	substring.Regexp(`(^|/)extjs/locale/`),
+	substring.Regexp(`(^|/)extjs/packages/`),
+	substring.Regexp(`(^|/)extjs/plugins/`),
+	substring.Regexp(`(^|/)extjs/resources/`),
+	substring.Regexp(`(^|/)extjs/src/`),
+	substring.Regexp(`(^|/)extjs/welcome/`),
+	substring.Regexp(`(^|/)html5shiv\.js$`),
+	substring.Regexp(`^[Tt]ests?/fixtures/`),
+	substring.Regexp(`^[Ss]pecs?/fixtures/`),
+	substring.Regexp(`(^|/)cordova([^.]*)\.js$`),
+	substring.Regexp(`(^|/)cordova\-\d\.\d(\.\d)?\.js$`),
+	substring.Regexp(`foundation(\..*)?\.js$`),
+	substring.Regexp(`^Vagrantfile$`),
+	substring.Regexp(`.[Dd][Ss]_[Ss]tore$`),
+	substring.Regexp(`^vignettes/`),
+	substring.Regexp(`^inst/extdata/`),
+	substring.Regexp(`octicons.css`),
+	substring.Regexp(`sprockets-octicons.scss`),
+	substring.Regexp(`(^|/)activator$`),
+	substring.Regexp(`(^|/)activator\.bat$`),
+	substring.Regexp(`proguard.pro`),
+	substring.Regexp(`proguard-rules.pro`),
+	substring.Regexp(`^puphpet/`),
+	substring.Regexp(`(^|/)\.google_apis/`),
+	substring.Regexp(`^Jenkinsfile$`),
 )

internal/code-generator/generator/test_files/vendor.test.yml

@@ -1,24 +0,0 @@
-# Caches
-- (^|/)cache/
-
-# Dependencies
-- ^[Dd]ependencies/
-
-# Distributions
-- (^|/)dist/
-
-# C deps
-#  https://github.com/joyent/node
-- ^deps/
-- ^tools/
-- (^|/)configure$
-- (^|/)config.guess$
-- (^|/)config.sub$
-
-# stuff autogenerated by autoconf - still C deps
-- (^|/)aclocal.m4
-- (^|/)libtool.m4
-- (^|/)ltoptions.m4
-- (^|/)ltsugar.m4
-- (^|/)ltversion.m4
-- (^|/)lt~obsolete.m4

internal/code-generator/generator/types.go

@@ -3,6 +3,7 @@ package generator
 import (
 	"bytes"
 	"io"
+	"io/ioutil"
 	"text/template"
 
 	yaml "gopkg.in/yaml.v2"
@@ -15,21 +16,26 @@ var typeToTypeConst = map[string]string{
 	"prose":       "Prose",
 }
 
-// Types reads from buf and builds source file from typeTmplPath.
-func Types(data []byte, typeTmplPath, typeTmplName, commit string) ([]byte, error) {
+// Types reads from fileToParse and builds source file from tmplPath. It's comply with type File signature.
+func Types(fileToParse, samplesDir, outPath, tmplPath, tmplName, commit string) error {
+	data, err := ioutil.ReadFile(fileToParse)
+	if err != nil {
+		return err
+	}
+
 	languages := make(map[string]*languageInfo)
 	if err := yaml.Unmarshal(data, &languages); err != nil {
-		return nil, err
+		return err
 	}
 
 	langTypeMap := buildLanguageTypeMap(languages)
 
 	buf := &bytes.Buffer{}
-	if err := executeTypesTemplate(buf, langTypeMap, typeTmplPath, typeTmplName, commit); err != nil {
-		return nil, err
+	if err := executeTypesTemplate(buf, langTypeMap, tmplPath, tmplName, commit); err != nil {
+		return err
 	}
 
-	return buf.Bytes(), nil
+	return formatedWrite(outPath, buf.Bytes())
 }
 
 func buildLanguageTypeMap(languages map[string]*languageInfo) map[string]string {
@@ -41,12 +47,12 @@ func buildLanguageTypeMap(languages map[string]*languageInfo) map[string]string
 	return langTypeMap
 }
 
-func executeTypesTemplate(out io.Writer, langTypeMap map[string]string, typeTmplPath, typeTmpl, commit string) error {
+func executeTypesTemplate(out io.Writer, langTypeMap map[string]string, tmplPath, tmplName, commit string) error {
 	fmap := template.FuncMap{
 		"getCommit": func() string { return commit },
 	}
 
-	t := template.Must(template.New(typeTmpl).Funcs(fmap).ParseFiles(typeTmplPath))
+	t := template.Must(template.New(tmplName).Funcs(fmap).ParseFiles(tmplPath))
 	if err := t.Execute(out, langTypeMap); err != nil {
 		return err
 	}

internal/code-generator/generator/vendor.go

@@ -3,32 +3,38 @@ package generator
 import (
 	"bytes"
 	"io"
+	"io/ioutil"
 	"text/template"
 
 	yaml "gopkg.in/yaml.v2"
 )
 
-// Vendor reads from buf and builds source file from vendorTmplPath.
-func Vendor(data []byte, vendorTmplPath, vendorTmplName, commit string) ([]byte, error) {
+// Vendor reads from fileToParse and builds source file from tmplPath. It's comply with type File signature.
+func Vendor(fileToParse, samplesDir, outPath, tmplPath, tmplName, commit string) error {
+	data, err := ioutil.ReadFile(fileToParse)
+	if err != nil {
+		return err
+	}
+
 	var regexpList []string
 	if err := yaml.Unmarshal(data, &regexpList); err != nil {
-		return nil, err
+		return nil
 	}
 
 	buf := &bytes.Buffer{}
-	if err := executeVendorTemplate(buf, regexpList, vendorTmplPath, vendorTmplName, commit); err != nil {
-		return nil, err
+	if err := executeVendorTemplate(buf, regexpList, tmplPath, tmplName, commit); err != nil {
+		return nil
 	}
 
-	return buf.Bytes(), nil
+	return formatedWrite(outPath, buf.Bytes())
 }
 
-func executeVendorTemplate(out io.Writer, regexpList []string, vendorTmplPath, vendorTmpl, commit string) error {
+func executeVendorTemplate(out io.Writer, regexpList []string, tmplPath, tmplName, commit string) error {
 	fmap := template.FuncMap{
 		"getCommit": func() string { return commit },
 	}
 
-	t := template.Must(template.New(vendorTmpl).Funcs(fmap).ParseFiles(vendorTmplPath))
+	t := template.Must(template.New(tmplName).Funcs(fmap).ParseFiles(tmplPath))
 	if err := t.Execute(out, regexpList); err != nil {
 		return err
 	}

internal/code-generator/main.go

@@ -11,6 +11,9 @@ const (
 	// languages info file
 	languagesYAML = ".linguist/lib/linguist/languages.yml"
 
+	// linguist's samples directory
+	samplesDir = ".linguist/samples"
+
 	// extension.go generation
 	extensionsFile     = "extension.go"
 	extensionsTmplPath = "internal/code-generator/assets/extensions.go.tmpl"
@@ -55,7 +58,6 @@ const (
 	aliasesTmpl     = "aliases.go.tmpl"
 
 	// frequencies.go generation
-	samplesDir          = ".linguist/samples"
 	frequenciesFile     = "frequencies.go"
 	frequenciesTmplPath = "internal/code-generator/assets/frequencies.go.tmpl"
 	frequenciesTmpl     = "frequencies.go.tmpl"
@@ -63,13 +65,14 @@ const (
 	commitPath = ".linguist/.git/refs/heads/master"
 )
 
-type generatorArgs struct {
+type generatorFiles struct {
+	generate    generator.File
 	fileToParse string
+	samplesDir  string
 	outPath     string
 	tmplPath    string
 	tmplName    string
 	commit      string
-	generate    generator.Func
 }
 
 func main() {
@@ -78,26 +81,23 @@ func main() {
 		log.Printf("couldn't find commit: %v", err)
 	}
 
-	argsList := []*generatorArgs{
-		&generatorArgs{languagesYAML, extensionsFile, extensionsTmplPath, extensionsTmpl, commit, generator.Extensions},
-		&generatorArgs{heuristicsRuby, contentFile, contentTmplPath, contentTmpl, commit, generator.Heuristics},
-		&generatorArgs{vendorYAML, vendorFile, vendorTmplPath, vendorTmpl, commit, generator.Vendor},
-		&generatorArgs{documentationYAML, documentationFile, documentationTmplPath, documentationTmpl, commit, generator.Documentation},
-		&generatorArgs{languagesYAML, typeFile, typeTmplPath, typeTmpl, commit, generator.Types},
-		&generatorArgs{languagesYAML, interpretersFile, interpretersTmplPath, interpretersTmpl, commit, generator.Interpreters},
-		&generatorArgs{languagesYAML, filenamesFile, filenamesTmplPath, filenamesTmpl, commit, generator.Filenames},
-		&generatorArgs{languagesYAML, aliasesFile, aliasesTmplPath, aliasesTmpl, commit, generator.Aliases},
+	fileList := []*generatorFiles{
+		&generatorFiles{generator.Extensions, languagesYAML, "", extensionsFile, extensionsTmplPath, extensionsTmpl, commit},
+		&generatorFiles{generator.Heuristics, heuristicsRuby, "", contentFile, contentTmplPath, contentTmpl, commit},
+		&generatorFiles{generator.Vendor, vendorYAML, "", vendorFile, vendorTmplPath, vendorTmpl, commit},
+		&generatorFiles{generator.Documentation, documentationYAML, "", documentationFile, documentationTmplPath, documentationTmpl, commit},
+		&generatorFiles{generator.Types, languagesYAML, "", typeFile, typeTmplPath, typeTmpl, commit},
+		&generatorFiles{generator.Interpreters, languagesYAML, "", interpretersFile, interpretersTmplPath, interpretersTmpl, commit},
+		&generatorFiles{generator.Filenames, languagesYAML, samplesDir, filenamesFile, filenamesTmplPath, filenamesTmpl, commit},
+		&generatorFiles{generator.Aliases, languagesYAML, "", aliasesFile, aliasesTmplPath, aliasesTmpl, commit},
+		&generatorFiles{generator.Frequencies, "", samplesDir, frequenciesFile, frequenciesTmplPath, frequenciesTmpl, commit},
 	}
 
-	for _, args := range argsList {
-		if err := generator.FromFile(args.fileToParse, args.outPath, args.tmplPath, args.tmplName, args.commit, args.generate); err != nil {
+	for _, file := range fileList {
+		if err := file.generate(file.fileToParse, file.samplesDir, file.outPath, file.tmplPath, file.tmplName, file.commit); err != nil {
 			log.Println(err)
 		}
 	}
-
-	if err := generator.Frequencies(samplesDir, frequenciesTmplPath, frequenciesTmpl, commit, frequenciesFile); err != nil {
-		log.Println(err)
-	}
 }
 
 func getCommit(path string) (string, error) {

internal/tokenizer/tokenize.go

@@ -44,7 +44,7 @@ var (
 	}
 
 	reLiteralStringQuotes = regexp.MustCompile(`(?sU)(".*"|'.*')`)
-	reSingleLineComment   = regexp.MustCompile(`(?m)(//|--|#|%|")(.*$)`)
+	reSingleLineComment   = regexp.MustCompile(`(?m)(//|--|#|%|")\s(.*$)`)
 	reMultilineComment    = regexp.MustCompile(`(?sU)(/\*.*\*/|<!--.*-->|\{-.*-\}|\(\*.*\*\)|""".*"""|'''.*''')`)
 	reLiteralNumber       = regexp.MustCompile(`(0x[0-9A-Fa-f]([0-9A-Fa-f]|\.)*|\d(\d|\.)*)([uU][lL]{0,2}|([eE][-+]\d*)?[fFlL]*)`)
 	reShebang             = regexp.MustCompile(`(?m)^#!(?:/\w+)*/(?:(\w+)|\w+(?:\s*\w+=\w+\s*)*\s*(\w+))(?:\s*-\w+\s*)*$`)

internal/tokenizer/tokenize_test.go

@@ -53,6 +53,9 @@ abb (tokenByte, 0xAF02) | ,3.2L
 oneBool = 3 <= 2
 varBool = 3<=2>
  
+#ifndef
+#i'm not a comment if the single line comment symbol is not followed by a white
+
   PyErr_SetString(PyExc_RuntimeError, "Relative import is not supported for Python <=2.4.");
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -77,13 +80,15 @@ var (
 	tokensFromTestContent = []string{"SHEBANG#!ruby", "SHEBANG#!node", "SHEBANG#!awk", "<!DOCTYPE>", "PUBLIC", "W3C", "DTD", "XHTML", "1", "0",
 		"Strict", "EN", "http", "www", "w3", "org", "TR", "xhtml1", "DTD", "xhtml1", "strict", "dtd", "<html>", "<head>", "<title>", "class=",
 		"</title>", "<style>", "<![CDATA[>", "example", "background", "color", "yellow", "</style>", "</head>", "<body>", "<div>", "<strong>",
-		"</strong>", "</div>", "</body>", "</html>", "(", "[", "]", ")", "[", "]", "{", "(", ")", "(", ")", "{", "}", "(", ")", ";", ";", "}",
-		"]", "]", "aaa", "func", "Tokenize", "content", "byte", "string", "splitted", "bytes.Fields", "content", "tokens", "othercode", "ppp",
-		"no", "comment", "abb", "tokenByte", "notcatchasanumber", "number", "*", "anotherNumber", "if", "isTrue", "isToo", "b", "return",
-		"tokens", "oneBool", "varBool", "PyErr_SetString", "PyExc_RuntimeError", "html", "PUBLIC", "xmlns", "id", "class", "This", "is", "a",
-		"XHTML", "sample", "file", "type", "background", "color", "yellow", "id", "Just", "a", "simple", "XHTML", "test", "page.", "|", "+",
-		"&&", "<", "<", "-", ":", "=", ":", "=", ",", ",", "=", ">", ">", "=", "=", "=", "=", ">", ",", ">", "=", ">", "=", "=", ">", "=", ">",
-		":", ">", "=", ">"}
+		"</strong>", "</div>", "</body>", "</html>", "(", "[", "]", ")", "[", "]", "{", "(", ")", "(", ")", "{", "}", "(", ")", ";", "{", ";",
+		"}", "]", "]", "#", "/usr/bin/ruby", "#", "/usr/bin/env", "node", "aaa", "#", "/usr/bin/env", "A", "B", "foo", "bar", "awk", "f", "#",
+		"python", "func", "Tokenize", "content", "byte", "string", "splitted", "bytes.Fields", "content", "tokens", "othercode", "ppp", "no",
+		"comment", "abb", "tokenByte", "notcatchasanumber", "number", "*", "anotherNumber", "if", "isTrue", "isToo", "b", "return", "tokens",
+		"oneBool", "varBool", "#ifndef", "#i", "m", "not", "a", "comment", "if", "the", "single", "line", "comment", "symbol", "is", "not",
+		"followed", "by", "a", "white", "PyErr_SetString", "PyExc_RuntimeError", "html", "PUBLIC", "xmlns", "id", "class", "This", "is", "a",
+		"XHTML", "sample", "file", "type", "#example", "background", "color", "yellow", "id", "Just", "a", "simple", "XHTML", "test", "page.",
+		"-", "|", "+", "&&", "<", "<", "-", "!", "!", "!", "=", "=", "!", ":", "=", ":", "=", ",", ",", "=", ">", ">", "=", "=", "=", "=", ">",
+		"'", ",", ">", "=", ">", "=", "=", ">", "=", ">", ":", ">", "=", ">"}
 )
 
 func TestTokenize(t *testing.T) {