Fix filetags to use colon instead of comma. Closes #25.

Author: kristijanhusak

lua/orgmode/org/autocompletion.lua

@@ -13,7 +13,11 @@ local Autocompletion = {}
 
 local directives = { rgx = vim.regex([[^\#+\?\w*$]]), line_rgx = vim.regex([[^\#\?+\?\w*$]]), list = data.directives }
 local begin_blocks = { rgx = vim.regex([[\(^\s*\)\@<=\#+\?\w*$]]), line_rgx = vim.regex([[^\s*\#\?+\?\w*$]]), list = data.begin_blocks }
-local properties = { rgx = vim.regex([[\(^\s*\)\@<=:\w*$]]), list = data.properties }
+local properties = {
+  line_rgx = vim.regex([[\(^\s\+\|^\s*:\?$\)]]),
+  rgx = vim.regex([[\(^\|^\s\+\)\@<=:\w*$]]),
+  list = data.properties,
+}
 local links = {
   line_rgx = vim.regex([[\(\(^\|\s\+\)\[\[\)\@<=\(\*\|\#\)\?\(\w\+\)\?]]),
   rgx = vim.regex([[\(\*\|\#\)\?\(\w\+\)\?$]]),
@@ -28,6 +32,17 @@ local tags = {
     end, Files.get_tags())
   end,
 }
+
+local filetags = {
+  line_rgx = vim.regex([[^\#+FILETAGS:\s\+]]),
+  rgx = vim.regex([[:\([0-9A-Za-z_%@\#]*\)$]]),
+  fetcher = function()
+    return vim.tbl_map(function(tag)
+      return ':'..tag..':'
+    end, Files.get_tags())
+  end,
+}
+
 local todo_keywords = {
   rgx = vim.regex([[\(^\(\*\+\s\+\)\?\)\@<=\w*$]]),
   line_rgx = vim.regex([[^\*\+\s\+\w*$]]),
@@ -39,6 +54,7 @@ local todo_keywords = {
 local contexts = {
   directives,
   begin_blocks,
+  filetags,
   properties,
   links,
   metadata,

lua/orgmode/parser/root.lua

@@ -3,6 +3,7 @@ local Content = require('orgmode.parser.content')
 local Config = require('orgmode.config')
 local Types = require('orgmode.parser.types')
 local Range = require('orgmode.parser.range')
+local utils = require('orgmode.utils')
 
 ---@class Root
 ---@field lines string[]
@@ -129,8 +130,9 @@ end
 ---@return string
 function Root:process_root_content(content)
   if content:is_keyword() and content.keyword.name == 'FILETAGS' then
-    for _, tag in ipairs(vim.split(content.keyword.value, '%s*,%s*')) do
-      if tag:find('^[%w_%%@#]+$') and not vim.tbl_contains(self.tags, tag) then
+    local filetags = utils.parse_tags_string(content.keyword.value)
+    for _, tag in ipairs(filetags) do
+      if not vim.tbl_contains(self.tags, tag) then
         table.insert(self.tags, tag)
       end
     end

tests/plenary/org/autocompletion_spec.lua

@@ -183,6 +183,17 @@ describe('Autocompletion', function()
       { menu = "[Org]", word = ":PRIVATE:" },
     }, result)
 
+    mock_line(api, '#+FILETAGS: ')
+    result = Autocompletion.omni(0, '')
+    assert.are.same({}, result)
+
+    mock_line(api, '#+FILETAGS: :')
+    result = Autocompletion.omni(0, ':')
+    assert.are.same({
+      { menu = "[Org]", word = ":OFFICE:" },
+      { menu = "[Org]", word = ":PRIVATE:" },
+    }, result)
+
     -- TODO: Add hyperlinks test
 
     mock.revert(api)

tests/plenary/parser/content_parser_spec.lua

@@ -20,7 +20,7 @@ describe('Content parser', function()
 
   it('should parse keyword', function()
     local content = Content:new({
-      line = ' #+FILETAGS: Tag1, Tag2',
+      line = ' #+FILETAGS: :Tag1:Tag2:',
       lnum = 1,
       parent = { id = 0, level = 0 },
     })

tests/plenary/parser/parser_spec.lua

@@ -7,7 +7,7 @@ local config = require('orgmode.config')
 describe('Parser', function()
   it('should parse filetags headline', function()
     local lines = {
-      '#+FILETAGS: Tag1, Tag2',
+      '#+FILETAGS: :Tag1:Tag2:',
       '* TODO Something with a lot of tags :WORK:'
     }