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

Replace Swift grammar #6603

Merged
merged 3 commits into from
Dec 5, 2023
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions .gitmodules
Expand Up @@ -1148,9 +1148,9 @@
[submodule "vendor/grammars/sweave.tmbundle"]
path = vendor/grammars/sweave.tmbundle
url = https://github.com/textmate/sweave.tmbundle.git
[submodule "vendor/grammars/swift.tmbundle"]
path = vendor/grammars/swift.tmbundle
url = https://github.com/textmate/swift.tmbundle
[submodule "vendor/grammars/swift-tmlanguage"]
path = vendor/grammars/swift-tmlanguage
url = https://github.com/jtbandes/swift-tmlanguage.git
[submodule "vendor/grammars/tcl.tmbundle"]
path = vendor/grammars/tcl.tmbundle
url = https://github.com/textmate/tcl.tmbundle
Expand Down
2 changes: 1 addition & 1 deletion grammars.yml
Expand Up @@ -1030,7 +1030,7 @@ vendor/grammars/sway-vscode-plugin:
- source.sway
vendor/grammars/sweave.tmbundle:
- text.tex.latex.sweave
vendor/grammars/swift.tmbundle:
vendor/grammars/swift-tmlanguage:
- source.swift
vendor/grammars/tcl.tmbundle:
- source.tcl
Expand Down
2 changes: 1 addition & 1 deletion vendor/README.md
Expand Up @@ -535,7 +535,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting
- **Svelte:** [sebastinez/svelte-atom](https://github.com/sebastinez/svelte-atom)
- **Sway:** [FuelLabs/sway-vscode-plugin](https://github.com/FuelLabs/sway-vscode-plugin)
- **Sweave:** [textmate/sweave.tmbundle](https://github.com/textmate/sweave.tmbundle)
- **Swift:** [textmate/swift.tmbundle](https://github.com/textmate/swift.tmbundle)
- **Swift:** [jtbandes/swift-tmlanguage](https://github.com/jtbandes/swift-tmlanguage)
- **SystemVerilog:** [TheClams/SystemVerilog](https://github.com/TheClams/SystemVerilog)
- **TL-Verilog:** [adamint/tlv-vscode](https://github.com/adamint/tlv-vscode)
- **TLA:** [tlaplus-community/tree-sitter-tlaplus](https://github.com/tlaplus-community/tree-sitter-tlaplus) 🐌
Expand Down
1 change: 1 addition & 0 deletions vendor/grammars/swift-tmlanguage
Submodule swift-tmlanguage added at 62239f
1 change: 0 additions & 1 deletion vendor/grammars/swift.tmbundle
Submodule swift.tmbundle deleted from aa73c3
19 changes: 19 additions & 0 deletions vendor/licenses/git_submodule/swift-tmlanguage.dep.yml
@@ -0,0 +1,19 @@
---
name: swift-tmlanguage
version: 62239f3ff29224c7317ab2fbcc769e3c61beb2a8
type: git_submodule
homepage: https://github.com/jtbandes/swift-tmlanguage.git
license: mit
licenses:
- sources: LICENSE.md
text: |
Copyright 2023 Jacob Bandes-Storch

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 project is licensed under the terms of the [MIT license](LICENSE.md).
notices: []
17 changes: 0 additions & 17 deletions vendor/licenses/git_submodule/swift.tmbundle.dep.yml

This file was deleted.