diff --git a/.gitmodules b/.gitmodules index e14f0bf03f..0e9fb6810c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/grammars.yml b/grammars.yml index cf9da731c7..e6f66a084c 100644 --- a/grammars.yml +++ b/grammars.yml @@ -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 diff --git a/vendor/README.md b/vendor/README.md index 67f1d452b0..aa3688e073 100644 --- a/vendor/README.md +++ b/vendor/README.md @@ -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) 🐌 diff --git a/vendor/grammars/swift-tmlanguage b/vendor/grammars/swift-tmlanguage new file mode 160000 index 0000000000..62239f3ff2 --- /dev/null +++ b/vendor/grammars/swift-tmlanguage @@ -0,0 +1 @@ +Subproject commit 62239f3ff29224c7317ab2fbcc769e3c61beb2a8 diff --git a/vendor/grammars/swift.tmbundle b/vendor/grammars/swift.tmbundle deleted file mode 160000 index aa73c3410d..0000000000 --- a/vendor/grammars/swift.tmbundle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit aa73c3410d26dea8d39c834fd8e9bec4319dad2c diff --git a/vendor/licenses/git_submodule/swift-tmlanguage.dep.yml b/vendor/licenses/git_submodule/swift-tmlanguage.dep.yml new file mode 100644 index 0000000000..1d94b38a1f --- /dev/null +++ b/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: [] diff --git a/vendor/licenses/git_submodule/swift.tmbundle.dep.yml b/vendor/licenses/git_submodule/swift.tmbundle.dep.yml deleted file mode 100644 index e233c79f99..0000000000 --- a/vendor/licenses/git_submodule/swift.tmbundle.dep.yml +++ /dev/null @@ -1,17 +0,0 @@ ---- -name: swift.tmbundle -version: aa73c3410d26dea8d39c834fd8e9bec4319dad2c -type: git_submodule -homepage: https://github.com/textmate/swift.tmbundle -license: permissive -licenses: -- sources: README.md - 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: []