Replace markdown grammar with maintained version (#6341)

* Add new markdown grammar * Prefer `text.md` scope --------- Co-authored-by: Colin Seymour <[email protected]>
github-linguist · May 30, 2023 · 90f1911 · 90f1911
1 parent 2c4898a
commit 90f1911
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 42 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -626,9 +626,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

diff --git a/grammars.yml b/grammars.yml
@@ -583,8 +583,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:

diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
@@ -3999,7 +3999,7 @@ Markdown:
   - ".workbook"
   filenames:
   - contents.lr
-  tm_scope: source.gfm
+  tm_scope: text.md
   language_id: 222
 Marko:
   type: markup
@@ -5571,7 +5571,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
@@ -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
@@ -319,7 +319,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)
@@ -440,7 +440,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
diff --git a/vendor/licenses/git_submodule/language-gfm.dep.yml b/vendor/licenses/git_submodule/language-gfm.dep.yml