KevinMidboe/linguist
1
0
Fork 0
mirror of https://github.com/KevinMidboe/linguist.git synced 2025-10-29 17:50:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

#all_extensions already includes primary extension

Browse Source
This commit is contained in:
Brandon Keepers
2014-11-18 15:10:07 -05:00
parent b20fa497b9
commit 850ab6dedb
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/linguist/language.rb
View File

@@ -413,6 +413,9 @@ module Linguist
# Returns the extensions Array # Returns the extensions Array
attr_reader :extensions attr_reader :extensions
# DEPRECATED: Will be removed in 5.x
alias_method :all_extensions, :extensions
# Public: Get interpreters # Public: Get interpreters
# #
# Examples # Examples
@@ -431,11 +434,6 @@ module Linguist
# Returns the extensions Array # Returns the extensions Array
attr_reader :filenames attr_reader :filenames
# Public: Return all possible extensions for language
def all_extensions
(extensions + [primary_extension]).uniq
end
# Deprecated: Get primary extension # Deprecated: Get primary extension
# #
# Defaults to the first extension but can be overridden # Defaults to the first extension but can be overridden

4
test/test_samples.rb
View File

@@ -57,8 +57,8 @@ class TestSamples < Test::Unit::TestCase
# If a language extension isn't globally unique then make sure there are samples # If a language extension isn't globally unique then make sure there are samples
Linguist::Language.all.each do |language| Linguist::Language.all.each do |language|
define_method "test_#{language.name}_has_samples" do define_method "test_#{language.name}_has_samples" do
language.all_extensions.each do |extension| language.extensions.each do |extension|
language_matches = Language.find_by_filename("foo#{extension}") language_matches = Language.find_by_extension(extension)
# Check for samples if more than one language matches the given extension. # Check for samples if more than one language matches the given extension.
if language_matches.length > 1 if language_matches.length > 1