mirror of
https://github.com/KevinMidboe/linguist.git
synced 2025-10-29 17:50:22 +00:00
Merge branch 'detect-prolog' of https://github.com/tautologico/linguist into tautologico-detect-prolog
Conflicts: lib/linguist/blob_helper.rb test/test_blob.rb
This commit is contained in:
@@ -230,9 +230,10 @@ class TestBlob < Test::Unit::TestCase
|
||||
assert_equal Language['Ruby'], blob("wrong_shebang.rb").language
|
||||
assert_nil blob("octocat.png").language
|
||||
|
||||
# .r disambiguation
|
||||
assert_equal Language['R'], blob("hello-r.R").language
|
||||
assert_equal Language['Rebol'], blob("hello-rebol.r").language
|
||||
# .pl disambiguation
|
||||
assert_equal Language['Prolog'], blob("test-prolog.pl").language
|
||||
assert_equal Language['Perl'], blob("test-perl.pl").language
|
||||
assert_equal Language['Perl'], blob("test-perl2.pl").language
|
||||
|
||||
# .m disambiguation
|
||||
assert_equal Language['Objective-C'], blob("Foo.m").language
|
||||
@@ -240,6 +241,10 @@ class TestBlob < Test::Unit::TestCase
|
||||
assert_equal Language['Matlab'], blob("matlab_function.m").language
|
||||
assert_equal Language['Matlab'], blob("matlab_script.m").language
|
||||
|
||||
# .r disambiguation
|
||||
assert_equal Language['R'], blob("hello-r.R").language
|
||||
assert_equal Language['Rebol'], blob("hello-rebol.r").language
|
||||
|
||||
# ML
|
||||
assert_equal Language['OCaml'], blob("Foo.ml").language
|
||||
assert_equal Language['Standard ML'], blob("Foo.sig").language
|
||||
|
||||
Reference in New Issue
Block a user