From f449c0499ca63e653c9829c2e40bff7594e9eb23 Mon Sep 17 00:00:00 2001 From: TJ DeVries Date: Sat, 12 Sep 2020 14:56:58 -0400 Subject: feat: Better border configuration. Started adding `resolve` which will allow you to do some really nice stuff easily with options to get the window options from a variety of inputs. You can see how we do it in pickers.lua for borders & borderchars currently. --- lua/telescope/pickers.lua | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'lua/telescope/pickers.lua') diff --git a/lua/telescope/pickers.lua b/lua/telescope/pickers.lua index cd83b3c..d402b39 100644 --- a/lua/telescope/pickers.lua +++ b/lua/telescope/pickers.lua @@ -3,6 +3,7 @@ local popup = require('popup') local actions = require('telescope.actions') local config = require('telescope.config') +local resolve = require('telescope.config.resolve') local layout_strategies = require('telescope.pickers.layout_strategies') local log = require('telescope.log') local mappings = require('telescope.mappings') @@ -134,28 +135,28 @@ function Picker:new(opts) end function Picker:_get_initial_window_options(prompt_title) - local popup_border = self.window.border - local popup_borderchars = self.window.borderchars + local popup_border = resolve.win_option(self.window.border) + local popup_borderchars = resolve.win_option(self.window.borderchars) local preview = { title = 'Preview', - border = popup_border, - borderchars = popup_borderchars, + border = popup_border.preview, + borderchars = popup_borderchars.preview, enter = false, highlight = false } local results = { title = 'Results', - border = popup_border, - borderchars = popup_borderchars, + border = popup_border.results, + borderchars = popup_borderchars.results, enter = false, } local prompt = { title = prompt_title, - border = popup_border, - borderchars = popup_borderchars, + border = popup_border.prompt, + borderchars = popup_borderchars.prompt, enter = true } -- cgit v1.2.3