master #1

Open
oli wants to merge 912 commits from master into lua
Showing only changes of commit a2f360ddb4 - Show all commits

View File

@@ -1,5 +1,13 @@
dap = require('dap') dap = require('dap')
local function getVenvSuffix()
if vim.loop.os_uname().sysname == 'Linux' then
return 'bin/python'
elseif vim.loop.os_uname().sysname == 'Windows_NT' then
return 'Scripts/python.exe'
end
end
local function getPythonEnv() local function getPythonEnv()
local venv = os.getenv("VIRTUAL_ENV") local venv = os.getenv("VIRTUAL_ENV")
if venv ~= nil then if venv ~= nil then
@@ -46,14 +54,6 @@ local initDir = vim.api.nvim_list_runtime_paths()[1]
local masonpath = vim.fn.stdpath('data') .. '/mason' local masonpath = vim.fn.stdpath('data') .. '/mason'
-- PYTHON -- PYTHON
local function getVenvSuffix()
if vim.loop.os_uname().sysname == 'Linux' then
return 'bin/python'
elseif vim.loop.os_uname().sysname == 'Windows_NT' then
return 'Scripts/python.exe'
end
end
dap.adapters.python = { dap.adapters.python = {
type = 'executable'; type = 'executable';
command = masonpath .. '/packages/debugpy/venv/' .. getVenvSuffix(); command = masonpath .. '/packages/debugpy/venv/' .. getVenvSuffix();