fix(esupports.hop): broken definitions and footnotes (#733)

nvim-neorg · Apr 27, 2023 · 94cf7d2 · 94cf7d2
1 parent 22ffa41
commit 94cf7d2
Showing 1 changed file with 35 additions and 41 deletions.
diff --git a/lua/neorg/modules/core/esupports/hop/module.lua b/lua/neorg/modules/core/esupports/hop/module.lua
@@ -472,34 +472,31 @@ module.public = {
 
                     [{ "definition", "footnote" }] = string.format(
                         [[
-                            [(single_%s
-                               [(strong_carryover_set
+                        (%s_list
+                            (strong_carryover_set
                                   (strong_carryover
                                     name: (tag_name) @tag_name
                                     (tag_parameters) @title
-                                    (#eq? @tag_name "name")))
-                                (weak_carryover_set
+                                    (#eq? @tag_name "name")))?
+                            .
+                            [(single_%s
+                               (weak_carryover_set
                                   (weak_carryover
                                     name: (tag_name) @tag_name
                                     (tag_parameters) @title
-                                    (#eq? @tag_name "name")))]?
+                                    (#eq? @tag_name "name")))?
                                (single_%s_prefix)
                                title: (paragraph_segment) @title)
                              (multi_%s
-                               [(strong_carryover_set
-                                  (strong_carryover
-                                   name: (tag_name) @tag_name
-                                   (tag_parameters) @title
-                                   (#eq? @tag_name "name")))
-                                (weak_carryover_set
+                               (weak_carryover_set
                                   (weak_carryover
                                     name: (tag_name) @tag_name
                                     (tag_parameters) @title
-                                    (#eq? @tag_name "name")))]?
+                                    (#eq? @tag_name "name")))?
                                 (multi_%s_prefix)
-                                  title: (paragraph_segment) @title)]
+                                  title: (paragraph_segment) @title)])
                         ]],
-                        neorg.lib.reparg(parsed_link_information.link_type, 4)
+                        neorg.lib.reparg(parsed_link_information.link_type, 5)
                     ),
                     _ = string.format(
                         [[
@@ -656,34 +653,31 @@ module.private = {
             ]],
             [{ "definition", "footnote" }] = string.format(
                 [[
-                [(single_%s
-                   [(strong_carryover_set
-                      (strong_carryover
-                        name: (tag_name) @tag_name
-                        (tag_parameters) @title
-                        (#eq? @tag_name "name")))
-                    (weak_carryover_set
-                      (weak_carryover
-                        name: (tag_name) @tag_name
-                        (tag_parameters) @title
-                        (#eq? @tag_name "name")))]?
-                   (single_%s_prefix)
-                   title: (paragraph_segment) @title)
-                 (multi_%s
-                   [(strong_carryover_set
-                      (strong_carryover
-                       name: (tag_name) @tag_name
-                       (tag_parameters) @title
-                       (#eq? @tag_name "name")))
-                    (weak_carryover_set
-                      (weak_carryover
-                        name: (tag_name) @tag_name
-                        (tag_parameters) @title
-                        (#eq? @tag_name "name")))]?
-                    (multi_%s_prefix)
-                      title: (paragraph_segment) @title)]
+                (%s_list
+                    (strong_carryover_set
+                          (strong_carryover
+                            name: (tag_name) @tag_name
+                            (tag_parameters) @title
+                            (#eq? @tag_name "name")))?
+                    .
+                    [(single_%s
+                       (weak_carryover_set
+                          (weak_carryover
+                            name: (tag_name) @tag_name
+                            (tag_parameters) @title
+                            (#eq? @tag_name "name")))?
+                       (single_%s_prefix)
+                       title: (paragraph_segment) @title)
+                     (multi_%s
+                       (weak_carryover_set
+                          (weak_carryover
+                            name: (tag_name) @tag_name
+                            (tag_parameters) @title
+                            (#eq? @tag_name "name")))?
+                        (multi_%s_prefix)
+                          title: (paragraph_segment) @title)])
             ]],
-                neorg.lib.reparg(parsed_link_information.link_type, 4)
+                neorg.lib.reparg(parsed_link_information.link_type, 5)
             ),
             _ = string.format(
                 [[