From 559a6426942abcae16b6d6b328147476432bf6cb Mon Sep 17 00:00:00 2001 From: Lukas Neubert Date: Wed, 17 Jan 2024 11:59:53 +0100 Subject: [PATCH] Change VBA grammar source (#6678) * vscode-vba-json --> vscode-vba * finish * codespaces is too slow * Manually set license --------- Co-authored-by: Colin Seymour --- .gitmodules | 6 ++-- grammars.yml | 2 +- vendor/README.md | 2 +- vendor/grammars/vscode-vba | 1 + vendor/grammars/vscode-vba-json | 1 - ...de-vba-json.dep.yml => vscode-vba.dep.yml} | 28 +++++++++++++++++-- 6 files changed, 31 insertions(+), 9 deletions(-) create mode 160000 vendor/grammars/vscode-vba delete mode 160000 vendor/grammars/vscode-vba-json rename vendor/licenses/git_submodule/{vscode-vba-json.dep.yml => vscode-vba.dep.yml} (93%) diff --git a/.gitmodules b/.gitmodules index 7d8100d7e7..6890f1a7dc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1302,9 +1302,9 @@ [submodule "vendor/grammars/vscode-slice"] path = vendor/grammars/vscode-slice url = https://github.com/zeroc-ice/vscode-slice -[submodule "vendor/grammars/vscode-vba-json"] - path = vendor/grammars/vscode-vba-json - url = https://github.com/tiabeast/vscode-vba-json.git +[submodule "vendor/grammars/vscode-vba"] + path = vendor/grammars/vscode-vba + url = https://github.com/serkonda7/vscode-vba.git [submodule "vendor/grammars/vscode-vlang"] path = vendor/grammars/vscode-vlang url = https://github.com/0x9ef/vscode-vlang diff --git a/grammars.yml b/grammars.yml index 92a49b2d31..e9c84c6522 100644 --- a/grammars.yml +++ b/grammars.yml @@ -1176,7 +1176,7 @@ vendor/grammars/vscode-singularity: vendor/grammars/vscode-slice: - source.ice - source.slice -vendor/grammars/vscode-vba-json: +vendor/grammars/vscode-vba: - source.vba - source.wwb vendor/grammars/vscode-vlang: diff --git a/vendor/README.md b/vendor/README.md index 62c31c6228..98d03e1c29 100644 --- a/vendor/README.md +++ b/vendor/README.md @@ -572,7 +572,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting - **UnrealScript:** [textmate/java.tmbundle](https://github.com/textmate/java.tmbundle) - **UrWeb:** [gwalborn/UrWeb-Language-Definition](https://github.com/gwalborn/UrWeb-Language-Definition) - **V:** [0x9ef/vscode-vlang](https://github.com/0x9ef/vscode-vlang) -- **VBA:** [tiabeast/vscode-vba-json](https://github.com/tiabeast/vscode-vba-json) +- **VBA:** [serkonda7/vscode-vba](https://github.com/serkonda7/vscode-vba) - **VBScript:** [peters-ben-0007/VBDotNetSyntax](https://github.com/peters-ben-0007/VBDotNetSyntax) - **VCL:** [brandonwamboldt/sublime-varnish](https://github.com/brandonwamboldt/sublime-varnish) - **VHDL:** [textmate/vhdl.tmbundle](https://github.com/textmate/vhdl.tmbundle) diff --git a/vendor/grammars/vscode-vba b/vendor/grammars/vscode-vba new file mode 160000 index 0000000000..94e1124164 --- /dev/null +++ b/vendor/grammars/vscode-vba @@ -0,0 +1 @@ +Subproject commit 94e112416478e1f1728ce9ce88fc4ff1a9ed01ad diff --git a/vendor/grammars/vscode-vba-json b/vendor/grammars/vscode-vba-json deleted file mode 160000 index cfe7e5671c..0000000000 --- a/vendor/grammars/vscode-vba-json +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cfe7e5671cce6e2529de0e68ca003cf96f3255f8 diff --git a/vendor/licenses/git_submodule/vscode-vba-json.dep.yml b/vendor/licenses/git_submodule/vscode-vba.dep.yml similarity index 93% rename from vendor/licenses/git_submodule/vscode-vba-json.dep.yml rename to vendor/licenses/git_submodule/vscode-vba.dep.yml index 3a7661f68b..328349e1df 100644 --- a/vendor/licenses/git_submodule/vscode-vba-json.dep.yml +++ b/vendor/licenses/git_submodule/vscode-vba.dep.yml @@ -1,8 +1,8 @@ --- -name: vscode-vba-json -version: cfe7e5671cce6e2529de0e68ca003cf96f3255f8 +name: vscode-vba +version: 94e112416478e1f1728ce9ce88fc4ff1a9ed01ad type: git_submodule -homepage: https://github.com/tiabeast/vscode-vba-json.git +homepage: https://github.com/serkonda7/vscode-vba.git license: mpl-2.0 licenses: - sources: LICENSE.txt @@ -380,4 +380,26 @@ licenses: This Source Code Form is "Incompatible With Secondary Licenses", as defined by the Mozilla Public License, v. 2.0. +- sources: README.md + text: |- + Source code and grammars are licensed under the [Mozilla Public License (MPL-2.0)](LICENSE.txt). + + The icon is licensed under the [Creative Commons ShareAlike](images/LICENSE) license. + + + + [ci-badge]: https://github.com/serkonda7/vscode-vba/actions/workflows/ci.yml/badge.svg + [ci-status]: https://github.com/serkonda7/vscode-vba/actions/workflows/ci.yml + + [badge-installs-market]: https://img.shields.io/visual-studio-marketplace/i/serkonda7.vscode-vba?label=Installs + [badge-installs-vsx]: https://img.shields.io/open-vsx/dt/serkonda7/vscode-vba?label=VSX%20downloads + [vs-marketplace]: https://marketplace.visualstudio.com/items?itemName=serkonda7.vscode-vba + [open-vsx]: https://open-vsx.org/extension/serkonda7/vscode-vba + + [discussions]: https://github.com/serkonda7/vscode-vba/discussions + + [gh-linguist]: https://github.com/DecimalTurn/linguist/blob/master/vendor/licenses/git_submodule/vscode-vba-json.dep.yml + + [sponsors-badge]: https://img.shields.io/badge/Sponsor-GitHub-blue.svg + [sponsors-profile]: https://github.com/sponsors/serkonda7 notices: []