Merge branch 'master' into reworking-documentation-paths

lib/linguist/language.rb

@@ -150,6 +150,7 @@ module Linguist
     #
     # Returns the Language or nil if none was found.
     def self.find_by_name(name)
+      return nil if name.to_s.empty?
       name && (@name_index[name.downcase] || @name_index[name.split(',').first.downcase])
     end
 
@@ -164,6 +165,7 @@ module Linguist
     #
     # Returns the Language or nil if none was found.
     def self.find_by_alias(name)
+      return nil if name.to_s.empty?
       name && (@alias_index[name.downcase] || @alias_index[name.split(',').first.downcase])
     end
 
@@ -240,6 +242,7 @@ module Linguist
     #
     # Returns the Language or nil if none was found.
     def self.[](name)
+      return nil if name.to_s.empty?
       name && (@index[name.downcase] || @index[name.split(',').first.downcase])
     end
 

lib/linguist/languages.yml

@@ -2934,6 +2934,7 @@ Ruby:
   - .pryrc
   - Appraisals
   - Berksfile
+  - Brewfile
   - Buildfile
   - Deliverfile
   - Fastfile
@@ -3718,7 +3719,9 @@ YAML:
   - .yml
   - .reek
   - .rviz
+  - .syntax
   - .yaml
+  - .yaml-tmlanguage
   ace_mode: yaml
 
 Yacc:

lib/linguist/strategy/modeline.rb

@@ -2,7 +2,7 @@ module Linguist
   module Strategy
     class Modeline
       EmacsModeline = /-\*-\s*(?:(?!mode)[\w-]+\s*:\s*(?:[\w+-]+)\s*;?\s*)*(?:mode\s*:)?\s*([\w+-]+)\s*(?:;\s*(?!mode)[\w-]+\s*:\s*[\w+-]+\s*)*;?\s*-\*-/i
-      VimModeline = /vim:\s*set\s*(?:ft|filetype)=(\w+):/i
+      VimModeline = /vim:\s*set.*\s(?:ft|filetype)=(\w+)\s?.*:/i
 
       # Public: Detects language based on Vim and Emacs modelines
       #

lib/linguist/version.rb

@@ -1,3 +1,3 @@
 module Linguist
-  VERSION = "4.5.11"
+  VERSION = "4.5.13"
 end