Add completion-nvim support. Closes nvim-orgmode#5.

davidatsurge · Jun 29, 2021 · b8c027b · b8c027b
1 parent 9c25432
commit b8c027b
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 12 deletions.
diff --git a/DOCS.md b/DOCS.md
@@ -407,6 +407,15 @@ If you use [nvim-compe](https://github.com/hrsh7th/nvim-compe) add this to compe
   })
 ```
 
+For [completion.nvim](https://github.com/nvim-lua/completion-nvim), add this to your completion nvim config:
+```lua
+vim.g.completion_chain_complete_list = {
+  org = {
+    { complete_items = {'orgmode'}},
+  },
+}
+```
+
 Note that autocompletion is context aware, which means that
 for example tags autocompletion will kick in only when cursor is at the end of headline.
 Example (`|` marks the cursor):

diff --git a/README.md b/README.md
@@ -51,12 +51,22 @@ If you use [nvim-compe](https://github.com/hrsh7th/nvim-compe) and want
 to enable autocompletion, add this to your compe config:
 
 ```lua
-  require'compe'.setup({
-    source = {
-      orgmode = true
-    }
-  })
+require'compe'.setup({
+  source = {
+    orgmode = true
+  }
+})
+```
+
+For [completion.nvim](https://github.com/nvim-lua/completion-nvim), add this to your completion nvim config:
+```lua
+vim.g.completion_chain_complete_list = {
+  org = {
+    { complete_items = {'orgmode'}},
+  },
+}
 ```
+
 Or just use `omnifunc` via <kbd>\<C-x\>\<C-o\></kbd>
 
 ### Gifs

diff --git a/doc/orgmode.txt b/doc/orgmode.txt
@@ -582,6 +582,15 @@ If you use nvim-compe (https://github.com/hrsh7th/nvim-compe) add this to compe
       })
 <
 
+For completion.nvim (https://github.com/nvim-lua/completion-nvim), add this to your completion nvim config:
+>
+    vim.g.completion_chain_complete_list = {
+      org = {
+        { complete_items = {'orgmode'}},
+      },
+    }
+<
+
 Note that autocompletion is context aware, which means that
 for example tags autocompletion will kick in only when cursor is at the end of headline.
 Example (`|` marks the cursor):

diff --git a/lua/orgmode/org/autocompletion.lua b/lua/orgmode/org/autocompletion.lua
@@ -87,13 +87,13 @@ function Autocompletion.omni(findstart, base)
   return results
 end
 
-local Source = {}
+local CompeSource = {}
 
-function Source.new()
-  return setmetatable({}, { __index = Source })
+function CompeSource.new()
+  return setmetatable({}, { __index = CompeSource })
 end
 
-function Source.get_metadata()
+function CompeSource.get_metadata()
   return {
     priority = 999,
     sort = false,
@@ -103,7 +103,7 @@ function Source.get_metadata()
   }
 end
 
-function Source.determine(_, context)
+function CompeSource.determine(_, context)
   local offset = Autocompletion.omni(1, '') + 1
   if offset > 0 then
     return {
@@ -113,7 +113,7 @@ function Source.determine(_, context)
   end
 end
 
-function Source.complete(_, context)
+function CompeSource.complete(_, context)
   local items = Autocompletion.omni(0, context.input)
   context.callback({
     items = items,
@@ -124,7 +124,22 @@ end
 
 local has_compe, compe = pcall(require, 'compe')
 if has_compe then
-  compe.register_source('orgmode', Source)
+  compe.register_source('orgmode', CompeSource)
+end
+
+local has_completion_nvim, completion_nvim = pcall(require, 'completion')
+if has_completion_nvim then
+  local CompletionNvim = {}
+  vim.cmd[[set iskeyword+=:,#,+]]
+  CompletionNvim.item = function(prefix)
+    local items = Autocompletion.omni(0, prefix)
+    for _, item in pairs(items) do
+      item.dup = 0
+    end
+
+    return items
+  end
+  completion_nvim.addCompletionSource('orgmode', CompletionNvim)
 end
 
 return Autocompletion