Merge remote-tracking branch 'upstream/main' into feat/docs-preview-w…

…indow

* upstream/main: (36 commits)
  feat: add `filter` option to sources (hrsh7th#1067)
  Restore rockspec
  Fix grammar mistake: "setup" -> "set up" (hrsh7th#1155)
  fix(timer): close timers before Neovim exits (hrsh7th#1166)
  Add incsearch_redraw_keys settings (hrsh7th#1162)
  Fix hrsh7th#1149 (temporary fix)
  Fix hrsh7th#1146
  Re-fix hrsh7th#1144
  Fix hrsh7th#1144
  Fix hrsh7th#1142
  Fix hrsh7th#1135
  Fix onetime configuration handling
  fix(entry/get_replace_range): handle TextEdit.range (hrsh7th#1140)
  Refactor a bit
  Restore filetype setting
  Fix hrsh7th#1139
  Add FAQ for clangd's command-line arguments. Fixes hrsh7th#999
  The default highlight groups shouldn't be default=true. Fixes hrsh7th#972
  Fix hrsh7th#1102
  Use `cmp.config.sources` (hrsh7th#1105)
  ...

README.md

@@ -10,17 +10,14 @@ Readme!
 
 1. There is a Github issue that documents [breaking changes](https://github.com/hrsh7th/nvim-cmp/issues/231) for nvim-cmp. Subscribe to the issue to be notified of upcoming breaking changes.
 2. This is my hobby project. You can support me via GitHub sponsors.
-3. Bug reports are welcome, but I might not fix if you don't provide a minimal reproduction configuration and steps.
-4. The nvim-cmp documents is [here](./doc/cmp.txt).
-5. The nvim-cmp is designed for `customization`! It's not designed to `work out of the box`.
-
+3. Bug reports are welcome, but don't expect a fix unless you provide minimal configuration and steps to reproduce your issue.
 
 Concept
 ====================
 
 - Full support for LSP completion related capabilities
 - Powerful customizability via Lua functions
-- Smart handling of key mapping
+- Smart handling of key mappings
 - No flicker
 
 
@@ -29,7 +26,7 @@ Setup
 
 ### Recommended Configuration
 
-This example configuration uses `vim-plug` as the plugin manager and `vim-vsnip` as snippet plugin.
+This example configuration uses `vim-plug` as the plugin manager and `vim-vsnip` as a snippet plugin.
 
 ```lua
 call plug#begin(s:plug_dir)
@@ -61,7 +58,7 @@ call plug#end()
 set completeopt=menu,menuone,noselect
 
 lua <<EOF
-  -- Setup nvim-cmp.
+  -- Set up nvim-cmp.
   local cmp = require'cmp'
 
   cmp.setup({
@@ -123,7 +120,7 @@ lua <<EOF
     })
   })
 
-  -- Setup lspconfig.
+  -- Set up lspconfig.
   local capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities())
   -- Replace <YOUR_LSP_SERVER> with each lsp server you've enabled.
   require('lspconfig')['<YOUR_LSP_SERVER>'].setup {
@@ -135,12 +132,9 @@ EOF
 
 ### Where can I find more completion sources?
 
-- See the [Wiki](https://github.com/hrsh7th/nvim-cmp/wiki/List-of-sources)
-- See the [GitHub topic](https://github.com/topics/nvim-cmp).
+Have a look at the [Wiki](https://github.com/hrsh7th/nvim-cmp/wiki/List-of-sources) and the `nvim-cmp` [GitHub topic](https://github.com/topics/nvim-cmp).
 
 
 ### Where can I find advanced configuration examples?
 
-See the [Wiki](https://github.com/hrsh7th/nvim-cmp/wiki)
-
-
+See the [Wiki](https://github.com/hrsh7th/nvim-cmp/wiki).