From e75ee14ba5005844b888f76912179b83caba8355 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20Fr=C3=B8kj=C3=A6r=20Wortmann?= Date: Tue, 24 Oct 2023 16:04:59 +0200 Subject: [PATCH] Added fugitive neotree --- init.lua | 15 ++++++++++++--- lua/custom/plugins/filetree.lua | 7 +------ lua/custom/plugins/nvim-jdtls.lua | 17 +++++++++++++++-- 3 files changed, 28 insertions(+), 11 deletions(-) diff --git a/init.lua b/init.lua index 8db54233..eee9f3c0 100644 --- a/init.lua +++ b/init.lua @@ -259,9 +259,10 @@ vim.keymap.set('n', 'Y', 'gg"+yG') vim.keymap.set('n', 'd', '"_d') vim.keymap.set('v', 'd', '"_d') +-- Needed to sync windows clipboard with wsl vim.g.clipboard = { - name= 'WslClipboard', - copy= { + name = 'WslClipboard', + copy = { ['+'] = 'clip.exe', ['*'] = 'clip.exe', }, @@ -269,7 +270,7 @@ vim.g.clipboard = { ['+'] = 'powershell.exe -c [Console]::Out.Write($(Get-Clipboard -Raw).tostring().replace("`r", ""))', ['*'] = 'powershell.exe -c [Console]::Out.Write($(Get-Clipboard -Raw).tostring().replace("`r", ""))', }, - cache_enabled= 0, + cache_enabled = 0, } -- Enable break indent vim.o.breakindent = true @@ -315,6 +316,14 @@ vim.api.nvim_create_autocmd('TextYankPost', { pattern = '*', }) +-- [[ Fugitive ]] +-- Mappings and configuration for fugitive (git plugin) +vim.keymap.set("n", "gs", vim.cmd.Git, { desc = '[G]it [S]tatus' }) + +-- [[ NeoTree ]] +-- Configuration for neo tree +vim.keymap.set('n', 'nn', function() vim.cmd('Neotree toggle') end, { desc = "Toggle [N]eotree" }) + -- [[ Configure Telescope ]] -- See `:help telescope` and `:help telescope.setup()` require('telescope').setup { diff --git a/lua/custom/plugins/filetree.lua b/lua/custom/plugins/filetree.lua index a79f7a73..cd8469c7 100644 --- a/lua/custom/plugins/filetree.lua +++ b/lua/custom/plugins/filetree.lua @@ -9,14 +9,9 @@ return { "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended "MunifTanjim/nui.nvim", }, - config = function () + config = function() require('neo-tree').setup { filesystem = { - hide_by_pattern = { -- uses glob style patterns - --"*.meta", - --"*/src/*/tsconfig.json", - "*/dk/nykredit/*" - }, follow_current_file = { enabled = true, -- This will find and focus the file in the active buffer every time leave_dirs_open = false diff --git a/lua/custom/plugins/nvim-jdtls.lua b/lua/custom/plugins/nvim-jdtls.lua index 6235e301..5d139783 100644 --- a/lua/custom/plugins/nvim-jdtls.lua +++ b/lua/custom/plugins/nvim-jdtls.lua @@ -72,6 +72,11 @@ return { enabled = true, }, }, + inlayHints = { + parameterNames = { + enabled = "all", -- literals, all, none + }, + }, configuration = { runtimes = { { @@ -122,9 +127,17 @@ return { vim.keymap.set("n", "co", function() require("jdtls").organize_imports() end, { buffer = buffer, desc = "LSP: Organize Imports" }) - vim.keymap.set("n", "ct", + + vim.keymap.set('n', 'ct', function() require('jdtls').test_class() end, + { buffer = buffer, desc = 'LSP: Run test class' }) + + vim.keymap.set('n', 'cn', function() require('jdtls').test_nearest_method() end, + { buffer = buffer, desc = 'LSP: Run nerest test method' }) + + vim.keymap.set("n", "cs", function() require("jdtls").pick_test({ bufnr = buffer, after_test = print_test_results }) end, - { buffer = buffer, desc = "LSP: Run Test" }) + { buffer = buffer, desc = "LSP: Run Single Test" }) + require("jdtls").setup_dap({ hotcodereplace = "auto" }) require("jdtls.dap").setup_dap_main_class_configs() end