KevinMidboe/linguist
1
0
Fork 0
mirror of https://github.com/KevinMidboe/linguist.git synced 2026-01-21 08:45:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow primary extension override

Browse Source
This commit is contained in:
Joshua Peek
2011-07-25 11:56:08 -05:00
parent 6aedcfd0da
commit f52afec7c5
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/linguist/language.rb
View File

@@ -222,7 +222,7 @@ module Linguist
@overrides = attributes[:overrides] || [] @overrides = attributes[:overrides] || []
@filenames = attributes[:filenames] || [] @filenames = attributes[:filenames] || []
@primary_extension = default_primary_extension || extensions.first @primary_extension = attributes[:primary_extension] || default_primary_extension || extensions.first
# Prepend primary extension unless its already included # Prepend primary extension unless its already included
if primary_extension && !extensions.include?(primary_extension) if primary_extension && !extensions.include?(primary_extension)
@@ -403,17 +403,18 @@ module Linguist
YAML.load_file(File.expand_path("../languages.yml", __FILE__)).each do |name, options| YAML.load_file(File.expand_path("../languages.yml", __FILE__)).each do |name, options|
Language.create( Language.create(
:name => name, :name => name,
:type => options['type'], :type => options['type'],
:aliases => options['aliases'], :aliases => options['aliases'],
:lexer => options['lexer'], :lexer => options['lexer'],
:group_name => options['group'], :group_name => options['group'],
:searchable => options.key?('searchable') ? options['searchable'] : true, :searchable => options.key?('searchable') ? options['searchable'] : true,
:search_term => options['search_term'], :search_term => options['search_term'],
:extensions => options['extensions'], :extensions => options['extensions'],
:overrides => options['overrides'], :primary_extension => options['primary_extension'],
:filenames => options['filenames'], :overrides => options['overrides'],
:popular => popular.include?(name) :filenames => options['filenames'],
:popular => popular.include?(name)
) )
end end
end end