Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch ApacheConf to maintained upstream #7143

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -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
5 changes: 2 additions & 3 deletions grammars.yml
Original file line number Diff line number Diff line change
@@ -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:
2 changes: 1 addition & 1 deletion vendor/README.md
Original file line number Diff line number Diff line change
@@ -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)
1 change: 0 additions & 1 deletion vendor/grammars/apache.tmbundle
Submodule apache.tmbundle deleted from a12e89
1 change: 1 addition & 0 deletions vendor/grammars/vscode-apache
Submodule vscode-apache added at 0585b0
33 changes: 33 additions & 0 deletions vendor/licenses/git_submodule/vscode-apache.dep.yml
Original file line number Diff line number Diff line change
@@ -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: []