Fix builtin.builtin again and add TelescopePreviewMatch hlgroup (#342)

lua/telescope/builtin/internal.lua

@@ -34,7 +34,15 @@ internal.builtin = function(opts)
     prompt_title = 'Telescope Builtin',
     finder    = finders.new_table {
       results     = objs,
-      entry_maker = make_entry.gen_from_quickfix(opts),
+      entry_maker = function(entry)
+        return {
+          value = entry,
+          text = entry.text,
+          display = entry.text,
+          ordinal = entry.text,
+          filename = entry.filename,
+        }
+      end
     },
     previewer = previewers.builtin.new(opts),
     sorter = conf.generic_sorter(opts),

lua/telescope/previewers.lua

@@ -608,7 +608,7 @@ previewers.ctags = defaulter(function(_)
         vim.cmd "norm! gg"
         vim.fn.search(scode)
 
-        self.state.hl_id = vim.fn.matchadd('TelescopePreviewLine', scode)
+        self.state.hl_id = vim.fn.matchadd('TelescopePreviewMatch', scode)
       end)
     end
   }
@@ -647,7 +647,7 @@ previewers.builtin = defaulter(function(_)
         vim.cmd "norm! gg"
         vim.fn.search(text)
 
-        self.state.hl_id = vim.fn.matchadd('TelescopePreviewLine', text)
+        self.state.hl_id = vim.fn.matchadd('TelescopePreviewMatch', text)
       end)
     end
   }
@@ -711,7 +711,7 @@ previewers.help = defaulter(function(_)
         vim.cmd "norm! gg"
         vim.fn.search(query, "W")
 
-        self.state.hl_id = vim.fn.matchadd('TelescopePreviewLine', query)
+        self.state.hl_id = vim.fn.matchadd('TelescopePreviewMatch', query)
       end)
     end
   }
@@ -843,9 +843,10 @@ previewers.highlights = defaulter(function(_)
         vim.cmd "norm! gg"
         vim.fn.search(entry.value .. ' ')
         local lnum = vim.fn.line('.')
+        -- That one is actually a match but its better to use it like that then matchadd
         vim.api.nvim_buf_add_highlight(self.state.bufnr,
           previewer_ns,
-          "TelescopePreviewLine",
+          "TelescopePreviewMatch",
           lnum - 1,
           0,
           #entry.value)

plugin/telescope.vim

@@ -21,7 +21,8 @@ highlight default link TelescopeMatching Special
 highlight default link TelescopePromptPrefix Identifier
 
 " Used for highlighting the matched line inside Previewer. Works only for (vim_buffer_ previewer)
-highlight default link TelescopePreviewLine Search
+highlight default link TelescopePreviewLine Visual
+highlight default link TelescopePreviewMatch Search
 
 " This is like "<C-R>" in your terminal.
 "   To use it, do `cmap <C-R> <Plug>(TelescopeFuzzyCommandSearch)