From 6ae39e50ae3fabb0e1725021bd383f2e4b746f42 Mon Sep 17 00:00:00 2001 From: Lars Brinkhoff Date: Fri, 5 Dec 2014 11:51:33 +0100 Subject: [PATCH] Fix #1731 to allow samples with multiple file extension segments. --- lib/linguist/language.rb | 2 +- test/test_samples.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/linguist/language.rb b/lib/linguist/language.rb index 210b244d..5f1808ce 100644 --- a/lib/linguist/language.rb +++ b/lib/linguist/language.rb @@ -548,7 +548,7 @@ module Linguist if extnames = extensions[name] extnames.each do |extname| - if !options['extensions'].include?(extname) + if !options['extensions'].index { |x| x.end_with? extname } warn "#{name} has a sample with extension (#{extname}) that isn't explicitly defined in languages.yml" unless extname == '.script!' options['extensions'] << extname end diff --git a/test/test_samples.rb b/test/test_samples.rb index f47244ed..3a00c02d 100644 --- a/test/test_samples.rb +++ b/test/test_samples.rb @@ -43,7 +43,7 @@ class TestSamples < Test::Unit::TestCase if extnames = Samples.cache['extnames'][name] extnames.each do |extname| next if extname == '.script!' - assert options['extensions'].include?(extname), "#{name} has a sample with extension (#{extname}) that isn't explicitly defined in languages.yml" + assert options['extensions'].index { |x| x.end_with? extname }, "#{name} has a sample with extension (#{extname}) that isn't explicitly defined in languages.yml" end end