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 CMake grammar #7060

Merged
merged 2 commits into from
Nov 25, 2024
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
Original file line number Diff line number Diff line change
Expand Up @@ -389,9 +389,6 @@
[submodule "vendor/grammars/clarity.tmbundle"]
path = vendor/grammars/clarity.tmbundle
url = https://github.com/hirosystems/clarity.tmbundle.git
[submodule "vendor/grammars/cmake.tmbundle"]
path = vendor/grammars/cmake.tmbundle
url = https://github.com/textmate/cmake.tmbundle
[submodule "vendor/grammars/code-peggy-language"]
path = vendor/grammars/code-peggy-language
url = https://github.com/peggyjs/code-peggy-language.git
Expand Down Expand Up @@ -1271,6 +1268,9 @@
[submodule "vendor/grammars/vscode-cadence"]
path = vendor/grammars/vscode-cadence
url = https://github.com/onflow/vscode-cadence.git
[submodule "vendor/grammars/vscode-cmake-tools"]
path = vendor/grammars/vscode-cmake-tools
url = https://github.com/microsoft/vscode-cmake-tools.git
[submodule "vendor/grammars/vscode-codeql"]
path = vendor/grammars/vscode-codeql
url = https://github.com/github/vscode-codeql
Expand Down
6 changes: 3 additions & 3 deletions grammars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -318,9 +318,6 @@ vendor/grammars/circom-highlighting-vscode:
- source.circom
vendor/grammars/clarity.tmbundle:
- source.clar
vendor/grammars/cmake.tmbundle:
- source.cache.cmake
- source.cmake
vendor/grammars/code-peggy-language:
- inline.peggy
- source.peggy
Expand Down Expand Up @@ -1136,6 +1133,9 @@ vendor/grammars/vscode-caddyfile:
vendor/grammars/vscode-cadence:
- markdown.cadence.codeblock
- source.cadence
vendor/grammars/vscode-cmake-tools:
- source.cmake
- source.cmakecache
vendor/grammars/vscode-codeql:
- source.ql
vendor/grammars/vscode-cue:
Expand Down
2 changes: 1 addition & 1 deletion vendor/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting
- **CAP CDS:** [SAP/cds-textmate-grammar](https://github.com/SAP/cds-textmate-grammar)
- **CIL:** [google/selinux-policy-languages](https://github.com/google/selinux-policy-languages)
- **CLIPS:** [psicomante/CLIPS-sublime](https://github.com/psicomante/CLIPS-sublime)
- **CMake:** [textmate/cmake.tmbundle](https://github.com/textmate/cmake.tmbundle)
- **CMake:** [microsoft/vscode-cmake-tools](https://github.com/microsoft/vscode-cmake-tools)
- **COBOL:** [spgennard/vscode_cobol](https://github.com/spgennard/vscode_cobol)
- **CODEOWNERS:** [Alhadis/language-etc](https://github.com/Alhadis/language-etc)
- **COLLADA:** [textmate/xml.tmbundle](https://github.com/textmate/xml.tmbundle)
Expand Down
1 change: 0 additions & 1 deletion vendor/grammars/cmake.tmbundle
Submodule cmake.tmbundle deleted from 1421c6
1 change: 1 addition & 0 deletions vendor/grammars/vscode-cmake-tools
Submodule vscode-cmake-tools added at 3305ff
15 changes: 0 additions & 15 deletions vendor/licenses/git_submodule/cmake.tmbundle.dep.yml

This file was deleted.

31 changes: 31 additions & 0 deletions vendor/licenses/git_submodule/vscode-cmake-tools.dep.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
---
name: vscode-cmake-tools
version: 3305ff22fc000533f67b66bb107f53401e42bb3c
type: git_submodule
homepage: https://github.com/microsoft/vscode-cmake-tools.git
license: mit
licenses:
- sources: LICENSE.txt
text: |
MIT License

Copyright (c) 2018 vector-of-bool <vectorofbool@gmail.com>

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.
notices: []
Loading