From 7feb745e6c2f5f48c6994863f57fcdde4f71f45b Mon Sep 17 00:00:00 2001
From: ray-x <rayx.cn@gmail.com>
Date: Sat, 25 Sep 2021 12:44:52 +1000
Subject: [PATCH] remove gofumport from go.nvim #18

---
 .gitignore         |  2 ++
 README.md          | 12 ++++++------
 lua/go.lua         |  2 +-
 lua/go/format.lua  |  4 ++--
 lua/go/install.lua |  1 -
 lua/go/lsp.lua     |  2 ++
 samplevimrc.vim    |  2 +-
 7 files changed, 14 insertions(+), 11 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..3c856ee
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+
+workflows
\ No newline at end of file
diff --git a/README.md b/README.md
index cc898ca..dbfeae9 100644
--- a/README.md
+++ b/README.md
@@ -72,7 +72,7 @@ nvim-lsp support goimport by default.
 autocmd BufWritePre (InsertLeave?) <buffer> lua vim.lsp.buf.formatting_sync(nil,500)
 ```
 
-The plugin provides code format, by default is goline + gofumports (stricter version of goimport)
+The plugin provides code format, by default is goline + gofumpt (stricter version of gofmt)
 
 Use following code to format go code
 
@@ -174,13 +174,13 @@ Modify struct tags by [`gomodifytags`](https://github.com/fatih/gomodifytags) an
 
 ## GoFmt
 
-nvim-lsp support goimport by default. The plugin provided a new formatter, goline + gofumports (stricter version of
-goimport)
+nvim-lsp support goimport by default. The plugin provided a new formatter, goline + gofumpt (stricter version of
+gofmt)
 
 | command  | Description                 |
 | -------- | --------------------------- |
-| Gofmt    | goline + gofumpt            |
-| Goimport | goline + goimport + gofumpt |
+| GoFmt    | goline + gofumpt            |
+| GoImport | goline + goimport + gofumpt |
 
 ## GoImpl
 
@@ -320,7 +320,7 @@ Configure from lua suggested, The default setup:
 
 ```lua
 require('go').setup({
-  goimport='gopls', -- goimport command, can be gopls[default], gofumports[deprecated] or goimport
+  goimport='gopls', -- goimport command, can be gopls[default] or goimport
   gofmt = 'gofumpt', --gofmt cmd,
   max_line_len = 120, -- max line length in goline format
   tag_transform = false, -- tag_transfer  check gomodifytags for details
diff --git a/lua/go.lua b/lua/go.lua
index b46fabc..74f4d55 100644
--- a/lua/go.lua
+++ b/lua/go.lua
@@ -1,7 +1,7 @@
 -- some of commands extracted from gopher.vim
 local go = {}
 _GO_NVIM_CFG = {
-  goimport = 'gopls', -- if set to 'gopls' will use gopls format, 'gofumports': deprecated
+  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,
diff --git a/lua/go/format.lua b/lua/go/format.lua
index 4d7625a..1bf575e 100644
--- a/lua/go/format.lua
+++ b/lua/go/format.lua
@@ -1,5 +1,5 @@
 -- golines A golang formatter that fixes long lines
--- golines + gofumports(stricter gofmt + goimport)
+-- golines + goimport
 local api = vim.api
 local utils = require("go.utils")
 local log = utils.log
@@ -78,7 +78,7 @@ M.gofmt = function(buf)
 end
 
 M.org_imports = function(wait_ms)
-  local codeaction=require('go.lsp').codeaction
+  local codeaction = require('go.lsp').codeaction
   codeaction('', 'source.organizeImports', wait_ms)
   vim.lsp.buf.formatting()
 end
diff --git a/lua/go/install.lua b/lua/go/install.lua
index 15d3658..cc59785 100644
--- a/lua/go/install.lua
+++ b/lua/go/install.lua
@@ -3,7 +3,6 @@ local DIR_SEP = package.config:sub(1, 1)
 
 local url = {
   gofumpt = "mvdan.cc/gofumpt",
-  gofumports = "mvdan.cc/gofumpt",
   golines = "github.com/segmentio/golines",
   goimports = "golang.org/x/tools/cmd/goimports",
   gorename = "golang.org/x/tools/cmd/gorename",
diff --git a/lua/go/lsp.lua b/lua/go/lsp.lua
index 2bf7deb..3550816 100644
--- a/lua/go/lsp.lua
+++ b/lua/go/lsp.lua
@@ -145,6 +145,8 @@ end
 	ExtractVariable = "extract_variable"
 	ExtractFunction = "extract_function"
 	ExtractMethod   = "extract_method"
+valueSet = { "", "Empty", "QuickFix", "Refactor", "RefactorExtract", "RefactorInline", "RefactorRewrite", "Source", "SourceOrganizeImports", "quickfix", "refactor", "refactor.extract", "refactor.inline", "refactor.re
+write", "source", "source.organizeImports" }
 ]]
 
 -- action / fix to take
diff --git a/samplevimrc.vim b/samplevimrc.vim
index b3f5e8a..477b29b 100644
--- a/samplevimrc.vim
+++ b/samplevimrc.vim
@@ -17,7 +17,7 @@ call plug#end()
 " No need for rquire('lspconfig'), navigator will configure it for you
 lua <<EOF
 require('go').setup({
-  goimport='gofumports', -- goimport command
+  goimport='goimport', -- goimport command
   gofmt = 'gofumpt', --gofmt cmd,
   max_line_len = 120, -- max line length in goline format
   tag_transform = false, -- tag_transfer  check gomodifytags for details