Merge branch 'master' into newlisp

lib/linguist/heuristics.rb

@@ -61,6 +61,14 @@ module Linguist
       @heuristic.call(data)
     end
 
+    disambiguate "BitBake", "BlitzBasic" do |data|
+      if /^\s*; /.match(data) || data.include?("End Function")
+        Language["BlitzBasic"]
+      elsif /^\s*(# |include|require)\b/.match(data)
+        Language["BitBake"]
+      end
+    end
+
     disambiguate "Objective-C", "C++", "C" do |data|
       if (/@(interface|class|protocol|property|end|synchronised|selector|implementation)\b/.match(data))
         Language["Objective-C"]
@@ -156,6 +164,14 @@ module Linguist
       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)
         Language["Forth"]
@@ -165,13 +181,5 @@ module Linguist
         Language["text"]
       end
     end
-
-    disambiguate "BitBake", "BlitzBasic" do |data|
-      if /^\s*; /.match(data) || data.include?("End Function")
-        Language["BlitzBasic"]
-      elsif /^\s*(# |include|require)\b/.match(data)
-        Language["BitBake"]
-      end
-    end
   end
 end

lib/linguist/languages.yml

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