From bc66f558b91a280edabecd7e9825042a728086d2 Mon Sep 17 00:00:00 2001 From: Brandon Keepers Date: Fri, 28 Nov 2014 12:17:52 -0600 Subject: [PATCH] Remove inactive heuristics MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We can add these back when we’re ready to enable them. --- lib/linguist/heuristics.rb | 32 -------------------------------- test/test_heuristics.rb | 27 --------------------------- 2 files changed, 59 deletions(-) diff --git a/lib/linguist/heuristics.rb b/lib/linguist/heuristics.rb index 8033d722..d23ea7f0 100644 --- a/lib/linguist/heuristics.rb +++ b/lib/linguist/heuristics.rb @@ -115,37 +115,5 @@ module Linguist Language["GLSL"] end end - - # .h extensions are ambiguous between C, C++, and Objective-C. - # We want to shortcut look for Objective-C _and_ now C++ too! - # - # Returns an array of Languages or [] - def self.disambiguate_c(data) - matches = [] - if data.include?("@interface") - matches << Language["Objective-C"] - elsif data.include?("#include ") - matches << Language["C++"] - end - matches - end - - def self.disambiguate_ts(data) - matches = [] - if (data.include?("")) - matches << Language["XML"] - else - matches << Language["TypeScript"] - end - matches - end - - def self.disambiguate_r(data) - matches = [] - matches << Language["Rebol"] if /\bRebol\b/i.match(data) - matches << Language["R"] if data.include?("<-") - matches - end - end end diff --git a/test/test_heuristics.rb b/test/test_heuristics.rb index ce50daa4..36c8ece1 100644 --- a/test/test_heuristics.rb +++ b/test/test_heuristics.rb @@ -20,21 +20,6 @@ class TestHeuristcs < Test::Unit::TestCase Dir.glob("#{samples_path}/#{language_name}/#{file}") end - # Candidate languages = ["C++", "Objective-C"] - def test_obj_c_by_heuristics - # Only calling out '.h' filenames as these are the ones causing issues - all_fixtures("Objective-C", "*.h").each do |fixture| - results = Heuristics.disambiguate_c(fixture("Objective-C/#{File.basename(fixture)}")) - assert_equal Language["Objective-C"], results.first - end - end - - # Candidate languages = ["C++", "Objective-C"] - def test_cpp_by_heuristics - results = Heuristics.disambiguate_c(fixture("C++/render_adapter.cpp")) - assert_equal Language["C++"], results.first - end - def test_detect_still_works_if_nothing_matches blob = Linguist::FileBlob.new(File.join(samples_path, "Objective-C/hello.m")) match = Language.detect(blob) @@ -79,18 +64,6 @@ class TestHeuristcs < Test::Unit::TestCase }) end - # Candidate languages = ["TypeScript", "XML"] - def test_ts_typescript_by_heuristics - results = Heuristics.disambiguate_ts(fixture("TypeScript/classes.ts")) - assert_equal Language["TypeScript"], results.first - end - - # Candidate languages = ["TypeScript", "XML"] - def test_ts_xml_by_heuristics - results = Heuristics.disambiguate_ts(fixture("XML/pt_BR.xml")) - assert_equal Language["XML"], results.first - end - def test_cl_by_heuristics assert_heuristics({ "Common Lisp" => all_fixtures("Common Lisp"),