From 5ecef2bf2ead6f1962082ea4f7fde4063a40ed5c Mon Sep 17 00:00:00 2001 From: nisbet-hubbard <87453615+nisbet-hubbard@users.noreply.github.com> Date: Mon, 2 Dec 2024 20:31:47 +0800 Subject: [PATCH 1/7] Switch to `mrmlnc/vscode-apache` --- .gitmodules | 6 ++-- vendor/grammars/apache.tmbundle | 1 - vendor/grammars/vscode-apache | 1 + .../git_submodule/vscode-apache.dep.yml | 33 +++++++++++++++++++ 4 files changed, 37 insertions(+), 4 deletions(-) delete mode 160000 vendor/grammars/apache.tmbundle create mode 160000 vendor/grammars/vscode-apache create mode 100644 vendor/licenses/git_submodule/vscode-apache.dep.yml diff --git a/.gitmodules b/.gitmodules index 65d5ef54e..b531f2bd0 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 @@ -1446,3 +1443,6 @@ [submodule "vendor/grammars/zephir-sublime"] path = vendor/grammars/zephir-sublime url = https://github.com/phalcon/zephir-sublime +[submodule "vendor/grammars/vscode-apache"] + path = vendor/grammars/vscode-apache + url = https://github.com/mrmlnc/vscode-apache.git diff --git a/vendor/grammars/apache.tmbundle b/vendor/grammars/apache.tmbundle deleted file mode 160000 index a12e89553..000000000 --- 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 000000000..0585b0bb3 --- /dev/null +++ b/vendor/grammars/vscode-apache @@ -0,0 +1 @@ +Subproject commit 0585b0bb3d390fc541aa27cfcfb83b3204156be3 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 000000000..24843fc9b --- /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: [] From 1c7a57fb74fc3b6edce4d27b0d31b66f86bcc56a Mon Sep 17 00:00:00 2001 From: nisbet-hubbard <87453615+nisbet-hubbard@users.noreply.github.com> Date: Sun, 8 Dec 2024 19:07:07 +0800 Subject: [PATCH 2/7] Fix auto-generated `grammars.yml` --- grammars.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/grammars.yml b/grammars.yml index 219734dcf..cba4818b7 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 @@ -1141,6 +1138,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: From a9ec515846aa73bd6c41be5b3d15687b2dbbc166 Mon Sep 17 00:00:00 2001 From: nisbet-hubbard <87453615+nisbet-hubbard@users.noreply.github.com> Date: Sat, 14 Dec 2024 08:42:56 +0800 Subject: [PATCH 3/7] Fix auto-generated `vendor/README.md` --- vendor/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/README.md b/vendor/README.md index f2b1a53f6..cfa89547b 100644 --- a/vendor/README.md +++ b/vendor/README.md @@ -34,7 +34,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting - **AngelScript:** [wronex/sublime-angelscript](https://github.com/wronex/sublime-angelscript) - **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) From 6a2d09aa25743cbbd3d86833c0aa41bb20677b68 Mon Sep 17 00:00:00 2001 From: Colin Seymour Date: Tue, 14 Jan 2025 10:28:08 +0000 Subject: [PATCH 4/7] Revert "Fix auto-generated `vendor/README.md`" This reverts commit a9ec515846aa73bd6c41be5b3d15687b2dbbc166. --- vendor/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/README.md b/vendor/README.md index cfa89547b..f2b1a53f6 100644 --- a/vendor/README.md +++ b/vendor/README.md @@ -34,7 +34,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting - **AngelScript:** [wronex/sublime-angelscript](https://github.com/wronex/sublime-angelscript) - **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:** [mrmlnc/vscode-apache](https://github.com/mrmlnc/vscode-apache) +- **ApacheConf:** [textmate/apache.tmbundle](https://github.com/textmate/apache.tmbundle) - **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) From 76da177893f449ee97259e3f430286fd0bfc4345 Mon Sep 17 00:00:00 2001 From: Colin Seymour Date: Tue, 14 Jan 2025 10:28:18 +0000 Subject: [PATCH 5/7] Revert "Fix auto-generated `grammars.yml`" This reverts commit 1c7a57fb74fc3b6edce4d27b0d31b66f86bcc56a. --- grammars.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/grammars.yml b/grammars.yml index cba4818b7..219734dcf 100644 --- a/grammars.yml +++ b/grammars.yml @@ -211,6 +211,9 @@ 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 @@ -1138,8 +1141,6 @@ 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: From 492e6ec7f2d068644ae3f1a1d86328041a8fa9f0 Mon Sep 17 00:00:00 2001 From: Colin Seymour Date: Tue, 14 Jan 2025 10:28:29 +0000 Subject: [PATCH 6/7] Revert "Switch to `mrmlnc/vscode-apache`" This reverts commit 5ecef2bf2ead6f1962082ea4f7fde4063a40ed5c. --- .gitmodules | 6 ++-- vendor/grammars/apache.tmbundle | 1 + vendor/grammars/vscode-apache | 1 - .../git_submodule/vscode-apache.dep.yml | 33 ------------------- 4 files changed, 4 insertions(+), 37 deletions(-) create mode 160000 vendor/grammars/apache.tmbundle delete mode 160000 vendor/grammars/vscode-apache delete mode 100644 vendor/licenses/git_submodule/vscode-apache.dep.yml diff --git a/.gitmodules b/.gitmodules index b531f2bd0..65d5ef54e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -260,6 +260,9 @@ [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 @@ -1443,6 +1446,3 @@ [submodule "vendor/grammars/zephir-sublime"] path = vendor/grammars/zephir-sublime url = https://github.com/phalcon/zephir-sublime -[submodule "vendor/grammars/vscode-apache"] - path = vendor/grammars/vscode-apache - url = https://github.com/mrmlnc/vscode-apache.git diff --git a/vendor/grammars/apache.tmbundle b/vendor/grammars/apache.tmbundle new file mode 160000 index 000000000..a12e89553 --- /dev/null +++ b/vendor/grammars/apache.tmbundle @@ -0,0 +1 @@ +Subproject commit a12e895533700b0200cca20f169be63727efff8c diff --git a/vendor/grammars/vscode-apache b/vendor/grammars/vscode-apache deleted file mode 160000 index 0585b0bb3..000000000 --- a/vendor/grammars/vscode-apache +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0585b0bb3d390fc541aa27cfcfb83b3204156be3 diff --git a/vendor/licenses/git_submodule/vscode-apache.dep.yml b/vendor/licenses/git_submodule/vscode-apache.dep.yml deleted file mode 100644 index 24843fc9b..000000000 --- a/vendor/licenses/git_submodule/vscode-apache.dep.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- -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: [] From c7e70b20241dcf36b149778e8172efae6783434e Mon Sep 17 00:00:00 2001 From: Colin Seymour Date: Tue, 14 Jan 2025 10:33:49 +0000 Subject: [PATCH 7/7] Replace Apacheconf grammar --- .gitmodules | 6 ++-- grammars.yml | 5 ++- lib/linguist/languages.yml | 2 +- vendor/README.md | 2 +- vendor/grammars/apache.tmbundle | 1 - vendor/grammars/vscode-apache | 1 + .../git_submodule/apache.tmbundle.dep.yml | 15 --------- .../git_submodule/vscode-apache.dep.yml | 33 +++++++++++++++++++ 8 files changed, 41 insertions(+), 24 deletions(-) delete mode 160000 vendor/grammars/apache.tmbundle create mode 160000 vendor/grammars/vscode-apache delete mode 100644 vendor/licenses/git_submodule/apache.tmbundle.dep.yml create mode 100644 vendor/licenses/git_submodule/vscode-apache.dep.yml diff --git a/.gitmodules b/.gitmodules index 65d5ef54e..23391e671 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 @@ -1277,6 +1274,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 219734dcf..cba4818b7 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 @@ -1141,6 +1138,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 b5eebfe28..7625683c1 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -341,7 +341,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 f2b1a53f6..cfa89547b 100644 --- a/vendor/README.md +++ b/vendor/README.md @@ -34,7 +34,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting - **AngelScript:** [wronex/sublime-angelscript](https://github.com/wronex/sublime-angelscript) - **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 a12e89553..000000000 --- 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 000000000..0585b0bb3 --- /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 abbc9864f..000000000 --- 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 000000000..24843fc9b --- /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: []