diff --git a/.gitmodules b/.gitmodules index 1612334af6..219a3d4981 100644 --- a/.gitmodules +++ b/.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 diff --git a/grammars.yml b/grammars.yml index e030d65dc6..d98d05f4c0 100644 --- a/grammars.yml +++ b/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: diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index 5b9d9ef6f5..113aeeabd2 100644 --- a/lib/linguist/languages.yml +++ b/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: diff --git a/vendor/README.md b/vendor/README.md index 04acce1da5..7087fc3ce9 100644 --- a/vendor/README.md +++ b/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) diff --git a/vendor/grammars/apache.tmbundle b/vendor/grammars/apache.tmbundle deleted file mode 160000 index a12e895533..0000000000 --- a/vendor/grammars/apache.tmbundle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a12e895533700b0200cca20f169be63727efff8c diff --git a/vendor/grammars/vscode-apache b/vendor/grammars/vscode-apache new file mode 160000 index 0000000000..0585b0bb3d --- /dev/null +++ b/vendor/grammars/vscode-apache @@ -0,0 +1 @@ +Subproject commit 0585b0bb3d390fc541aa27cfcfb83b3204156be3 diff --git a/vendor/licenses/git_submodule/apache.tmbundle.dep.yml b/vendor/licenses/git_submodule/apache.tmbundle.dep.yml deleted file mode 100644 index abbc9864f2..0000000000 --- a/vendor/licenses/git_submodule/apache.tmbundle.dep.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -type: git_submodule -name: apache.tmbundle -version: a12e895533700b0200cca20f169be63727efff8c -license: permissive -licenses: -- text: "If not otherwise specified (see below), files in this repository fall under - the following license:\n\n\tPermission to copy, use, modify, sell and distribute - this\n\tsoftware is granted. This software is provided \"as is\" without\n\texpress - or implied warranty, and with no claim as to its\n\tsuitability for any purpose.\n\nAn - 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”." -notices: [] diff --git a/vendor/licenses/git_submodule/vscode-apache.dep.yml b/vendor/licenses/git_submodule/vscode-apache.dep.yml new file mode 100644 index 0000000000..24843fc9b6 --- /dev/null +++ b/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: []