merge conflict

lua/go.lua

@@ -218,10 +218,14 @@ function go.setup(cfg)
     vim.cmd([[command! GoDbgStop lua require'go.dap'.stop()]])
   end
 
+  require("go.project").load_project()
+
   if _GO_NVIM_CFG.run_in_floaterm then
     vim.cmd([[command! -nargs=* GoTermClose lua require("go.term").close()]])
   end
 
+  require("go.utils").set_nulls()
+
   if _GO_NVIM_CFG.lsp_cfg then
     require("go.lsp").setup()
     if _GO_NVIM_CFG.lsp_diag_hdlr then

lua/go/project_setup.lua

@@ -1,69 +0,0 @@
--- this file allow a setup load per project
---[[
--- sample cfg
-return  {
-  go = "go", -- set to go1.18beta1 if necessary
-  goimport = "gopls", -- if set to 'gopls' will use gopls format, also goimport
-  fillstruct = "gopls",
-  gofmt = "gofumpt", -- if set to gopls will use gopls format
-  max_line_len = 120,
-  tag_transform = false,
-  test_dir = "",
-  gocoverage_sign_priority = 5,
-  launch_json = nil, -- the launch.json file path, default to .vscode/launch.json
-  -- launch_json = vim.fn.getcwd() .. "/.vscode/launch.json",
-
-  build_tags = "", --- you can provide extra build tags for tests or debugger
-
-}
-
-]]
-
--- if the file existed, load it into config
-
-local util = require("go.utils")
-local log = util.log
-local M = {}
-local sep = require("go.utils").sep()
-
-function M.project_existed()
-  local workfolder = vim.lsp.buf.list_workspace_folders()[1] or vim.fn.getcwd()
-  local gocfgfd = workfolder .. sep .. ".gonvim"
-  local gocfgbrks = gocfgfd .. sep .. "breakpoints.lua"
-  local gocfg = gocfgfd .. sep .. "init.lua"
-  if vim.fn.filereadable(gocfg) == 1 or  vim.fn.filereadable(gocfgbrks) == 1 then
-    log("projects existed", gocfg, gocfgbrks)
-    return gocfg, gocfgbrks
-  end
-end
-
-function M.setup_project()
-  local workfolder = vim.lsp.buf.list_workspace_folders()[1] or vim.fn.getcwd()
-  local gocfgfd = workfolder .. sep .. ".gonvim"
-  local gocfg = gocfgfd .. sep .. "init.lua"
-
-  if vim.fn.isdirectory(gocfgfd) == 0 then
-    vim.fn.mkdir(gocfgfd)
-  end
-  if vim.fn.filereadable(gocfg) == 0 then
-    local f = io.open(gocfg, "w")
-    f:write("return {}")
-    f:close()
-  end
-  return gocfg, gocfgfd
-end
-
-function M.load_project()
-  local workfolder = vim.lsp.buf.list_workspace_folders()[1] or vim.fn.getcwd()
-  local gocfg = workfolder .. sep .. ".gonvim"
-  if vim.fn.filereadable(gocfg) == 1 then
-    local f = assert(loadfile(gocfg))
-    _GO_NVIM_CFG = vim.tbl_deep_extend("force", _GO_NVIM_CFG, f())
-  else
-    return false
-  end
-end
-
-M.load_project()
-
-return M