From c82289855429ed66473cdcb14f6da7c1dfc85f02 Mon Sep 17 00:00:00 2001 From: dskleingeld Date: Thu, 14 Oct 2021 17:36:02 +0200 Subject: [PATCH] small bug fixes --- lua/prosesitter.lua | 6 +++--- lua/prosesitter/actions/hover.lua | 2 +- lua/prosesitter/backend/langtool.lua | 1 - lua/prosesitter/on_event/check/check.lua | 16 ++++++++-------- lua/prosesitter/shared.lua | 8 ++++++++ lua/telescope/_extensions/prosesitter.lua | 2 +- 6 files changed, 21 insertions(+), 14 deletions(-) diff --git a/lua/prosesitter.lua b/lua/prosesitter.lua index bae8658..4fa4729 100644 --- a/lua/prosesitter.lua +++ b/lua/prosesitter.lua @@ -69,9 +69,9 @@ function M:setup(user_cfg) return end - -- if cfg.langtool_bin ~= nil then - -- langtool.start_server(on_event, cfg.langtool_bin) - -- end + if cfg.langtool_bin ~= nil then + langtool.start_server(on_event, cfg.langtool_bin) + end if cfg.default_cmds then config.add_cmds() diff --git a/lua/prosesitter/actions/hover.lua b/lua/prosesitter/actions/hover.lua index 0fe2970..a2d2937 100644 --- a/lua/prosesitter/actions/hover.lua +++ b/lua/prosesitter/actions/hover.lua @@ -20,7 +20,7 @@ function M.popup() return false end - local id = mark[1][1] + local id = mark[1] local issues = shared.issues:for_id(id) vim.lsp.util.open_floating_preview(format(issues), "markdown", {}) diff --git a/lua/prosesitter/backend/langtool.lua b/lua/prosesitter/backend/langtool.lua index 62145f5..304b3a5 100644 --- a/lua/prosesitter/backend/langtool.lua +++ b/lua/prosesitter/backend/langtool.lua @@ -32,7 +32,6 @@ local function mark_rdy_if_responding(on_event) if text ~= nil then if string.starts(text, '{"software":{"name":"LanguageTool"') then shared.langtool_running = true - log.info("Language tool started") for buf, _ in pairs(shared.buf_query) do on_event:lint_everything(buf) end diff --git a/lua/prosesitter/on_event/check/check.lua b/lua/prosesitter/on_event/check/check.lua index 877bfac..8c34950 100644 --- a/lua/prosesitter/on_event/check/check.lua +++ b/lua/prosesitter/on_event/check/check.lua @@ -22,14 +22,14 @@ local function do_check() M.schedualled = false local req = M.lintreq:build() - -- if shared.langtool_running then - -- local function post_langtool(json) - -- local results = langtool.add_spans(json) - -- marks.mark_results(results, req.areas, "langool", langtool.to_meta) - -- end - -- local curl_args = { "--no-progress-meter", "--data", "@-", "http://localhost:8081/v2/check" } - -- async.dispatch_with_stdin(langtool_query(req.text), "curl", curl_args, post_langtool) - -- end + if shared.langtool_running then + local function post_langtool(json) + local results = langtool.add_spans(json) + marks.mark_results(results, req.areas, "langtool", langtool.to_meta) + end + local curl_args = { "--no-progress-meter", "--data", "@-", "http://localhost:8081/v2/check" } + async.dispatch_with_stdin(langtool_query(req.text), "curl", curl_args, post_langtool) + end if cfg.vale_bin ~= nil then local function post_vale(json) diff --git a/lua/prosesitter/shared.lua b/lua/prosesitter/shared.lua index 6f76835..2807418 100644 --- a/lua/prosesitter/shared.lua +++ b/lua/prosesitter/shared.lua @@ -5,6 +5,14 @@ local M = {} M.langtool_running = false M.buf_query = {} +function M:attached_buffers() + local list = {} + for bufnr, _ in pairs(self.buf_query) do + list[#list+1] = bufnr + end + return list +end + M.cfg = "should be set in prosesitter.setup" M.issues = "should be set in prosesitter.setup" diff --git a/lua/telescope/_extensions/prosesitter.lua b/lua/telescope/_extensions/prosesitter.lua index 77465bd..077f718 100644 --- a/lua/telescope/_extensions/prosesitter.lua +++ b/lua/telescope/_extensions/prosesitter.lua @@ -88,7 +88,7 @@ return require("telescope").register_extension({ pick_lint(opts, {curr_buf}) end, all = function(opts) - local buffers = shared.mark_to_meta:buffers() + local buffers = shared:attached_buffers() pick_lint(opts, buffers) end, }