small improvements and wip

5 files changed, 51 insertions, 20 deletions

diff --git a/after/plugin/mason.lua b/after/plugin/mason.lua
index cf1f67d..fd8ac4e 100644
--- a/after/plugin/mason.lua
+++ b/after/plugin/mason.lua
@@ -41,6 +41,7 @@ require('mason-tool-installer').setup {
     "typescript-language-server",
     "vue-language-server",
     "phpactor",
+    "sql-formatter",
   },
 
   -- if set to true this will check each tool for updates. If updates
diff --git a/after/plugin/null-ls.lua b/after/plugin/null-ls.lua
index 52d96fc..e252579 100644
--- a/after/plugin/null-ls.lua
+++ b/after/plugin/null-ls.lua
@@ -12,9 +12,9 @@ local sources = {
 	-- null_ls.builtins.diagnostics.eslint,
 	-- null_ls.builtins.formatting.phpcsfixer,
 	null_ls.builtins.diagnostics.golangci_lint,
-	null_ls.builtins.diagnostics.codespell.with({
-		args = { "--ignore-words-list", "crate" },
-	}),
+	-- null_ls.builtins.diagnostics.codespell.with({
+	-- 	args = { "--ignore-words-list", "crate" },
+	-- }),
 	null_ls.builtins.formatting.jq,
 	null_ls.builtins.code_actions.gitrebase,
 	null_ls.builtins.code_actions.refactoring,
diff --git a/after/queries/yaml/captures.scm b/after/queries/yaml/captures.scm
new file mode 100644
index 0000000..4e0f1fb
--- /dev/null
+++ b/after/queries/yaml/captures.scm
@@ -0,0 +1,6 @@
+;; extends
+
+(block_mapping_pair
+    key: (flow_node) @key.resolve (#eq? @key.resolve "resolve")
+    value: (flow_node) @resolver
+)
diff --git a/lua/alpha/php/lsp.lua b/lua/alpha/php/lsp.lua
index be18c79..8a92b0e 100644
--- a/lua/alpha/php/lsp.lua
+++ b/lua/alpha/php/lsp.lua
@@ -2,40 +2,36 @@ local Path = require("plenary.path")
 
 local lsp = {}
 
-local lsp_server_name = "phpactor"
-
-lsp.get_lsp_buffer = function ()
-    local clients = vim.lsp.get_active_clients({ name = lsp_server_name})
+---Return a buffer id for the given client
+---@param server_name string
+---@return integer|nil
+lsp.get_lsp_buffer = function(server_name)
+    local clients = vim.lsp.get_active_clients({ name = server_name })
     if #clients == 0 then
-        return
+        return nil
     end
 
-    local lsp_client = clients[1]
-
-    local attached_buffers = lsp_client.attached_buffers
+    local buffers = vim.lsp.get_buffers_by_client_id(clients[1].id)
 
-    for key, val in pairs(attached_buffers) do
-        if val then
-            return key
-        end
+    if #buffers == 0 then
+        return nil
     end
 
-    return nil
+    return buffers[1]
 end
 
-
 --- @param search string: fully name to search Class::method
-lsp.find = function (search)
+lsp.find = function(search, client)
     search = vim.split(search, "::")
     local fqn_class = search[1]
     local method = search[2]
 
-    local buffer = lsp.get_lsp_buffer()
+    local buffer = lsp.get_lsp_buffer(client)
 
     if buffer == nil then
         -- TODO I want to not require this.
         -- I can load a buffer but does not start the lsp
-        P("load a php buffer to load the lsp server")
+        vim.api.nvim_err_writeln(string.format("No buffer available for client %s", client))
         return
     end
 
diff --git a/lua/alpha/php/servers.lua b/lua/alpha/php/servers.lua
new file mode 100644
index 0000000..78c99a8
--- /dev/null
+++ b/lua/alpha/php/servers.lua
@@ -0,0 +1,28 @@
+local phpactor = {}
+
+function phpactor.findclass(buffer, fqn, callback)
+    local class_parts = vim.split(fqn, "\\")
+    local class = class_parts[#class_parts]
+
+    vim.lsp.buf_request(buffer, "workspace/symbol", { query = class }, function(err, server_result, _, _)
+        if err then
+            callback(
+                nil,
+                "Error when finding workspace symbols: " .. err.message
+            )
+
+            return
+        end
+
+        local locations = vim.lsp.util.symbols_to_items(server_result or {}, buffer) or {}
+        if vim.tbl_isempty(locations) then
+            vim.api.nvim_err_writeln("Empty response looking for class: " .. fqn)
+            return
+        end
+
+    end)
+end
+
+return {
+    phpactor = phpactor,
+}