From 3ae78f376c2e721ce4feb23e9a5e8bc6062a2657 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 14 Mar 2024 18:46:10 +0800
Subject: [PATCH] fix(vimdoc): adapt to breaking Neovim change

Problem:
https://github.com/neovim/neovim/commit/cb46f6e467268edf917cc3617b4c024a66b256de#diff-edf997b0c2d42d31828800641ac1f5a46487fe24a0d46ccf70bcd58a14f3868f
introduced a regression on how `#set!` behaves with several matches in a
single pattern, breaking conceals in, e.g., taglinks.

Solution: Separate taglink etc. patterns into concealed marker and
contents. Also add URL support for concealed markdown links.
---
 queries/markdown_inline/highlights.scm |  5 +++++
 queries/vimdoc/highlights.scm          | 12 +++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/queries/markdown_inline/highlights.scm b/queries/markdown_inline/highlights.scm
index cae8acfb4..e38ef3d7b 100644
--- a/queries/markdown_inline/highlights.scm
+++ b/queries/markdown_inline/highlights.scm
@@ -33,6 +33,11 @@
   ] @markup.link
   (#set! conceal ""))
 
+(inline_link
+  (link_text) @markup.link.label
+  (link_destination) @markup.link
+  (#set! @markup.link.label "url" @markup.link))
+
 ; Conceal image links
 (image
   [
diff --git a/queries/vimdoc/highlights.scm b/queries/vimdoc/highlights.scm
index a1c14f02e..70a3a2f20 100644
--- a/queries/vimdoc/highlights.scm
+++ b/queries/vimdoc/highlights.scm
@@ -12,12 +12,16 @@
 
 (tag
   "*" @label
-  (#set! conceal "")
+  (#set! conceal ""))
+
+(tag
   text: (_) @label)
 
 (taglink
   "|" @markup.link
-  (#set! conceal "")
+  (#set! conceal ""))
+
+(taglink
   text: (_) @markup.link)
 
 (optionlink
@@ -25,7 +29,9 @@
 
 (codespan
   "`" @markup.raw
-  (#set! conceal "")
+  (#set! conceal ""))
+
+(codespan
   text: (_) @markup.raw)
 
 ((codeblock) @markup.raw.block