Add support for nvim-cmp completion.

Author: kristijanhusak

DOCS.md

@@ -616,6 +616,15 @@ If you use [nvim-compe](https://github.com/hrsh7th/nvim-compe) add this to compe
   })
 ```
 
+For [nvim-cmp](https://github.com/hrsh7th/nvim-cmp), add `orgmode` to list of sources:
+```lua
+require'cmp'.setup({
+  sources = {
+    { name = 'orgmode' }
+  }
+})
+```
+
 For [completion.nvim](https://github.com/nvim-lua/completion-nvim), just add `omni` mode to chain complete list and add additional keyword chars:
 ```lua
 vim.g.completion_chain_complete_list = {

README.md

@@ -86,6 +86,15 @@ require'compe'.setup({
 })
 ```
 
+For [nvim-cmp](https://github.com/hrsh7th/nvim-cmp), add `orgmode` to list of sources:
+```lua
+require'cmp'.setup({
+  sources = {
+    { name = 'orgmode' }
+  }
+})
+```
+
 For [completion.nvim](https://github.com/nvim-lua/completion-nvim), just add `omni` mode to chain complete list and add additional keyword chars:
 ```lua
 vim.g.completion_chain_complete_list = {

doc/orgmode.txt

@@ -838,6 +838,15 @@ If you use nvim-compe (https://github.com/hrsh7th/nvim-compe) add this to compe
       })
 <
 
+For nvim-cmp (https://github.com/hrsh7th/nvim-cmp), add `orgmode` to list of sources:
+>
+    require'cmp'.setup({
+      sources = {
+        { name = 'orgmode' }
+      }
+    })
+<
+
 For completion.nvim (https://github.com/nvim-lua/completion-nvim), just add `omni` mode to chain complete list and add additional keyword chars:
 >
     vim.g.completion_chain_complete_list = {

ftplugin/org.vim

@@ -1,6 +1,6 @@
 lua require('orgmode.config'):setup_mappings('org')
 function OrgmodeOmni(findstart, base)
-  return luaeval('require("orgmode.org.autocompletion").omni(_A[1], _A[2])', [a:findstart, a:base])
+  return luaeval('require("orgmode.org.autocompletion.omni")(_A[1], _A[2])', [a:findstart, a:base])
 endfunction
 
 setlocal omnifunc=OrgmodeOmni

lua/orgmode/init.lua

@@ -3,7 +3,7 @@ local instance = nil
 
 ---@class Org
 ---@field initialized boolean
----@field files OrgFiles
+---@field files Files
 ---@field agenda Agenda
 ---@field capture Capture
 ---@field notifications Notifications
@@ -28,7 +28,7 @@ function Org:init()
     capture = self.capture,
     agenda = self.agenda,
   })
-  require('orgmode.org.autocompletion') -- Needed for registering compe source
+  require('orgmode.org.autocompletion').register()
   self.initialized = true
 end
 

lua/orgmode/org/autocompletion/cmp.lua

@@ -0,0 +1,45 @@
+local has_cmp, cmp = pcall(require, 'cmp')
+if not has_cmp then
+  return
+end
+
+local OrgmodeOmniCompletion = require('orgmode.org.autocompletion.omni')
+
+local Source = {}
+
+Source.new = function()
+  local self = setmetatable({}, { __index = Source })
+  return self
+end
+
+Source.get_debug_name = function()
+  return 'orgmode'
+end
+
+function Source:is_available()
+  return true
+end
+
+function Source:get_trigger_characters(_)
+  return { '#', '+', ':', '*' }
+end
+
+function Source:complete(params, callback)
+  local offset = OrgmodeOmniCompletion(1, '') + 1
+  local input = string.sub(params.context.cursor_before_line, offset)
+  print(vim.inspect(input))
+  local results = OrgmodeOmniCompletion(0, input)
+  local items = {}
+  for _, item in ipairs(results) do
+    table.insert(items, {
+      label = item.word,
+    })
+  end
+
+  callback({
+    items = items,
+    isIncomplete = true,
+  })
+end
+
+cmp.register_source('orgmode', Source.new())

lua/orgmode/org/autocompletion/compe.lua

@@ -0,0 +1,42 @@
+local has_compe, compe = pcall(require, 'compe')
+if not has_compe then
+  return
+end
+
+local OrgmodeOmniCompletion = require('orgmode.org.autocompletion.omni')
+
+local CompeSource = {}
+
+function CompeSource.new()
+  return setmetatable({}, { __index = CompeSource })
+end
+
+function CompeSource.get_metadata()
+  return {
+    priority = 999,
+    sort = false,
+    dup = 0,
+    filetypes = { 'org' },
+    menu = '[Org]',
+  }
+end
+
+function CompeSource.determine(_, context)
+  local offset = OrgmodeOmniCompletion(1, '') + 1
+  if offset > 0 then
+    return {
+      keyword_pattern_offset = offset,
+      trigger_character_offset = vim.tbl_contains({ '#', '+', ':', '*' }, context.before_char) and context.col or 0,
+    }
+  end
+end
+
+function CompeSource.complete(_, context)
+  local items = OrgmodeOmniCompletion(0, context.input)
+  context.callback({
+    items = items,
+    incomplete = true,
+  })
+end
+
+compe.register_source('orgmode', CompeSource)

lua/orgmode/org/autocompletion/init.lua

@@ -0,0 +1,8 @@
+local function register()
+  require('orgmode.org.autocompletion.compe')
+  require('orgmode.org.autocompletion.cmp')
+end
+
+return {
+  register = register,
+}

lua/orgmode/org/autocompletion.lua renamed to lua/orgmode/org/autocompletion/omni.lua

@@ -9,8 +9,6 @@ local data = {
   metadata = { 'DEADLINE:', 'SCHEDULED:', 'CLOSED:' },
 }
 
-local Autocompletion = {}
-
 local directives = { rgx = vim.regex([[^\#+\?\w*$]]), line_rgx = vim.regex([[^\#\?+\?\w*$]]), list = data.directives }
 local begin_blocks = {
   rgx = vim.regex([[\(^\s*\)\@<=\#+\?\w*$]]),
@@ -70,7 +68,7 @@ local headline_contexts = {
   todo_keywords,
 }
 
-function Autocompletion.omni(findstart, base)
+local function omni(findstart, base)
   local line = vim.api.nvim_get_current_line():sub(1, vim.api.nvim_call_function('col', { '.' }) - 1)
   local is_headline = line:match('^%*+%s+')
   local ctx = is_headline and headline_contexts or contexts
@@ -107,43 +105,4 @@ function Autocompletion.omni(findstart, base)
   return results
 end
 
-local CompeSource = {}
-
-function CompeSource.new()
-  return setmetatable({}, { __index = CompeSource })
-end
-
-function CompeSource.get_metadata()
-  return {
-    priority = 999,
-    sort = false,
-    dup = 0,
-    filetypes = { 'org' },
-    menu = '[Org]',
-  }
-end
-
-function CompeSource.determine(_, context)
-  local offset = Autocompletion.omni(1, '') + 1
-  if offset > 0 then
-    return {
-      keyword_pattern_offset = offset,
-      trigger_character_offset = vim.tbl_contains({ '#', '+', ':', '*' }, context.before_char) and context.col or 0,
-    }
-  end
-end
-
-function CompeSource.complete(_, context)
-  local items = Autocompletion.omni(0, context.input)
-  context.callback({
-    items = items,
-    incomplete = true,
-  })
-end
-
-local has_compe, compe = pcall(require, 'compe')
-if has_compe then
-  compe.register_source('orgmode', CompeSource)
-end
-
-return Autocompletion
+return omni