Merge branch 'master' into dont-explode-on-invalid-shebang

Conflicts:
	lib/linguist/samples.json
	test/test_tokenizer.rb
This commit is contained in:
Joshua Peek
2012-12-10 09:02:24 -06:00
9 changed files with 472 additions and 21 deletions

View File

@@ -94,6 +94,7 @@ class TestTokenizer < Test::Unit::TestCase
assert_equal "SHEBANG#!ruby", tokenize(:"Ruby/ruby.script!")[0]
assert_equal "SHEBANG#!ruby", tokenize(:"Ruby/ruby2.script!")[0]
assert_equal "SHEBANG#!node", tokenize(:"JavaScript/js.script!")[0]
assert_equal "SHEBANG#!php", tokenize(:"PHP/php.script!")[0]
assert_equal "echo", tokenize(:"Shell/invalid-shebang.sh")[0]
end