Fix builtin.builtin for lsp and git modules (#300)

2 files changed, 12 insertions, 18 deletions

diff --git a/lua/telescope/builtin/internal.lua b/lua/telescope/builtin/internal.lua
index 76bc969..c50e04b 100644
--- a/lua/telescope/builtin/internal.lua
+++ b/lua/telescope/builtin/internal.lua
@@ -22,22 +22,12 @@ internal.builtin = function(opts)
 
   local objs = {}
 
-  local modules = {
-    require('telescope.builtin.internal'),
-    require('telescope.builtin.git'),
-    require('telescope.builtin.lsp'),
-    require('telescope.builtin.files'),
-  }
-
-  for _, m in ipairs(modules) do
-    for k, v in pairs(m) do
-      local debug_info = debug.getinfo(v)
-
-      table.insert(objs, {
-        filename = string.sub(debug_info.source, 2),
-        text = k,
-      })
-    end
+  for k, v in pairs(require'telescope.builtin') do
+    local debug_info = debug.getinfo(v)
+    table.insert(objs, {
+      filename = string.sub(debug_info.source, 2),
+      text = k,
+    })
   end
 
   pickers.new(opts, {
diff --git a/lua/telescope/previewers.lua b/lua/telescope/previewers.lua
index e6e2f8c..81664ec 100644
--- a/lua/telescope/previewers.lua
+++ b/lua/telescope/previewers.lua
@@ -500,8 +500,12 @@ previewers.builtin = defaulter(function(_)
     preview_fn = function(self, entry, status)
       with_preview_window(status, nil, function()
         local module_name = vim.fn.fnamemodify(entry.filename, ':t:r')
-        local text = module_name .. '\\.' .. entry.text
-
+        local text
+        if entry.text:sub(1, #module_name) ~= module_name then
+          text = module_name .. '.' .. entry.text
+        else
+          text = entry.text:gsub('_', '.', 1)
+        end
         local new_bufnr = vim.fn.bufnr(entry.filename, true)
         vim.fn.bufload(new_bufnr)