latest linguist patterns 36ba3783443275525fff7b72b633a3bccfb132cb

content.go

@@ -18,11 +18,21 @@ func GetLanguageByContent(filename string, content []byte) (lang string, safe bo
 type languageMatcher func([]byte) (string, bool)
 
 var matchers = map[string]languageMatcher{
-	".cl":  clExtLanguage,
+	".cl":   clExtLanguage,
-	".cls": clsExtLanguage,
+	".inc":  incExtLanguage,
-	".m":   mExtLanguage,
+	".cls":  clsExtLanguage,
-	".h":   hExtLanguage,
+	".m":    mExtLanguage,
-	".pl":  plExtLanguage,
+	".ms":   msExtLanguage,
+	".h":    hExtLanguage,
+	".l":    lExtLanguage,
+	".n":    nExtLanguage,
+	".lisp": lispExtLanguage,
+	".lsp":  lispExtLanguage,
+	".pm":   pmExtLanguage,
+	".t":    pmExtLanguage,
+	".pl":   plExtLanguage,
+	".pro":  proExtLanguage,
+	".toc":  tocExtLanguage,
 }
 
 var (
@@ -37,6 +47,14 @@ var (
 	)
 )
 
+func incExtLanguage(input []byte) (string, bool) {
+	if substring.BytesRegexp(`^<\?(?:php)?`).Match(input) {
+		return "PHP", true
+	}
+
+	return OtherLanguage, true
+}
+
 func hExtLanguage(input []byte) (string, bool) {
 	if objectiveCMatcher.Match(input) {
 		return "Objective-C", true
@@ -47,6 +65,48 @@ func hExtLanguage(input []byte) (string, bool) {
 	return "C", true
 }
 
+func msExtLanguage(input []byte) (string, bool) {
+	if substring.BytesRegexp(`[.'][a-z][a-z](\s|$)`).Match(input) {
+		return "Groff", true
+	}
+
+	return "MAXScript", true
+}
+
+func nExtLanguage(input []byte) (string, bool) {
+	if substring.BytesRegexp(`^[.']`).Match(input) {
+		return "Groff", true
+	} else if substring.BytesRegexp(`(module|namespace|using)`).Match(input) {
+		return "Nemerle", true
+	}
+
+	return OtherLanguage, false
+}
+
+func lExtLanguage(input []byte) (string, bool) {
+	if substring.BytesRegexp(`\(def(un|macro)\s`).Match(input) {
+		return "Common Lisp", true
+	} else if substring.BytesRegexp(`(%[%{}]xs|<.*>)`).Match(input) {
+		return "Lex", true
+	} else if substring.BytesRegexp(`\.[a-z][a-z](\s|$)`).Match(input) {
+		return "Groff", true
+	} else if substring.BytesRegexp(`(de|class|rel|code|data|must)`).Match(input) {
+		return "PicoLisp", true
+	}
+
+	return OtherLanguage, false
+}
+
+func lispExtLanguage(input []byte) (string, bool) {
+	if commonLispMatcher.Match(input) {
+		return "Common Lisp", true
+	} else if substring.BytesRegexp(`\s*\(define `).Match(input) {
+		return "NewLisp", true
+	}
+
+	return OtherLanguage, false
+}
+
 var (
 	commonLispMatcher = substring.BytesRegexp("(?i)(defpackage|defun|in-package)")
 	coolMatcher       = substring.BytesRegexp("(?i)class")
@@ -101,10 +161,10 @@ func clsExtLanguage(input []byte) (string, bool) {
 }
 
 var (
-	mathematicaMatcher = substring.BytesHas(`(*`)
+	mathematicaMatcher = substring.BytesHas(`\s*\(\*`)
-	matlabMatcher      = substring.BytesRegexp(`\b(function\s*[\[a-zA-Z]+|classdef|figure|end|elseif)\b`)
+	matlabMatcher      = substring.BytesRegexp(`\b(function\s*[\[a-zA-Z]+|pcolor|classdef|figure|end|elseif)\b`)
 	objectiveCMatcher  = substring.BytesRegexp(
-		`@(class|end|implementation|interface|property|protocol|selector|synchronised)`)
+		`@(interface|class|protocol|property|end|synchronised|selector|implementation)\b|#import\s+.+\.h[">]`)
 )
 
 func mExtLanguage(input []byte) (string, bool) {
@@ -121,7 +181,8 @@ func mExtLanguage(input []byte) (string, bool) {
 
 var (
 	prologMatcher = substring.BytesRegexp(`^[^#]+:-`)
-	perl6Matcher  = substring.BytesRegexp(`^(use v6|(my )?class|module)`)
+	perlMatcher   = substring.BytesRegexp(`use strict|use\s+v?5\.`)
+	perl6Matcher  = substring.BytesRegexp(`(use v6|(my )?class|module)`)
 )
 
 func plExtLanguage(input []byte) (string, bool) {
@@ -133,3 +194,31 @@ func plExtLanguage(input []byte) (string, bool) {
 
 	return "Perl", false
 }
+
+func pmExtLanguage(input []byte) (string, bool) {
+	if perlMatcher.Match(input) {
+		return "Perl", true
+	} else if perl6Matcher.Match(input) {
+		return "Perl6", true
+	}
+
+	return "Perl", false
+}
+
+func proExtLanguage(input []byte) (string, bool) {
+	if prologMatcher.Match(input) {
+		return "Prolog", true
+	}
+
+	return OtherLanguage, false
+}
+
+func tocExtLanguage(input []byte) (string, bool) {
+	if substring.BytesRegexp("## |@no-lib-strip@").Match(input) {
+		return "World of Warcraft Addon Data", true
+	} else if substring.BytesRegexp("(contentsline|defcounter|beamer|boolfalse)").Match(input) {
+		return "TeX", true
+	}
+
+	return OtherLanguage, false
+}

content_test.go

@@ -9,8 +9,25 @@ import (
 	. "gopkg.in/check.v1"
 )
 
-func (s *TSuite) TestGetLanguageByContent(c *C) {
+func (s *TSuite) TestGetLanguageByContentH(c *C) {
+	s.testGetLanguageByContent(c, "Objective-C")
+	s.testGetLanguageByContent(c, "C++")
 	s.testGetLanguageByContent(c, "C")
+	s.testGetLanguageByContent(c, "Common Lisp")
+	s.testGetLanguageByContent(c, "Cool")
+	s.testGetLanguageByContent(c, "OpenCL")
+	s.testGetLanguageByContent(c, "Groff")
+	s.testGetLanguageByContent(c, "PicoLisp")
+	s.testGetLanguageByContent(c, "PicoLisp")
+	s.testGetLanguageByContent(c, "NewLisp")
+	s.testGetLanguageByContent(c, "Lex")
+	s.testGetLanguageByContent(c, "TeX")
+	s.testGetLanguageByContent(c, "Visual Basic")
+	s.testGetLanguageByContent(c, "Matlab")
+	s.testGetLanguageByContent(c, "Mathematica")
+	s.testGetLanguageByContent(c, "Prolog")
+	s.testGetLanguageByContent(c, "Perl")
+	s.testGetLanguageByContent(c, "Perl6")
 }
 
 func (s *TSuite) testGetLanguageByContent(c *C, expected string) {
@@ -26,6 +43,10 @@ func (s *TSuite) testGetLanguageByContent(c *C, expected string) {
 		content, _ := ioutil.ReadFile(file)
 
 		obtained, _ := GetLanguageByContent(path.Base(file), content)
-		c.Assert(obtained, Equals, expected, Commentf(file))
+		if obtained == OtherLanguage {
+			continue
+		}
+
+		c.Check(obtained, Equals, expected, Commentf(file))
 	}
 }

extension.go

@@ -2,11 +2,14 @@ package slinguist
 
 import (
 	"path/filepath"
+	"strings"
 )
 
 func GetLanguageByExtension(filename string) (lang string, safe bool) {
+	ext := strings.ToLower(filepath.Ext(filename))
+
 	lang = OtherLanguage
-	langs, ok := LanguagesByExtension[filepath.Ext(filename)]
+	langs, ok := LanguagesByExtension[ext]
 	if !ok {
 		return
 	}