[nvim] improve C++ bindings for cmake/docker tasks

2 files changed, 43 insertions, 14 deletions

diff --git a/neovim/.config/nvim/ftplugin/cpp.lua b/neovim/.config/nvim/ftplugin/cpp.lua
index f6e21f2..962b604 100644
--- a/neovim/.config/nvim/ftplugin/cpp.lua
+++ b/neovim/.config/nvim/ftplugin/cpp.lua
@@ -1,5 +1,5 @@
 --- Personal lua config files for NeoVim.
---  Last Changed: 2019-01-27
+--  Last Changed: 2023-02-08
 --  Author: Federico Igne <git@federicoigne.com>
 --  License: This file is placed in the public domain.
 
@@ -8,25 +8,32 @@ local cmake = require 'tasks.module.cmake'
 local cmd   = vim.cmd
 local map   = require 'dyamon.util.map'
 
-
 vim.b.ctags_command="ctags -R --c++-kinds=+p --fields=+iaS --extra=+qf --exclude=build ."
 
+vim.b['surround_'..string.byte('h')] = "#ifndef \1#define: \r.*\r\\U&\\E_H\1\n#define \1\r.*\r\\U&\\E_H\1\n\n\r\n\n#endif //\1\r.*\r\\U&\\E_H\1"
 --- Tasks
 
 map.b.nore.n(0, '<leader>cb', '<cmd>Task start cmake build<cr>')
 map.b.nore.n(0, '<leader>cc', '<cmd>Task start cmake configure<cr>')
-map.b.nore.n(0, '<leader>cd', '<cmd>Task start cmake debug<cr>')
+map.b.nore.n(0, '<leader>cg', '<cmd>Task start cmake debug<cr>')
+map.b.nore.n(0, '<leader>cdu', '<cmd>Task start docker up<cr>')
+map.b.nore.n(0, '<leader>cdd', '<cmd>Task start docker down<cr>')
 map.b.nore.n(0, '<leader>cr', '<cmd>Task start cmake run<cr>')
 map.b.nore.n(0, '<leader>ct', '<cmd>Task set_module_param cmake target<cr>')
 
 function compose(first, second, idx)
     if (type(first) == "table") then
-        local idx = idx or #first
-        local task = first[idx]
-        first[idx] = function(module_config, _)
+        -- NOTE we need a copy, first is passed by reference!
+        local res = {}
+        for _,t in ipairs(first) do
+            table.insert(res,t)
+        end
+        local idx = idx or #res
+        local task = res[idx]
+        res[idx] = function(module_config, _)
             return second(task(module_config))
         end
-        return first
+        return res
     else
         return function(module_config, _)
             return second(first(module_config))
@@ -34,20 +41,39 @@ function compose(first, second, idx)
     end
 end
 
-local function lsp_restart(t)
+local function add_conan_options(t)
+    -- NOTE slow operation since it reads JSON from file
+    local build_type = require'tasks.project_config'.new().cmake.build_type
+    local args = {
+        "-D", "CONAN_OPTIONS=--build missing --settings build_type=" .. build_type ,
+        table.unpack(t.args)
+    }
+    t.args = args
+    return t
+end
+
+local function close_qf(t)
     local old_after_success = t.after_success
     function t.after_success()
         old_after_success()
         cmd.cclose()
+    end
+    return t
+end
+
+local function lsp_restart(t)
+    local old_after_success = t.after_success
+    function t.after_success()
+        old_after_success()
         cmd.LspRestart()
     end
     return t
 end
-cmake.tasks.configure = compose(cmake.tasks.configure, lsp_restart)
 
 local function invoke_gdb(t)
     local function after_success()
         cmd.cclose()
+        cmd.only()
         cmd.packadd("termdebug")
         cmd.Termdebug(t.cmd)
     end
@@ -56,4 +82,7 @@ local function invoke_gdb(t)
         after_success = after_success
     }
 end
+
+cmake.tasks.configure = compose(compose(compose(cmake.tasks.configure, add_conan_options), close_qf), lsp_restart)
+cmake.tasks.build = compose(cmake.tasks.build, close_qf)
 cmake.tasks.debug = compose(cmake.tasks.run, invoke_gdb)
diff --git a/neovim/.config/nvim/plugin/mappings.lua b/neovim/.config/nvim/plugin/mappings.lua
index 94958c7..ceaa408 100644
--- a/neovim/.config/nvim/plugin/mappings.lua
+++ b/neovim/.config/nvim/plugin/mappings.lua
@@ -11,12 +11,12 @@ vim.g.mapleader = ' '
 map.nore.n('<leader>bd', '<cmd>Bdelete<cr>')
 
 -- Compilation
-map.nore.n('<leader>cs', '^v$h:<c-u>SlimeSend1 <c-r>*<cr>')
-map.n('<leader>cS', '<Plug>SlimeParagraphSend')
-map.x('<leader>cs', '<Plug>SlimeRegionSend')
-map.n('<leader>ct', '<cmd>TagsGenerate<cr>')
+-- map.nore.n('<leader>cs', '^v$h"sy:SlimeSend1 <c-r>s<cr>')
+-- map.n('<leader>cS', '<Plug>SlimeParagraphSend')
+-- map.x('<leader>cs', '<Plug>SlimeRegionSend')
+-- map.n('<leader>ct', '<cmd>TagsGenerate<cr>')
 
--- Files
+-- Navigation
 map.nore.n('-', ':NnnPicker %:p:h<cr>')
 map.nore.n('<leader>n', '<cmd>NnnPicker<cr>')
 --map.nore.n('<leader>f', ':find<space>')