neovim

commit 178691c13c99776c41798bbc477a0defc9a8464d
parent 33761b0b5bc67964cf4e165115298fe16aa21158
Author: Tomas Nemec <nemi@skaut.cz>
Date:   Mon,  6 Mar 2023 14:56:11 +0100

update

Diffstat:
M
after/plugin/cmp.lua
 | 
9
+++++----
A
after/plugin/dart-tools.lua
 | 
5
+++++
M
lua/plugins.lua
 | 
4
++--
M
plugin/trun.lua
 | 
7
+++++--

4 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/after/plugin/cmp.lua b/after/plugin/cmp.lua
@@ -55,7 +55,8 @@ local function doOrOpen(fn, t)
 end
 
 cmp.setup({
-  window = { --
+  window = {
+    --
     completion = cmp.config.window.bordered(),
     documentation = cmp.config.window.bordered(),
   },
@@ -86,7 +87,7 @@ cmp.setup({
     ['<c-y>'] = cmp.mapping.confirm({ select = true }),
     ['<c-f>'] = cmp.mapping(cmp.mapping.scroll_docs(4), { 'i', 'c' }),
     ['<c-d>'] = cmp.mapping(cmp.mapping.scroll_docs(-4), { 'i', 'c' }),
-    ['<c-space>'] = cmp.mapping { i = doOrOpen(cmp.confirm, { select = true }) },
+    -- ['<c-space>'] = cmp.mapping { i = doOrOpen(cmp.confirm, { select = true }) },
     ['<c-p>'] = cmp.mapping({ i = doOrOpen(cmp.select_prev_item, { behavior = cmp.SelectBehavior.Select }) }),
     ['<c-n>'] = cmp.mapping({ i = doOrOpen(cmp.select_next_item, { behavior = cmp.SelectBehavior.Select }) }),
   },
@@ -127,7 +128,7 @@ cmp.setup.cmdline('/', {
   mapping = {
     ['<c-e>'] = { c = cmp.mapping.close() },
     ['<c-y>'] = { c = cmp.mapping.confirm({ select = true }) },
-    ['<c-space>'] = cmp.mapping { c = doOrOpen(cmp.confirm, { select = true }) },
+    -- ['<c-space>'] = cmp.mapping { c = doOrOpen(cmp.confirm, { select = true }) },
     ['<c-p>'] = cmp.mapping({ c = doOrOpen(cmp.select_prev_item, { behavior = cmp.SelectBehavior.Select }) }),
     ['<c-n>'] = cmp.mapping({ c = doOrOpen(cmp.select_next_item, { behavior = cmp.SelectBehavior.Select }) }),
   },
@@ -138,7 +139,7 @@ cmp.setup.cmdline(':', {
   mapping = {
     ['<c-e>'] = { c = cmp.mapping.close() },
     ['<c-y>'] = { c = cmp.mapping.confirm({ select = true }) },
-    ['<c-space>'] = cmp.mapping { c = doOrOpen(cmp.confirm, { select = true }) },
+    -- ['<c-space>'] = cmp.mapping { c = doOrOpen(cmp.confirm, { select = true }) },
     ['<c-p>'] = cmp.mapping({ c = doOrOpen(cmp.select_prev_item, { behavior = cmp.SelectBehavior.Select }) }),
     ['<c-n>'] = cmp.mapping({ c = doOrOpen(cmp.select_next_item, { behavior = cmp.SelectBehavior.Select }) }),
   },
diff --git a/after/plugin/dart-tools.lua b/after/plugin/dart-tools.lua
@@ -0,0 +1,5 @@
+if not pcall(require, 'dart-tools') then
+  return
+end
+
+require('dart-tools').setup {}
diff --git a/lua/plugins.lua b/lua/plugins.lua
@@ -47,7 +47,6 @@ return packer.startup({
     use 'elihunter173/dirbuf.nvim'
     use 'norcalli/nvim-terminal.lua'
     use 'j-hui/fidget.nvim'
-    use 'junegunn/vim-peekaboo'
     use 'lervag/vimtex'
 
     -- lua
@@ -158,7 +157,8 @@ return packer.startup({
 
     -- personal
     use 'GenesisTMS/trans.nvim'
-    use 'git@gitlab.com:gtms/dart-tools.nvim'
+    -- use 'git@gitlab.com:gtms/dart-tools.nvim'
+    use '/home/tms/dev/nvim/plugins/dart-tools.nvim'
     use 'git@gitlab.com:gtms/difftastic.nvim'
 
     -- database
diff --git a/plugin/trun.lua b/plugin/trun.lua
@@ -67,9 +67,12 @@ local function trun_to_qf_list(name)
       end
       -- translate
       if package_name and packages_paths then
-        local package_root = packages_paths[package_name].root
+        -- local package_root = packages_paths[package_name].root
+        line = string.gsub(line, 'org%-dartlang%-app:.+', '')
         line = string.gsub(line, '^packages/(.-)/(.-:%d+:%d+:)', function(package, path)
-          return package_root .. '/' .. '.dart_tool/build/generated/' .. package .. '/lib/' .. path
+          -- return package_root .. '/' .. '.dart_tool/build/generated/' .. package .. '/lib/' .. path
+          local root = packages_paths[package].lib
+          return root .. '/' .. path
         end)
         line = string.gsub(line, 'asset:(.-)/(.-):', function(package, path)
           local root = packages_paths[package].root