From bf6deaf1ed9a556863d3a3ae081c7ad82d379027 Mon Sep 17 00:00:00 2001
From: "Kenneth Benzie (Benie)" <benie@infektor.net>
Date: Fri, 29 Jan 2021 14:02:51 +0000
Subject: [PATCH] Configure cmake-language-server and coc-cmake

Utilises the following Python package:

```console
$ pip3 install --user cmake-language-server
```
---
 after/ftplugin/cmake.vim | 3 ---
 autoload/build.vim       | 1 +
 coc-settings.json        | 1 +
 vimrc                    | 2 --
 4 files changed, 2 insertions(+), 5 deletions(-)
 create mode 100644 coc-settings.json

diff --git a/after/ftplugin/cmake.vim b/after/ftplugin/cmake.vim
index 659956f..a040c0c 100644
--- a/after/ftplugin/cmake.vim
+++ b/after/ftplugin/cmake.vim
@@ -1,6 +1,3 @@
-" Add omnifunc completion plugin.
-packadd vim-cmake-completion
-
 " Enable syntax folding, see .vim/after/syntax/cmake.vim
 setlocal foldmethod=syntax
 " Set comment string
diff --git a/autoload/build.vim b/autoload/build.vim
index afb97ee..b449caf 100644
--- a/autoload/build.vim
+++ b/autoload/build.vim
@@ -40,6 +40,7 @@ function! build#dir(...) abort
     " TODO: Check .vim/coc-settings.json exists, create it if not
     let l:coc_settings = json_decode(join(readfile('.vim/coc-settings.json'), ''))
     let l:coc_settings['clangd.compilationDatabasePath'] = $BUILD_DIR
+    let l:coc_settings['cmake.lsp.buildDirectory'] = $BUILD_DIR
     call writefile([json_encode(l:coc_settings)], '.vim/coc-settings.json')
     CocRestart
   endif
diff --git a/coc-settings.json b/coc-settings.json
new file mode 100644
index 0000000..5e15e99
--- /dev/null
+++ b/coc-settings.json
@@ -0,0 +1 @@
+{"cmake.lsp.enable": true}
diff --git a/vimrc b/vimrc
index 3ae6933..2182fe0 100644
--- a/vimrc
+++ b/vimrc
@@ -40,8 +40,6 @@ Pack 'neoclide/coc.nvim', {'branch': 'release'}
 " ultisnips - snippet engine
 Pack 'SirVer/ultisnips'
 Pack 'honza/vim-snippets'
-" vim-cmake-completion - completion & help
-Pack 'kbenzie/vim-cmake-completion', {'type': 'opt'}
 " vimomni - Completion for vimscript
 Pack 'vim-scripts/vimomni', {'type': 'opt'}