mirror of
				https://github.com/KevinMidboe/linguist.git
				synced 2025-10-29 17:50:22 +00:00 
			
		
		
		
	Merge branch 'master' into 950
Conflicts: lib/linguist/languages.yml
This commit is contained in:
		| @@ -10,6 +10,7 @@ class TestLanguage < Test::Unit::TestCase | ||||
|  | ||||
|   def test_lexer | ||||
|     assert_equal Lexer['ActionScript 3'], Language['ActionScript'].lexer | ||||
|     assert_equal Lexer['AspectJ'], Language['AspectJ'].lexer | ||||
|     assert_equal Lexer['Bash'], Language['Gentoo Ebuild'].lexer | ||||
|     assert_equal Lexer['Bash'], Language['Gentoo Eclass'].lexer | ||||
|     assert_equal Lexer['Bash'], Language['Shell'].lexer | ||||
| @@ -322,7 +323,7 @@ class TestLanguage < Test::Unit::TestCase | ||||
|   def test_color | ||||
|     assert_equal '#701516', Language['Ruby'].color | ||||
|     assert_equal '#3581ba', Language['Python'].color | ||||
|     assert_equal '#f15501', Language['JavaScript'].color | ||||
|     assert_equal '#f1e05a', Language['JavaScript'].color | ||||
|     assert_equal '#31859c', Language['TypeScript'].color | ||||
|   end | ||||
|  | ||||
| @@ -385,6 +386,15 @@ class TestLanguage < Test::Unit::TestCase | ||||
| <div class="highlight"><pre><span class="k">def</span> <span class="nf">foo</span> | ||||
|   <span class="s1">'foo'</span> | ||||
| <span class="k">end</span> | ||||
| </pre></div> | ||||
|     HTML | ||||
|   end | ||||
|  | ||||
|   def test_colorize_with_options | ||||
|     assert_equal <<-HTML.chomp, Language['Ruby'].colorize("def foo\n  'foo'\nend\n", :options => { :cssclass => "highlight highlight-ruby" }) | ||||
| <div class="highlight highlight-ruby"><pre><span class="k">def</span> <span class="nf">foo</span> | ||||
|   <span class="s1">'foo'</span> | ||||
| <span class="k">end</span> | ||||
| </pre></div> | ||||
|     HTML | ||||
|   end | ||||
|   | ||||
		Reference in New Issue
	
	Block a user