Merge branch 'pr/678' into add_crystal

Conflicts:
	lib/linguist/languages.yml
This commit is contained in:
Arfon Smith
2013-12-23 14:58:35 -06:00
2 changed files with 7 additions and 0 deletions

View File

@@ -382,6 +382,12 @@ Creole:
wrap: true
primary_extension: .creole
Crystal:
type: programming
lexer: Ruby
primary_extension: .cr
ace_mode: ruby
Cucumber:
lexer: Gherkin
primary_extension: .feature

View File

@@ -40,6 +40,7 @@ class TestLanguage < Test::Unit::TestCase
assert_equal Lexer['REBOL'], Language['Rebol'].lexer
assert_equal Lexer['RHTML'], Language['HTML+ERB'].lexer
assert_equal Lexer['RHTML'], Language['RHTML'].lexer
assert_equal Lexer['Ruby'], Language['Crystal'].lexer
assert_equal Lexer['Ruby'], Language['Mirah'].lexer
assert_equal Lexer['Ruby'], Language['Ruby'].lexer
assert_equal Lexer['S'], Language['R'].lexer