commit f84a75aa509d99a84007159e508c84c7bc2ebbc7
parent d3f85004a65e1beb378d8cb59c10b56bbf5b37e7
Author: Tomas Nemec <nemi@skaut.cz>
Date: Wed, 22 Feb 2023 07:49:46 +0100
update
Diffstat:
4 files changed, 45 insertions(+), 37 deletions(-)
diff --git a/after/plugin/format.lua b/after/plugin/format.lua
@@ -15,9 +15,7 @@ vim.api.nvim_create_autocmd('LspAttach', {
if vim.api.nvim_buf_get_option(buf, 'ft') == 'dart' then
vim.cmd.NgHtmlFormat()
end
-
end, { buffer = buf, desc = 'LSP Format' })
-
end
if cap.documentRangeFormattingProvider then
diff --git a/after/plugin/nulls.lua b/after/plugin/nulls.lua
@@ -28,25 +28,27 @@ null_ls.setup({
sources = {
-- formatting
builtins.formatting.prettier.with {
- filetypes = { 'html', 'yaml', 'markdown', 'css', 'scss' },
+ filetypes = { 'typescript' },
args = h.range_formatting_args_factory({
'--parser',
vim.api.nvim_buf_get_option(0, 'filetype'),
+ '--trailing-comma',
+ 'all',
+ '--tab-width',
+ '2',
'--stdin-filepath',
'$FILENAME',
}, '--range-start', '--range-end'),
},
builtins.formatting.prettier.with {
- filetypes = { 'typescript' },
+ filetypes = { 'html', 'yaml', 'css', 'scss', 'markdown' },
args = h.range_formatting_args_factory({
'--parser',
vim.api.nvim_buf_get_option(0, 'filetype'),
- '--trailing-comma',
- 'all',
- '--tab-width',
- '2',
'--stdin-filepath',
'$FILENAME',
+ '--prose-wrap',
+ 'always',
}, '--range-start', '--range-end'),
},
builtins.formatting.lua_format,
diff --git a/after/plugin/telescope.lua b/after/plugin/telescope.lua
@@ -5,8 +5,6 @@ end
local telescope = require('telescope')
local actions = require('telescope.actions')
local action_generate = require('telescope.actions.generate')
-local builtin = require('telescope.builtin')
-local extensions = telescope.extensions
local themes = require('telescope.themes')
telescope.setup {
@@ -31,84 +29,94 @@ _ = pcall(telescope.load_extension, 'packer')
local layout = require('tms.p.telescope').layout
vim.keymap.set('n', '<space>h', function()
- builtin.help_tags()
+ require('telescope.builtin').help_tags()
end, { desc = 'Telescope Help Tags' })
vim.keymap.set('n', '<space>d', function()
- builtin.find_files(layout.dd_large_noprev)
+ require('telescope.builtin').find_files(layout.dd_large_noprev)
end, { desc = 'Telescope Find Files' })
vim.keymap.set('n', '<space>D', function()
local opts = layout.dd_large_noprev
opts.no_ignore = true
opts.hidden = true
- builtin.find_files(opts)
+ require('telescope.builtin').find_files(opts)
end, { desc = 'Telescope Find Files' })
vim.keymap.set('n', '<space>g', function()
- builtin.git_files()
+ require('telescope.builtin').git_files()
end, { desc = 'Telescope Git Files' })
vim.keymap.set('n', '<space>b', function()
- builtin.buffers(layout.dd_large)
+ require('telescope.builtin').buffers(layout.dd_large)
end, { desc = 'Telescope Buffers' })
vim.keymap.set('n', '<space>l', function()
- builtin.current_buffer_fuzzy_find(layout.dd_large_noprev)
+ require('telescope.builtin').current_buffer_fuzzy_find(layout.dd_large_noprev)
end, { desc = 'Telescope Buffer Lines' })
vim.keymap.set('n', '<space>e', function()
- builtin.grep_string()
+ require('telescope.builtin').grep_string()
end, { desc = 'Telescope Grep String' })
vim.keymap.set('n', '<space>c', function()
- builtin.git_status()
+ require('telescope.builtin').git_status()
end, { desc = 'Telescope Git Status' })
vim.keymap.set('n', '<space>q', function()
- builtin.quickfix(layout.dd_large)
+ require('telescope.builtin').quickfix(layout.dd_large)
end, { desc = 'Telescope Quickfix' })
vim.keymap.set('n', '<space>k', function()
- builtin.keymaps(layout.dd_large)
+ require('telescope.builtin').keymaps(layout.dd_large)
end, { desc = 'Telescope Keymaps' })
-vim.keymap.set('n', '<space>m', function()
- builtin.lsp_document_symbols(layout.dd_large)
-end, { desc = 'Telescope Lsp Document Symbols' })
-
-vim.keymap.set('n', '<space>M', function()
- builtin.lsp_dynamic_workspace_symbols()
-end, { desc = 'Telescope LSP Dynamic Workspace Symbols' })
-
vim.keymap.set('n', '<space>o', function()
- builtin.oldfiles()
+ require('telescope.builtin').oldfiles()
end, { desc = 'Telescope Old Files' })
vim.keymap.set('n', '<space>s', function()
- builtin.spell_suggest()
+ require('telescope.builtin').spell_suggest()
end, { desc = 'Telescope Spell Suggest' })
vim.keymap.set('n', '<space>t', function()
- builtin.treesitter()
+ require('telescope.builtin').treesitter()
end, { desc = 'Telescope Treesitter' })
vim.keymap.set('n', '<space>p', function()
- extensions.packer.packer()
+ require('telescope').extensions.packer.packer()
end, { desc = 'Telescope Packer' })
vim.keymap.set('n', '<space>P', function()
- builtin.reloader(layout.dd_noprev)
+ require('telescope.builtin').reloader(layout.dd_noprev)
end, { desc = 'Telescope Reloader' })
vim.keymap.set('n', '<space>wo', function()
- extensions.git_worktree.git_worktrees()
+ require('telescope').extensions.git_worktree.git_worktrees()
end, { desc = 'Telescope Git Worktree List' })
vim.keymap.set('n', '<space>wi', function()
- extensions.git_worktree.create_git_worktree()
+ require('telescope').extensions.git_worktree.create_git_worktree()
end, { desc = 'Telescope Git Worktree Create' })
vim.keymap.set('n', '<space>n', function()
- builtin.find_files(themes.get_dropdown { prompt_title = 'dotfiles', cwd = '~/.config/nvim', previewer = false })
+ require('telescope.builtin').find_files(themes.get_dropdown {
+ prompt_title = 'dotfiles',
+ cwd = '~/.config/nvim',
+ previewer = false,
+ })
end, { desc = 'Telescope Dotfiles' })
+
+local group = vim.api.nvim_create_augroup('user-telescope', {})
+vim.api.nvim_create_autocmd('LspAttach', {
+ group = group,
+ callback = function()
+ vim.keymap.set('n', '<space>m', function()
+ require('telescope.builtin').lsp_document_symbols(layout.dd_large)
+ end, { desc = 'Telescope Lsp Document Symbols' })
+
+ vim.keymap.set('n', '<space>M', function()
+ require('telescope.builtin').lsp_dynamic_workspace_symbols()
+ end, { desc = 'Telescope LSP Dynamic Workspace Symbols' })
+ end,
+})
diff --git a/lua/tms/lsp/servers.lua b/lua/tms/lsp/servers.lua
@@ -29,7 +29,7 @@ function M.cssls(opts)
return opts
end
-function M.sumneko_lua(opts)
+function M.lua_ls(opts)
if pcall(require, 'neodev') then
require('neodev').setup {}
end
