Use Textmate's HAML grammar (#3627)

* Use Textmate's HAML grammar

* Whitelist license

.gitmodules

@@ -779,9 +779,6 @@
 [submodule "vendor/grammars/EBNF.tmbundle"]
 	path = vendor/grammars/EBNF.tmbundle
 	url = https://github.com/sanssecours/EBNF.tmbundle
-[submodule "vendor/grammars/language-haml"]
-	path = vendor/grammars/language-haml
-	url = https://github.com/ezekg/language-haml
 [submodule "vendor/grammars/language-ninja"]
 	path = vendor/grammars/language-ninja
 	url = https://github.com/khyo/language-ninja
@@ -845,3 +842,6 @@
 [submodule "vendor/grammars/Sublime-Pep8"]
 	path = vendor/grammars/Sublime-Pep8
 	url = https://github.com/R4PaSs/Sublime-Pep8
+[submodule "vendor/grammars/ruby-haml.tmbundle"]
+	path = vendor/grammars/ruby-haml.tmbundle
+	url = https://github.com/textmate/ruby-haml.tmbundle

grammars.yml

@@ -389,9 +389,6 @@ vendor/grammars/language-gn:
 - source.gn
 vendor/grammars/language-graphql:
 - source.graphql
-vendor/grammars/language-haml:
-- text.haml
-- text.hamlc
 vendor/grammars/language-haskell:
 - hint.haskell
 - hint.message.haskell
@@ -571,6 +568,8 @@ vendor/grammars/rascal-syntax-highlighting:
 - source.rascal
 vendor/grammars/reason:
 - source.reason
+vendor/grammars/ruby-haml.tmbundle:
+- text.haml
 vendor/grammars/ruby-slim.tmbundle:
 - text.slim
 vendor/grammars/ruby.tmbundle:

vendor/README.md

@@ -137,7 +137,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting
 - **Groovy:** [textmate/groovy.tmbundle](https://github.com/textmate/groovy.tmbundle)
 - **Groovy Server Pages:** [textmate/java.tmbundle](https://github.com/textmate/java.tmbundle)
 - **Hack:** [textmate/php.tmbundle](https://github.com/textmate/php.tmbundle)
-- **Haml:** [ezekg/language-haml](https://github.com/ezekg/language-haml)
+- **Haml:** [textmate/ruby-haml.tmbundle](https://github.com/textmate/ruby-haml.tmbundle)
 - **Handlebars:** [daaain/Handlebars](https://github.com/daaain/Handlebars)
 - **Harbour:** [hernad/atom-language-harbour](https://github.com/hernad/atom-language-harbour)
 - **Haskell:** [atom-haskell/language-haskell](https://github.com/atom-haskell/language-haskell)
@@ -167,6 +167,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting
 - **JFlex:** [jflex-de/jflex.tmbundle](https://github.com/jflex-de/jflex.tmbundle)
 - **Jison:** [cdibbs/language-jison](https://github.com/cdibbs/language-jison)
 - **Jison Lex:** [cdibbs/language-jison](https://github.com/cdibbs/language-jison)
+- **Jolie:** [fmontesi/language-jolie](https://github.com/fmontesi/language-jolie)
 - **JSON:** [textmate/json.tmbundle](https://github.com/textmate/json.tmbundle)
 - **JSON5:** [atom/language-javascript](https://github.com/atom/language-javascript)
 - **JSONiq:** [wcandillon/language-jsoniq](https://github.com/wcandillon/language-jsoniq)
@@ -251,6 +252,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting
 - **Parrot Internal Representation:** [textmate/parrot.tmbundle](https://github.com/textmate/parrot.tmbundle)
 - **Pascal:** [textmate/pascal.tmbundle](https://github.com/textmate/pascal.tmbundle)
 - **PAWN:** [Southclaw/pawn-sublime-language](https://github.com/Southclaw/pawn-sublime-language)
+- **Pep8:** [R4PaSs/Sublime-Pep8](https://github.com/R4PaSs/Sublime-Pep8)
 - **Perl:** [textmate/perl.tmbundle](https://github.com/textmate/perl.tmbundle)
 - **Perl6:** [perl6/atom-language-perl6](https://github.com/perl6/atom-language-perl6)
 - **PHP:** [textmate/php.tmbundle](https://github.com/textmate/php.tmbundle)
@@ -307,9 +309,10 @@ This is a list of grammars that Linguist selects to provide syntax highlighting
 - **Scheme:** [textmate/scheme.tmbundle](https://github.com/textmate/scheme.tmbundle)
 - **Scilab:** [textmate/scilab.tmbundle](https://github.com/textmate/scilab.tmbundle)
 - **SCSS:** [MarioRicalde/SCSS.tmbundle](https://github.com/MarioRicalde/SCSS.tmbundle)
+- **ShaderLab:** [tgjones/shaders-tmLanguage](https://github.com/tgjones/shaders-tmLanguage)
 - **Shell:** [atom/language-shellscript](https://github.com/atom/language-shellscript)
 - **ShellSession:** [atom/language-shellscript](https://github.com/atom/language-shellscript)
-- **Shen** [rkoeninger/sublime-shen](https://github.com/rkoeninger/sublime-shen)
+- **Shen:** [rkoeninger/sublime-shen](https://github.com/rkoeninger/sublime-shen)
 - **Slash:** [slash-lang/Slash.tmbundle](https://github.com/slash-lang/Slash.tmbundle)
 - **Slim:** [slim-template/ruby-slim.tmbundle](https://github.com/slim-template/ruby-slim.tmbundle)
 - **Smali:** [ShaneWilton/sublime-smali](https://github.com/ShaneWilton/sublime-smali)

vendor/licenses/config.yml

@@ -21,6 +21,7 @@ reviewed:
     - mime-types
   grammar:
     - Sublime-Lasso
+    - ruby-haml.tmbundle
 
 sources:
   npm: false

vendor/licenses/grammar/language-haml.txt

@@ -1,25 +0,0 @@
----
-type: grammar
-name: language-haml
-license: mit
----
-The MIT License (MIT)
-
-Copyright (c) 2014 Rob Cameron
-
-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.

vendor/licenses/grammar/language-python.txt

@@ -1,36 +0,0 @@
----
-type: grammar
-name: language-python
-license: mit
----
-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/python.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.

vendor/licenses/grammar/ruby-haml.tmbundle.txt

@@ -0,0 +1,13 @@
+---
+type: grammar
+name: ruby-haml.tmbundle
+license: other
+---
+If not otherwise specified (see below), files in this repository fall under the following license:
+
+	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.
+
+An exception is made for files in readable text which contain their own license information, or files where an accompanying file exists (in the same directory) with a “-license” suffix added to the base-name name of the original file, and an extension of txt, html, or similar. For example “tidy” is accompanied by “tidy-license.txt”.