diff --git a/.gitmodules b/.gitmodules index 7de9fd0d02..b452a15ab9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -623,9 +623,6 @@ [submodule "vendor/grammars/language-gf"] path = vendor/grammars/language-gf url = https://github.com/johnjcamilleri/language-gf -[submodule "vendor/grammars/language-gfm"] - path = vendor/grammars/language-gfm - url = https://github.com/atom/language-gfm [submodule "vendor/grammars/language-gn"] path = vendor/grammars/language-gn url = https://github.com/devoncarew/language-gn @@ -848,6 +845,9 @@ [submodule "vendor/grammars/mako-tmbundle"] path = vendor/grammars/mako-tmbundle url = https://github.com/marconi/mako-tmbundle +[submodule "vendor/grammars/markdown-tm-language"] + path = vendor/grammars/markdown-tm-language + url = https://github.com/wooorm/markdown-tm-language.git [submodule "vendor/grammars/marko-tmbundle"] path = vendor/grammars/marko-tmbundle url = https://github.com/marko-js/marko-tmbundle diff --git a/grammars.yml b/grammars.yml index 052574ba58..439ad2e53d 100644 --- a/grammars.yml +++ b/grammars.yml @@ -580,8 +580,6 @@ vendor/grammars/language-fontforge: - text.sfd vendor/grammars/language-gf: - source.gf -vendor/grammars/language-gfm: -- source.gfm vendor/grammars/language-gn: - source.gn vendor/grammars/language-grammars: @@ -806,6 +804,9 @@ vendor/grammars/make.tmbundle: - source.makefile vendor/grammars/mako-tmbundle: - text.html.mako +vendor/grammars/markdown-tm-language: +- source.mdx +- text.md vendor/grammars/marko-tmbundle: - text.marko vendor/grammars/mathematica-tmbundle: diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index b9139595b4..24aaa34f6a 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -3987,7 +3987,7 @@ Markdown: - ".workbook" filenames: - contents.lr - tm_scope: source.gfm + tm_scope: text.md language_id: 222 Marko: type: markup @@ -5558,7 +5558,7 @@ RMarkdown: extensions: - ".qmd" - ".rmd" - tm_scope: source.gfm + tm_scope: text.md language_id: 313 RPC: type: programming diff --git a/tools/grammars/compiler/data.go b/tools/grammars/compiler/data.go index 8795328dff..a1d4759632 100644 --- a/tools/grammars/compiler/data.go +++ b/tools/grammars/compiler/data.go @@ -4,8 +4,8 @@ var GrammarAliases = map[string]string{ "source.erb": "text.html.erb", "source.cpp": "source.c++", "source.less": "source.css.less", - "text.html.markdown": "source.gfm", - "text.md": "source.gfm", + "text.html.markdown": "text.md", + "source.gfm": "text.md", "source.php": "text.html.php", "text.plain": "", "source.asciidoc": "text.html.asciidoc", diff --git a/vendor/README.md b/vendor/README.md index f94010a8a5..98fb6f17e8 100644 --- a/vendor/README.md +++ b/vendor/README.md @@ -318,7 +318,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting - **Macaulay2:** [Macaulay2/language-macaulay2](https://github.com/Macaulay2/language-macaulay2) - **Makefile:** [textmate/make.tmbundle](https://github.com/textmate/make.tmbundle) - **Mako:** [marconi/mako-tmbundle](https://github.com/marconi/mako-tmbundle) -- **Markdown:** [atom/language-gfm](https://github.com/atom/language-gfm) +- **Markdown:** [wooorm/markdown-tm-language](https://github.com/wooorm/markdown-tm-language) - **Marko:** [marko-js/marko-tmbundle](https://github.com/marko-js/marko-tmbundle) - **Mask:** [tenbits/sublime-mask](https://github.com/tenbits/sublime-mask) - **Mathematica:** [shadanan/mathematica-tmbundle](https://github.com/shadanan/mathematica-tmbundle) @@ -439,7 +439,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting - **RDoc:** [joshaven/RDoc.tmbundle](https://github.com/joshaven/RDoc.tmbundle) - **REALbasic:** [peters-ben-0007/VBDotNetSyntax](https://github.com/peters-ben-0007/VBDotNetSyntax) - **REXX:** [mblocker/rexx-sublime](https://github.com/mblocker/rexx-sublime) -- **RMarkdown:** [atom/language-gfm](https://github.com/atom/language-gfm) +- **RMarkdown:** [wooorm/markdown-tm-language](https://github.com/wooorm/markdown-tm-language) - **RPC:** [textmate/c.tmbundle](https://github.com/textmate/c.tmbundle) - **RPGLE:** [barrettotte/vscode-ibmi-languages](https://github.com/barrettotte/vscode-ibmi-languages) - **RPM Spec:** [waveclaw/language-rpm-spec](https://github.com/waveclaw/language-rpm-spec) diff --git a/vendor/grammars/language-gfm b/vendor/grammars/language-gfm deleted file mode 160000 index 6686ac6ccc..0000000000 --- a/vendor/grammars/language-gfm +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6686ac6ccca2632af24d5c200f85bcd80b9fa752 diff --git a/vendor/grammars/markdown-tm-language b/vendor/grammars/markdown-tm-language new file mode 160000 index 0000000000..9776f2e73a --- /dev/null +++ b/vendor/grammars/markdown-tm-language @@ -0,0 +1 @@ +Subproject commit 9776f2e73a3c1dac6a70c36255417a0edb388d31 diff --git a/vendor/licenses/git_submodule/language-gfm.dep.yml b/vendor/licenses/git_submodule/language-gfm.dep.yml deleted file mode 100644 index 220aaa8829..0000000000 --- a/vendor/licenses/git_submodule/language-gfm.dep.yml +++ /dev/null @@ -1,30 +0,0 @@ ---- -name: language-gfm -version: 6686ac6ccca2632af24d5c200f85bcd80b9fa752 -type: git_submodule -homepage: https://github.com/atom/language-gfm -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. -notices: [] diff --git a/vendor/licenses/git_submodule/markdown-tm-language.dep.yml b/vendor/licenses/git_submodule/markdown-tm-language.dep.yml new file mode 100644 index 0000000000..9d4241e6b0 --- /dev/null +++ b/vendor/licenses/git_submodule/markdown-tm-language.dep.yml @@ -0,0 +1,57 @@ +--- +name: markdown-tm-language +version: 9776f2e73a3c1dac6a70c36255417a0edb388d31 +type: git_submodule +homepage: https://github.com/wooorm/markdown-tm-language.git +license: mit +licenses: +- sources: license + text: | + (The MIT License) + + Copyright (c) 2023 Titus Wormer + + 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: |- + [MIT][license] © [Titus Wormer][author] + + + + [build-badge]: https://github.com/wooorm/markdown-tm-language/workflows/main/badge.svg + + [build]: https://github.com/wooorm/markdown-tm-language/actions + + [license]: license + + [author]: https://wooorm.com + + [contribute]: https://opensource.guide/how-to-contribute/ + + [markdown]: https://commonmark.org + + [mdx]: https://mdxjs.com + + [demo]: https://wooorm.com/markdown-tm-language/ + + [starry-night]: https://github.com/wooorm/starry-night + + [shiki]: https://github.com/shikijs/shiki +notices: []