Merge branch 'master' into memory_blob

lib/linguist/generated.rb

@@ -71,7 +71,8 @@ module Linguist
       generated_jni_header? ||
       vcr_cassette? ||
       generated_module? ||
-      generated_unity3d_meta?
+      generated_unity3d_meta? ||
+      generated_racc?
     end
 
     # Internal: Is the blob an Xcode file?
@@ -359,5 +360,18 @@ module Linguist
       return false unless lines.count > 1
       return lines[0].include?("fileFormatVersion: ")
     end
+
+    # Internal: Is this a Racc-generated file?
+    #
+    # A Racc-generated file contains:
+    # # This file is automatically generated by Racc x.y.z
+    # on the third line.
+    #
+    # Return true or false
+    def generated_racc?
+      return false unless extname == '.rb'
+      return false unless lines.count > 2
+      return lines[2].start_with?("# This file is automatically generated by Racc")
+    end
   end
 end

lib/linguist/languages.yml

@@ -1037,6 +1037,16 @@ Frege:
   tm_scope: source.haskell
   ace_mode: haskell
 
+FreeMarker:
+  type: programming
+  color: "#0050b2"
+  aliases:
+  - ftl
+  extensions:
+  - .ftl
+  tm_scope: text.html.ftl
+  ace_mode: ftl
+
 G-code:
   type: data
   extensions:
@@ -1323,6 +1333,16 @@ HTML+Django:
   - htmldjango
   ace_mode: django
 
+HTML+EEX:
+  type: markup
+  tm_scope: text.html.eex
+  group: HTML
+  aliases:
+  - eex
+  extensions:
+  - .eex
+  ace_mode: html_eex
+
 HTML+ERB:
   type: markup
   tm_scope: text.html.erb
@@ -2063,6 +2083,14 @@ Mercury:
   tm_scope: source.mercury
   ace_mode: prolog
 
+Metal:
+  type: programming
+  color: "#8f14e9"
+  extensions:
+  - .metal
+  tm_scope: source.c++
+  ace_mode: c_cpp
+
 MiniD: # Legacy
   type: programming
   searchable: false
@@ -2441,6 +2469,7 @@ PHP:
   - .php3
   - .php4
   - .php5
+  - .phps
   - .phpt
   filenames:
   - Phakefile