doc: Update information about popup.nvim (#1103)

* doc: Update information about popup.nvim

* fixup: Got rest of popup.nvim mentions
This commit is contained in:
TJ DeVries
2021-08-11 08:59:56 -04:00
committed by GitHub
parent a056a9c7e0
commit b5d7f48e70
7 changed files with 27 additions and 37 deletions

View File

@@ -82,7 +82,6 @@ endif
source /tmp/plug.vim source /tmp/plug.vim
call plug#begin('/tmp/plugged') call plug#begin('/tmp/plugged')
Plug 'nvim-lua/popup.nvim'
Plug 'nvim-lua/plenary.nvim' Plug 'nvim-lua/plenary.nvim'
Plug 'nvim-telescope/telescope.nvim' Plug 'nvim-telescope/telescope.nvim'
call plug#end() call plug#end()

View File

@@ -21,7 +21,6 @@ jobs:
sudo apt install fd-find sudo apt install fd-find
mkdir -p ~/.local/share/nvim/site/pack/vendor/start mkdir -p ~/.local/share/nvim/site/pack/vendor/start
git clone --depth 1 https://github.com/nvim-lua/plenary.nvim ~/.local/share/nvim/site/pack/vendor/start/plenary.nvim git clone --depth 1 https://github.com/nvim-lua/plenary.nvim ~/.local/share/nvim/site/pack/vendor/start/plenary.nvim
git clone --depth 1 https://github.com/nvim-lua/popup.nvim ~/.local/share/nvim/site/pack/vendor/start/popup.nvim
git clone --depth 1 https://github.com/kyazdani42/nvim-web-devicons ~/.local/share/nvim/site/pack/vendor/start/nvim-web-devicons git clone --depth 1 https://github.com/kyazdani42/nvim-web-devicons ~/.local/share/nvim/site/pack/vendor/start/nvim-web-devicons
ln -s $(pwd) ~/.local/share/nvim/site/pack/vendor/start ln -s $(pwd) ~/.local/share/nvim/site/pack/vendor/start
@@ -55,7 +54,6 @@ jobs:
} }
mkdir -p ~/.local/share/nvim/site/pack/vendor/start mkdir -p ~/.local/share/nvim/site/pack/vendor/start
git clone --depth 1 https://github.com/nvim-lua/plenary.nvim ~/.local/share/nvim/site/pack/vendor/start/plenary.nvim git clone --depth 1 https://github.com/nvim-lua/plenary.nvim ~/.local/share/nvim/site/pack/vendor/start/plenary.nvim
git clone --depth 1 https://github.com/nvim-lua/popup.nvim ~/.local/share/nvim/site/pack/vendor/start/popup.nvim
git clone --depth 1 https://github.com/kyazdani42/nvim-web-devicons ~/.local/share/nvim/site/pack/vendor/start/nvim-web-devicons git clone --depth 1 https://github.com/kyazdani42/nvim-web-devicons ~/.local/share/nvim/site/pack/vendor/start/nvim-web-devicons
ln -s $(pwd) ~/.local/share/nvim/site/pack/vendor/start ln -s $(pwd) ~/.local/share/nvim/site/pack/vendor/start

View File

@@ -66,7 +66,6 @@ This section should guide you to run your first built-in pickers :smile:.
Using [vim-plug](https://github.com/junegunn/vim-plug) Using [vim-plug](https://github.com/junegunn/vim-plug)
```viml ```viml
Plug 'nvim-lua/popup.nvim'
Plug 'nvim-lua/plenary.nvim' Plug 'nvim-lua/plenary.nvim'
Plug 'nvim-telescope/telescope.nvim' Plug 'nvim-telescope/telescope.nvim'
``` ```
@@ -74,7 +73,6 @@ Plug 'nvim-telescope/telescope.nvim'
Using [dein](https://github.com/Shougo/dein.vim) Using [dein](https://github.com/Shougo/dein.vim)
```viml ```viml
call dein#add('nvim-lua/popup.nvim')
call dein#add('nvim-lua/plenary.nvim') call dein#add('nvim-lua/plenary.nvim')
call dein#add('nvim-telescope/telescope.nvim') call dein#add('nvim-telescope/telescope.nvim')
``` ```
@@ -83,7 +81,7 @@ Using [packer.nvim](https://github.com/wbthomason/packer.nvim)
```lua ```lua
use { use {
'nvim-telescope/telescope.nvim', 'nvim-telescope/telescope.nvim',
requires = {{'nvim-lua/popup.nvim'}, {'nvim-lua/plenary.nvim'}} requires = { {'nvim-lua/plenary.nvim'} }
} }
``` ```

View File

@@ -1,14 +1,13 @@
vim.cmd [[packadd! plenary.nvim]] vim.cmd [[packadd! plenary.nvim]]
vim.cmd [[packadd! popup.nvim]]
vim.cmd [[packadd! telescope.nvim]] vim.cmd [[packadd! telescope.nvim]]
local finders = require('telescope.finders') local finders = require "telescope.finders"
local previewers = require('telescope.previewers') local previewers = require "telescope.previewers"
local pickers = require('telescope.pickers') local pickers = require "telescope.pickers"
local sorters = require('telescope.sorters') local sorters = require "telescope.sorters"
local utils = require('telescope.utils') local utils = require "telescope.utils"
local rgargs = {'--color=never', '--no-heading', '--with-filename', '--line-number', '--column', '--smart-case'} local rgargs = { "--color=never", "--no-heading", "--with-filename", "--line-number", "--column", "--smart-case" }
-- grep typed string in current directory (live, not fuzzy!) -- grep typed string in current directory (live, not fuzzy!)
finders.rg_live = function(opts) finders.rg_live = function(opts)
local live_grepper = finders.new { local live_grepper = finders.new {
@@ -18,14 +17,14 @@ finders.rg_live = function(opts)
end end
return { return {
command = 'rg', command = "rg",
args = vim.tbl_flatten { rgargs, prompt }, args = vim.tbl_flatten { rgargs, prompt },
} }
end end,
} }
pickers.new(opts, { pickers.new(opts, {
prompt = 'Live Grep', prompt = "Live Grep",
finder = live_grepper, finder = live_grepper,
previewer = previewers.vimgrep, previewer = previewers.vimgrep,
}):find() }):find()
@@ -35,11 +34,11 @@ end
finders.rg = function(opts) finders.rg = function(opts)
opts = opts or {} opts = opts or {}
local search = opts.search or '' local search = opts.search or ""
pickers.new(opts, { pickers.new(opts, {
prompt = 'Find Word', prompt = "Find Word",
finder = finders.new_oneshot_job(vim.tbl_flatten{'rg', rgargs, search}), finder = finders.new_oneshot_job(vim.tbl_flatten { "rg", rgargs, search }),
previewer = previewers.vimgrep, previewer = previewers.vimgrep,
sorter = sorters.get_norcalli_sorter(), sorter = sorters.get_norcalli_sorter(),
}):find() }):find()
@@ -48,7 +47,7 @@ end
-- fuzzy find files in current directory (may be slow in root dir) -- fuzzy find files in current directory (may be slow in root dir)
finders.fd = function(opts) finders.fd = function(opts)
pickers.new(opts, { pickers.new(opts, {
prompt = 'Find Files', prompt = "Find Files",
finder = finders.new_oneshot_job { "fd" }, finder = finders.new_oneshot_job { "fd" },
previewer = previewers.bat, previewer = previewers.bat,
sorter = sorters.get_fuzzy_file(), sorter = sorters.get_fuzzy_file(),
@@ -77,7 +76,7 @@ finders.lsp_references = function(opts)
end end
pickers.new(opts, { pickers.new(opts, {
prompt = 'LSP References', prompt = "LSP References",
finder = finders.new_table(results), finder = finders.new_table(results),
previewer = previewers.qflist, previewer = previewers.qflist,
sorter = sorters.get_norcalli_sorter(), sorter = sorters.get_norcalli_sorter(),
@@ -104,7 +103,7 @@ finders.lsp_document_symbols = function(opts)
end end
pickers.new(opts, { pickers.new(opts, {
prompt = 'LSP Document Symbols', prompt = "LSP Document Symbols",
finder = finders.new_table(results), finder = finders.new_table(results),
previewer = previewers.qflist, previewer = previewers.qflist,
sorter = sorters.get_norcalli_sorter(), sorter = sorters.get_norcalli_sorter(),
@@ -113,7 +112,7 @@ end
-- fuzzy find in all workspace symbols (may need longer timeout!) -- fuzzy find in all workspace symbols (may need longer timeout!)
finders.lsp_workspace_symbols = function(opts) finders.lsp_workspace_symbols = function(opts)
local params = {query = ''} local params = { query = "" }
local results_lsp, err = vim.lsp.buf_request_sync(0, "workspace/symbol", params, 1000) local results_lsp, err = vim.lsp.buf_request_sync(0, "workspace/symbol", params, 1000)
if err then if err then
vim.api.nvim_err_writeln("Error when finding symbols: " .. err) vim.api.nvim_err_writeln("Error when finding symbols: " .. err)
@@ -131,12 +130,11 @@ finders.lsp_workspace_symbols = function(opts)
end end
pickers.new(opts, { pickers.new(opts, {
prompt = 'LSP Workspace Symbols', prompt = "LSP Workspace Symbols",
finder = finders.new_table(results), finder = finders.new_table(results),
previewer = previewers.qflist, previewer = previewers.qflist,
sorter = sorters.get_norcalli_sorter(), sorter = sorters.get_norcalli_sorter(),
}):find() }):find()
end end
return finders return finders

View File

@@ -1,7 +1,6 @@
set rtp+=. set rtp+=.
set rtp+=../plenary.nvim/ set rtp+=../plenary.nvim/
set rtp+=../popup.nvim/
source plugin/telescope.vim source plugin/telescope.vim

View File

@@ -1,6 +1,5 @@
set rtp+=. set rtp+=.
set rtp+=../plenary.nvim/ set rtp+=../plenary.nvim/
set rtp+=../popup.nvim/
set statusline="" set statusline=""

View File

@@ -1,6 +1,5 @@
set rtp+=. set rtp+=.
set rtp+=../plenary.nvim/ set rtp+=../plenary.nvim/
set rtp+=../popup.nvim/
set rtp+=../tree-sitter-lua/ set rtp+=../tree-sitter-lua/
runtime! plugin/plenary.vim runtime! plugin/plenary.vim