Switch ApacheConf to maintained upstream (#7143)

* Switch to `mrmlnc/vscode-apache`

* Fix auto-generated `grammars.yml`

* Fix auto-generated `vendor/README.md`

* Revert "Fix auto-generated `vendor/README.md`"

This reverts commit a9ec515.

* Revert "Fix auto-generated `grammars.yml`"

This reverts commit 1c7a57f.

* Revert "Switch to `mrmlnc/vscode-apache`"

This reverts commit 5ecef2b.

* Replace Apacheconf grammar

---------

Co-authored-by: Colin Seymour <[email protected]>

.gitmodules

@@ -260,9 +260,6 @@
 [submodule "vendor/grammars/antlr.tmbundle"]
 	path = vendor/grammars/antlr.tmbundle
 	url = https://github.com/textmate/antlr.tmbundle
-[submodule "vendor/grammars/apache.tmbundle"]
-	path = vendor/grammars/apache.tmbundle
-	url = https://github.com/textmate/apache.tmbundle
 [submodule "vendor/grammars/apex-tmLanguage"]
 	path = vendor/grammars/apex-tmLanguage
 	url = https://github.com/forcedotcom/apex-tmLanguage.git
@@ -1283,6 +1280,9 @@
 [submodule "vendor/grammars/vscode-antlers-language-server"]
 	path = vendor/grammars/vscode-antlers-language-server
 	url = https://github.com/Stillat/vscode-antlers-language-server.git
+[submodule "vendor/grammars/vscode-apache"]
+	path = vendor/grammars/vscode-apache
+	url = https://github.com/mrmlnc/vscode-apache.git
 [submodule "vendor/grammars/vscode-bitbake"]
 	path = vendor/grammars/vscode-bitbake
 	url = https://github.com/yoctoproject/vscode-bitbake.git

grammars.yml

@@ -211,9 +211,6 @@ vendor/grammars/ant.tmbundle:
 - text.xml.ant
 vendor/grammars/antlr.tmbundle:
 - source.antlr
-vendor/grammars/apache.tmbundle:
-- source.apache-config
-- source.apache-config.mod_perl
 vendor/grammars/apex-tmLanguage:
 - source.apex
 - source.soql
@@ -1145,6 +1142,8 @@ vendor/grammars/vscode-TalonScript:
 - source.talon
 vendor/grammars/vscode-antlers-language-server:
 - text.html.statamic
+vendor/grammars/vscode-apache:
+- source.apacheconf
 vendor/grammars/vscode-bitbake:
 - source.bb
 vendor/grammars/vscode-brightscript-language:

lib/linguist/languages.yml

@@ -351,7 +351,7 @@ ApacheConf:
   - ".htaccess"
   - apache2.conf
   - httpd.conf
-  tm_scope: source.apache-config
+  tm_scope: source.apacheconf
   ace_mode: apache_conf
   language_id: 16
 Apex:

vendor/README.md

@@ -35,7 +35,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting
 - **Answer Set Programming:** [nickswalker/asp-syntax-highlight](https://github.com/nickswalker/asp-syntax-highlight)
 - **Ant Build System:** [textmate/ant.tmbundle](https://github.com/textmate/ant.tmbundle)
 - **Antlers:** [Stillat/vscode-antlers-language-server](https://github.com/Stillat/vscode-antlers-language-server)
-- **ApacheConf:** [textmate/apache.tmbundle](https://github.com/textmate/apache.tmbundle)
+- **ApacheConf:** [mrmlnc/vscode-apache](https://github.com/mrmlnc/vscode-apache)
 - **Apex:** [forcedotcom/apex-tmLanguage](https://github.com/forcedotcom/apex-tmLanguage)
 - **Apollo Guidance Computer:** [Alhadis/language-agc](https://github.com/Alhadis/language-agc)
 - **AppleScript:** [textmate/applescript.tmbundle](https://github.com/textmate/applescript.tmbundle)

vendor/licenses/git_submodule/vscode-apache.dep.yml

@@ -0,0 +1,33 @@
+---
+name: vscode-apache
+version: '0585b0bb3d390fc541aa27cfcfb83b3204156be3'
+type: git_submodule
+homepage: https://github.com/mrmlnc/vscode-apache.git
+license: mit
+licenses:
+- sources: LICENSE
+  text: |
+    The MIT License (MIT)
+
+    Copyright (c) Denis Malinochkin
+
+    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.
+- sources: README.md
+  text: This software is released under the terms of the MIT license.
+notices: []