windows path issue #40

pull/41/head
ray-x 3 years ago
parent 39a66c3534
commit 0dc7b57f6f

@ -2,6 +2,8 @@ local bind = require("go.keybind")
local map_cr = bind.map_cr
local utils = require('go.utils')
local log = utils.log
local sep = '.' .. utils.sep()
local function setup_telescope()
require('telescope').setup()
require('telescope').load_extension('dap')
@ -115,7 +117,6 @@ M.run = function(...)
}
local row, col = unpack(vim.api.nvim_win_get_cursor(0))
row, col = row, col + 1
@ -132,13 +133,13 @@ M.run = function(...)
dap_cfg.mode = "test"
-- dap_cfg.program = "${workspaceFolder}"
-- dap_cfg.program = "${file}"
dap_cfg.program = "./${relativeFileDirname}"
dap_cfg.program = sep .. "${relativeFileDirname}"
dap.configurations.go = {dap_cfg}
dap.continue()
elseif mode == 'nearest' then
dap_cfg.name = dap_cfg.name .. ' test_nearest'
dap_cfg.mode = "test"
dap_cfg.program = "./${relativeFileDirname}"
dap_cfg.program = sep .. "${relativeFileDirname}"
dap_cfg.args = {'-test.run', '^' .. ns.name}
log(dap_cfg)
dap.configurations.go = {dap_cfg}
@ -184,7 +185,7 @@ function M.ultest_post()
type = "go",
request = "launch",
mode = "test",
program = "./${relativeFileDirname}",
program = sep .. "${relativeFileDirname}",
dlvToolPath = vim.fn.exepath("dlv"),
args = args,
buildFlags = get_build_flags()

@ -1,5 +1,7 @@
local util = {}
local os_name = vim.loop.os_uname().sysname
local is_windows = os_name == 'Windows' or os_name == 'Windows_NT'
-- Check whether current buffer contains main function
local function has_main()
local output = vim.api.nvim_exec("grep func\\ main\\(\\) %", true)
@ -8,6 +10,14 @@ local function has_main()
return #matchCount > 3
end
function util.sep()
if is_windows then
return '\\'
end
return '/'
end
local function smartrun()
if has_main() then
-- Found main function in current buffer
@ -78,8 +88,7 @@ util.log = function(...)
return
end
local arg = {...}
local log_default = string.format("%s/%s.log", vim.api.nvim_call_function("stdpath", {"data"}),
"gonvim")
local log_default = string.format("%s%s%s.log", vim.api.nvim_call_function("stdpath", {"data"}), util.sep(), "gonvim")
local log_path = _GO_NVIM_CFG.log_path or log_default
local str = ""

Loading…
Cancel
Save