mirror of
				https://github.com/KevinMidboe/linguist.git
				synced 2025-10-29 17:50:22 +00:00 
			
		
		
		
	Merge branch 'master' into apollo
This commit is contained in:
		
							
								
								
									
										3
									
								
								.gitmodules
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								.gitmodules
									
									
									
									
										vendored
									
									
								
							| @@ -749,3 +749,6 @@ url = https://github.com/austinwagner/sublime-sourcepawn | ||||
| [submodule "vendor/grammars/language-agc"] | ||||
| 	path = vendor/grammars/language-agc | ||||
| 	url = https://github.com/Alhadis/language-agc | ||||
| [submodule "vendor/grammars/language-blade"] | ||||
| 	path = vendor/grammars/language-blade | ||||
| 	url = https://github.com/jawee/language-blade | ||||
|   | ||||
| @@ -334,6 +334,8 @@ vendor/grammars/language-apl: | ||||
| vendor/grammars/language-babel/: | ||||
| - source.js.jsx | ||||
| - source.regexp.babel | ||||
| vendor/grammars/language-blade/: | ||||
| - text.html.php.blade | ||||
| vendor/grammars/language-click/: | ||||
| - source.click | ||||
| vendor/grammars/language-clojure: | ||||
|   | ||||
| @@ -339,6 +339,15 @@ BitBake: | ||||
|   - .bb | ||||
|   ace_mode: text | ||||
|  | ||||
| Blade: | ||||
|   type: markup | ||||
|   group: HTML | ||||
|   extensions: | ||||
|     - .blade | ||||
|     - .blade.php | ||||
|   tm_scope: text.html.php.blade | ||||
|   ace_mode: text | ||||
|  | ||||
| BlitzBasic: | ||||
|   type: programming | ||||
|   aliases: | ||||
|   | ||||
							
								
								
									
										21
									
								
								samples/Blade/hello.blade
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										21
									
								
								samples/Blade/hello.blade
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,21 @@ | ||||
| <!DOCTYPE html> | ||||
| <html> | ||||
| <head> | ||||
|     <title>@yield('title', 'We love GitHub')</title> | ||||
|     @stack('scripts') | ||||
|     @stack('styles') | ||||
| </head> | ||||
| <body> | ||||
|     @include('partials.nav') | ||||
|  | ||||
|     @yield('content') | ||||
|  | ||||
|     <ul> | ||||
|         @foreach($foo as $bar) | ||||
|         <li>{{ $bar }}</li> | ||||
|         @endforeach | ||||
|     </ul> | ||||
|  | ||||
|     {!! $raw_content !!} | ||||
| </body> | ||||
| </html> | ||||
							
								
								
									
										21
									
								
								samples/Blade/hello.blade.php
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										21
									
								
								samples/Blade/hello.blade.php
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,21 @@ | ||||
| <!DOCTYPE html> | ||||
| <html> | ||||
| <head> | ||||
|     <title>@yield('title', 'We love GitHub')</title> | ||||
|     @stack('scripts') | ||||
|     @stack('styles') | ||||
| </head> | ||||
| <body> | ||||
|     @include('partials.nav') | ||||
|  | ||||
|     @yield('content') | ||||
|  | ||||
|     <ul> | ||||
|         @foreach($foo as $bar) | ||||
|         <li>{{ $bar }}</li> | ||||
|         @endforeach | ||||
|     </ul> | ||||
|  | ||||
|     {!! $raw_content !!} | ||||
| </body> | ||||
| </html> | ||||
							
								
								
									
										1
									
								
								vendor/grammars/language-blade
									
									
									
									
										vendored
									
									
										Submodule
									
								
							
							
								
								
								
								
								
							
						
						
									
										1
									
								
								vendor/grammars/language-blade
									
									
									
									
										vendored
									
									
										Submodule
									
								
							 Submodule vendor/grammars/language-blade added at 50dcfb72af
									
								
							
							
								
								
									
										60
									
								
								vendor/licenses/grammar/language-blade.txt
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										60
									
								
								vendor/licenses/grammar/language-blade.txt
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -0,0 +1,60 @@ | ||||
| --- | ||||
| type: grammar | ||||
| name: language-blade | ||||
| license: mit | ||||
| --- | ||||
| Copyright (c) 2016 Andreas Olsson, Indrek Ardel | ||||
|  | ||||
| Permission is hereby granted, free of charge, to any person obtaining a copy | ||||
| of this software and associated documentation files (the "Software"), to deal | ||||
| in the Software without restriction, including without limitation the rights | ||||
| to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||||
| copies of the Software, and to permit persons to whom the Software is | ||||
| furnished to do so, subject to the following conditions: | ||||
|  | ||||
| The above copyright notice and this permission notice shall be included in all | ||||
| copies or substantial portions of the Software. | ||||
|  | ||||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||||
| IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||||
| FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||||
| AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||||
| LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||||
| OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||||
| SOFTWARE. | ||||
|  | ||||
| -------------------------------------------------------------------- | ||||
|  | ||||
| This package uses parts from [Atom language-php package](https://github.com/atom/language-php). | ||||
|  | ||||
| > Copyright (c) 2014 GitHub Inc. | ||||
|  | ||||
| > Permission is hereby granted, free of charge, to any person obtaining | ||||
| a copy of this software and associated documentation files (the | ||||
| "Software"), to deal in the Software without restriction, including | ||||
| without limitation the rights to use, copy, modify, merge, publish, | ||||
| distribute, sublicense, and/or sell copies of the Software, and to | ||||
| permit persons to whom the Software is furnished to do so, subject to | ||||
| the following conditions: | ||||
|  | ||||
| > The above copyright notice and this permission notice shall be | ||||
| included in all copies or substantial portions of the Software. | ||||
|  | ||||
| > THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||||
| EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||||
| MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||||
| NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE | ||||
| LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION | ||||
| OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | ||||
| WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||||
|  | ||||
| > -------------------------------------------------------------------- | ||||
|  | ||||
| > This package was derived from a TextMate bundle located at | ||||
| https://github.com/textmate/php.tmbundle and distributed under the following | ||||
| license, located in `README.mdown`: | ||||
|  | ||||
| > Permission to copy, use, modify, sell and distribute this | ||||
| software is granted. This software is provided "as is" without | ||||
| express or implied warranty, and with no claim as to its | ||||
| suitability for any purpose. | ||||
		Reference in New Issue
	
	Block a user