commit 1e9faa333c721d110a6c99e8b487fddb37ae15b3
parent be41918e799f3dcc32637f82b254dae08d596ebc
Author: Tomas Nemec <owl@gtms.dev>
Date: Sun, 5 Nov 2023 12:51:45 +0100
update
Diffstat:
2 files changed, 54 insertions(+), 58 deletions(-)
diff --git a/ftplugin/dart.lua b/ftplugin/dart.lua
@@ -1,80 +1,74 @@
vim.bo.comments = [[sO:*\ -,mO:*\ \ ,exO:*/,s1:/*,mb:*,ex:*/,:///,://]]
vim.bo.commentstring = '//%s'
-vim.bo.includeexpr =
- [[v:lua.require('tms.ft.dart.package').package_path(v:fname)]]
-vim.opt_local.isfname:append{':'}
-vim.opt_local.iskeyword:append{'$'}
+vim.bo.includeexpr = [[v:lua.require('tms.ft.dart.package').package_path(v:fname)]]
+vim.opt_local.isfname:append{ ':' }
+vim.opt_local.iskeyword:append{ '$' }
vim.b.undo_ftplugin = 'setl com< cms< inex< isf<'
vim.cmd.iabbrev('STring', 'String')
-vim.bo.makeprg = [[echo && dart %]]
+vim.bo.makeprg = [[dart %]]
vim.bo.efm = [[%f:%l:%c: %m]]
local full_path = vim.fn.expand('%:p')
-if string.find(full_path, '%.pub%-cache') then vim.bo.modifiable = false end
+if string.find(full_path, '%.pub%-cache') then
+ vim.bo.modifiable = false
+end
vim.lsp.start(require'tms.lsp'.make_opts('dartls'))
vim.api.nvim_set_hl(0, '@lsp.type.comment.dart', {})
-vim.keymap.set('n', '<leader>ar', vim.cmd.make, { desc = 'Dart Run' })
-vim.keymap.set('n', '<leader>at', vim.cmd.DartTest, { desc = 'Dart Test' })
+vim.keymap.set('n', '<leader>ar', ':make<cr>', { desc = 'Dart Run' })
+vim.keymap.set('n', '<leader>at', ':DartTest<cr>', { desc = 'Dart Test' })
vim.keymap.set('n', '<leader>an', vim.cmd.Trun, { desc = 'Trun' })
vim.api.nvim_buf_create_user_command(0, 'DartTest', function()
local temp_makeprg = vim.bo.makeprg
- vim.bo.makeprg = [[echo && dart test --no-color -r expanded %]]
+ vim.bo.makeprg = [[dart test --no-color -r expanded %]]
vim.cmd.make()
vim.bo.makeprg = temp_makeprg
end, {})
if pcall(require, 'dart-tools') then
- local dt_lsp = require('dart-tools.lsp')
- local dt_req = require('dart-tools.lsp.request')
- local ddebug = require('tms.ft.dart.debug')
+ local dt_lsp = require('dart-tools.lsp')
+ local dt_req = require('dart-tools.lsp.request')
+ local ddebug = require('tms.ft.dart.debug')
- local cmd_opts = {}
- vim.api.nvim_buf_create_user_command(0, 'DartDebug', ddebug.func, cmd_opts)
- vim.api.nvim_buf_create_user_command(0, 'DartPrint', ddebug.print, cmd_opts)
- vim.api.nvim_buf_create_user_command(0, 'DartOrganizeImports',
- dt_lsp.organize_imports, cmd_opts)
- vim.api.nvim_buf_create_user_command(0, 'DartFixAll', dt_lsp.fix_all,
- cmd_opts)
- vim.api.nvim_buf_create_user_command(0, 'DartExtract',
- dt_lsp.extract_method, cmd_opts)
- vim.api.nvim_buf_create_user_command(0, 'DartVariable',
- dt_lsp.extract_local_variable, cmd_opts)
+ local cmd_opts = {}
+ vim.api.nvim_buf_create_user_command(0, 'DartDebug', ddebug.func, cmd_opts)
+ vim.api.nvim_buf_create_user_command(0, 'DartPrint', ddebug.print, cmd_opts)
+ vim.api.nvim_buf_create_user_command(0, 'DartOrganizeImports', dt_lsp.organize_imports, cmd_opts)
+ vim.api.nvim_buf_create_user_command(0, 'DartFixAll', dt_lsp.fix_all, cmd_opts)
+ vim.api.nvim_buf_create_user_command(0, 'DartExtract', dt_lsp.extract_method, cmd_opts)
+ vim.api.nvim_buf_create_user_command(0, 'DartVariable', dt_lsp.extract_local_variable, cmd_opts)
- local opts = function(desc) return {buffer = true, desc = desc} end
- vim.keymap.set('n', '<leader>ap', function() ddebug.print() end,
- opts('Dart Debug Print'))
- vim.keymap.set('n', '<leader>ao', dt_lsp.organize_imports,
- opts('Dart Organize Imports'))
- vim.keymap.set('n', '<leader>af', dt_lsp.fix_all, opts('Dart Fix All'))
- vim.keymap.set({'v', 'n'}, '<leader>ai', dt_lsp.inline_local_variable,
- opts('Dart Inline Local Varibale'))
- vim.keymap.set({'v', 'n'}, '<leader>ae', dt_lsp.extract_local_variable,
- opts('Dart Extract Local Varibale'))
- vim.keymap.set({'v', 'n'}, '<leader>am', dt_lsp.extract_method,
- opts('Dart Extract Method'))
- vim.keymap.set('n', '<leader>al', dt_lsp.list_code_action_kinds,
- opts('Dart List Code Actions'))
- vim.keymap.set('n', '<leader>as', function()
- dt_req.execute_command('refactor.splitVariableDeclaration')
- end, opts('Dart Split Variable Declaration'))
- vim.keymap.set('n', '<leader>aj', function()
- dt_req.execute_command('refactor.joinVariableDeclaration')
- end, opts('Dart Join Variable Declaration'))
- vim.keymap.set('n', '<leader>ax', function()
- dt_req.execute_command('refactor.convert.bodyToExpression')
- end, opts('Dart Convert To Expression'))
- vim.keymap.set('n', '<leader>aa', function()
- dt_req.execute_command('refactor.convert.bodyToAsync')
- end, opts('Dart Convert To Async'))
- vim.keymap.set('n', '<leader>ab', function()
- dt_req.execute_command('refactor.convert.bodyToBlock')
- end, opts('Dart Convert To Block'))
- vim.keymap.set('n', '<leader>ad', dt_lsp.super,
- opts('Dart Go to Super Definition'))
+ local opts = function(desc)
+ return { buffer = true, desc = desc }
+ end
+ vim.keymap.set('n', '<leader>ap', function()
+ ddebug.print()
+ end, opts('Dart Debug Print'))
+ vim.keymap.set('n', '<leader>ao', dt_lsp.organize_imports, opts('Dart Organize Imports'))
+ vim.keymap.set('n', '<leader>af', dt_lsp.fix_all, opts('Dart Fix All'))
+ vim.keymap.set({ 'v', 'n' }, '<leader>ai', dt_lsp.inline_local_variable, opts('Dart Inline Local Varibale'))
+ vim.keymap.set({ 'v', 'n' }, '<leader>ae', dt_lsp.extract_local_variable, opts('Dart Extract Local Varibale'))
+ vim.keymap.set({ 'v', 'n' }, '<leader>am', dt_lsp.extract_method, opts('Dart Extract Method'))
+ vim.keymap.set('n', '<leader>al', dt_lsp.list_code_action_kinds, opts('Dart List Code Actions'))
+ vim.keymap.set('n', '<leader>as', function()
+ dt_req.execute_command('refactor.splitVariableDeclaration')
+ end, opts('Dart Split Variable Declaration'))
+ vim.keymap.set('n', '<leader>aj', function()
+ dt_req.execute_command('refactor.joinVariableDeclaration')
+ end, opts('Dart Join Variable Declaration'))
+ vim.keymap.set('n', '<leader>ax', function()
+ dt_req.execute_command('refactor.convert.bodyToExpression')
+ end, opts('Dart Convert To Expression'))
+ vim.keymap.set('n', '<leader>aa', function()
+ dt_req.execute_command('refactor.convert.bodyToAsync')
+ end, opts('Dart Convert To Async'))
+ vim.keymap.set('n', '<leader>ab', function()
+ dt_req.execute_command('refactor.convert.bodyToBlock')
+ end, opts('Dart Convert To Block'))
+ vim.keymap.set('n', '<leader>ad', dt_lsp.super, opts('Dart Go to Super Definition'))
end
diff --git a/ftplugin/go.lua b/ftplugin/go.lua
@@ -6,10 +6,12 @@ vim.lsp.start(require'tms.lsp'.make_opts('gopls'))
vim.api.nvim_create_autocmd('BufWritePre',
{ callback = require('tms.ft.go').org_imports, buffer = 0, desc = 'Go Organize Imports' })
vim.keymap.set('n', '<leader>ao', require('tms.ft.go').org_imports, { buffer = true, desc = 'Go Organize Imports' })
-vim.keymap.set('n', '<leader>ar', vim.cmd.make, { buffer = true })
-vim.keymap.set('n', '<leader>at', function()
+vim.keymap.set('n', '<leader>ar', ':make<cr>', { buffer = true })
+vim.keymap.set('n', '<leader>at', ':GoTest<cr>', { buffer = true })
+
+vim.api.nvim_buf_create_user_command(0, 'GoTest', function()
local tmp = vim.bo.makeprg
- vim.bo.makeprg = 'echo && go test'
+ vim.bo.makeprg = 'go test ./...'
vim.cmd.make()
vim.bo.makeprg = tmp
-end, { buffer = true })
+end, {})
