Merge pull request github-linguist#2447 from Ryman/rustup

Split on comma in language name if no match is found
yermulnik · Aug 7, 2015 · deab066 · deab066
2 parents 7238f50 + bc8d65e
commit deab066
Show file tree

Hide file tree

Showing 4 changed files with 2,351 additions and 3 deletions.
diff --git a/lib/linguist/language.rb b/lib/linguist/language.rb
@@ -150,7 +150,7 @@ def self.all
     #
     # Returns the Language or nil if none was found.
     def self.find_by_name(name)
-      name && @name_index[name.downcase]
+      name && (@name_index[name.downcase] || @name_index[name.split(',').first.downcase])
     end
 
     # Public: Look up Language by one of its aliases.
@@ -164,7 +164,7 @@ def self.find_by_name(name)
     #
     # Returns the Language or nil if none was found.
     def self.find_by_alias(name)
-      name && @alias_index[name.downcase]
+      name && (@alias_index[name.downcase] || @alias_index[name.split(',').first.downcase])
     end
 
     # Public: Look up Languages by filename.
@@ -240,7 +240,7 @@ def self.find_by_interpreter(interpreter)
     #
     # Returns the Language or nil if none was found.
     def self.[](name)
-      name && @index[name.downcase]
+      name && (@index[name.downcase] || @index[name.split(',').first.downcase])
     end
 
     # Public: A List of popular languages