Allows links in viewport names

Author: nkakouros

taskwiki/main.py

@@ -299,6 +299,14 @@ def task_info_or_vimwiki_follow_link():
             ']]' in line,
             column >= line.find('[['),
             column <= line.find(']]') + 1
+        ]) or all([
+            '[' in line,
+            '](' in line,
+            ')' in line,
+            line.find('[') < line.find(']('),
+            line.find('](') < line.find(')'),
+            column >= line.find('['),
+            column <= line.find(')') + 1
         ])
 
         if inside_vimwiki_link:

taskwiki/regexp.py

@@ -46,8 +46,12 @@
     re.compile(
         r'^'                             # Starts at the begging of the line
         r'(?P<header_start>[=]+)'        # Heading begging
-        r'(?P<name>[^=\|\[\{]*)'         # Name of the viewport, all before the | sign
-                                         # Cannot include '[', '=', '|', and '{'
+
+        r'(?P<name>([^=\|\[\{]*)|(\s*\{\{.*}}\s*)|(.*\[\[.*]].*))'
+                                         # Name of the viewport, either with
+                                         # a vimwiki link or without
+                                         # Cannot include '='
+
         r'\|'                            # Bar
         r'(?!\|)'                        # (But not two, that would be a preset)
         r'(?P<filter>[^=\|]*?)'          # Filter
@@ -68,8 +72,8 @@
     re.compile(
         r'^'                             # Starts at the begging of the line
         r'(?P<header_start>[#]+)'        # Heading begging
-        r'(?P<name>[^#\|\[\{]*)'         # Name of the viewport, all before the | sign
-                                         # Cannot include '[', '#', '|', and '{'
+        r'(?P<name>[^#\|]*)'             # Name of the viewport, all before the | sign
+                                         # Cannot include '#'
         r'\|'                            # Bar
         r'(?!\|)'                        # (But not two, that would be a preset)
         r'(?P<filter>[^#\|]*?)'          # Filter

tests/conftest.py

@@ -37,7 +37,7 @@ def header_expand(string):
         inclusive.
         """
         for header_level, format_header in format_header_dict.items():
-            regex = header_level + r'\((.*?)\)'
+            regex = header_level + r'\((.*)\)'
             string = re.sub(regex,
                             lambda match: format_header % match.group(1),
                             string)

tests/test_viewport_parsing.py

@@ -159,3 +159,75 @@ def test_override_default_virtual_tags_positive_without_forcing(self, test_synta
         assert port.defaults == {'project':'Home'}
         assert port.sort == DEFAULT_SORT_ORDER
         assert port.tw == 'default'
+
+    def test_vimwiki_link_as_header_name_simple(self, test_syntax):
+        if test_syntax[0] == 'default':
+            example_viewport = "HEADER2([[Test|https://www.vim.org]] | project:Home)"
+        elif test_syntax[0] == 'markdown':
+            example_viewport = "HEADER2([Test](https://www.vim.org) | project:Home)"
+
+        port = self.process_viewport(example_viewport, test_syntax)
+
+        assert port.taskfilter == list(DEFAULT_VIEWPORT_VIRTUAL_TAGS) + ["(", "project:Home", ")"]
+
+        if test_syntax[0] == 'default':
+            assert port.name == "[[Test|https://www.vim.org]]"
+        elif test_syntax[0] == 'markdown':
+            assert port.name == "[Test](https://www.vim.org)"
+
+        assert port.defaults == {'project':'Home'}
+        assert port.sort == DEFAULT_SORT_ORDER
+        assert port.tw == 'default'
+
+    def test_vimwiki_link_as_header_name_with_defaults(self, test_syntax):
+        if test_syntax[0] == 'default':
+            example_viewport = "HEADER2([[Test|https://www.vim.org]] | project:Home)"
+        elif test_syntax[0] == 'markdown':
+            example_viewport = "HEADER2([Test](https://www.vim.org) | project:Home)"
+
+        port = self.process_viewport(example_viewport, test_syntax)
+
+        assert port.taskfilter == list(DEFAULT_VIEWPORT_VIRTUAL_TAGS) + ["(", "project:Home", ")"]
+        if test_syntax[0] == 'default':
+            assert port.name == "[[Test|https://www.vim.org]]"
+        elif test_syntax[0] == 'markdown':
+            assert port.name == "[Test](https://www.vim.org)"
+        assert port.defaults == {'project':'Home'}
+        assert port.sort == DEFAULT_SORT_ORDER
+        assert port.tw == 'default'
+
+    def test_vimwiki_link_in_header_name_simple(self, test_syntax):
+        if test_syntax[0] == 'default':
+            example_viewport = "HEADER2(Link to [[this|https://www.vim.org]] | project:Home)"
+        elif test_syntax[0] == 'markdown':
+            example_viewport = "HEADER2(Link to [this](https://www.vim.org) | project:Home)"
+
+        port = self.process_viewport(example_viewport, test_syntax)
+
+        assert port.taskfilter == list(DEFAULT_VIEWPORT_VIRTUAL_TAGS) + ["(", "project:Home", ")"]
+
+        if test_syntax[0] == 'default':
+            assert port.name == "Link to [[this|https://www.vim.org]]"
+        elif test_syntax[0] == 'markdown':
+            assert port.name == "Link to [this](https://www.vim.org)"
+
+        assert port.defaults == {'project':'Home'}
+        assert port.sort == DEFAULT_SORT_ORDER
+        assert port.tw == 'default'
+
+    def test_vimwiki_link_in_header_name_with_defaults(self, test_syntax):
+        if test_syntax[0] == 'default':
+            example_viewport = "HEADER2(Link to [[this|https://www.vim.org]] | project:Home)"
+        elif test_syntax[0] == 'markdown':
+            example_viewport = "HEADER2(Link to [this](https://www.vim.org) | project:Home)"
+
+        port = self.process_viewport(example_viewport, test_syntax)
+
+        assert port.taskfilter == list(DEFAULT_VIEWPORT_VIRTUAL_TAGS) + ["(", "project:Home", ")"]
+        if test_syntax[0] == 'default':
+            assert port.name == "Link to [[this|https://www.vim.org]]"
+        elif test_syntax[0] == 'markdown':
+            assert port.name == "Link to [this](https://www.vim.org)"
+        assert port.defaults == {'project':'Home'}
+        assert port.sort == DEFAULT_SORT_ORDER
+        assert port.tw == 'default'