fix: Improve parsing hyperlink like text (#571)

Author: kristijanhusak

lua/orgmode/colors/markup_highlighter.lua

@@ -139,7 +139,7 @@ local function is_valid_markup_range(match, _, source, _)
   end
 
   local start_line = start_node:range()
-  local end_line = start_node:range()
+  local end_line = end_node:range()
 
   if start_line ~= end_line then
     return false
@@ -194,9 +194,10 @@ local function is_valid_latex_range(match, _, source, _)
   end
 
   local start_line = start_node_left:range()
-  local end_line = start_node_left:range()
+  local start_line_right = start_node_right:range()
+  local end_line = end_node:range()
 
-  if start_line ~= end_line then
+  if start_line ~= start_line_right or start_line ~= end_line then
     return false
   end
 

queries/org/markup.scm

@@ -11,8 +11,8 @@
  (expr "=" @verbatim.start "=" @verbatim.end (#org-is-valid-markup-range? @verbatim.start @verbatim.end))
  ((expr "+" @strikethrough.start) (expr "+" @strikethrough.end) (#org-is-valid-markup-range? @strikethrough.start @strikethrough.end))
  (expr "+" @strikethrough.start "+" @strikethrough.end (#org-is-valid-markup-range? @strikethrough.start @strikethrough.end))
- ((expr "[" @hyperlink.start) (expr "]" @hyperlink.end) (#org-is-valid-hyperlink-range? @hyperlink.start @hyperlink.end))
- (expr "[" @hyperlink.start "]" @hyperlink.end (#org-is-valid-hyperlink-range? @hyperlink.start @hyperlink.end))
+ ((expr "[" @hyperlink.start . "[") (expr "]" . "]" @hyperlink.end) (#org-is-valid-hyperlink-range? @hyperlink.start @hyperlink.end))
+ (expr "[" @hyperlink.start . "[" _  "]" . "]" @hyperlink.end (#org-is-valid-hyperlink-range? @hyperlink.start @hyperlink.end))
  ((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))
  (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))
  ((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))
@@ -33,8 +33,8 @@
  (expr "=" @verbatim.start "=" @verbatim.end (#org-is-valid-markup-range? @verbatim.start @verbatim.end))
  ((expr "+" @strikethrough.start) (expr "+" @strikethrough.end) (#org-is-valid-markup-range? @strikethrough.start @strikethrough.end))
  (expr "+" @strikethrough.start "+" @strikethrough.end (#org-is-valid-markup-range? @strikethrough.start @strikethrough.end))
- ((expr "[" @hyperlink.start) (expr "]" @hyperlink.end) (#org-is-valid-hyperlink-range? @hyperlink.start @hyperlink.end))
- (expr "[" @hyperlink.start "]" @hyperlink.end (#org-is-valid-hyperlink-range? @hyperlink.start @hyperlink.end))
+ ((expr "[" @hyperlink.start . "[") (expr "]" . "]" @hyperlink.end) (#org-is-valid-hyperlink-range? @hyperlink.start @hyperlink.end))
+ (expr "[" @hyperlink.start . "[" _  "]" . "]" @hyperlink.end (#org-is-valid-hyperlink-range? @hyperlink.start @hyperlink.end))
  ((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))
  (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))
  ((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))
@@ -55,8 +55,8 @@
  (expr "=" @verbatim.start "=" @verbatim.end (#org-is-valid-markup-range? @verbatim.start @verbatim.end))
  ((expr "+" @strikethrough.start) (expr "+" @strikethrough.end) (#org-is-valid-markup-range? @strikethrough.start @strikethrough.end))
  (expr "+" @strikethrough.start "+" @strikethrough.end (#org-is-valid-markup-range? @strikethrough.start @strikethrough.end))
- ((expr "[" @hyperlink.start) (expr "]" @hyperlink.end) (#org-is-valid-hyperlink-range? @hyperlink.start @hyperlink.end))
- (expr "[" @hyperlink.start "]" @hyperlink.end (#org-is-valid-hyperlink-range? @hyperlink.start @hyperlink.end))
+ ((expr "[" @hyperlink.start . "[") (expr "]" . "]" @hyperlink.end) (#org-is-valid-hyperlink-range? @hyperlink.start @hyperlink.end))
+ (expr "[" @hyperlink.start . "[" _  "]" . "]" @hyperlink.end (#org-is-valid-hyperlink-range? @hyperlink.start @hyperlink.end))
  ((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))
  (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))
  ((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))
@@ -77,8 +77,8 @@
  (expr "=" @verbatim.start "=" @verbatim.end (#org-is-valid-markup-range? @verbatim.start @verbatim.end))
  ((expr "+" @strikethrough.start) (expr "+" @strikethrough.end) (#org-is-valid-markup-range? @strikethrough.start @strikethrough.end))
  (expr "+" @strikethrough.start "+" @strikethrough.end (#org-is-valid-markup-range? @strikethrough.start @strikethrough.end))
- ((expr "[" @hyperlink.start) (expr "]" @hyperlink.end) (#org-is-valid-hyperlink-range? @hyperlink.start @hyperlink.end))
- (expr "[" @hyperlink.start "]" @hyperlink.end (#org-is-valid-hyperlink-range? @hyperlink.start @hyperlink.end))
+ ((expr "[" @hyperlink.start . "[") (expr "]" . "]" @hyperlink.end) (#org-is-valid-hyperlink-range? @hyperlink.start @hyperlink.end))
+ (expr "[" @hyperlink.start . "[" _  "]" . "]" @hyperlink.end (#org-is-valid-hyperlink-range? @hyperlink.start @hyperlink.end))
  ((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))
  (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))
  ((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))