Merge branch 'master' into data-fixture-folder

This commit is contained in:
Paul Chaignon
2014-12-10 19:15:41 -05:00
30 changed files with 1483 additions and 159 deletions

View File

@@ -118,6 +118,14 @@ class TestHeuristcs < Test::Unit::TestCase
})
end
def test_fr_by_heuristics
assert_heuristics({
"Frege" => all_fixtures("Frege"),
"Forth" => all_fixtures("Forth"),
"text" => all_fixtures("text")
})
end
def assert_heuristics(hash)
candidates = hash.keys.map { |l| Language[l] }
@@ -135,4 +143,11 @@ class TestHeuristcs < Test::Unit::TestCase
"LoomScript" => "LoomScript/HelloWorld.ls"
})
end
def test_ts_by_heuristics
assert_heuristics({
"TypeScript" => all_fixtures("TypeScript", "*.ts"),
"XML" => all_fixtures("XML", "*.ts")
})
end
end

View File

@@ -308,11 +308,12 @@ class TestLanguage < Test::Unit::TestCase
assert_equal 'css', Language['CSS'].ace_mode
assert_equal 'lsl', Language['LSL'].ace_mode
assert_equal 'javascript', Language['JavaScript'].ace_mode
assert_equal 'none', Language['FORTRAN'].ace_mode
assert_equal 'text', Language['FORTRAN'].ace_mode
end
def test_ace_modes
assert Language.ace_modes.include?(Language['Ruby'])
assert Language.ace_modes.include?(Language['FORTRAN'])
end
def test_wrap
@@ -366,9 +367,9 @@ class TestLanguage < Test::Unit::TestCase
File.basename(ace_github_mode["name"], ".js") if ace_github_mode["name"] !~ /_highlight_rules|_test|_worker/
end.compact.uniq.sort.map(&:downcase)
missing = Language.all.reject { |language| language.ace_mode == "none" || existing_ace_modes.include?(language.ace_mode) }
missing = Language.all.reject { |language| language.ace_mode == "text" || existing_ace_modes.include?(language.ace_mode) }
message = "The following languages do not have an Ace mode listed in languages.yml. Please add an Ace mode for all new languages.\n"
message << "If no Ace mode exists for a language, mark the language with `ace_mode: none` in lib/linguist/languages.yml.\n"
message << "If no Ace mode exists for a language, mark the language with `ace_mode: text` in lib/linguist/languages.yml.\n"
width = missing.map { |language| language.name.length }.max
message << missing.map { |language| sprintf("%-#{width}s %s", language.name, language.ace_mode) }.sort.join("\n")