commit 534bbbcb5ad903d87526380a835527e1681ae007
parent a598a2ec975c34421025abb96c2b75d513b7d248
Author: Tomas Nemec <nemi@skaut.cz>
Date: Mon, 29 Nov 2021 17:42:58 +0100
update
Diffstat:
7 files changed, 24 insertions(+), 44 deletions(-)
diff --git a/ftplugin/dart.lua b/ftplugin/dart.lua
@@ -1,7 +1,7 @@
vim.g.dart_style_guide = 2
vim.g.dart_html_in_string = true
-vim.cmd [[command! -buffer DartAnalyzer lua require('tms.ft.dart.analyze').qf2131()]]
+-- vim.cmd [[command! -buffer DartAnalyzer lua require('tms.ft.dart.analyze').qf2131()]]
vim.cmd [[command! -buffer DartDebug lua require('tms.ft.dart.debug').func()]]
vim.cmd [[command! -buffer DartPrint lua require('tms.ft.dart.debug').print()]]
vim.cmd [[command! -buffer DartOrganizeImports lua require('tms.ft.dart.lsp').organize_imports()]]
@@ -9,6 +9,7 @@ vim.cmd [[command! -buffer DartFixAll lua require('tms.ft.dart.lsp').fix_all()]]
vim.cmd [[command! -buffer DartExtract lua require('tms.ft.dart.lsp').extract()]]
vim.keymap.nnoremap {'<leader>pp', [[<cmd>DartPrint<cr>]], ['buffer'] = true}
+vim.keymap.nnoremap {'<leader>pa', [[<cmd>lua require('tms.ft.dart.analyze').qf2131()<cr>]], ['buffer'] = true}
vim.keymap.nnoremap {'<leader>po', [[<cmd>DartOrganizeImports<cr>]], ['buffer'] = true}
vim.keymap.nnoremap {'<leader>pf', [[<cmd>DartFixAll<cr>]], ['buffer'] = true}
diff --git a/lua/tms/ft/dart/analyze.lua b/lua/tms/ft/dart/analyze.lua
@@ -11,16 +11,14 @@ M.qf = function(make_entry)
if data then
local line = string.gsub(data, '\n', '')
local parsed = make_entry(line)
- if parsed then
- table.insert(list, parsed)
- end
+ if parsed then table.insert(list, parsed) end
end
end
local stdout = loop.new_pipe(false)
local handle
- handle = loop.spawn('dart', {args = {'analyze'}, stdio = {nil, stdout, nil}},
- vim.schedule_wrap(function()
+ print('Analyzing...')
+ handle = loop.spawn('dart', {args = {'analyze'}, stdio = {nil, stdout, nil}}, vim.schedule_wrap(function()
stdout:read_stop()
stdout:close()
handle:close()
@@ -29,7 +27,7 @@ M.qf = function(make_entry)
if #list > 0 then
vim.cmd [[copen]]
else
- print('Analyzer finished...')
+ print('Analyzer finished.')
end
end))
@@ -38,16 +36,9 @@ end
M.qf2103 = function()
local dart2103 = function(line)
- local level, msg, filename, lnum, lcol = string.match(line,
- '(%a+) %- (.*) at (%S+):(%d+):(%d+) .*')
+ local level, msg, filename, lnum, lcol = string.match(line, '(%a+) %- (.*) at (%S+):(%d+):(%d+) .*')
if level and filename and lnum and lcol and msg then
- return {
- type = string.sub(level, 1, 1):upper(),
- filename = filename,
- lnum = lnum,
- lcol = lcol,
- text = msg,
- }
+ return {type = string.sub(level, 1, 1):upper(), filename = filename, lnum = lnum, lcol = lcol, text = msg}
end
end
M.qf(dart2103)
@@ -55,16 +46,9 @@ end
M.qf2131 = function()
local dart2131 = function(line)
- local level, filename, lnum, lcol, msg =
- string.match(line, '(%a+) %- (%S+):(%d+):(%d+) %- (.*)')
+ local level, filename, lnum, lcol, msg = string.match(line, '(%a+) %- (%S+):(%d+):(%d+) %- (.*)')
if level and filename and lnum and lcol and msg then
- return {
- type = string.sub(level, 1, 1):upper(),
- filename = filename,
- lnum = lnum,
- lcol = lcol,
- text = msg,
- }
+ return {type = string.sub(level, 1, 1):upper(), filename = filename, lnum = lnum, lcol = lcol, text = msg}
end
end
M.qf(dart2131)
diff --git a/lua/tms/ft/dart/bin.lua b/lua/tms/ft/dart/bin.lua
@@ -2,7 +2,7 @@ local fn = vim.fn
local M = {}
-function M.lspcmd()
+function M.lsp_cmd()
local dart_bin = fn.resolve(fn.exepath('dart'))
local dart_bin_root = fn.fnamemodify(dart_bin, ':h')
local snapshot = dart_bin_root .. '/snapshots/analysis_server.dart.snapshot'
diff --git a/lua/tms/lsp/init.lua b/lua/tms/lsp/init.lua
@@ -86,7 +86,7 @@ M.setup = function()
-- Manual install
local manual_servers = {
'gdscript',
- -- 'dartls'
+ 'dartls'
}
for _, name in ipairs(manual_servers) do add_server(name) end
end
diff --git a/lua/tms/lsp/servers.lua b/lua/tms/lsp/servers.lua
@@ -29,8 +29,7 @@ M.gopls = function(opts)
end
M.dartls = function(opts)
- opts.cmd = require('tms.ft.dart.bin').require('lspconfig')
- md()
+ opts.cmd = require('tms.ft.dart.bin').lsp_cmd()
opts.init_options = {closingLabels = true, outline = true}
-- filetypes = {'dart', 'html'}
opts.settings = {dart = {lineLength = 120, showTodos = true, completeFunctionCalls = true}}
diff --git a/lua/tms/p/aerial.lua b/lua/tms/p/aerial.lua
@@ -11,7 +11,7 @@ M.setup = function()
end)
require('telescope').load_extension('aerial')
- -- require('tms.lsp').add_attach({fn = aerial.on_attach})
+ require('tms.lsp').add_attach({fn = aerial.on_attach})
end
return M
diff --git a/lua/tms/plugins.lua b/lua/tms/plugins.lua
@@ -124,7 +124,7 @@ return packer.startup({
use 'chaoren/vim-wordmotion' -- word counts with _,.,-,...
use {
'jandamm/cryoline.nvim',
- after={'vim-fugitive'},
+ after = {'vim-fugitive'},
config = function()
require('cryoline').config {
ft = {fugitive = '%{FugitiveStatusline()}'},
@@ -281,7 +281,7 @@ return packer.startup({
use {'vim-php/vim-composer', setup = function() vim.g.composer_cmd = 'composer' end}
use 'fpob/nette.vim'
use 'baskerville/vim-sxhkdrc'
- use {'dart-lang/dart-vim-plugin', ft = {'dart'}}
+ use {'dart-lang/dart-vim-plugin', ft = {'dart'}, config = function() vim.cmd [[delc DartAnalyzer]] end}
-- snippets
use {'norcalli/snippets.nvim', config = function() require('tms.p.snippets').setup() end}
@@ -320,7 +320,7 @@ return packer.startup({
use {
disable = true,
'ThePrimeagen/refactoring.nvim',
- after={ 'nvim-treesitter'},
+ after = {'nvim-treesitter'},
requires = {'nvim-lua/plenary.nvim'},
config = function() require('tms.p.refactoring').setup() end,
}
@@ -342,7 +342,7 @@ return packer.startup({
use {
'jose-elias-alvarez/null-ls.nvim',
after = {'nvim-lspconfig'},
- requires = {'nvim-lua/plenary.nvim' },
+ requires = {'nvim-lua/plenary.nvim'},
config = function() require('tms.p.nullls').setup() end,
}
use {
@@ -355,15 +355,11 @@ return packer.startup({
-- dap
use {'mfussenegger/nvim-dap', config = function() require('tms.p.dap').setup() end}
- use {
- 'rcarriga/nvim-dap-ui',
- after = {'nvim-dap'},
- config = function() require('tms.p.dap').setup_ui() end,
- }
+ use {'rcarriga/nvim-dap-ui', after = {'nvim-dap'}, config = function() require('tms.p.dap').setup_ui() end}
use {
disable = true,
'Pocco81/DAPInstall.nvim',
- after={'nvim-dap'},
+ after = {'nvim-dap'},
requires = {'jbyuki/one-small-step-for-vimkind'},
config = function()
local dap_install = require('dap-install')
@@ -391,10 +387,10 @@ return packer.startup({
vim.keymap.nnoremap {'<leader>su', '<cmd>TSHRefresh<cr>'}
end,
}
- use {'nvim-treesitter/nvim-treesitter-textobjects', after={'nvim-treesitter'}}
- use {'nvim-treesitter/nvim-treesitter-refactor', after={'nvim-treesitter'}}
- use {'nvim-treesitter/playground', after={'nvim-treesitter'}}
- use {'JoosepAlviste/nvim-ts-context-commentstring', after={'nvim-treesitter'}}
+ use {'nvim-treesitter/nvim-treesitter-textobjects', after = {'nvim-treesitter'}}
+ use {'nvim-treesitter/nvim-treesitter-refactor', after = {'nvim-treesitter'}}
+ use {'nvim-treesitter/playground', after = {'nvim-treesitter'}}
+ use {'JoosepAlviste/nvim-ts-context-commentstring', after = {'nvim-treesitter'}}
-- telescope
use {
