Use Atom's HTML grammar instead of TextMate's (#4274)

* Use Atom's HTML grammar instead of TextMate's

* Manually specify license type of `language-html`

.gitmodules

@@ -406,9 +406,6 @@
 [submodule "vendor/grammars/haxe-TmLanguage"]
 	path = vendor/grammars/haxe-TmLanguage
 	url = https://github.com/vshaxe/haxe-TmLanguage
-[submodule "vendor/grammars/html.tmbundle"]
-	path = vendor/grammars/html.tmbundle
-	url = https://github.com/textmate/html.tmbundle
 [submodule "vendor/grammars/hy.tmLanguage"]
 	path = vendor/grammars/hy.tmLanguage
 	url = https://github.com/Slowki/hy.tmLanguage.git
@@ -517,6 +514,9 @@
 [submodule "vendor/grammars/language-hql"]
 	path = vendor/grammars/language-hql
 	url = https://github.com/adidonato/language-hql
+[submodule "vendor/grammars/language-html"]
+	path = vendor/grammars/language-html
+	url = https://github.com/atom/language-html
 [submodule "vendor/grammars/language-inform7"]
 	path = vendor/grammars/language-inform7
 	url = https://github.com/erkyrath/language-inform7

grammars.yml

@@ -331,8 +331,6 @@ vendor/grammars/groovy.tmbundle:
 vendor/grammars/haxe-TmLanguage:
 - source.hx
 - source.hxml
-vendor/grammars/html.tmbundle:
-- text.html.basic
 vendor/grammars/hy.tmLanguage:
 - source.hy
 vendor/grammars/idl.tmbundle:
@@ -435,6 +433,8 @@ vendor/grammars/language-haskell:
 - text.tex.latex.haskell
 vendor/grammars/language-hql:
 - source.hql
+vendor/grammars/language-html:
+- text.html.basic
 vendor/grammars/language-inform7:
 - source.inform7
 vendor/grammars/language-javascript:

vendor/README.md

@@ -159,7 +159,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting
 - **HCL:** [alexlouden/Terraform.tmLanguage](https://github.com/alexlouden/Terraform.tmLanguage)
 - **HiveQL:** [adidonato/language-hql](https://github.com/adidonato/language-hql)
 - **HLSL:** [tgjones/shaders-tmLanguage](https://github.com/tgjones/shaders-tmLanguage)
-- **HTML:** [textmate/html.tmbundle](https://github.com/textmate/html.tmbundle)
+- **HTML:** [atom/language-html](https://github.com/atom/language-html)
 - **HTML+Django:** [textmate/python-django.tmbundle](https://github.com/textmate/python-django.tmbundle)
 - **HTML+ECR:** [atom-crystal/language-crystal](https://github.com/atom-crystal/language-crystal)
 - **HTML+EEX:** [elixir-lang/elixir-tmbundle](https://github.com/elixir-lang/elixir-tmbundle)
@@ -196,7 +196,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting
 - **KiCad Layout:** [Alhadis/language-pcb](https://github.com/Alhadis/language-pcb)
 - **KiCad Legacy Layout:** [Alhadis/language-pcb](https://github.com/Alhadis/language-pcb)
 - **KiCad Schematic:** [Alhadis/language-pcb](https://github.com/Alhadis/language-pcb)
-- **Kit:** [textmate/html.tmbundle](https://github.com/textmate/html.tmbundle)
+- **Kit:** [atom/language-html](https://github.com/atom/language-html)
 - **Kotlin:** [nishtahir/language-kotlin](https://github.com/nishtahir/language-kotlin)
 - **LabVIEW:** [textmate/xml.tmbundle](https://github.com/textmate/xml.tmbundle)
 - **Lasso:** [bfad/Sublime-Lasso](https://github.com/bfad/Sublime-Lasso)
@@ -238,7 +238,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting
 - **MoonScript:** [leafo/moonscript-tmbundle](https://github.com/leafo/moonscript-tmbundle)
 - **MQL4:** [mqsoft/MQL5-sublime](https://github.com/mqsoft/MQL5-sublime)
 - **MQL5:** [mqsoft/MQL5-sublime](https://github.com/mqsoft/MQL5-sublime)
-- **MTML:** [textmate/html.tmbundle](https://github.com/textmate/html.tmbundle)
+- **MTML:** [atom/language-html](https://github.com/atom/language-html)
 - **mupad:** [ccreutzig/sublime-MuPAD](https://github.com/ccreutzig/sublime-MuPAD)
 - **NCL:** [rpavlick/language-ncl](https://github.com/rpavlick/language-ncl)
 - **Nearley:** [Hardmath123/sublime-nearley](https://github.com/Hardmath123/sublime-nearley)

vendor/licenses/grammar/language-html.txt

@@ -0,0 +1,70 @@
+---
+type: grammar
+name: language-html
+version: c69aa83a816b38a59ff6f47654dc89ce921567c9
+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/html.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.
+
+********************************************************************************
+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/html.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.