build: switch to plenary.path2 for improve Windows path support

Author: jamestrew

lua/telescope/actions/history.lua

@@ -1,5 +1,5 @@
 local conf = require("telescope.config").values
-local Path = require "plenary.path"
+local Path = require "plenary.path2"
 local utils = require "telescope.utils"
 
 local uv = vim.loop

lua/telescope/actions/set.lua

@@ -14,7 +14,7 @@
 local a = vim.api
 
 local log = require "telescope.log"
-local Path = require "plenary.path"
+local Path = require "plenary.path2"
 local state = require "telescope.state"
 local utils = require "telescope.utils"
 
@@ -196,7 +196,7 @@ action_set.edit = function(prompt_bufnr, command)
     -- check if we didn't pick a different buffer
     -- prevents restarting lsp server
     if vim.api.nvim_buf_get_name(0) ~= filename or command ~= "edit" then
-      filename = Path:new(filename):normalize(vim.loop.cwd())
+      filename = Path:new(filename):make_relative(vim.loop.cwd(), true)
       pcall(vim.cmd, string.format("%s %s", command, vim.fn.fnameescape(filename)))
     end
   end

lua/telescope/actions/utils.lua

@@ -108,7 +108,7 @@ end
 
 -- Best effort to infer function names for actions.which_key
 function utils._get_anon_function_name(info)
-  local Path = require "plenary.path"
+  local Path = require "plenary.path2"
   local fname
   -- if fn defined in string (ie loadstring) source is string
   -- if fn defined in file, source is file name prefixed with a `@´

lua/telescope/algos/fzy.lua

@@ -7,14 +7,7 @@
 -- > matches on consecutive letters and starts of words. This allows matching
 -- > using acronyms or different parts of the path." - J Hawthorn
 
-local has_path, Path = pcall(require, "plenary.path")
-if not has_path then
-  Path = {
-    path = {
-      separator = "/",
-    },
-  }
-end
+local Path = require "plenary.path2"
 
 local SCORE_GAP_LEADING = -0.005
 local SCORE_GAP_TRAILING = -0.005

lua/telescope/builtin/__files.lua

@@ -10,7 +10,7 @@ local utils = require "telescope.utils"
 local conf = require("telescope.config").values
 local log = require "telescope.log"
 
-local Path = require "plenary.path"
+local Path = require "plenary.path2"
 
 local flatten = utils.flatten
 local filter = vim.tbl_filter

lua/telescope/builtin/__git.lua

@@ -8,7 +8,7 @@ local previewers = require "telescope.previewers"
 local utils = require "telescope.utils"
 local entry_display = require "telescope.pickers.entry_display"
 local strings = require "plenary.strings"
-local Path = require "plenary.path"
+local Path = require "plenary.path2"
 
 local conf = require("telescope.config").values
 local git_command = utils.__git_command

lua/telescope/builtin/__internal.lua

@@ -3,7 +3,7 @@ local action_set = require "telescope.actions.set"
 local action_state = require "telescope.actions.state"
 local finders = require "telescope.finders"
 local make_entry = require "telescope.make_entry"
-local Path = require "plenary.path"
+local Path = require "plenary.path2"
 local pickers = require "telescope.pickers"
 local previewers = require "telescope.previewers"
 local p_window = require "telescope.pickers.window"
@@ -319,7 +319,7 @@ internal.symbols = function(opts)
 
   local results = {}
   for _, source in ipairs(sources) do
-    local data = vim.json.decode(Path:new(source):read())
+    local data = vim.json.decode(assert(Path:new(source):read()))
     for _, entry in ipairs(data) do
       table.insert(results, entry)
     end

lua/telescope/config.lua

@@ -1,7 +1,7 @@
 local strings = require "plenary.strings"
 local deprecated = require "telescope.deprecated"
 local sorters = require "telescope.sorters"
-local os_sep = require("plenary.path").path.sep
+local os_sep = require("plenary.path2").path.sep
 local has_win = vim.fn.has "win32" == 1
 
 -- Keep the values around between reloads

lua/telescope/make_entry.lua

@@ -37,7 +37,7 @@
 local entry_display = require "telescope.pickers.entry_display"
 local utils = require "telescope.utils"
 local strings = require "plenary.strings"
-local Path = require "plenary.path"
+local Path = require "plenary.path2"
 
 local treesitter_type_highlight = {
   ["associated"] = "TSConstant",
@@ -625,7 +625,7 @@ function make_entry.gen_from_buffer(opts)
 
   return function(entry)
     local filename = entry.info.name ~= "" and entry.info.name or nil
-    local bufname = filename and Path:new(filename):normalize(cwd) or "[No Name]"
+    local bufname = filename and Path:new(filename):make_relative(cwd, true) or "[No Name]"
 
     local hidden = entry.info.hidden == 1 and "h" or "a"
     local readonly = vim.api.nvim_buf_get_option(entry.bufnr, "readonly") and "=" or " "
@@ -1026,7 +1026,7 @@ function make_entry.gen_from_ctags(opts)
   opts = opts or {}
 
   local cwd = utils.path_expand(opts.cwd or vim.loop.cwd())
-  local current_file = Path:new(vim.api.nvim_buf_get_name(opts.bufnr)):normalize(cwd)
+  local current_file = Path:new(vim.api.nvim_buf_get_name(opts.bufnr)):make_relative(cwd)
 
   local display_items = {
     { remaining = true },
@@ -1111,7 +1111,7 @@ function make_entry.gen_from_ctags(opts)
 
     if opts.only_current_file then
       if current_file_cache[file] == nil then
-        current_file_cache[file] = Path:new(file):normalize(cwd) == current_file
+        current_file_cache[file] = Path:new(file):make_relative(cwd, true) == current_file
       end
 
       if current_file_cache[file] == false then

lua/telescope/previewers/buffer_previewer.lua

@@ -1,5 +1,5 @@
 local from_entry = require "telescope.from_entry"
-local Path = require "plenary.path"
+local Path = require "plenary.path2"
 local utils = require "telescope.utils"
 local putils = require "telescope.previewers.utils"
 local Previewer = require "telescope.previewers.previewer"
@@ -98,7 +98,7 @@ color_hash[6] = function(line)
 end
 
 local colorize_ls_long = function(bufnr, data, sections)
-  local windows_add = Path.path.sep == "\\" and 2 or 0
+  local windows_add = utils.iswin and 2 or 0
   for lnum, line in ipairs(data) do
     local section = sections[lnum]
     for i = 1, section[1].end_index - 1 do -- Highlight permissions
@@ -125,7 +125,7 @@ local handle_directory_preview = function(filepath, bufnr, opts)
   local set_colorize_lines
   if opts.preview.ls_short then
     set_colorize_lines = function(data, sections)
-      local PATH_SECTION = Path.path.sep == "\\" and 4 or 6
+      local PATH_SECTION = utils.iswin and 4 or 6
       local paths = {}
       for i, line in ipairs(data) do
         local section = sections[i][PATH_SECTION]
@@ -195,7 +195,7 @@ local handle_file_preview = function(filepath, bufnr, stat, opts)
     end
 
     opts.start_time = vim.loop.hrtime()
-    Path:new(filepath):_read_async(vim.schedule_wrap(function(data)
+    Path:new(filepath):read(vim.schedule_wrap(function(data)
       if not vim.api.nvim_buf_is_valid(bufnr) then
         return
       end
@@ -491,7 +491,7 @@ previewers.cat = defaulter(function(opts)
   return previewers.new_buffer_previewer {
     title = "File Preview",
     dyn_title = function(_, entry)
-      return Path:new(from_entry.path(entry, false, false)):normalize(cwd)
+      return Path:new(from_entry.path(entry, false, false)):make_relative(cwd, true)
     end,
 
     get_buffer_by_name = function(_, entry)
@@ -554,7 +554,7 @@ previewers.vimgrep = defaulter(function(opts)
   return previewers.new_buffer_previewer {
     title = "Grep Preview",
     dyn_title = function(_, entry)
-      return Path:new(from_entry.path(entry, false, false)):normalize(cwd)
+      return Path:new(from_entry.path(entry, false, false)):make_relative(cwd, true)
     end,
 
     get_buffer_by_name = function(_, entry)