oli/nvim
1
1
Fork 0
Code Issues Pull Requests 1 Releases 1 Wiki Activity

master #1

Open
oli wants to merge 912 commits from master into lua
pull from: master
merge into: oli:lua
Conversation 0 Commits 912 Files Changed 102 +4
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 56797a2564 - Show all commits

4
lua/setup/my_dap.lua
View File

@@ -47,6 +47,10 @@ local function getPythonEnv()
if venv ~= nil then if venv ~= nil then
return string.format("%s/%s", venv, getVenvSuffix()) return string.format("%s/%s", venv, getVenvSuffix())
end end
local conda = os.getenv("CONDA_PREFIX")
if conda ~= nil then
return string.format("%s/%s", conda, 'python.exe')
end
local cwd = vim.fn.getcwd() local cwd = vim.fn.getcwd()
if vim.fn.executable(cwd .. '/venv/' .. getVenvSuffix()) == 1 then if vim.fn.executable(cwd .. '/venv/' .. getVenvSuffix()) == 1 then