diff --git a/lib/linguist/blob_helper.rb b/lib/linguist/blob_helper.rb index de6e20c4..8f2941e8 100644 --- a/lib/linguist/blob_helper.rb +++ b/lib/linguist/blob_helper.rb @@ -454,30 +454,18 @@ module Linguist # Returns a Language or nil. def disambiguate_extension_language if Language.ambiguous?(extname) + # name = "guess_#{extname.sub(/^\./, '')}_language" + # send(name) if respond_to?(name) + possible_languages = Language.all.select { |l| l.extensions.include?(extname) } - - name = "guess_#{extname.sub(/^\./, '')}_language" - language = send(name) if respond_to?(name) - if possible_languages.any? - results = Classifier.instance.classify(data, possible_languages) - guessed_language, score = results.first - - if guessed_language != language - report_classifier_incorrect_guess(language, guessed_language, score) + if result = Classifier.instance.classify(data, possible_languages).first + result[0] end end - - language end end - class LanguageClassifierError < StandardError; end - - def report_classifier_incorrect_guess(expected, actual, score) - raise LanguageClassifierError, "Expected #{expected}, but was #{actual} scoring #{score}.\n#{name}\n#{data}" - end - # Internal: Guess language of .cls files # # Returns a Language.