Merge pull request #97 from boltlessengineer/split_parser

Add wiki-links support (#54)

Author: MDeiml

README.md

@@ -38,6 +38,7 @@ of them are on by default, these can be disabled with the environment variable
 | YAML metadata | `EXTENSION_MINUS_METADATA` | [link](https://gohugo.io/content-management/front-matter/) | ✓ |  |
 | TOML metadata | `EXTENSION_PLUS_METADATA` | [link](https://gohugo.io/content-management/front-matter/) | ✓ |  |
 | Tags | `EXTENSION_TAGS` | [link](https://help.obsidian.md/Editing+and+formatting/Tags#Tag+format) |  |  |
+| Wiki Link | `EXTENSION_WIKI_LINK` | [link](https://help.obsidian.md/Linking+notes+and+files/Internal+links) |  |  |
 
 ## Usage in Editors
 

common/grammar.js

@@ -7,6 +7,7 @@ exports.EXTENSION_MINUS_METADATA = process.env.EXTENSION_MINUS_METADATA || expor
 exports.EXTENSION_PLUS_METADATA = process.env.EXTENSION_PLUS_METADATA || exports.EXTENSION_DEFAULT || process.env.ALL_EXTENSIONS;
 exports.EXTENSION_TAGS = process.env.EXTENSION_TAGS || process.env.ALL_EXTENSIONS;
 exports.EXTENSION_LATEX = process.env.EXTENSION_LATEX || exports.EXTENSION_DEFAULT || process.env.ALL_EXTENSIONS;
+exports.EXTENSION_WIKI_LINK = process.env.EXTENSION_WIKI_LINK || process.env.ALL_EXTENSIONS;
 
 const PUNCTUATION_CHARACTERS_REGEX = '!-/:-@\\[-`\\{-~';
 const PUNCTUATION_CHARACTERS_ARRAY = [

tree-sitter-markdown-inline/corpus/extension_wikilink.txt

@@ -0,0 +1,64 @@
+================================================================================
+Basic Wiki-link parsing.
+================================================================================
+[[Tree laws of motion]]
+
+-------------------------------------------------------------------------------
+(inline
+  (wiki_link
+    (link_destination)
+  ))
+
+================================================================================
+Wiki-link to a file
+================================================================================
+[[Figure 1.png]]
+
+-------------------------------------------------------------------------------
+(inline
+  (wiki_link
+    (link_destination)
+  ))
+
+================================================================================
+Wiki-link to a heading in a note
+================================================================================
+[[Tree laws of motion#Second law]]
+
+-------------------------------------------------------------------------------
+(inline
+  (wiki_link
+    (link_destination)
+  ))
+
+================================================================================
+Wiki-link with title
+================================================================================
+[[Internal links|custom display text]]
+
+-------------------------------------------------------------------------------
+(inline
+  (wiki_link
+    (link_destination)
+    (link_text)
+  ))
+
+================================================================================
+Wiki-link opener with no closer
+================================================================================
+[[
+
+-------------------------------------------------------------------------------
+(inline)
+
+================================================================================
+Wiki-link version of Example 556
+================================================================================
+[[[foo]]]
+
+--------------------------------------------------------------------------------
+
+(inline
+  (wiki_link
+    (link_destination)))
+

tree-sitter-markdown-inline/corpus/spec.txt

@@ -2909,17 +2909,6 @@ Example 555 - https://github.github.com/gfm/#example-555
   (shortcut_link
     (link_text)))
 
-================================================================================
-Example 556 - https://github.github.com/gfm/#example-556
-================================================================================
-[[[foo]]]
-
---------------------------------------------------------------------------------
-
-(inline
-  (shortcut_link
-    (link_text)))
-
 ================================================================================
 Example 557 - https://github.github.com/gfm/#example-557
 ================================================================================
@@ -3021,20 +3010,6 @@ Example 566 - https://github.github.com/gfm/#example-566
 
 --------------------------------------------------------------------------------
 
-(inline
-  (shortcut_link
-    (link_text
-      (emphasis
-        (emphasis_delimiter)
-        (emphasis_delimiter)))))
-
-================================================================================
-Example 567 - https://github.github.com/gfm/#example-567
-================================================================================
-[[*foo* bar]]
-
---------------------------------------------------------------------------------
-
 (inline
   (shortcut_link
     (link_text

tree-sitter-markdown-inline/grammar.js

@@ -109,6 +109,11 @@ module.exports = grammar(add_inline_rules({
         [$.shortcut_link, $._link_text],
         [$.link_destination, $.link_title],
         [$._link_destination_parenthesis, $.link_title],
+
+        [$.wiki_link, $._inline_element],
+        [$.wiki_link, $._inline_element_no_star],
+        [$.wiki_link, $._inline_element_no_underscore],
+        [$.wiki_link, $._inline_element_no_tilde],
     ],
     extras: $ => [],
 
@@ -184,6 +189,29 @@ module.exports = grammar(add_inline_rules({
             ')'
         )),
 
+        wiki_link: $ => prec.dynamic(2 * PRECEDENCE_LEVEL_LINK, seq(
+            '[', '[',
+            alias($._wiki_link_destination, $.link_destination),
+            optional(seq(
+                '|',
+                alias($._wiki_link_text, $.link_text)
+            )),
+            ']', ']'
+            )
+        ),
+
+        _wiki_link_destination: $ => repeat1(choice(
+            $._word,
+            common.punctuation_without($, ['[',']', '|']),
+            $._whitespace,
+        )),
+
+        _wiki_link_text: $ => repeat1(choice(
+            $._word,
+            common.punctuation_without($, ['[',']']),
+            $._whitespace,
+        )),
+
         // Images work exactly like links with a '!' added in front.
         //
         // https://github.github.com/gfm/#images
@@ -407,8 +435,12 @@ function add_inline_rules(grammar) {
                         $.full_reference_link,
                         $.collapsed_reference_link,
                         $.inline_link,
+                        // (common.EXTENSION_WIKI_LINK && $.wiki_link),
                         seq(choice('[', ']'), optional($._last_token_punctuation)),
                     ]);
+                    if (common.EXTENSION_WIKI_LINK) {
+                        elements.push($.wiki_link);
+                    }
                 }
                 return choice(...elements);
             };

tree-sitter-markdown-inline/queries/highlights.scm

@@ -35,3 +35,4 @@
 (image ["!" "[" "]" "("] @punctuation.delimiter)
 (inline_link ["[" "]" "("] @punctuation.delimiter)
 (shortcut_link ["[" "]"] @punctuation.delimiter)
+(wiki_link ["[" "|" "]"] @punctuation.delimiter)