fix: Update markdown grammar properly (#803)

Use the correct branch for the markdown grammar and update the build + tests for the new grammar version.
afnanenayet · Jan 14, 2024 · bacdbda · bacdbda
1 parent 494d0cf
commit bacdbda
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/build.rs b/build.rs
@@ -335,9 +335,8 @@ fn grammars() -> Vec<GrammarCompileInfo<'static>> {
         },
         GrammarCompileInfo {
             display_name: "markdown",
-            path: PathBuf::from("grammars/tree-sitter-markdown"),
-            c_sources: vec!["parser.c"],
-            cpp_sources: vec!["scanner.cc"],
+            path: PathBuf::from("grammars/tree-sitter-markdown/tree-sitter-markdown"),
+            c_sources: vec!["parser.c", "scanner.c"],
             ..Default::default()
         }, // Add new grammars here...
     ];

diff --git a/grammars/tree-sitter-markdown b/grammars/tree-sitter-markdown
diff --git a/...ts/regression_test__tests__short_markdown_split_graphemes_true_strip_whitespace_true.snap b/...ts/regression_test__tests__short_markdown_split_graphemes_true_strip_whitespace_true.snap
@@ -11,7 +11,7 @@ RichHunks(
                         line_index: 5,
                         entries: [
                             Entry {
-                                reference: {Node paragraph (4, 0) - (6, 0)},
+                                reference: {Node inline (4, 0) - (5, 14)},
                                 text: "3",
                                 start_position: Point {
                                     row: 5,
@@ -21,7 +21,7 @@ RichHunks(
                                     row: 5,
                                     column: 14,
                                 },
-                                kind_id: 127,
+                                kind_id: 204,
                             },
                         ],
                     },
@@ -35,7 +35,7 @@ RichHunks(
                         line_index: 6,
                         entries: [
                             Entry {
-                                reference: {Node paragraph (5, 0) - (7, 0)},
+                                reference: {Node inline (5, 0) - (6, 14)},
                                 text: "2",
                                 start_position: Point {
                                     row: 6,
@@ -45,7 +45,7 @@ RichHunks(
                                     row: 6,
                                     column: 14,
                                 },
-                                kind_id: 127,
+                                kind_id: 204,
                             },
                         ],
                     },
+20 −0		.github/ISSUE_TEMPLATE/bug_report.md
+11 −0		.github/ISSUE_TEMPLATE/feature_request.md
+43 −0		.github/workflows/node.js.yml
+2 −0		.gitignore
+70 −0		CONTRIBUTING.md
+0 −26		Cargo.toml
+44 −0		Package.swift
+59 −6		README.md
+9 −5		binding.gyp
+0 −28		bindings/node/binding.cc
+0 −19		bindings/node/index.js
+0 −29		bindings/rust/build.rs
+0 −52		bindings/rust/lib.rs
+129 −0		common/grammar.js
+0 −0		common/html_entities.json
+0 −69		corpus/issues.txt
+0 −9,678		corpus/spec.txt
+0 −1,069		grammar.js
+1,771 −5		package-lock.json
+30 −11		package.json
+0 −34		queries/highlights.scm
+0 −7		queries/injections.scm
+0 −11,563		src/grammar.json
+0 −1,643		src/node-types.json
+0 −163,947		src/parser.c
+0 −1,012		src/scanner.cc
+16 −0		tree-sitter-markdown-inline/bindings/swift/TreeSitterMarkdownInline/markdown_inline.h
+67 −139		tree-sitter-markdown-inline/corpus-failing/spec.txt
+65 −0		tree-sitter-markdown-inline/corpus/extension_latex.txt
+32 −0		tree-sitter-markdown-inline/corpus/extension_strikethrough.txt
+64 −0		tree-sitter-markdown-inline/corpus/extension_wikilink.txt
+106 −0		tree-sitter-markdown-inline/corpus/issues.txt
+4,006 −0		tree-sitter-markdown-inline/corpus/spec.txt
+21 −0		tree-sitter-markdown-inline/corpus/tags.txt
+487 −0		tree-sitter-markdown-inline/grammar.js
+38 −0		tree-sitter-markdown-inline/queries/highlights.scm
+2 −0		tree-sitter-markdown-inline/queries/injections.scm
+6,264 −0		tree-sitter-markdown-inline/src/grammar.json
+865 −0		tree-sitter-markdown-inline/src/node-types.json
+75,228 −0		tree-sitter-markdown-inline/src/parser.c
+388 −0		tree-sitter-markdown-inline/src/scanner.c
+0 −0		tree-sitter-markdown-inline/src/tree_sitter/parser.h
+16 −0		tree-sitter-markdown/bindings/swift/TreeSitterMarkdown/markdown.h
+17 −0		tree-sitter-markdown/corpus-failing/spec.txt
+19 −0		tree-sitter-markdown/corpus/extension_minus_metadata.txt
+204 −0		tree-sitter-markdown/corpus/extension_pipe_table.txt
+19 −0		tree-sitter-markdown/corpus/extension_plus_metadata.txt
+58 −0		tree-sitter-markdown/corpus/extension_task_list.txt
+92 −0		tree-sitter-markdown/corpus/issues.txt
+5,842 −0		tree-sitter-markdown/corpus/spec.txt
+613 −0		tree-sitter-markdown/grammar.js
+52 −0		tree-sitter-markdown/queries/highlights.scm
+12 −0		tree-sitter-markdown/queries/injections.scm
+5,381 −0		tree-sitter-markdown/src/grammar.json
+960 −0		tree-sitter-markdown/src/node-types.json
+59,643 −0		tree-sitter-markdown/src/parser.c
+1,597 −0		tree-sitter-markdown/src/scanner.c
+224 −0		tree-sitter-markdown/src/tree_sitter/parser.h