Added smart_path option for file name getters.

lua/telescope/builtin/lsp.lua

@@ -14,8 +14,6 @@ local conf = require('telescope.config').values
 local lsp = {}
 
 lsp.references = function(opts)
-  opts.shorten_path = utils.get_default(opts.shorten_path, true)
-
   local params = vim.lsp.util.make_position_params()
   params.context = { includeDeclaration = true }
 
@@ -243,8 +241,6 @@ lsp.range_code_actions = function(opts)
 end
 
 lsp.workspace_symbols = function(opts)
-  opts.shorten_path = utils.get_default(opts.shorten_path, true)
-
   local params = {query = opts.query or ''}
   local results_lsp, err = vim.lsp.buf_request_sync(0, "workspace/symbol", params, opts.timeout or 10000)
   if err then

lua/telescope/config.lua

@@ -1,3 +1,5 @@
+local types = require('telescope.types')
+
 -- Keep the values around between reloads
 _TelescopeConfigurationValues = _TelescopeConfigurationValues or {}
 
@@ -113,6 +115,11 @@ function config.set_defaults(defaults)
   set("border", {})
   set("borderchars", { '─', '│', '─', '│', '╭', '╮', '╯', '╰'})
 
+  set(types.path_display_options.HIDE_PATH, false)
+  set(types.path_display_options.SHORTEN_PATH, false)
+  set(types.path_display_options.TAIL_PATH, false)
+  set(types.path_display_options.SMART_PATH, false)
+
   set("get_status_text", function(self)
     local xx = (self.stats.processed or 0) - (self.stats.filtered or 0)
     local yy = self.stats.processed or 0

lua/telescope/make_entry.lua

@@ -74,17 +74,13 @@ do
     local cwd = vim.fn.expand(opts.cwd or vim.fn.getcwd())
 
     local disable_devicons = opts.disable_devicons
-    local shorten_path = opts.shorten_path
 
     local mt_file_entry = {}
 
     mt_file_entry.cwd = cwd
     mt_file_entry.display = function(entry)
       local hl_group
-      local display = path.make_relative(entry.value, cwd)
-      if shorten_path then
-        display = utils.path_shorten(display)
-      end
+      local display = utils.transform_filepath(opts, entry.value)
 
       display, hl_group = utils.transform_devicons(entry.value, display, disable_devicons)
 
@@ -142,7 +138,6 @@ do
   end
 
   --- Special options:
-  ---  - shorten_path: make the path appear short
   ---  - disable_coordinates: Don't show the line & row numbers
   ---  - only_sort_text: Only sort via the text. Ignore filename and other items
   function make_entry.gen_from_vimgrep(opts)
@@ -151,7 +146,6 @@ do
     opts = opts or {}
 
     local disable_devicons = opts.disable_devicons
-    local shorten_path = opts.shorten_path
     local disable_coordinates = opts.disable_coordinates
     local only_sort_text = opts.only_sort_text
 
@@ -194,12 +188,7 @@ do
       cwd = vim.fn.expand(opts.cwd or vim.fn.getcwd()),
 
       display = function(entry)
-        local display_filename
-        if shorten_path then
-          display_filename = utils.path_shorten(entry.filename)
-        else
-          display_filename = entry.filename
-        end
+        local display_filename = utils.transform_filepath(opts, entry.filename)
 
         local coordinates = ""
         if not disable_coordinates then
@@ -306,15 +295,7 @@ function make_entry.gen_from_quickfix(opts)
   }
 
   local make_display = function(entry)
-    local filename
-    if not opts.hide_filename then
-      filename = entry.filename
-      if opts.tail_path then
-        filename = utils.path_tail(filename)
-      elseif opts.shorten_path then
-        filename = utils.path_shorten(filename)
-      end
-    end
+    local filename = utils.transform_filepath(opts, entry.filename)
 
     local line_info = {table.concat({entry.lnum, entry.col}, ":"), "TelescopeResultsLineNr"}
 
@@ -383,17 +364,7 @@ function make_entry.gen_from_lsp_symbols(opts)
         )[1] or ''
       msg = vim.trim(msg)
     else
-      local filename = ""
-      opts.tail_path = get_default(opts.tail_path, true)
-
-      if not opts.hide_filename then -- hide the filename entirely
-        filename = entry.filename
-        if opts.tail_path then
-          filename = utils.path_tail(filename)
-        elseif opts.shorten_path then
-          filename = utils.path_shorten(filename)
-        end
-      end
+      local filename = utils.transform_filepath(opts, entry.filename)
 
       if opts.show_line then -- show inline line info
         filename = filename .. " [" ..entry.lnum .. ":" .. entry.col .. "]"
@@ -467,12 +438,7 @@ function make_entry.gen_from_buffer(opts)
   local cwd = vim.fn.expand(opts.cwd or vim.fn.getcwd())
 
   local make_display = function(entry)
-    local display_bufname
-    if opts.shorten_path then
-      display_bufname = path.shorten(entry.filename)
-    else
-      display_bufname = entry.filename
-    end
+    local display_bufname = utils.transform_filepath(opts, entry.filename)
 
     local icon, hl_group = utils.get_devicons(entry.filename, disable_devicons)
 
@@ -872,14 +838,7 @@ function make_entry.gen_from_ctags(opts)
   }
 
   local make_display = function(entry)
-    local filename
-    if not opts.hide_filename then
-      if opts.shorten_path then
-        filename = path.shorten(entry.filename)
-      else
-        filename = entry.filename
-      end
-    end
+    local filename = utils.transform_filepath(opts, entry.filename)
 
     local scode
     if opts.show_line then
@@ -935,7 +894,7 @@ end
 
 function make_entry.gen_from_lsp_diagnostics(opts)
   opts = opts or {}
-  opts.tail_path = utils.get_default(opts.tail_path, true)
+  opts.tail_path = get_default(opts.tail_path, true)
 
   local signs
   if not opts.no_sign then
@@ -963,15 +922,7 @@ function make_entry.gen_from_lsp_diagnostics(opts)
   }
 
   local make_display = function(entry)
-    local filename
-    if not opts.hide_filename then
-      filename = entry.filename
-      if opts.tail_path then
-        filename = utils.path_tail(filename)
-      elseif opts.shorten_path then
-        filename = utils.path_shorten(filename)
-      end
-    end
+    local filename = utils.transform_filepath(opts, entry.filename)
 
     -- add styling of entries
     local pos = string.format("%4d:%2d", entry.lnum, entry.col)
@@ -1156,7 +1107,6 @@ end
 
 function make_entry.gen_from_jumplist(opts)
   opts = opts or {}
-  opts.tail_path = get_default(opts.tail_path, true)
 
   local displayer = entry_display.create {
     separator = "▏",
@@ -1167,15 +1117,7 @@ function make_entry.gen_from_jumplist(opts)
   }
 
   local make_display = function(entry)
-    local filename
-    if not opts.hide_filename then
-      filename = entry.filename
-      if opts.tail_path then
-        filename = utils.path_tail(filename)
-      elseif opts.shorten_path then
-        filename = utils.path_shorten(filename)
-      end
-    end
+    local filename = utils.transform_filepath(opts, entry.filename)
 
     local line_info = {table.concat({entry.lnum, entry.col}, ":"), "TelescopeResultsLineNr"}
 

lua/telescope/types.lua

@@ -0,0 +1,21 @@
+local types = {}
+
+-- convert numbered index table into an enum
+--
+-- example:
+-- enum { "foo", "bar" }
+-- returns:
+-- { foo = 1, bar = 2 }
+-- these are going to be option names. to enable, add <option> = true
+local paths = {"hide_path", "shorten_path", "tail_path", "smart_path"}
+local enum = function(table)
+  for i = 1, #table do
+      table[table[i]] = paths[i]
+      table[i] = nil
+  end
+  return table
+end
+
+types.path_display_options = enum {"HIDE_PATH", "SHORTEN_PATH", "TAIL_PATH", "SMART_PATH"}
+
+return types

lua/telescope/utils.lua

@@ -2,6 +2,7 @@ local has_devicons, devicons = pcall(require, 'nvim-web-devicons')
 
 local pathlib = require('telescope.path')
 local Job     = require('plenary.job')
+local types   = require('telescope.types')
 
 local utils = {}
 
@@ -147,6 +148,83 @@ utils.path_tail = (function()
   end
 end)()
 
+utils.slice = function(tbl, s, e)
+  local pos, new = 1, {}
+
+  for i = s, e do
+    new[pos] = tbl[i]
+    pos = pos + 1
+  end
+
+  return new
+end
+
+
+
+PATHS = {}
+utils.path_smart = function(initial_path)
+  local final = initial_path
+  if (table.getn(PATHS) ~= 0) then
+    local diff_counts = { 1, }
+    local dirs = vim.split(initial_path, "/")
+    for _, path in pairs(PATHS) do
+      local _dirs = vim.split(path, "/")
+      local l = table.getn(_dirs)
+      local differs = 0
+      for i = 0, l do
+        if (dirs[i] ~= _dirs[i]) then
+          differs = i
+          break
+        end
+      end
+      table.insert(diff_counts, differs)
+    end
+    local max = math.max(unpack(diff_counts))
+    local length = table.getn(dirs)
+    local final_table = utils.slice(dirs, max, length)
+    if (max == length) then
+      final_table = utils.slice(dirs, length - 1, length)
+    end
+    final = table.concat(final_table, "/")
+  else
+    local length = string.len(final)
+    final = utils.slice(initial_path, length - 1, length)
+    final = table.concat(final, "/")
+  end
+  table.insert(PATHS, initial_path)
+  if (final == initial_path) then
+    return final
+  else
+    return "../" .. final
+  end
+end
+
+utils.transform_filepath = function(opts, path)
+  local config = require('telescope.config').values
+  local types = types.path_display_options
+
+  if path == nil or utils.get_default(opts[types.HIDE_PATH], config[types.HIDE_PATH]) then
+    return ''
+  end
+
+  local transformed_path = path
+
+  if utils.get_default(opts[types.TAIL_PATH], config[types.TAIL_PATH]) then
+    transformed_path = utils.path_tail(transformed_path)
+  elseif utils.get_default(opts[types.SMART_PATH], config[types.SMART_PATH]) then
+    transformed_path = utils.path_smart(transformed_path)
+  else
+    local cwd = vim.fn.expand(opts.cwd or vim.fn.getcwd())
+    transformed_path = pathlib.make_relative(transformed_path, cwd)
+
+    if utils.get_default(opts[types.SHORTEN_PATH], config[types.SHORTEN_PATH]) then
+      transformed_path = pathlib.shorten(transformed_path)
+    end
+  end
+
+  return transformed_path
+end
+
 -- local x = utils.make_default_callable(function(opts)
 --   return function()
 --     print(opts.example, opts.another)