Skip to content

Commit bbd2550

Browse files
kristijanhusakkristijanhusak
committed
feat!: Update markup parser to require content
Markup now requires something to be inside the markers in order to be treated as markup. For example, this was treated as bold before: ``` ** ``` But now it will be presented as plain text until something is added: ``` *foo* ```
1 parent 185f54e commit bbd2550

File tree

1 file changed

+51
-52
lines changed

1 file changed

+51
-52
lines changed

‎queries/org/markup.scm

+51-52
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,75 @@
1-
(paragraph ((expr "*" @bold.start) (expr "*" @bold.end) (#org-is-valid-markup-range? @bold.start @bold.end)))
2-
(paragraph (expr "*" @bold.start "*" @bold.end (#org-is-valid-markup-range? @bold.start @bold.end)))
3-
(paragraph ((expr "~" @code.start) (expr "~" @code.end) (#org-is-valid-markup-range? @code.start @code.end)))
4-
(paragraph (expr "~" @code.start "~" @code.end (#org-is-valid-markup-range? @code.start @code.end)))
5-
(paragraph ((expr "/" @italic.start) (expr "/" @italic.end) (#org-is-valid-markup-range? @italic.start @italic.end)))
6-
(paragraph (expr "/" @italic.start "/" @italic.end (#org-is-valid-markup-range? @italic.start @italic.end)))
7-
(paragraph ((expr "_" @underline.start) (expr "_" @underline.end) (#org-is-valid-markup-range? @underline.start @underline.end)))
8-
(paragraph (expr "_" @underline.start "_" @underline.end (#org-is-valid-markup-range? @underline.start @underline.end)))
9-
(paragraph ((expr "=" @verbatim.start) (expr "=" @verbatim.end) (#org-is-valid-markup-range? @verbatim.start @verbatim.end)))
10-
(paragraph (expr "=" @verbatim.start "=" @verbatim.end (#org-is-valid-markup-range? @verbatim.start @verbatim.end)))
11-
(paragraph ((expr "+" @strikethrough.start) (expr "+" @strikethrough.end) (#org-is-valid-markup-range? @strikethrough.start @strikethrough.end)))
12-
(paragraph (expr "+" @strikethrough.start "+" @strikethrough.end (#org-is-valid-markup-range? @strikethrough.start @strikethrough.end)))
13-
(paragraph ((expr "[" @hyperlink.start . "[") (expr "]" . "]" @hyperlink.end) (#org-is-valid-hyperlink-range? @hyperlink.start @hyperlink.end)))
1+
(paragraph ((expr "*" @bold.start _) (expr _ "*" @bold.end) (#org-is-valid-markup-range? @bold.start @bold.end)))
2+
(paragraph (expr "*" @bold.start _ "*" @bold.end (#org-is-valid-markup-range? @bold.start @bold.end)))
3+
(paragraph ((expr "~" @code.start _) (expr _ "~" @code.end) (#org-is-valid-markup-range? @code.start @code.end)))
4+
(paragraph (expr "~" @code.start _ "~" @code.end (#org-is-valid-markup-range? @code.start @code.end)))
5+
(paragraph ((expr "/" @italic.start _) (expr _ "/" @italic.end) (#org-is-valid-markup-range? @italic.start @italic.end)))
6+
(paragraph (expr "/" @italic.start _ "/" @italic.end (#org-is-valid-markup-range? @italic.start @italic.end)))
7+
(paragraph ((expr "_" @underline.start _) (expr _ "_" @underline.end) (#org-is-valid-markup-range? @underline.start @underline.end)))
8+
(paragraph (expr "_" @underline.start _ "_" @underline.end (#org-is-valid-markup-range? @underline.start @underline.end)))
9+
(paragraph ((expr "=" @verbatim.start _) (expr _ "=" @verbatim.end) (#org-is-valid-markup-range? @verbatim.start @verbatim.end)))
10+
(paragraph (expr "=" @verbatim.start _ "=" @verbatim.end (#org-is-valid-markup-range? @verbatim.start @verbatim.end)))
11+
(paragraph ((expr "+" @strikethrough.start _) (expr _ "+" @strikethrough.end) (#org-is-valid-markup-range? @strikethrough.start @strikethrough.end)))
12+
(paragraph (expr "+" @strikethrough.start _ "+" @strikethrough.end (#org-is-valid-markup-range? @strikethrough.start @strikethrough.end)))
13+
(paragraph ((expr "[" @hyperlink.start . "[" _) (expr _ "]" . "]" @hyperlink.end) (#org-is-valid-hyperlink-range? @hyperlink.start @hyperlink.end)))
1414
(paragraph (expr "[" @hyperlink.start . "[" _ "]" . "]" @hyperlink.end (#org-is-valid-hyperlink-range? @hyperlink.start @hyperlink.end)))
1515
(paragraph ((expr ("\\" @text.math.start.left "(" @text.math.start.right)) (expr ("\\" ")" @text.math.end)) (#org-is-valid-latex-range? @text.math.start.left @text.math.start.right @text.math.end)))
1616
(paragraph (expr "\\" @text.math.start.left "(" @text.math.start.right "\\" ")" @text.math.end (#org-is-valid-latex-range? @text.math.start.left @text.math.start.right @text.math.end)))
1717
(paragraph ((expr ("\\" @text.math.start.left ("str")+ @text.math.start.right "{")) (expr "}" @text.math.end) (#org-is-valid-latex-range? @text.math.start.left @text.math.start.right @text.math.end)))
1818
(paragraph (expr "\\" @text.math.start.left ("str")+ @text.math.start.right "{" "}" @text.math.end (#org-is-valid-latex-range? @text.math.start.left @text.math.start.right @text.math.end)))
1919
(paragraph (expr "\\" @text.math.start.left ("str")+ @text.math.start.right @text.math.end (#org-is-valid-latex-range? @text.math.start.left @text.math.start.right @text.math.end)))
2020

21-
(item ((expr "*" @bold.start) (expr "*" @bold.end) (#org-is-valid-markup-range? @bold.start @bold.end)))
22-
(item (expr "*" @bold.start "*" @bold.end (#org-is-valid-markup-range? @bold.start @bold.end)))
23-
(item ((expr "~" @code.start) (expr "~" @code.end) (#org-is-valid-markup-range? @code.start @code.end)))
24-
(item (expr "~" @code.start "~" @code.end (#org-is-valid-markup-range? @code.start @code.end)))
25-
(item ((expr "/" @italic.start) (expr "/" @italic.end) (#org-is-valid-markup-range? @italic.start @italic.end)))
26-
(item (expr "/" @italic.start "/" @italic.end (#org-is-valid-markup-range? @italic.start @italic.end)))
27-
(item ((expr "_" @underline.start) (expr "_" @underline.end) (#org-is-valid-markup-range? @underline.start @underline.end)))
28-
(item (expr "_" @underline.start "_" @underline.end (#org-is-valid-markup-range? @underline.start @underline.end)))
29-
(item ((expr "=" @verbatim.start) (expr "=" @verbatim.end) (#org-is-valid-markup-range? @verbatim.start @verbatim.end)))
30-
(item (expr "=" @verbatim.start "=" @verbatim.end (#org-is-valid-markup-range? @verbatim.start @verbatim.end)))
31-
(item ((expr "+" @strikethrough.start) (expr "+" @strikethrough.end) (#org-is-valid-markup-range? @strikethrough.start @strikethrough.end)))
32-
(item (expr "+" @strikethrough.start "+" @strikethrough.end (#org-is-valid-markup-range? @strikethrough.start @strikethrough.end)))
33-
(item ((expr "[" @hyperlink.start . "[") (expr "]" . "]" @hyperlink.end) (#org-is-valid-hyperlink-range? @hyperlink.start @hyperlink.end)))
21+
(item ((expr "*" @bold.start _) (expr _ "*" @bold.end) (#org-is-valid-markup-range? @bold.start @bold.end)))
22+
(item (expr "*" @bold.start _ "*" @bold.end (#org-is-valid-markup-range? @bold.start @bold.end)))
23+
(item ((expr "~" @code.start _) (expr _ "~" @code.end) (#org-is-valid-markup-range? @code.start @code.end)))
24+
(item (expr "~" @code.start _ "~" @code.end (#org-is-valid-markup-range? @code.start @code.end)))
25+
(item ((expr "/" @italic.start _) (expr _ "/" @italic.end) (#org-is-valid-markup-range? @italic.start @italic.end)))
26+
(item (expr "/" @italic.start _ "/" @italic.end (#org-is-valid-markup-range? @italic.start @italic.end)))
27+
(item ((expr "_" @underline.start _) (expr _ "_" @underline.end) (#org-is-valid-markup-range? @underline.start @underline.end)))
28+
(item (expr "_" @underline.start _ "_" @underline.end (#org-is-valid-markup-range? @underline.start @underline.end)))
29+
(item ((expr "=" @verbatim.start _) (expr _ "=" @verbatim.end) (#org-is-valid-markup-range? @verbatim.start @verbatim.end)))
30+
(item (expr "=" @verbatim.start _ "=" @verbatim.end (#org-is-valid-markup-range? @verbatim.start @verbatim.end)))
31+
(item ((expr "+" @strikethrough.start _) (expr _ "+" @strikethrough.end) (#org-is-valid-markup-range? @strikethrough.start @strikethrough.end)))
32+
(item (expr "+" @strikethrough.start _ "+" @strikethrough.end (#org-is-valid-markup-range? @strikethrough.start @strikethrough.end)))
33+
(item ((expr "[" @hyperlink.start . "[" _) (expr _ "]" . "]" @hyperlink.end) (#org-is-valid-hyperlink-range? @hyperlink.start @hyperlink.end)))
3434
(item (expr "[" @hyperlink.start . "[" _ "]" . "]" @hyperlink.end (#org-is-valid-hyperlink-range? @hyperlink.start @hyperlink.end)))
3535
(item ((expr ("\\" @text.math.start.left "(" @text.math.start.right)) (expr ("\\" ")" @text.math.end)) (#org-is-valid-latex-range? @text.math.start.left @text.math.start.right @text.math.end)))
3636
(item (expr "\\" @text.math.start.left "(" @text.math.start.right "\\" ")" @text.math.end (#org-is-valid-latex-range? @text.math.start.left @text.math.start.right @text.math.end)))
3737
(item ((expr ("\\" @text.math.start.left ("str")+ @text.math.start.right "{")) (expr "}" @text.math.end) (#org-is-valid-latex-range? @text.math.start.left @text.math.start.right @text.math.end)))
3838
(item (expr "\\" @text.math.start.left ("str")+ @text.math.start.right "{" "}" @text.math.end (#org-is-valid-latex-range? @text.math.start.left @text.math.start.right @text.math.end)))
3939
(item (expr "\\" @text.math.start.left ("str")+ @text.math.start.right @text.math.end (#org-is-valid-latex-range? @text.math.start.left @text.math.start.right @text.math.end)))
4040

41-
(cell (contents ((expr "*" @bold.start) (expr "*" @bold.end) (#org-is-valid-markup-range? @bold.start @bold.end))))
42-
(cell (contents (expr "*" @bold.start "*" @bold.end (#org-is-valid-markup-range? @bold.start @bold.end))))
43-
(cell (contents ((expr "~" @code.start) (expr "~" @code.end) (#org-is-valid-markup-range? @code.start @code.end))))
44-
(cell (contents (expr "~" @code.start "~" @code.end (#org-is-valid-markup-range? @code.start @code.end))))
45-
(cell (contents ((expr "/" @italic.start) (expr "/" @italic.end) (#org-is-valid-markup-range? @italic.start @italic.end))))
46-
(cell (contents (expr "/" @italic.start "/" @italic.end (#org-is-valid-markup-range? @italic.start @italic.end))))
47-
(cell (contents ((expr "_" @underline.start) (expr "_" @underline.end) (#org-is-valid-markup-range? @underline.start @underline.end))))
48-
(cell (contents (expr "_" @underline.start "_" @underline.end (#org-is-valid-markup-range? @underline.start @underline.end))))
49-
(cell (contents ((expr "=" @verbatim.start) (expr "=" @verbatim.end) (#org-is-valid-markup-range? @verbatim.start @verbatim.end))))
50-
(cell (contents (expr "=" @verbatim.start "=" @verbatim.end (#org-is-valid-markup-range? @verbatim.start @verbatim.end))))
51-
(cell (contents ((expr "+" @strikethrough.start) (expr "+" @strikethrough.end) (#org-is-valid-markup-range? @strikethrough.start @strikethrough.end))))
52-
(cell (contents (expr "+" @strikethrough.start "+" @strikethrough.end (#org-is-valid-markup-range? @strikethrough.start @strikethrough.end))))
53-
(cell (contents ((expr "[" @hyperlink.start . "[") (expr "]" . "]" @hyperlink.end) (#org-is-valid-hyperlink-range? @hyperlink.start @hyperlink.end))))
41+
(cell (contents ((expr "*" @bold.start _) (expr _ "*" @bold.end) (#org-is-valid-markup-range? @bold.start @bold.end))))
42+
(cell (contents (expr "*" @bold.start _ "*" @bold.end (#org-is-valid-markup-range? @bold.start @bold.end))))
43+
(cell (contents ((expr "~" @code.start _) (expr _ "~" @code.end) (#org-is-valid-markup-range? @code.start @code.end))))
44+
(cell (contents (expr "~" @code.start _ "~" @code.end (#org-is-valid-markup-range? @code.start @code.end))))
45+
(cell (contents (expr "/" @italic.start _ "/" @italic.end (#org-is-valid-markup-range? @italic.start @italic.end))))
46+
(cell (contents ((expr "_" @underline.start _) (expr _ "_" @underline.end) (#org-is-valid-markup-range? @underline.start @underline.end))))
47+
(cell (contents (expr "_" @underline.start _ "_" @underline.end (#org-is-valid-markup-range? @underline.start @underline.end))))
48+
(cell (contents ((expr "=" @verbatim.start _) (expr _ "=" @verbatim.end) (#org-is-valid-markup-range? @verbatim.start @verbatim.end))))
49+
(cell (contents (expr "=" @verbatim.start _ "=" @verbatim.end (#org-is-valid-markup-range? @verbatim.start @verbatim.end))))
50+
(cell (contents ((expr "+" @strikethrough.start _) (expr _ "+" @strikethrough.end) (#org-is-valid-markup-range? @strikethrough.start @strikethrough.end))))
51+
(cell (contents (expr "+" @strikethrough.start _ "+" @strikethrough.end (#org-is-valid-markup-range? @strikethrough.start @strikethrough.end))))
52+
(cell (contents ((expr "[" @hyperlink.start . "[" _) (expr _ "]" . "]" @hyperlink.end) (#org-is-valid-hyperlink-range? @hyperlink.start @hyperlink.end))))
5453
(cell (contents (expr "[" @hyperlink.start . "[" _ "]" . "]" @hyperlink.end (#org-is-valid-hyperlink-range? @hyperlink.start @hyperlink.end))))
5554
(cell (contents ((expr ("\\" @text.math.start.left "(" @text.math.start.right)) (expr ("\\" ")" @text.math.end)) (#org-is-valid-latex-range? @text.math.start.left @text.math.start.right @text.math.end))))
5655
(cell (contents (expr "\\" @text.math.start.left "(" @text.math.start.right "\\" ")" @text.math.end (#org-is-valid-latex-range? @text.math.start.left @text.math.start.right @text.math.end))))
5756
(cell (contents ((expr ("\\" @text.math.start.left ("str")+ @text.math.start.right "{")) (expr "}" @text.math.end) (#org-is-valid-latex-range? @text.math.start.left @text.math.start.right @text.math.end))))
5857
(cell (contents (expr "\\" @text.math.start.left ("str")+ @text.math.start.right "{" "}" @text.math.end (#org-is-valid-latex-range? @text.math.start.left @text.math.start.right @text.math.end))))
5958
(cell (contents (expr "\\" @text.math.start.left ("str")+ @text.math.start.right @text.math.end (#org-is-valid-latex-range? @text.math.start.left @text.math.start.right @text.math.end))))
6059

61-
(drawer (contents ((expr "*" @bold.start) (expr "*" @bold.end) (#org-is-valid-markup-range? @bold.start @bold.end))))
62-
(drawer (contents (expr "*" @bold.start "*" @bold.end (#org-is-valid-markup-range? @bold.start @bold.end))))
63-
(drawer (contents ((expr "~" @code.start) (expr "~" @code.end) (#org-is-valid-markup-range? @code.start @code.end))))
64-
(drawer (contents (expr "~" @code.start "~" @code.end (#org-is-valid-markup-range? @code.start @code.end))))
65-
(drawer (contents ((expr "/" @italic.start) (expr "/" @italic.end) (#org-is-valid-markup-range? @italic.start @italic.end))))
66-
(drawer (contents (expr "/" @italic.start "/" @italic.end (#org-is-valid-markup-range? @italic.start @italic.end))))
67-
(drawer (contents ((expr "_" @underline.start) (expr "_" @underline.end) (#org-is-valid-markup-range? @underline.start @underline.end))))
68-
(drawer (contents (expr "_" @underline.start "_" @underline.end (#org-is-valid-markup-range? @underline.start @underline.end))))
69-
(drawer (contents ((expr "=" @verbatim.start) (expr "=" @verbatim.end) (#org-is-valid-markup-range? @verbatim.start @verbatim.end))))
70-
(drawer (contents (expr "=" @verbatim.start "=" @verbatim.end (#org-is-valid-markup-range? @verbatim.start @verbatim.end))))
71-
(drawer (contents ((expr "+" @strikethrough.start) (expr "+" @strikethrough.end) (#org-is-valid-markup-range? @strikethrough.start @strikethrough.end))))
72-
(drawer (contents (expr "+" @strikethrough.start "+" @strikethrough.end (#org-is-valid-markup-range? @strikethrough.start @strikethrough.end))))
73-
(drawer (contents ((expr "[" @hyperlink.start . "[") (expr "]" . "]" @hyperlink.end) (#org-is-valid-hyperlink-range? @hyperlink.start @hyperlink.end))))
60+
(drawer (contents ((expr "*" @bold.start _) (expr _ "*" @bold.end) (#org-is-valid-markup-range? @bold.start @bold.end))))
61+
(drawer (contents (expr "*" @bold.start _ "*" @bold.end (#org-is-valid-markup-range? @bold.start @bold.end))))
62+
(drawer (contents ((expr "~" @code.start _) (expr _ "~" @code.end) (#org-is-valid-markup-range? @code.start @code.end))))
63+
(drawer (contents (expr "~" @code.start _ "~" @code.end (#org-is-valid-markup-range? @code.start @code.end))))
64+
(drawer (contents ((expr "/" @italic.start _) (expr _ "/" @italic.end) (#org-is-valid-markup-range? @italic.start @italic.end))))
65+
(drawer (contents (expr "/" @italic.start _ "/" @italic.end (#org-is-valid-markup-range? @italic.start @italic.end))))
66+
(drawer (contents ((expr "_" @underline.start _) (expr _ "_" @underline.end) (#org-is-valid-markup-range? @underline.start @underline.end))))
67+
(drawer (contents (expr "_" @underline.start _ "_" @underline.end (#org-is-valid-markup-range? @underline.start @underline.end))))
68+
(drawer (contents ((expr "=" @verbatim.start _) (expr _ "=" @verbatim.end) (#org-is-valid-markup-range? @verbatim.start @verbatim.end))))
69+
(drawer (contents (expr "=" @verbatim.start _ "=" @verbatim.end (#org-is-valid-markup-range? @verbatim.start @verbatim.end))))
70+
(drawer (contents ((expr "+" @strikethrough.start _) (expr _ "+" @strikethrough.end) (#org-is-valid-markup-range? @strikethrough.start @strikethrough.end))))
71+
(drawer (contents (expr "+" @strikethrough.start _ "+" @strikethrough.end (#org-is-valid-markup-range? @strikethrough.start @strikethrough.end))))
72+
(drawer (contents ((expr "[" @hyperlink.start . "[" _) (expr _ "]" . "]" @hyperlink.end) (#org-is-valid-hyperlink-range? @hyperlink.start @hyperlink.end))))
7473
(drawer (contents (expr "[" @hyperlink.start . "[" _ "]" . "]" @hyperlink.end (#org-is-valid-hyperlink-range? @hyperlink.start @hyperlink.end))))
7574
(drawer (contents ((expr ("\\" @text.math.start.left "(" @text.math.start.right)) (expr ("\\" ")" @text.math.end)) (#org-is-valid-latex-range? @text.math.start.left @text.math.start.right @text.math.end))))
7675
(drawer (contents (expr "\\" @text.math.start.left "(" @text.math.start.right "\\" ")" @text.math.end (#org-is-valid-latex-range? @text.math.start.left @text.math.start.right @text.math.end))))

0 commit comments

Comments
 (0)