mirror of
				https://github.com/KevinMidboe/linguist.git
				synced 2025-10-29 17:50:22 +00:00 
			
		
		
		
	Merge branch 'master' into 3227-local
This commit is contained in:
		
							
								
								
									
										3
									
								
								test/fixtures/Data/Modelines/iamjs.pl
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								test/fixtures/Data/Modelines/iamjs.pl
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -0,0 +1,3 @@ | ||||
| # vim: noexpandtab: ft=javascript | ||||
|  | ||||
| "It's JavaScript, baby"; | ||||
							
								
								
									
										4
									
								
								test/fixtures/Data/Modelines/iamjs2.pl
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										4
									
								
								test/fixtures/Data/Modelines/iamjs2.pl
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -0,0 +1,4 @@ | ||||
| # vim:noexpandtab titlestring=hi\|there\\\ ft=perl ts=4 | ||||
| # vim:noexpandtab titlestring=hi|there\\ ft=javascript ts=4 | ||||
|  | ||||
| "Still JavaScript, bruh"; | ||||
							
								
								
									
										3
									
								
								test/fixtures/Data/Modelines/ruby10
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								test/fixtures/Data/Modelines/ruby10
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -0,0 +1,3 @@ | ||||
|  ex: noexpandtab: ft=ruby | ||||
|  | ||||
| # Still Ruby | ||||
							
								
								
									
										3
									
								
								test/fixtures/Data/Modelines/ruby11
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								test/fixtures/Data/Modelines/ruby11
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -0,0 +1,3 @@ | ||||
| # vim600: ft=ruby | ||||
|  | ||||
| # Targets Vim 6.0 or later | ||||
							
								
								
									
										3
									
								
								test/fixtures/Data/Modelines/ruby12
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								test/fixtures/Data/Modelines/ruby12
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -0,0 +1,3 @@ | ||||
| vim<520: ft=ruby | ||||
|  | ||||
| # Targets Vim 5.20 and earlier | ||||
| @@ -5,8 +5,11 @@ class TestGrammars < Minitest::Test | ||||
|  | ||||
|   # List of projects that are allowed without licenses | ||||
|   PROJECT_WHITELIST = [ | ||||
|     # Dual MIT and GPL license | ||||
|     "vendor/grammars/factor", | ||||
|     "vendor/grammars/go-tmbundle", | ||||
|     "vendor/grammars/jflex.tmbundle", | ||||
|     "vendor/grammars/language-csharp", | ||||
|     "vendor/grammars/language-viml", | ||||
|     "vendor/grammars/sublimeassembly" | ||||
|   ].freeze | ||||
|  | ||||
|   | ||||
| @@ -17,6 +17,9 @@ class TestModelines < Minitest::Test | ||||
|     assert_modeline Language["Ruby"], fixture_blob("Data/Modelines/ruby7") | ||||
|     assert_modeline Language["Ruby"], fixture_blob("Data/Modelines/ruby8") | ||||
|     assert_modeline Language["Ruby"], fixture_blob("Data/Modelines/ruby9") | ||||
|     assert_modeline Language["Ruby"], fixture_blob("Data/Modelines/ruby10") | ||||
|     assert_modeline Language["Ruby"], fixture_blob("Data/Modelines/ruby11") | ||||
|     assert_modeline Language["Ruby"], fixture_blob("Data/Modelines/ruby12") | ||||
|     assert_modeline Language["C++"], fixture_blob("Data/Modelines/seeplusplus") | ||||
|     assert_modeline Language["C++"], fixture_blob("Data/Modelines/seeplusplusEmacs1") | ||||
|     assert_modeline Language["C++"], fixture_blob("Data/Modelines/seeplusplusEmacs2") | ||||
| @@ -33,6 +36,8 @@ class TestModelines < Minitest::Test | ||||
|     assert_modeline Language["Text"], fixture_blob("Data/Modelines/fundamentalEmacs.c") | ||||
|     assert_modeline Language["Prolog"], fixture_blob("Data/Modelines/not_perl.pl") | ||||
|     assert_modeline Language["Smalltalk"], fixture_blob("Data/Modelines/example_smalltalk.md") | ||||
|     assert_modeline Language["JavaScript"], fixture_blob("Data/Modelines/iamjs.pl") | ||||
|     assert_modeline Language["JavaScript"], fixture_blob("Data/Modelines/iamjs2.pl") | ||||
|     assert_modeline Language["PHP"], fixture_blob("Data/Modelines/iamphp.inc") | ||||
|     assert_modeline nil, sample_blob("C/main.c") | ||||
|   end | ||||
| @@ -57,6 +62,8 @@ class TestModelines < Minitest::Test | ||||
|     assert_equal Language["Text"], fixture_blob("Data/Modelines/fundamentalEmacs.c").language | ||||
|     assert_equal Language["Prolog"], fixture_blob("Data/Modelines/not_perl.pl").language | ||||
|     assert_equal Language["Smalltalk"], fixture_blob("Data/Modelines/example_smalltalk.md").language | ||||
|     assert_equal Language["JavaScript"], fixture_blob("Data/Modelines/iamjs.pl").language | ||||
|     assert_equal Language["JavaScript"], fixture_blob("Data/Modelines/iamjs2.pl").language | ||||
|     assert_equal Language["PHP"], fixture_blob("Data/Modelines/iamphp.inc").language | ||||
|   end | ||||
| end | ||||
|   | ||||
		Reference in New Issue
	
	Block a user