From 10be4be18f978bee5734fc0365ed56fb08bb2517 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Thu, 7 Jul 2016 13:41:34 +0100 Subject: [PATCH 1/5] Added Laravel Blade --- .gitmodules | 3 ++ grammars.yml | 2 + lib/linguist/languages.yml | 9 ++++ samples/Blade/hello.blade | 19 +++++++ samples/Blade/hello.blade.php | 19 +++++++ vendor/grammars/language-blade | 1 + vendor/licenses/grammar/language-blade.txt | 60 ++++++++++++++++++++++ 7 files changed, 113 insertions(+) create mode 100644 samples/Blade/hello.blade create mode 100644 samples/Blade/hello.blade.php create mode 160000 vendor/grammars/language-blade create mode 100644 vendor/licenses/grammar/language-blade.txt diff --git a/.gitmodules b/.gitmodules index be387c01..6b43dcbe 100644 --- a/.gitmodules +++ b/.gitmodules @@ -746,3 +746,6 @@ url = https://github.com/austinwagner/sublime-sourcepawn [submodule "vendor/grammars/atom-language-srt"] path = vendor/grammars/atom-language-srt url = https://github.com/314eter/atom-language-srt +[submodule "vendor/grammars/language-blade"] + path = vendor/grammars/language-blade + url = https://github.com/jawee/language-blade diff --git a/grammars.yml b/grammars.yml index d76e9546..3d6133c7 100755 --- a/grammars.yml +++ b/grammars.yml @@ -332,6 +332,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: diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index d3cef7c1..dedac5b5 100755 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -330,6 +330,15 @@ BitBake: - .bb ace_mode: text +Blade: + type: markup + group: HTML + extensions: + - .blade + - .blade.php + tm_scope: text.html.blade.php + ace_mode: text + BlitzBasic: type: programming aliases: diff --git a/samples/Blade/hello.blade b/samples/Blade/hello.blade new file mode 100644 index 00000000..60c8a4d7 --- /dev/null +++ b/samples/Blade/hello.blade @@ -0,0 +1,19 @@ + + + + @yield('title', 'We love GitHub') + @stack('scripts') + @stack('styles') + + + @include('partials.nav') + + @yield('content') + + + + diff --git a/samples/Blade/hello.blade.php b/samples/Blade/hello.blade.php new file mode 100644 index 00000000..60c8a4d7 --- /dev/null +++ b/samples/Blade/hello.blade.php @@ -0,0 +1,19 @@ + + + + @yield('title', 'We love GitHub') + @stack('scripts') + @stack('styles') + + + @include('partials.nav') + + @yield('content') + + + + diff --git a/vendor/grammars/language-blade b/vendor/grammars/language-blade new file mode 160000 index 00000000..50dcfb72 --- /dev/null +++ b/vendor/grammars/language-blade @@ -0,0 +1 @@ +Subproject commit 50dcfb72af30b267c4397f21742d79e4d564642f diff --git a/vendor/licenses/grammar/language-blade.txt b/vendor/licenses/grammar/language-blade.txt new file mode 100644 index 00000000..80a8a3fc --- /dev/null +++ b/vendor/licenses/grammar/language-blade.txt @@ -0,0 +1,60 @@ +--- +type: grammar +name: language-blade +license: other +--- +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. From a1b236ddfa5c29b5f77c0932a100acf661e21d1c Mon Sep 17 00:00:00 2001 From: James Brooks Date: Mon, 11 Jul 2016 11:22:22 +0100 Subject: [PATCH 2/5] Update samples --- samples/Blade/hello.blade | 2 ++ samples/Blade/hello.blade.php | 2 ++ 2 files changed, 4 insertions(+) diff --git a/samples/Blade/hello.blade b/samples/Blade/hello.blade index 60c8a4d7..1355b041 100644 --- a/samples/Blade/hello.blade +++ b/samples/Blade/hello.blade @@ -15,5 +15,7 @@
  • {{ $bar }}
    • @endforeach + + {!! $raw_content !!} diff --git a/samples/Blade/hello.blade.php b/samples/Blade/hello.blade.php index 60c8a4d7..1355b041 100644 --- a/samples/Blade/hello.blade.php +++ b/samples/Blade/hello.blade.php @@ -15,5 +15,7 @@
  • {{ $bar }}
    • @endforeach + + {!! $raw_content !!} From 0019f60ba7466b06922e904c929b64c837b7f450 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Mon, 11 Jul 2016 11:51:09 +0100 Subject: [PATCH 3/5] Fix tm_scope --- lib/linguist/languages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index dedac5b5..15088f99 100755 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -336,7 +336,7 @@ Blade: extensions: - .blade - .blade.php - tm_scope: text.html.blade.php + tm_scope: text.html.php.blade ace_mode: text BlitzBasic: From b96ed4b56a27b72e39cc60268efce73188b66d53 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Mon, 11 Jul 2016 12:08:03 +0100 Subject: [PATCH 4/5] Switch Lean to text mode --- lib/linguist/languages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index 15088f99..04011607 100755 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -1961,7 +1961,7 @@ Lean: extensions: - .lean - .hlean - ace_mode: lean + ace_mode: text Less: type: markup From abbc132977739a9e332fe2efcc364075f89a13d5 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Mon, 11 Jul 2016 12:28:32 +0100 Subject: [PATCH 5/5] Set Blade license to MIT --- vendor/licenses/grammar/language-blade.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/licenses/grammar/language-blade.txt b/vendor/licenses/grammar/language-blade.txt index 80a8a3fc..b79b7a7a 100644 --- a/vendor/licenses/grammar/language-blade.txt +++ b/vendor/licenses/grammar/language-blade.txt @@ -1,7 +1,7 @@ --- type: grammar name: language-blade -license: other +license: mit --- Copyright (c) 2016 Andreas Olsson, Indrek Ardel