Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync 0415 #448

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
Open

Sync 0415 #448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
f2e5f06
write to file silent
tenfyzhong Jan 2, 2024
bf6591e
auto sync
tenfyzhong Jan 3, 2024
c149446
fix github workflow env
tenfyzhong Jan 3, 2024
83babdc
sync-fork use reusable workflow
tenfyzhong Jan 4, 2024
1289378
rename yaml -> yml
tenfyzhong Jan 4, 2024
381a5f1
sync-for permissions
tenfyzhong Feb 4, 2024
cdd51bf
sync-for permissions
tenfyzhong Feb 4, 2024
f68abfa
Merge branch 'ray-x:master' into master
tenfyzhong Feb 4, 2024
d003087
Merge branch 'ray-x:master' into master
github-actions[bot] Feb 9, 2024
8ba1b3b
Merge branch 'ray-x:master' into master
github-actions[bot] Feb 10, 2024
f841012
Merge branch 'ray-x:master' into master
github-actions[bot] Feb 11, 2024
76319b3
Merge branch 'ray-x:master' into master
github-actions[bot] Feb 29, 2024
a03ac1c
Merge branch 'ray-x:master' into master
github-actions[bot] Mar 1, 2024
0b3d189
Merge branch 'ray-x:master' into master
github-actions[bot] Mar 2, 2024
5a49de5
Merge branch 'ray-x:master' into master
github-actions[bot] Mar 3, 2024
ea4fbb1
Merge branch 'ray-x:master' into master
github-actions[bot] Mar 4, 2024
51c2824
Merge branch 'ray-x:master' into master
github-actions[bot] Mar 6, 2024
4ad39d3
Merge branch 'ray-x:master' into master
github-actions[bot] Mar 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .github/workflows/sync-fork.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name: sync-fork

# permissions: write-all

on:
schedule:
- cron: '0 0 * * *'
workflow_dispatch: { }
jobs:
sync:
uses: tenfyzhong/workflows/.github/workflows/sync-fork.yml@main
324 changes: 162 additions & 162 deletions lua/go/format.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,195 +8,195 @@ local gofmt = _GO_NVIM_CFG.gofmt or 'gofumpt'
local vfn = vim.fn
local write_delay = 10
if _GO_NVIM_CFG.lsp_fmt_async then
write_delay = 200
write_delay = 200
end

local install = require('go.install').install
local gofmt_args = _GO_NVIM_CFG.gofmt_args
or {
'--max-len=' .. tostring(max_len),
'--base-formatter=' .. gofmt,
}
or {
'--max-len=' .. tostring(max_len),
'--base-formatter=' .. gofmt,
}

local goimport_args = _GO_NVIM_CFG.goimport_args
or {
'--max-len=' .. tostring(max_len),
'--base-formatter=goimports',
}
or {
'--max-len=' .. tostring(max_len),
'--base-formatter=goimports',
}

if vim.lsp.buf.format == nil then
-- vim.notify('the vim.lsp.buf.format is not available, some feature is missing if you are running old version of neovim (<0.8.0)', vim.log.levels.DEBUG)
-- neovim < 0.7 only
require('go.lsp') -- this set default value of format
-- vim.notify('the vim.lsp.buf.format is not available, some feature is missing if you are running old version of neovim (<0.8.0)', vim.log.levels.DEBUG)
-- neovim < 0.7 only
require('go.lsp') -- this set default value of format
end

local run = function(fmtargs, bufnr, cmd)
bufnr = bufnr or vim.api.nvim_get_current_buf()
log(fmtargs, bufnr, cmd)
if vim.o.mod == true then
vim.cmd('noautocmd write')
end
if cmd == 'gopls' then
if not vim.api.nvim_buf_is_loaded(bufnr) then
vfn.bufload(bufnr)
bufnr = bufnr or vim.api.nvim_get_current_buf()
log(fmtargs, bufnr, cmd)
if vim.o.mod == true then
vim.cmd('noautocmd silent write')
end
-- log gopls format
vim.lsp.buf.format({
async = _GO_NVIM_CFG.lsp_fmt_async,
bufnr = bufnr,
name = 'gopls',
})
if not _GO_NVIM_CFG.lsp_fmt_async then
vim.defer_fn(function()
if vfn.getbufinfo('%')[1].changed == 1 then
vim.cmd('noautocmd write')
if cmd == 'gopls' then
if not vim.api.nvim_buf_is_loaded(bufnr) then
vfn.bufload(bufnr)
end
end, write_delay)
end
end

local args = vim.deepcopy(fmtargs)
table.insert(args, api.nvim_buf_get_name(bufnr))
log('formatting buffer... ' .. vim.inspect(args), vim.log.levels.DEBUG)

local old_lines = api.nvim_buf_get_lines(0, 0, -1, true)
if cmd then
table.insert(args, 1, cmd)
else
table.insert(args, 1, 'golines')
end
log('fmt cmd:', args)

local j = vfn.jobstart(args, {
on_stdout = function(_, data, _)
data = utils.handle_job_data(data)
if not data then
return
end
if not utils.check_same(old_lines, data) then
vim.notify('updating codes', vim.log.levels.DEBUG)
api.nvim_buf_set_lines(0, 0, -1, false, data)
vim.cmd('write')
else
vim.notify('already formatted', vim.log.levels.DEBUG)
end
-- log("stdout" .. vim.inspect(data))
old_lines = nil
end,
on_stderr = function(_, data, _)
data = utils.handle_job_data(data)
if data then
log(vim.inspect(data) .. ' from stderr')
end
end,
on_exit = function(_, data, _) -- id, data, event
-- log(vim.inspect(data) .. "exit")
if data ~= 0 then
return vim.notify('golines failed ' .. tostring(data), vim.log.levels.ERROR)
end
old_lines = nil
vim.defer_fn(function()
if vfn.getbufinfo('%')[1].changed == 1 then
vim.cmd('noautocmd write')
-- log gopls format
vim.lsp.buf.format({
async = _GO_NVIM_CFG.lsp_fmt_async,
bufnr = bufnr,
name = 'gopls',
})
if not _GO_NVIM_CFG.lsp_fmt_async then
vim.defer_fn(function()
if vfn.getbufinfo('%')[1].changed == 1 then
vim.cmd('noautocmd silent write')
end
end, write_delay)
end
end, 200)
end,
stdout_buffered = true,
stderr_buffered = true,
})
vfn.chansend(j, old_lines)
vfn.chanclose(j, 'stdin')
end

local args = vim.deepcopy(fmtargs)
table.insert(args, api.nvim_buf_get_name(bufnr))
log('formatting buffer... ' .. vim.inspect(args), vim.log.levels.DEBUG)

local old_lines = api.nvim_buf_get_lines(0, 0, -1, true)
if cmd then
table.insert(args, 1, cmd)
else
table.insert(args, 1, 'golines')
end
log('fmt cmd:', args)

local j = vfn.jobstart(args, {
on_stdout = function(_, data, _)
data = utils.handle_job_data(data)
if not data then
return
end
if not utils.check_same(old_lines, data) then
vim.notify('updating codes', vim.log.levels.DEBUG)
api.nvim_buf_set_lines(0, 0, -1, false, data)
vim.cmd('silent write')
else
vim.notify('already formatted', vim.log.levels.INFO)
end
-- log("stdout" .. vim.inspect(data))
old_lines = nil
end,
on_stderr = function(_, data, _)
data = utils.handle_job_data(data)
if data then
log(vim.inspect(data) .. ' from stderr')
end
end,
on_exit = function(_, data, _) -- id, data, event
-- log(vim.inspect(data) .. "exit")
if data ~= 0 then
return vim.notify('golines failed ' .. tostring(data), vim.log.levels.ERROR)
end
old_lines = nil
vim.defer_fn(function()
if vfn.getbufinfo('%')[1].changed == 1 then
vim.cmd('noautocmd silent write')
end
end, 200)
end,
stdout_buffered = true,
stderr_buffered = true,
})
vfn.chansend(j, old_lines)
vfn.chanclose(j, 'stdin')
end

local M = {}
M.gofmt = function(...)
local long_opts = {
all = 'a',
}

local short_opts = 'a'
local args = ... or {}

local getopt = require('go.alt_getopt')
local optarg = getopt.get_opts(args, short_opts, long_opts)
log(optarg)

local all_buf = false
if optarg['a'] then
all_buf = true
end
if not install(gofmt) then
utils.warn('installing ' .. gofmt .. ' please retry after installation')
return
end
if not install('golines') then
utils.warn('installing golines , please rerun format after install finished')
return
end
local a = {}
utils.copy_array(gofmt_args, a)
local fmtcmd
if gofmt == 'gopls' then
fmtcmd = 'gopls'
end
if all_buf then
log('fmt all buffers')
vim.cmd('wall')
local bufs = utils.get_active_buf()
log(bufs)

for _, b in ipairs(bufs) do
log(a, b)
run(a, b.bufnr, fmtcmd)
local long_opts = {
all = 'a',
}

local short_opts = 'a'
local args = ... or {}

local getopt = require('go.alt_getopt')
local optarg = getopt.get_opts(args, short_opts, long_opts)
log(optarg)

local all_buf = false
if optarg['a'] then
all_buf = true
end
if not install(gofmt) then
utils.warn('installing ' .. gofmt .. ' please retry after installation')
return
end
if not install('golines') then
utils.warn('installing golines , please rerun format after install finished')
return
end
local a = {}
utils.copy_array(gofmt_args, a)
local fmtcmd
if gofmt == 'gopls' then
fmtcmd = 'gopls'
end
if all_buf then
log('fmt all buffers')
vim.cmd('wall')
local bufs = utils.get_active_buf()
log(bufs)

for _, b in ipairs(bufs) do
log(a, b)
run(a, b.bufnr, fmtcmd)
end
else
run(a, 0, fmtcmd)
end
else
run(a, 0, fmtcmd)
end
end

M.org_imports = function()
require('go.lsp').codeaction('', 'source.organizeImports', function()
vim.lsp.buf.format({
async = _GO_NVIM_CFG.lsp_fmt_async,
bufnr = vim.api.nvim_get_current_buf(),
name = 'gopls',
})
if not _GO_NVIM_CFG.lsp_fmt_async then
vim.defer_fn(function()
if vfn.getbufinfo('%')[1].changed == 1 then
vim.cmd('noautocmd write')
require('go.lsp').codeaction('', 'source.organizeImports', function()
vim.lsp.buf.format({
async = _GO_NVIM_CFG.lsp_fmt_async,
bufnr = vim.api.nvim_get_current_buf(),
name = 'gopls',
})
if not _GO_NVIM_CFG.lsp_fmt_async then
vim.defer_fn(function()
if vfn.getbufinfo('%')[1].changed == 1 then
vim.cmd('noautocmd silent write')
end
end, write_delay)
end
end, write_delay)
end
end)
end)
end

M.goimport = function(...)
local goimport = _GO_NVIM_CFG.goimport or 'gopls'
local args = { ... }
log(args, goimport)
if goimport == 'gopls' then
if vfn.empty(args) == 1 then
return M.org_imports()
else
local path = select(1, ...)
local gopls = require('go.gopls')
return gopls.import(path)
local goimport = _GO_NVIM_CFG.goimport or 'gopls'
local args = { ... }
log(args, goimport)
if goimport == 'gopls' then
if vfn.empty(args) == 1 then
return M.org_imports()
else
local path = select(1, ...)
local gopls = require('go.gopls')
return gopls.import(path)
end
end
local buf = vim.api.nvim_get_current_buf()
require('go.install').install(goimport)
-- specified the pkg name
if #args > 0 then -- dont use golines
return run(args, buf, 'goimports')
end

-- golines base formatter is goimports
local a = {}
if goimport == 'golines' then
a = vim.deepcopy(goimport_args)
end
end
local buf = vim.api.nvim_get_current_buf()
require('go.install').install(goimport)
-- specified the pkg name
if #args > 0 then -- dont use golines
return run(args, buf, 'goimports')
end

-- golines base formatter is goimports
local a = {}
if goimport == 'golines' then
a = vim.deepcopy(goimport_args)
end
run(a, buf, goimport)
run(a, buf, goimport)
end

return M