Replace haxe-sublime-bundle with haxe-TmLanguage (#4079)

* Replace haxe-sublime-bundle with haxe-TmLanguage

* Add missing changes

* Typo fix

.gitmodules

@@ -391,9 +391,9 @@
 [submodule "vendor/grammars/groovy.tmbundle"]
 	path = vendor/grammars/groovy.tmbundle
 	url = https://github.com/textmate/groovy.tmbundle
-[submodule "vendor/grammars/haxe-sublime-bundle"]
-	path = vendor/grammars/haxe-sublime-bundle
-	url = https://github.com/clemos/haxe-sublime-bundle
+[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

grammars.yml

@@ -320,12 +320,9 @@ vendor/grammars/graphviz.tmbundle:
 - source.dot
 vendor/grammars/groovy.tmbundle:
 - source.groovy
-vendor/grammars/haxe-sublime-bundle:
-- source.erazor
-- source.haxe.2
-- source.hss.1
+vendor/grammars/haxe-TmLanguage:
+- source.hx
 - source.hxml
-- source.nmml
 vendor/grammars/html.tmbundle:
 - text.html.basic
 vendor/grammars/idl.tmbundle:

lib/linguist/languages.yml

@@ -1883,7 +1883,7 @@ Haxe:
   extensions:
   - ".hx"
   - ".hxsl"
-  tm_scope: source.haxe.2
+  tm_scope: source.hx
   language_id: 158
 Hy:
   type: programming

vendor/README.md

@@ -151,7 +151,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting
 - **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)
-- **Haxe:** [clemos/haxe-sublime-bundle](https://github.com/clemos/haxe-sublime-bundle)
+- **Haxe:** [vshaxe/haxe-TmLanguage](https://github.com/vshaxe/haxe-TmLanguage)
 - **HCL:** [alexlouden/Terraform.tmLanguage](https://github.com/alexlouden/Terraform.tmLanguage)
 - **HLSL:** [tgjones/shaders-tmLanguage](https://github.com/tgjones/shaders-tmLanguage)
 - **HTML:** [textmate/html.tmbundle](https://github.com/textmate/html.tmbundle)

vendor/licenses/grammar/haxe-TmLanguage.txt

@@ -0,0 +1,26 @@
+---
+type: grammar
+name: haxe-TmLanguage
+license: mit
+---
+The MIT License (MIT)
+
+Copyright (c) 2017 vshaxe contributors
+
+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.