tree-sitter-grammars
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,20 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+
+**Code example**
+```quarto
+Your example here
+```
+
+**Expected behavior**
+<!-- consider linking to a relevant section in a spec like https://github.github.com/gfm/ -->
+
+**Actual behavior**
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,11 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+<!-- consider linking a relevant section from a spec -->
+<!-- extensions from any spec (rquarto, pandoc, ...) are welcome -->
diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
@@ -0,0 +1,43 @@
+# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
+
+name: Node.js CI
+
+on:
+  push:
+    branches: [ "split_parser" ]
+  pull_request:
+    branches: [ "split_parser" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Use Node.js 14
+      uses: actions/setup-node@v3
+      with:
+        node-version: 14
+        cache: 'npm'
+    - run: npm ci
+    - run: npm run build --if-present
+    - name: Check grammar is compiled correctly
+      run: git diff --exit-code
+  test:
+
+    runs-on: ubuntu-latest
+    env:
+      ALL_EXTENSIONS: 1
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Use Node.js 14
+      uses: actions/setup-node@v3
+      with:
+        node-version: 14
+        cache: 'npm'
+    - run: npm ci
+    - run: npm run build --if-present
+    - run: npm test
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
 node_modules
 build
 target
+/.build
+Cargo.lock
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,66 @@
+# Contributing
+
+All contributions are welcome. Specifically, if you found a bug or have a
+suggestion for a new feature or quarto extension, you can always open an
+[issue] or [pull request].
+
+## Issues
+
+If you open an issue please give a short description of your bug or feature
+along with a code example. If there is a relevant spec like the [CommonMark
+Spec][commonmark] or the [GitHub Flavored markdown Spec][gfm] please link it in
+the issue.
+
+Some bug reports belong in other repositories if they only concern the
+implementation of the grammar in a specific context like `nvim-treesitter`, but
+you can always open an issue here and I will point you in the right direction.
+
+## Code Overview
+
+Please refer to the [tree-sitter spec] for more details on how to write a tree-
+sitter grammar.
+
+This parse is split into two grammars. One for block structure, which can be
+found in the `tree-sitter-quarto` folder, and one for inline structure, which
+can be found in the `tree-sitter-quarto-inline` folder. Components that are
+parts of either grammar can be found in the `common` folder.
+
+For either of the grammar the most important files are the `grammar.js` which
+defines most nodes and the `src/scanner.c` which defines nodes that cannot
+be parsed with normal tree-sitter rules. All other files in the `src` subfolder
+are auto-generated by running `tree-sitter generate --no-bindings`. (You need to
+install the [tree-sitter cli tool][tree-sitter-cli] first.)
+
+Some syntactical components can be enabled or disabled by environment variables
+at compile time. The logic for this can be found in the `common/grammar.js`
+file.
+
+Tests are located in the `corpus` subfolder:
+* `spec.txt` is taken from the examples in the [GFM spec][gfm].
+* `failing.txt` are those examples from the spec that do not pass yet.
+* `issues.txt` are test cases covering solved issues.
+* `extension_<>.txt` are covering specific extensions. Some of these are also
+  taken from the GFM spec.
+
+## Pull Requests
+
+I will happily accept any pull requests.
+
+Before submitting any code please check the following:
+
+* You ran `tree-sitter generate --no-bindings` in the `tree-sitter-quarto` or
+  `tree-sitter-quarto-inline` directories respecively after modifying any
+  `grammar.js` file.
+* When running `tree-sitter test` only the cases defined in `failing.txt` or
+  `extension_<>.txt` for not activated extensions fail for **both** gramars.
+* If you implemented new behavior please add tests. (In most cases these belong
+  in a `extension_<>.txt`.)
+* You deleted any auto-generated bindings and files for debugging purposes
+  like `log.html`
+
+[issue]: https://github.com/jmbuhr/tree-sitter-quarto/issues/new
+[pull request]: https://github.com/jmbuhr/tree-sitter-quarto/compare
+[gfm]: https://github.github.com/gfm/
+[commonmark]: https://spec.commonmark.org/
+[tree-sitter spec]: https://tree-sitter.github.io/tree-sitter/
+[tree-sitter-cli]: https://github.com/tree-sitter/tree-sitter/blob/master/cli/README.md
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,19 +1,21 @@
 [package]
 name = "tree-sitter-md"
-description = "markdown grammar for the tree-sitter parsing library"
-version = "0.0.1"
-keywords = ["incremental", "parsing", "markdown"]
+description = "quarto grammar for the tree-sitter parsing library"
+version = "0.1.5"
+keywords = ["incremental", "parsing", "quarto"]
 categories = ["parsing", "text-editors"]
-repository = "https://github.com/tree-sitter/tree-sitter-markdown"
+repository = "https://github.com/MDeiml/tree-sitter-quarto"
 edition = "2018"
 license = "MIT"
 
 build = "bindings/rust/build.rs"
 include = [
   "bindings/rust/*",
-  "grammar.js",
-  "queries/*",
-  "src/*",
+  "tree-sitter-quarto/src/*",
+  "tree-sitter-quarto-inline/src/*",
+  "tree-sitter-quarto/queries/*",
+  "tree-sitter-quarto-inline/queries/*",
+  "benchmark/main.rs",
 ]
 
 [lib]
@@ -24,3 +26,10 @@ tree-sitter = "~0.20"
 
 [build-dependencies]
 cc = "1.0"
+
+[[bin]]
+name = "benchmark"
+path = "benchmark/main.rs"
+
+[profile.release]
+debug = true
diff --git a/Package.swift b/Package.swift
@@ -0,0 +1,44 @@
+// swift-tools-version:5.3
+
+import PackageDescription
+
+let package = Package(
+    name: "TreeSitterquarto",
+    platforms: [.macOS(.v10_13), .iOS(.v11)],
+    products: [
+        .library(name: "TreeSitterquarto", targets: ["TreeSitterquarto", "TreeSitterquartoInline"]),
+    ],
+    dependencies: [],
+    targets: [
+        .target(name: "TreeSitterquarto",
+                path: "tree-sitter-quarto",
+                exclude: [
+                    "corpus",
+                    "grammar.js",
+                ],
+                sources: [
+                    "src/parser.c",
+                    "src/scanner.c",
+                ],
+                resources: [
+                    .copy("queries")
+                ],
+                publicHeadersPath: "bindings/swift",
+                cSettings: [.headerSearchPath("src")]),
+        .target(name: "TreeSitterquartoInline",
+                path: "tree-sitter-quarto-inline",
+                exclude: [
+                    "corpus",
+                    "grammar.js",
+                ],
+                sources: [
+                    "src/parser.c",
+                    "src/scanner.c",
+                ],
+                resources: [
+                    .copy("queries")
+                ],
+                publicHeadersPath: "bindings/swift",
+                cSettings: [.headerSearchPath("src")])
+    ]
+)
diff --git a/README.md b/README.md
@@ -1,9 +1,12 @@
-# tree-sitter-markdown
-A markdown parser for tree-sitter
+# tree-sitter-quarto
 
-For now this implements the [CommonMark Spec](https://spec.commonmark.org/). Maybe it will be extended to support [Github flavored markdown](https://github.github.com/gfm/)
+A quarto parser for [tree-sitter](https://github.com/tree-sitter/).
 
-## Disclaimer
+This is a fork of <https://github.com/MDeiml/tree-sitter-markdown>
+(until I figure out how extending instead of replacing a grammar works in `treesitter`).
 
-This parser is still quite experimental.
+## Contributing
 
+All contributions are welcome. For details refer to [CONTRIBUTING.md].
+
+[CONTRIBUTING.md]: https://github.com/jmbuhr/tree-sitter-quarto/blob/split_parser/CONTRIBUTING.md
diff --git a/benchmark/main.rs b/benchmark/main.rs
@@ -0,0 +1,21 @@
+use tree_sitter_md::*;
+
+fn main() {
+    let mut parser = quartoParser::default();
+    let filename = std::env::args().nth(1).unwrap();
+    let source = std::fs::read(filename).unwrap();
+    let mut tree = parser.parse(&source, None).unwrap();
+    tree.edit(&tree_sitter::InputEdit {
+        start_byte: 0,
+        old_end_byte: 1,
+        new_end_byte: 0,
+        start_position: tree_sitter::Point::new(0, 0),
+        old_end_position: tree_sitter::Point::new(0, 1),
+        new_end_position: tree_sitter::Point::new(0, 0),
+    });
+    reparse(&mut parser, &source[1..], tree);
+}
+
+fn reparse(parser: &mut quartoParser, source: &[u8], old_tree: quartoTree) {
+    parser.parse(source, Some(&old_tree));
+}
diff --git a/binding.gyp b/binding.gyp
@@ -1,19 +1,23 @@
 {
   "targets": [
     {
-      "target_name": "tree_sitter_markdown_binding",
+      "target_name": "tree_sitter_quarto_binding",
       "include_dirs": [
         "<!(node -e \"require('nan')\")",
-        "src"
+        "tree-sitter-quarto/src",
+        "tree-sitter-quarto-inline/src",
       ],
       "sources": [
-        "bindings/node/binding.cc",
-        "src/parser.c",
-        "src/scanner.cc"
+        "tree-sitter-quarto/src/parser.c",
+        "tree-sitter-quarto/src/scanner.c",
+        "tree-sitter-quarto-inline/src/parser.c",
+        "tree-sitter-quarto-inline/src/scanner.c",
+        "bindings/node/binding.cc"
       ],
       "cflags_c": [
-        "-std=c99",
+        "-std=c99"
       ]
     }
   ]
 }
+
diff --git a/bindings/node/binding.cc b/bindings/node/binding.cc
@@ -4,7 +4,8 @@
 
 using namespace v8;
 
-extern "C" TSLanguage * tree_sitter_markdown();
+extern "C" TSLanguage * tree_sitter_quarto();
+extern "C" TSLanguage * tree_sitter_quarto_inline();
 
 namespace {
 
@@ -16,13 +17,19 @@ void Init(Local<Object> exports, Local<Object> module) {
   tpl->InstanceTemplate()->SetInternalFieldCount(1);
 
   Local<Function> constructor = Nan::GetFunction(tpl).ToLocalChecked();
-  Local<Object> instance = constructor->NewInstance(Nan::GetCurrentContext()).ToLocalChecked();
-  Nan::SetInternalFieldPointer(instance, 0, tree_sitter_markdown());
 
-  Nan::Set(instance, Nan::New("name").ToLocalChecked(), Nan::New("markdown").ToLocalChecked());
-  Nan::Set(module, Nan::New("exports").ToLocalChecked(), instance);
+  Local<Object> instance_block = constructor->NewInstance(Nan::GetCurrentContext()).ToLocalChecked();
+  Nan::SetInternalFieldPointer(instance_block, 0, tree_sitter_quarto());
+  Nan::Set(instance_block, Nan::New("name").ToLocalChecked(), Nan::New("quarto").ToLocalChecked());
+  Nan::Set(exports, Nan::New("quarto").ToLocalChecked(), instance_block);
+
+  Local<Object> instance_inline = constructor->NewInstance(Nan::GetCurrentContext()).ToLocalChecked();
+  Nan::SetInternalFieldPointer(instance_inline, 0, tree_sitter_quarto_inline());
+  Nan::Set(instance_inline, Nan::New("name").ToLocalChecked(), Nan::New("quarto_inline").ToLocalChecked());
+  Nan::Set(exports, Nan::New("quarto_inline").ToLocalChecked(), instance_inline);
 }
 
-NODE_MODULE(tree_sitter_markdown_binding, Init)
+NODE_MODULE(tree_sitter_quarto_binding, Init)
 
 }  // namespace
+
diff --git a/bindings/node/index.js b/bindings/node/index.js
@@ -1,11 +1,11 @@
 try {
-  module.exports = require("../../build/Release/tree_sitter_markdown_binding");
+  module.exports = require("../../build/Release/tree_sitter_quarto_binding");
 } catch (error1) {
   if (error1.code !== 'MODULE_NOT_FOUND') {
     throw error1;
   }
   try {
-    module.exports = require("../../build/Debug/tree_sitter_markdown_binding");
+    module.exports = require("../../build/Debug/tree_sitter_quarto_binding");
   } catch (error2) {
     if (error2.code !== 'MODULE_NOT_FOUND') {
       throw error2;
@@ -15,5 +15,7 @@ try {
 }
 
 try {
-  module.exports.nodeTypeInfo = require("../../src/node-types.json");
+  module.exports.nodeTypeInfo = require("../../tree-sitter-quarto/src/node-types.json");
+  module.exports.nodeTypeInfoInline = require("../../tree-sitter-quarto-inline/src/node-types.json");
 } catch (_) {}
+