Merge branch 'master' into newlisp

lib/linguist/heuristics.rb

@@ -155,6 +155,22 @@ module Linguist
         Language["LiveScript"]
       end
     end
+    
+    disambiguate "Common Lisp", "NewLisp" do |data|
+      if /^\s*\((defun|defactor|in-package|defpackage) /.match(data)
+        Language["Common Lisp"]
+      elsif /^\s*\(define /.match(data)
+        Language["NewLisp"]
+      end
+    end
+
+    disambiguate "TypeScript", "XML" do |data|
+      if data.include?("<TS ")
+        Language["XML"]
+      else
+        Language["TypeScript"]
+      end
+    end
 
     disambiguate "Frege", "Forth", "text" do |data|
       if /^(: |also |new-device|previous )/.match(data)
@@ -165,13 +181,5 @@ module Linguist
         Language["text"]
       end
     end
-
-    disambiguate "Common Lisp", "NewLisp" do |data|
-      if /^\s*\((defun|defactor|in-package|defpackage) /.match(data)
-        Language["Common Lisp"]
-      elsif /^\s*\(define /.match(data)
-        Language["NewLisp"]
-      end
-    end
   end
 end

lib/linguist/languages.yml

@@ -1719,7 +1719,7 @@ Mask:
   ace_mode: mask
   extensions:
   - .mask
-  tm_scope: source.scss
+  tm_scope: source.mask
 
 Mathematica:
   type: programming
@@ -2333,6 +2333,7 @@ Python:
   - BUILD
   - SConscript
   - SConstruct
+  - Snakefile
   - wscript
   interpreters:
   - python
@@ -3079,6 +3080,7 @@ XML:
   - .tmSnippet
   - .tmTheme
   - .tml
+  - .ts
   - .ui
   - .urdf
   - .vbproj