Merge branch 'master' into return-nil-on-no-ace-mode

lib/linguist/heuristics.rb

@@ -156,5 +156,22 @@ module Linguist
       end
     end
 
+    disambiguate "Frege", "Forth", "text" do |data|
+      if /^(: |also |new-device|previous )/.match(data)
+        Language["Forth"]
+      elsif /\s*(import|module|package|data|type) /.match(data)
+        Language["Frege"]
+      else
+        Language["text"]
+      end
+    end
+
+    disambiguate "TypeScript", "XML" do |data|
+      if data.include?("<TS ")
+        Language["XML"]
+      else
+        Language["TypeScript"]
+      end
+    end
   end
 end

lib/linguist/languages.yml

@@ -903,6 +903,7 @@ Forth:
   - .f
   - .for
   - .forth
+  - .fr
   - .frt
   - .fs
   ace_mode: forth
@@ -1718,7 +1719,7 @@ Mask:
   ace_mode: mask
   extensions:
   - .mask
-  tm_scope: source.scss
+  tm_scope: source.mask
 
 Mathematica:
   type: programming
@@ -2319,6 +2320,7 @@ Python:
   - BUILD
   - SConscript
   - SConstruct
+  - Snakefile
   - wscript
   interpreters:
   - python
@@ -3065,6 +3067,7 @@ XML:
   - .tmSnippet
   - .tmTheme
   - .tml
+  - .ts
   - .ui
   - .urdf
   - .vbproj
@@ -3231,6 +3234,15 @@ reStructuredText:
   - .rest
   ace_mode: text
 
+text:
+  type: prose
+  wrap: true
+  extensions:
+  - .txt
+  - .fr
+  tm_scope: none
+  ace_mode: none
+
 wisp:
   type: programming
   ace_mode: clojure