Update plugins

Shatur · Oct 30, 2021 · 7e4df06 · 7e4df06
1 parent f74e6e6
commit 7e4df06
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 16 deletions.
diff --git a/pack/plugins/start/neogit b/pack/plugins/start/neogit
diff --git a/pack/plugins/start/neovim-cmake b/pack/plugins/start/neovim-cmake
diff --git a/pack/plugins/start/neovim-session-manager b/pack/plugins/start/neovim-session-manager
diff --git a/pack/plugins/start/nvim-cmp b/pack/plugins/start/nvim-cmp
diff --git a/pack/plugins/start/nvim-tree.lua b/pack/plugins/start/nvim-tree.lua
diff --git a/pack/plugins/start/nvim-treesitter b/pack/plugins/start/nvim-treesitter
diff --git a/pack/plugins/start/telescope.nvim b/pack/plugins/start/telescope.nvim
diff --git a/plugin/asyncrun.lua b/plugin/asyncrun.lua
@@ -9,6 +9,4 @@ end
 
 vim.api.nvim_set_keymap('', '<F3>', '<Cmd>call asyncrun#quickfix_toggle(10)<CR>', { noremap = true })
 vim.api.nvim_set_keymap('i', '<F3>', '<Esc><Cmd>call asyncrun#quickfix_toggle(10)<CR>', { noremap = true })
-vim.api.nvim_set_keymap('', '<C-BS>', '<Cmd>AsyncStop<CR>', { noremap = true })
-vim.api.nvim_set_keymap('i', '<C-BS>', '<Esc><Cmd>AsyncStop<CR>', { noremap = true })
 vim.api.nvim_set_keymap('', '<Leader>rcd', '<Cmd>execute "cd " . asyncrun#get_root("%")<CR>', { noremap = true })
diff --git a/plugin/cmake.lua b/plugin/cmake.lua
@@ -1,17 +1,22 @@
 local config = {
-  configure_arguments = '-D CMAKE_EXPORT_COMPILE_COMMANDS=1 -G Ninja',
+  configure_args = { '-D', 'CMAKE_EXPORT_COMPILE_COMMANDS=1', '-G', 'Ninja' },
   dap_open_command = require('dapui').open,
 }
 
 if vim.fn.has('unix') == 1 then
-  config.configure_arguments = config.configure_arguments .. ' -D CMAKE_CXX_FLAGS=-gdwarf-4'
+  table.insert(config.configure_args, '-D')
+  table.insert(config.configure_args, 'CMAKE_CXX_FLAGS=-gdwarf-4')
 else
-  config.configure_arguments = config.configure_arguments .. ' -D CMAKE_TOOLCHAIN_FILE=C:/ProgramData/vcpkg/scripts/buildsystems/vcpkg.cmake -D VCPKG_TARGET_TRIPLET=x64-windows'
-  config.asyncrun_options = { save = 2, program = 'vcvars64' }
+  table.insert(config.configure_args, '-D')
+  table.insert(config.configure_args, 'CMAKE_TOOLCHAIN_FILE=C:/ProgramData/vcpkg/scripts/buildsystems/vcpkg.cmake')
+  table.insert(config.configure_args, '-D')
+  table.insert(config.configure_args, 'VCPKG_TARGET_TRIPLET=x64-windows')
 end
 
 require('cmake').setup(config)
 
+vim.api.nvim_set_keymap('', '<C-BS>', '<Cmd>CMake cancel<CR>', { noremap = true })
+vim.api.nvim_set_keymap('i', '<C-BS>', '<Cmd>CMake cancel<CR>', { noremap = true })
 vim.api.nvim_set_keymap('', '<F5>', '<Cmd>CMake build_and_debug<CR>', { noremap = true })
 vim.api.nvim_set_keymap('i', '<F5>', '<Cmd>CMake build_and_debug<CR>', { noremap = true })
 vim.api.nvim_set_keymap('', '<S-F5>', '<Cmd>CMake set_target_arguments<CR>', { noremap = true })

diff --git a/plugin/lualine.lua b/plugin/lualine.lua
@@ -1,6 +1,7 @@
 local lualine = require('lualine')
 local colors = require('ayu.colors')
 local theme_utils = require('ayu.utils')
+local cmake_utils = require('cmake.utils')
 
 local config = {
   options = {
@@ -135,10 +136,10 @@ table.insert(config.sections.lualine_c, {
 -- Right sections
 table.insert(config.sections.lualine_x, {
   function()
-    if vim.g.asyncrun_status == 'running' then
-      return 'Running'
+    if not cmake_utils.last_job or cmake_utils.last_job.is_shutdown then
+      return ''
     end
-    return ''
+    return 'Running ' .. cmake_utils.last_job.command
   end,
   icon = '',
   color = { fg = colors.tag },
+5 −20		README.md
+3 −4		lua/cmake/config.lua
+43 −37		lua/cmake/init.lua
+55 −10		lua/cmake/utils.lua
+18 −0		README.md
+2 −0		lua/cmp/config/mapping.lua
+7 −0		lua/cmp/utils/api.lua
+6 −2		lua/cmp/utils/misc.lua
+14 −0		lua/cmp/utils/misc_spec.lua
+1 −0		ftdetect/fennel.vim
+15 −0		queries/rust/highlights.scm