neovim

commit b2f1f6d09c250e69db30cfe26cdf726b3be6758b
parent 171f7fa137a849ce56aa8bca00a06983f479b323
Author: Tomas Nemec <nemi@skaut.cz>
Date:   Tue,  3 May 2022 07:57:10 +0200

update

Diffstat:
M
after/plugin/luasnip.lua
 | 
5
+++++
M
after/plugin/treesitter.lua
 | 
36
++++++------------------------------
M
lua/tms/lsp/servers.lua
 | 
2
++
M
lua/tms/plugins.lua
 | 
3
+++

4 files changed, 16 insertions(+), 30 deletions(-)
diff --git a/after/plugin/luasnip.lua b/after/plugin/luasnip.lua
@@ -74,6 +74,11 @@ ls.add_snippets('dart', {
           {}
         }}
         ]], { i(1), i(2), i(3) })),
+  s('fori', fmt([[
+        for (var i = {}; i < {}; i++) {{
+          {}
+        }}
+        ]], { i(1), i(2), i(3) })),
 })
 
 -- Angular
diff --git a/after/plugin/treesitter.lua b/after/plugin/treesitter.lua
@@ -2,14 +2,6 @@ if not pcall(require, 'nvim-treesitter') then return end
 
 local parser_configs = require('nvim-treesitter.parsers').get_parser_configs()
 
-parser_configs.http = {
-  install_info = {
-    url = 'https://github.com/NTBBloodbath/tree-sitter-http',
-    files = { 'src/parser.c' },
-    branch = 'main',
-  },
-}
-
 parser_configs.norg = {
   install_info = {
     url = 'https://github.com/nvim-neorg/tree-sitter-norg',
@@ -35,7 +27,7 @@ parser_configs.norg_table = {
 }
 
 require'nvim-treesitter.configs'.setup {
-  ensure_intalled = 'maintained',
+  ensure_intalled = 'all',
   highlight = { enable = true --[[ , disable = {'scss'} --]]  },
 
   indent = { enable = true },
@@ -70,35 +62,19 @@ require'nvim-treesitter.configs'.setup {
       enable = true,
       goto_next_start = { [']]'] = '@function.outer', [']c'] = '@class.outer' },
       goto_next_end = { [']['] = '@function.inner', [']C'] = '@class.outer' },
-      goto_previous_start = {
-        ['[['] = '@function.outer',
-        ['[c'] = '@class.outer',
-      },
+      goto_previous_start = { ['[['] = '@function.outer', ['[c'] = '@class.outer' },
       goto_previous_end = { ['[]'] = '@function.inner', ['[C'] = '@class.outer' },
     },
     lsp_interop = {
       enable = true,
       border = 'single',
-      peek_definition_code = {
-        ['<leader>sf'] = '@function.outer',
-        ['<leader>sc'] = '@class.outer',
-      },
+      peek_definition_code = { ['<leader>sf'] = '@function.outer', ['<leader>sc'] = '@class.outer' },
     },
   },
 
-  playground = {
-    enable = true,
-    disable = {},
-    updatetime = 25,
-    persist_queries = false,
-  },
-  context_commentstring = {
-    enable = true,
-    enable_autocmd = false,
-    config = { scss = '// %s' },
-  },
+  playground = { enable = true, disable = {}, updatetime = 25, persist_queries = false },
+  context_commentstring = { enable = true, enable_autocmd = false, config = { scss = '// %s' } },
 }
 
-vim.api
-  .nvim_create_user_command('TSHRefresh', 'write|TSBufEnable highlight', {})
+vim.api.nvim_create_user_command('TSHRefresh', 'write|TSBufEnable highlight', {})
 vim.keymap.set('n', '<leader>su', '<cmd>TSHRefresh<cr>')
diff --git a/lua/tms/lsp/servers.lua b/lua/tms/lsp/servers.lua
@@ -21,6 +21,8 @@ M.installed = {
   'vimls',
   'yamlls',
   'zls',
+  'dartls',
+  'gdscript',
 }
 
 M.no_format = { sumneko_lua = true }
diff --git a/lua/tms/plugins.lua b/lua/tms/plugins.lua
@@ -5,6 +5,7 @@ return packer.startup({
     local use = packer.use
 
     packer.use_rocks('luautf8')
+    -- packer.use_rocks('lyaml')
 
     use { 'wbthomason/packer.nvim', opt = true }
 
@@ -67,6 +68,7 @@ return packer.startup({
     use { 'ipod825/igit.nvim', requires = { 'nvim-lua/plenary.nvim', 'ipod825/libp.nvim' } }
     use 'rhysd/git-messenger.vim'
     use 'ThePrimeagen/git-worktree.nvim'
+    use 'rhysd/conflict-marker.vim'
 
     -- http
     use { 'NTBBloodbath/rest.nvim', requires = { 'nvim-lua/plenary.nvim' } }
@@ -79,6 +81,7 @@ return packer.startup({
     use 'windwp/nvim-ts-autotag'
     use 'baskerville/vim-sxhkdrc'
     use 'dart-lang/dart-vim-plugin'
+    -- use 'akinsho/pubspec-assist.nvim'
     -- snippets
     use 'L3MON4D3/luaSnip'