barrett/canola.nvim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

fix(windows): convert posix paths before matching LSP watch globs (#374)

Browse source
This commit is contained in:
Steven Arcangeli 2024-05-14 22:55:18 -06:00 • committed by GitHub
parent 3283deec96
commit f630887cd8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lua/oil/lsp/helpers.lua
View file

@ -1,4 +1,5 @@
local config = require("oil.config") local config = require("oil.config")
local fs = require("oil.fs")
local util = require("oil.util") local util = require("oil.util")
local workspace = require("oil.lsp.workspace") local workspace = require("oil.lsp.workspace")
@ -17,23 +18,32 @@ M.will_perform_file_operations = function(actions)
local src_adapter = assert(config.get_adapter_by_scheme(src_scheme)) local src_adapter = assert(config.get_adapter_by_scheme(src_scheme))
local dest_scheme, dest_path = util.parse_url(action.dest_url) local dest_scheme, dest_path = util.parse_url(action.dest_url)
local dest_adapter = assert(config.get_adapter_by_scheme(dest_scheme)) local dest_adapter = assert(config.get_adapter_by_scheme(dest_scheme))
src_path = fs.posix_to_os_path(src_path)
dest_path = fs.posix_to_os_path(assert(dest_path))
if src_adapter.name == "files" and dest_adapter.name == "files" then if src_adapter.name == "files" and dest_adapter.name == "files" then
moves[src_path] = dest_path moves[src_path] = dest_path
elseif src_adapter.name == "files" then
table.insert(deletes, src_path)
elseif dest_adapter.name == "files" then
table.insert(creates, src_path)
end end
elseif action.type == "create" then elseif action.type == "create" then
local scheme, path = util.parse_url(action.url) local scheme, path = util.parse_url(action.url)
path = fs.posix_to_os_path(assert(path))
local adapter = assert(config.get_adapter_by_scheme(scheme)) local adapter = assert(config.get_adapter_by_scheme(scheme))
if adapter.name == "files" then if adapter.name == "files" then
table.insert(creates, path) table.insert(creates, path)
end end
elseif action.type == "delete" then elseif action.type == "delete" then
local scheme, path = util.parse_url(action.url) local scheme, path = util.parse_url(action.url)
path = fs.posix_to_os_path(assert(path))
local adapter = assert(config.get_adapter_by_scheme(scheme)) local adapter = assert(config.get_adapter_by_scheme(scheme))
if adapter.name == "files" then if adapter.name == "files" then
table.insert(deletes, path) table.insert(deletes, path)
end end
elseif action.type == "copy" then elseif action.type == "copy" then
local scheme, path = util.parse_url(action.dest_url) local scheme, path = util.parse_url(action.dest_url)
path = fs.posix_to_os_path(assert(path))
local adapter = assert(config.get_adapter_by_scheme(scheme)) local adapter = assert(config.get_adapter_by_scheme(scheme))
if adapter.name == "files" then if adapter.name == "files" then
table.insert(creates, path) table.insert(creates, path)

6
lua/oil/lsp/workspace.lua
View file

@ -65,6 +65,12 @@ local function get_matching_paths(client, filters, paths)
if ignore_case then if ignore_case then
glob = glob:lower() glob = glob:lower()
end end
-- Some language servers use forward slashes as path separators on Windows (LuaLS)
if fs.is_windows then
glob = glob:gsub("/", "\\")
end
---@type nil|vim.lpeg.Pattern ---@type nil|vim.lpeg.Pattern
local glob_pattern = vim.glob and vim.glob.to_lpeg and vim.glob.to_lpeg(glob) local glob_pattern = vim.glob and vim.glob.to_lpeg and vim.glob.to_lpeg(glob)
local matches = pattern.matches local matches = pattern.matches