chore: format everything with stylua and update
This commit is contained in:
parent
473d78494e
commit
e90763e223
22 changed files with 273 additions and 222 deletions
|
@ -1,22 +1,30 @@
|
|||
vim.api.nvim_buf_set_option(0, 'textwidth', 120)
|
||||
vim.cmd.iabbrev('syso', 'System.out.println')
|
||||
vim.api.nvim_buf_set_option(0, "textwidth", 120)
|
||||
vim.cmd.iabbrev("syso", "System.out.println")
|
||||
|
||||
local bmap = vim.keymap.set
|
||||
local map_opt = { silent = true, buffer = true }
|
||||
|
||||
bmap('n', '<leader>ev', function() require('jdtls').extract_variable() end,
|
||||
{ silent = true, buffer = true, desc = 'Extract variable' })
|
||||
bmap('v', '<leader>ev', function() require('jdtls').extract_variable(true) end,
|
||||
{ silent = true, buffer = true, desc = 'Extract variable' })
|
||||
bmap('n', '<leader>ec', function() require('jdtls').extract_constant() end,
|
||||
{ silent = true, buffer = true, desc = 'Extract constant' })
|
||||
bmap('v', '<leader>ec', function() require('jdtls').extract_constant(true) end,
|
||||
{ silent = true, buffer = true, desc = 'Extract constant' })
|
||||
bmap('v', '<leader>em', function() require('jdtls').extract_method(true) end,
|
||||
{ silent = true, buffer = true, desc = 'Extract method' })
|
||||
bmap('n', '<leader>ro', function() require('jdtls').organize_imports() end,
|
||||
{ silent = true, buffer = true, desc = 'Organize imports' })
|
||||
bmap('n', '<leader>tc', function() require 'jdtls'.test_class() end,
|
||||
{ silent = true, buffer = true, desc = 'Test class' })
|
||||
bmap('n', '<leader>tm', function() require 'jdtls'.test_nearest_method() end,
|
||||
{ silent = true, buffer = true, desc = 'Test nearest method' })
|
||||
bmap("n", "<leader>ev", function()
|
||||
require("jdtls").extract_variable()
|
||||
end, { silent = true, buffer = true, desc = "Extract variable" })
|
||||
bmap("v", "<leader>ev", function()
|
||||
require("jdtls").extract_variable(true)
|
||||
end, { silent = true, buffer = true, desc = "Extract variable" })
|
||||
bmap("n", "<leader>ec", function()
|
||||
require("jdtls").extract_constant()
|
||||
end, { silent = true, buffer = true, desc = "Extract constant" })
|
||||
bmap("v", "<leader>ec", function()
|
||||
require("jdtls").extract_constant(true)
|
||||
end, { silent = true, buffer = true, desc = "Extract constant" })
|
||||
bmap("v", "<leader>em", function()
|
||||
require("jdtls").extract_method(true)
|
||||
end, { silent = true, buffer = true, desc = "Extract method" })
|
||||
bmap("n", "<leader>ro", function()
|
||||
require("jdtls").organize_imports()
|
||||
end, { silent = true, buffer = true, desc = "Organize imports" })
|
||||
bmap("n", "<leader>tc", function()
|
||||
require("jdtls").test_class()
|
||||
end, { silent = true, buffer = true, desc = "Test class" })
|
||||
bmap("n", "<leader>tm", function()
|
||||
require("jdtls").test_nearest_method()
|
||||
end, { silent = true, buffer = true, desc = "Test nearest method" })
|
||||
|
|
|
@ -1 +1,3 @@
|
|||
vim.keymap.set("n", "<leader>s", function() require('nvim-quick-switcher').toggle('tsx', 'scss') end, { buffer = true })
|
||||
vim.keymap.set("n", "<leader>s", function()
|
||||
require("nvim-quick-switcher").toggle("tsx", "scss")
|
||||
end, { buffer = true })
|
||||
|
|
|
@ -1,33 +1,46 @@
|
|||
vim.o.textwidth = 120
|
||||
|
||||
vim.keymap.set("n", "<leader>o",
|
||||
function() vim.lsp.buf.execute_command({ command = "_typescript.organizeImports", arguments = { vim.fn.expand("%:p") } }) end,
|
||||
{ desc = "Organize imports" }
|
||||
)
|
||||
vim.keymap.set("n", "<leader>s", function() require('nvim-quick-switcher').toggle('tsx', 'scss') end, { buffer = true })
|
||||
vim.keymap.set("n", "<leader>o", function()
|
||||
vim.lsp.buf.execute_command({ command = "_typescript.organizeImports", arguments = { vim.fn.expand("%:p") } })
|
||||
end, { desc = "Organize imports" })
|
||||
vim.keymap.set("n", "<leader>s", function()
|
||||
require("nvim-quick-switcher").toggle("tsx", "scss")
|
||||
end, { buffer = true })
|
||||
|
||||
local function goToCSSClassDefinition()
|
||||
local node = vim.treesitter.get_node()
|
||||
if not node then return false end
|
||||
if not node then
|
||||
return false
|
||||
end
|
||||
|
||||
local parent = node:parent()
|
||||
if not parent then return false end
|
||||
if not parent then
|
||||
return false
|
||||
end
|
||||
|
||||
local grandparent = parent:parent()
|
||||
if not grandparent then return false end
|
||||
if not grandparent then
|
||||
return false
|
||||
end
|
||||
|
||||
local className
|
||||
if node:type() == "string_fragment" and grandparent:type() == "jsx_attribute" and vim.treesitter.get_node_text(grandparent:named_child(0), 0) == "className" then
|
||||
if
|
||||
node:type() == "string_fragment"
|
||||
and grandparent:type() == "jsx_attribute"
|
||||
and vim.treesitter.get_node_text(grandparent:named_child(0), 0) == "className"
|
||||
then
|
||||
className = vim.treesitter.get_node_text(node, 0)
|
||||
elseif parent:type() == "jsx_attribute" and vim.treesitter.get_node_text(parent:named_child(0), 0) == "className" then
|
||||
elseif
|
||||
parent:type() == "jsx_attribute" and vim.treesitter.get_node_text(parent:named_child(0), 0) == "className"
|
||||
then
|
||||
className = vim.treesitter.get_node_text(parent:named_child(1):named_child(0), 0)
|
||||
elseif node:type() == "jsx_attribute" and vim.treesitter.get_node_text(node:named_child(0), 0) == "className" then
|
||||
className = vim.treesitter.get_node_text(node:named_child(1):named_child(0), 0)
|
||||
end
|
||||
|
||||
if className then
|
||||
require('nvim-quick-switcher').toggle('tsx', 'scss', { only_existing = true })
|
||||
local query = vim.treesitter.query.parse("scss", "((class_name) @cn (#eq? @cn \"" .. className .. "\"))")
|
||||
require("nvim-quick-switcher").toggle("tsx", "scss", { only_existing = true })
|
||||
local query = vim.treesitter.query.parse("scss", '((class_name) @cn (#eq? @cn "' .. className .. '"))')
|
||||
local tree = vim.treesitter.get_node():tree()
|
||||
vim.fn.setqflist({})
|
||||
local start, _, stop, _ = tree:root():range()
|
||||
|
@ -37,17 +50,19 @@ local function goToCSSClassDefinition()
|
|||
for _, node in pairs(match) do
|
||||
local row, col = node:start()
|
||||
vim.api.nvim_win_set_cursor(0, { row + 1, col })
|
||||
vim.fn.setqflist({ {
|
||||
lnum = row + 1,
|
||||
col = col + 1,
|
||||
text = "class selector: " .. className,
|
||||
filename = vim.fn.expand('%:p'),
|
||||
bufnr = vim.fn.bufnr('%'),
|
||||
} }, 'a')
|
||||
vim.fn.setqflist({
|
||||
{
|
||||
lnum = row + 1,
|
||||
col = col + 1,
|
||||
text = "class selector: " .. className,
|
||||
filename = vim.fn.expand("%:p"),
|
||||
bufnr = vim.fn.bufnr("%"),
|
||||
},
|
||||
}, "a")
|
||||
end
|
||||
end
|
||||
if not anyMatch then
|
||||
require('nvim-quick-switcher').toggle('tsx', 'scss', { only_existing = true })
|
||||
require("nvim-quick-switcher").toggle("tsx", "scss", { only_existing = true })
|
||||
end
|
||||
return true
|
||||
end
|
||||
|
@ -56,9 +71,12 @@ end
|
|||
|
||||
vim.api.nvim_create_autocmd("LspAttach", {
|
||||
callback = function()
|
||||
vim.keymap.set("n", "gd", function() if not goToCSSClassDefinition() then require('telescope.builtin').lsp_definitions() end end,
|
||||
{ buffer = true })
|
||||
end
|
||||
vim.keymap.set("n", "gd", function()
|
||||
if not goToCSSClassDefinition() then
|
||||
require("telescope.builtin").lsp_definitions()
|
||||
end
|
||||
end, { buffer = true })
|
||||
end,
|
||||
})
|
||||
|
||||
vim.o.foldmethod = "expr"
|
||||
|
|
|
@ -1 +1,3 @@
|
|||
vim.api.nvim_create_user_command("Trash", function() require("genghis").trashFile({ trashCmd = "rm" }) end, { desc = "Delete current file" })
|
||||
vim.api.nvim_create_user_command("Trash", function()
|
||||
require("genghis").trashFile({ trashCmd = "rm" })
|
||||
end, { desc = "Delete current file" })
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
require 'nvim-treesitter.configs'.setup {
|
||||
require("nvim-treesitter.configs").setup({
|
||||
ensure_installed = { "typescript" },
|
||||
sync_install = true,
|
||||
auto_install = true,
|
||||
|
@ -11,6 +11,6 @@ require 'nvim-treesitter.configs'.setup {
|
|||
additional_vim_regex_highlighting = false,
|
||||
},
|
||||
indent = {
|
||||
enable = true
|
||||
enable = true,
|
||||
},
|
||||
}
|
||||
})
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
require("trouble").setup {
|
||||
require("trouble").setup({
|
||||
-- your configuration comes here
|
||||
-- or leave it empty to use the default settings
|
||||
-- refer to the configuration section below
|
||||
}
|
||||
})
|
||||
vim.api.nvim_set_keymap("n", "<leader>xx", "<cmd>Trouble<cr>", { silent = true, noremap = true })
|
||||
vim.api.nvim_set_keymap("n", "<leader>xw", "<cmd>Trouble workspace_diagnostics<cr>", { silent = true, noremap = true })
|
||||
vim.api.nvim_set_keymap("n", "<leader>xd", "<cmd>Trouble document_diagnostics<cr>", { silent = true, noremap = true })
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue