From 03fa4805693136dec22149fa0fff7645a7f5b106 Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Thu, 17 Mar 2022 01:25:10 +0100 Subject: [PATCH] Adding dap signs --- nvim/nvim/config/new/lua/dap-config.lua | 14 +++++++++++++- nvim/nvim/config/new/lua/lsp/lsp-install.lua | 15 +++++++++++++++ nvim/nvim/config/new/lua/tests.lua | 2 +- 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/nvim/nvim/config/new/lua/dap-config.lua b/nvim/nvim/config/new/lua/dap-config.lua index 0fb75a1..7ad6006 100644 --- a/nvim/nvim/config/new/lua/dap-config.lua +++ b/nvim/nvim/config/new/lua/dap-config.lua @@ -3,6 +3,9 @@ if not ok then return end +dap.defaults.fallback.focus_terminal = true +dap.defaults.fallback.terminal_win_cmd = ":lua require('dap.ui.widgets').new_centered_float_win(vim.api.nvim_create_buf(false, true))" + dap.adapters = { coreclr = { type = 'executable', @@ -21,10 +24,19 @@ dap.configurations = { return "/home/anonymus-raccoon/projects/Kyoo/src/Kyoo.Host.Console/bin/Debug/net6.0/Kyoo.Host.Console.dll" -- return vim.fn.input('Path to dll', vim.fn.getcwd() .. '/bin/Debug/', 'file') end, + console = "externalTerminal", }, }, } +dap.set_log_level('TRACE') + +vim.fn.sign_define('DapBreakpoint', {text='', texthl='GlyphPalette9', linehl='', numhl=''}) +vim.fn.sign_define("DapBreakpointCondition", { text = "", texthl = "GlyphPalette4", linehl = "", numhl = "" }) +vim.fn.sign_define('DapBreakpointRejected', {text='', texthl='GlyphPalette9', linehl='', numhl=''}) +vim.fn.sign_define('DapStopped', {text='', texthl='GlyphPalette2', linehl='debugPC', numhl=''}) + + require("nvim-dap-virtual-text").setup({ enabled = true, enabled_commands = true, @@ -38,7 +50,7 @@ wk.register({ d = { name = "Debugger", t = { "lua require'dap'.toggle_breakpoint()", "Toggle Breakpoint" }, - b = { "lua require'dap'.set_breakpoint(vim.fn.input('Breakpoint condition: ')", "Conditional Breakpoint" }, + b = { "lua require'dap'.set_breakpoint(vim.fn.input('Breakpoint condition: '))", "Conditional Breakpoint" }, r = { "lua require'dap'.repl.toggle()", "REPL" }, c = { "lua require'dap'.continue()", "Continue" }, n = { "lua require'dap'.step_over()", "Next" }, diff --git a/nvim/nvim/config/new/lua/lsp/lsp-install.lua b/nvim/nvim/config/new/lua/lsp/lsp-install.lua index 0a67ed4..e811819 100644 --- a/nvim/nvim/config/new/lua/lsp/lsp-install.lua +++ b/nvim/nvim/config/new/lua/lsp/lsp-install.lua @@ -22,6 +22,21 @@ local server_settings = { }, }, }, + sumneko_lua = { + settings = { + Lua = { + diagnostics = { + globals = { "vim" }, + }, + workspace = { + library = { + [vim.fn.expand("$VIMRUNTIME/lua")] = true, + [vim.fn.stdpath("config") .. "/lua"] = true, + }, + }, + }, + }, + }, } lsp_installer.settings({ diff --git a/nvim/nvim/config/new/lua/tests.lua b/nvim/nvim/config/new/lua/tests.lua index 8ef07d8..b4d3b14 100644 --- a/nvim/nvim/config/new/lua/tests.lua +++ b/nvim/nvim/config/new/lua/tests.lua @@ -6,7 +6,7 @@ vim.g["ultest_running_sign"] = "" vim.g["ultest_not_run_sign"] = "" vim.cmd [[ - augroup virtcolumn + augroup test_list autocmd! autocmd FileType UltestSummary setl nolist augroup end