diff --git a/.gitmodules b/.gitmodules index 6cbadcbda9..af3c7e9bd0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -356,6 +356,9 @@ [submodule "vendor/grammars/berry-grammar"] path = vendor/grammars/berry-grammar url = https://github.com/berry-lang/berry-grammar.git +[submodule "vendor/grammars/better-shell-syntax"] + path = vendor/grammars/better-shell-syntax + url = https://github.com/Chocapikk/better-shell-syntax.git [submodule "vendor/grammars/bicep"] path = vendor/grammars/bicep url = https://github.com/azure/bicep @@ -857,9 +860,6 @@ [submodule "vendor/grammars/language-sed"] path = vendor/grammars/language-sed url = https://github.com/Alhadis/language-sed -[submodule "vendor/grammars/language-shellscript"] - path = vendor/grammars/language-shellscript - url = https://github.com/atom/language-shellscript [submodule "vendor/grammars/language-subtitles"] path = vendor/grammars/language-subtitles url = https://github.com/Alhadis/language-subtitles.git @@ -1145,6 +1145,9 @@ [submodule "vendor/grammars/shaders-tmLanguage"] path = vendor/grammars/shaders-tmLanguage url = https://github.com/tgjones/shaders-tmLanguage +[submodule "vendor/grammars/shell-session-syntax"] + path = vendor/grammars/shell-session-syntax + url = https://github.com/Chocapikk/shell-session-syntax.git [submodule "vendor/grammars/slang-vscode-extension"] path = vendor/grammars/slang-vscode-extension url = https://github.com/shader-slang/slang-vscode-extension.git diff --git a/grammars.yml b/grammars.yml index 13979f0c14..37fd4570a1 100644 --- a/grammars.yml +++ b/grammars.yml @@ -291,6 +291,8 @@ vendor/grammars/ballerina-grammar: vendor/grammars/berry-grammar: - source.berry - source.berry.bytecode +vendor/grammars/better-shell-syntax: +- source.shell vendor/grammars/bicep: - markdown.bicep.codeblock - source.bicep @@ -816,9 +818,6 @@ vendor/grammars/language-sass: vendor/grammars/language-sed: - source.ed - source.sed -vendor/grammars/language-shellscript: -- source.shell -- text.shell-session vendor/grammars/language-subtitles: - text.srt - text.vtt @@ -1041,6 +1040,8 @@ vendor/grammars/selinux-policy-languages: vendor/grammars/shaders-tmLanguage: - source.hlsl - source.shaderlab +vendor/grammars/shell-session-syntax: +- text.shell-session vendor/grammars/slang-vscode-extension: - source.slang vendor/grammars/slint-tmLanguage: diff --git a/tools/grammars/compiler/data.go b/tools/grammars/compiler/data.go index 58d8d0893b..9afb1bc728 100644 --- a/tools/grammars/compiler/data.go +++ b/tools/grammars/compiler/data.go @@ -44,6 +44,7 @@ var KnownFields = map[string]bool{ // GrammarsInNonStdPath is a list of grammars known to have their syntax .cson or .json files in non-standard directories. var GrammarsInNonStdPath = map[string]bool{ + "autogenerated": true, "conllu-linguist-grammar": true, "hy.tmLanguage": true, "abl-tmlanguage": true, diff --git a/vendor/grammars/better-shell-syntax b/vendor/grammars/better-shell-syntax new file mode 160000 index 0000000000..993c0485fc --- /dev/null +++ b/vendor/grammars/better-shell-syntax @@ -0,0 +1 @@ +Subproject commit 993c0485fcac6e9f3fc6ade74adec51ba26ad797 diff --git a/vendor/grammars/language-shellscript b/vendor/grammars/language-shellscript deleted file mode 160000 index 35dc1aa137..0000000000 --- a/vendor/grammars/language-shellscript +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 35dc1aa1371ab75ece08fd0837330eb62e1f9da9 diff --git a/vendor/grammars/shell-session-syntax b/vendor/grammars/shell-session-syntax new file mode 160000 index 0000000000..a976a7e633 --- /dev/null +++ b/vendor/grammars/shell-session-syntax @@ -0,0 +1 @@ +Subproject commit a976a7e633c64677c4845558d4f72a999690cb5b diff --git a/vendor/licenses/git_submodule/better-shell-syntax.dep.yml b/vendor/licenses/git_submodule/better-shell-syntax.dep.yml new file mode 100644 index 0000000000..5a624a84b1 --- /dev/null +++ b/vendor/licenses/git_submodule/better-shell-syntax.dep.yml @@ -0,0 +1,31 @@ +--- +name: better-shell-syntax +version: 993c0485fcac6e9f3fc6ade74adec51ba26ad797 +type: git_submodule +homepage: https://github.com/jeff-hykin/better-shell-syntax +license: mit +licenses: +- sources: LICENSE + text: | + MIT License + + Copyright (c) 2019 Jeff Hykin + + 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: [] diff --git a/vendor/licenses/git_submodule/language-shellscript.dep.yml b/vendor/licenses/git_submodule/language-shellscript.dep.yml deleted file mode 100644 index ebe8b4a2cd..0000000000 --- a/vendor/licenses/git_submodule/language-shellscript.dep.yml +++ /dev/null @@ -1,41 +0,0 @@ ---- -name: language-shellscript -version: 35dc1aa1371ab75ece08fd0837330eb62e1f9da9 -type: git_submodule -homepage: https://github.com/atom/language-shellscript -license: mit -licenses: -- sources: LICENSE.md - text: | - Copyright (c) 2014 GitHub Inc. - - 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. - - -------------------------------------------------------------------- - - This package was derived from a TextMate bundle located at - https://github.com/textmate/shellscript.tmbundle and distributed under the - following license, located in `README.mdown`: - - Permission to copy, use, modify, sell and distribute this - software is granted. This software is provided "as is" without - express or implied warranty, and with no claim as to its - suitability for any purpose. -notices: [] diff --git a/vendor/licenses/git_submodule/shell-session-syntax.dep.yml b/vendor/licenses/git_submodule/shell-session-syntax.dep.yml new file mode 100644 index 0000000000..5c069d8e46 --- /dev/null +++ b/vendor/licenses/git_submodule/shell-session-syntax.dep.yml @@ -0,0 +1,31 @@ +--- +name: shell-session-syntax +version: a976a7e633c64677c4845558d4f72a999690cb5b +type: git_submodule +homepage: https://github.com/Chocapikk/shell-session-syntax +license: mit +licenses: +- sources: LICENSE + text: | + MIT License + + Copyright (c) 2026 Valentin Lobstein + + 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: []