Switch ApacheConf to maintained upstream by nisbet-hubbard · Pull Request #7143 · github-linguist/linguist · GitHub
Skip to content
Merged
Show file tree
Hide file tree
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
5 changes: 2 additions & 3 deletions grammars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion lib/linguist/languages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion vendor/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
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
15 changes: 0 additions & 15 deletions vendor/licenses/git_submodule/apache.tmbundle.dep.yml

This file was deleted.

33 changes: 33 additions & 0 deletions vendor/licenses/git_submodule/vscode-apache.dep.yml