From b3e1ce732b0dde39d2c4ae99cdc3194f82c28a2d Mon Sep 17 00:00:00 2001
From: ray <gitea@rayelliott.dev>
Date: Sun, 19 Sep 2021 13:01:52 +0100
Subject: [PATCH] lspconfig - add snippet support, fix css

---
 UltiSnips/php.snippets |  12 ++++++
 init.plugins.vim       |   2 +-
 lua/init-plugins.lua   |  93 +++++++++++++++++++----------------------
 spell/en.utf-8.add     |   2 +
 spell/en.utf-8.add.spl | Bin 2266 -> 2284 bytes
 5 files changed, 57 insertions(+), 52 deletions(-)

diff --git a/UltiSnips/php.snippets b/UltiSnips/php.snippets
index a32a09b..c54e5dd 100644
--- a/UltiSnips/php.snippets
+++ b/UltiSnips/php.snippets
@@ -1,3 +1,15 @@
+snippet pp "<?php ... ?>"
+<?php $0; ?>
+endsnippet
+
+snippet pe "<?php ... ?>"
+<?php echo "$0"; ?>
+endsnippet
+
+snippet ph "<?php ... ?>"
+<?php esc_html( $0 ); ?>
+endsnippet
+
 snippet pf "public function ..."
 public function $1($2) {
 	$0
diff --git a/init.plugins.vim b/init.plugins.vim
index b5f1a69..a5516b8 100644
--- a/init.plugins.vim
+++ b/init.plugins.vim
@@ -58,7 +58,7 @@ Plug '~/nvim-paper-tonic'
 	Plug 'hrsh7th/cmp-nvim-lsp', { 'branch': 'main' }
 	Plug 'hrsh7th/cmp-buffer', { 'branch': 'main' }
 	Plug 'hrsh7th/cmp-path', { 'branch': 'main' }
-	" Plug 'hrsh7th/cmp-nvim-ultisnips'
+	Plug 'quangnguyen30192/cmp-nvim-ultisnips', { 'branch': 'main' }
 
   "}}}
 
diff --git a/lua/init-plugins.lua b/lua/init-plugins.lua
index 2d81706..0953dad 100644
--- a/lua/init-plugins.lua
+++ b/lua/init-plugins.lua
@@ -11,32 +11,6 @@ require'nvim-treesitter.configs'.setup {
     additional_vim_regex_highlighting = false,
   },
 }
--- https://github.com/neovim/nvim-lspconfig
--- https://github.com/neovim/nvim-lspconfig/blob/master/CONFIG.md
--- npm install -g  typescript typescript-language-server
-require'lspconfig'.tsserver.setup{}
--- npm install -g vim-language-server
-require'lspconfig'.vimls.setup{}
--- npm install -g pyright
-require'lspconfig'.pyright.setup{}
--- phpactor installation -
---   https://phpactor.readthedocs.io/en/master/usage/standalone.html
-require'lspconfig'.phpactor.setup{}
--- npm i -g vscode-langservers-extracted
-require'lspconfig'.intelephense.setup{}
--- npm install -g intelephense
-require'lspconfig'.cssls.setup{}
--- npm install -g vls
-require'lspconfig'.vuels.setup{}
--- npm i -g bash-language-server
--- TODO - don't run for sh files but have something else instead - shellcheck?
-require'lspconfig'.bashls.setup{}
--- npm install -g yaml-language-server
-require'lspconfig'.yamlls.setup{}
--- npm i -g stylelint-lsp
-require'lspconfig'.stylelint_lsp.setup{}
--- https://github.com/neovim/nvim-lspconfig/wiki
-require'lspconfig'.tailwindcss.setup{}
 
 --[efm-langserver]
 
@@ -110,20 +84,48 @@ require "lspconfig".efm.setup {
   }
 }
 
+-- [lspconfig]
+
 local nvim_lsp = require('lspconfig')
 
+-- Use a loop to conveniently call 'setup' on multiple servers and
+-- map buffer local keybindings when the language server attaches
+local servers = {
+	-- npm i -g bash-language-server
+	-- TODO - don't run for sh files but have something else instead - shellcheck?
+	'bashls',
+	-- npm i -g vscode-langservers-extracted
+	'cssls',
+	-- npm install -g intelephense
+	'intelephense',
+	--   https://phpactor.readthedocs.io/en/master/usage/standalone.html
+	'phpactor',
+	-- npm install -g pyright
+	'pyright',
+	-- npm i -g stylelint-lsp
+	'stylelint_lsp',
+	-- https://github.com/neovim/nvim-lspconfig/wiki
+	'tailwindcss',
+	-- npm install -g  typescript typescript-language-server
+	'tsserver',
+	-- npm install -g vim-language-server
+	'vimls',
+	-- npm install -g vls
+	'vuels',
+	-- npm i -g stylelint-lsp
+	'yamlls',
+}
+
 -- Use an on_attach function to only map the following keys
 -- after the language server attaches to the current buffer
 local on_attach = function(client, bufnr)
-  local function buf_set_keymap(...) vim.api.nvim_buf_set_keymap(bufnr, ...) end
-  local function buf_set_option(...) vim.api.nvim_buf_set_option(bufnr, ...) end
+	local function buf_set_keymap(...) vim.api.nvim_buf_set_keymap(bufnr, ...) end
+	local function buf_set_option(...) vim.api.nvim_buf_set_option(bufnr, ...) end
 
   -- Enable completion triggered by <c-x><c-o>
   buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc')
-
   -- Mappings.
   local opts = { noremap=true, silent=true }
-
   -- See `:help vim.lsp.*` for documentation on any of the below functions
   buf_set_keymap('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts)
   buf_set_keymap('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
@@ -142,26 +144,15 @@ local on_attach = function(client, bufnr)
   -- buf_set_keymap('n', '<space>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', opts)
   -- buf_set_keymap('n', '<space>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', opts)
   -- buf_set_keymap('n', '<space>wl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', opts)
-
 end
 
--- Use a loop to conveniently call 'setup' on multiple servers and
--- map buffer local keybindings when the language server attaches
-local servers = {
-	'bashls',
-	'cssls',
-	'intelephense',
-	'phpactor',
-	'pyright',
-	'stylelint_lsp',
-	'tailwindcss',
-	'tsserver',
-	'vimls',
-	'vuels'
-}
+local capabilities = vim.lsp.protocol.make_client_capabilities()
+capabilities.textDocument.completion.completionItem.snippetSupport = true
+
 for _, lsp in ipairs(servers) do
   nvim_lsp[lsp].setup {
     on_attach = on_attach,
+		capabilities = capabilities,
     flags = {
       debounce_text_changes = 150,
     }
@@ -174,11 +165,11 @@ cmp.setup({
 		keyword_length = 4
 		-- autocomplete = false
 	},
-	-- snippet = {
-	--   expand = function(args)
-	--     vim.fn["vsnip#anonymous"](args.body)
-	--   end,
-	-- },
+	snippet = {
+	  expand = function(args)
+	    vim.fn["vsnip#anonymous"](args.body)
+	  end,
+	},
 	mapping = {
 		['<C-n>'] = cmp.mapping.complete(),
 		['<C-y>'] = cmp.mapping.confirm({ select = true }),
@@ -188,7 +179,7 @@ cmp.setup({
 		{ name = 'buffer' },
 		{ name = 'nvim_lsp' },
 		{ name = 'path' },
-		--{ name = 'ultisnips' },
+		{ name = 'ultisnips' },
 		...
 	}
 })
diff --git a/spell/en.utf-8.add b/spell/en.utf-8.add
index 596a301..d309946 100644
--- a/spell/en.utf-8.add
+++ b/spell/en.utf-8.add
@@ -174,3 +174,5 @@ erimplement
 particularly
 movie
 multivariable
+Unsetting
+ajax
diff --git a/spell/en.utf-8.add.spl b/spell/en.utf-8.add.spl
index 5586cabb36af3d1281a70b70bfd6870ee6a8a046..9eee6c13444aa241f418065cdfcd20a3d037783f 100644
GIT binary patch
literal 2284
zcmY*a%WfQ15bdhALo9@lV1X1_augv?G@D3K7M6fTVk;pg5hf-?NZH)(zB7G2{h}YX
zXXgb=vhX*sjQj^|{246#0a>zQg~B=2V+A~N&+WSPICbhVKRtckHNGhBzmKBz+h4dO
z&HQYhhoePNR&~?$!|}=K@*|fW6;-p8N}L=?Ctg(JtUQrgsyI^ZB$6N!MLQKltz<k;
zJ7`mOYR^7)VIhSqrH5`Rox)H`-o5swA2d+C5nV%s6rM6hI*aeSf(m^C;R2${9A;3M
zYcz+qQ82&h@}jH(T8k2q2J>1<1H=JQy+-s8`07%;cap=|7`un#0$QE)3Rpz1p|*HV
z5?s;J!(}EXV_JJl%JOb4tA=BENk;Kir!#|d9)ORIS`b3YT6=Q{La9-dgCa$?$gRVD
z3#|&k#%RkJ@}0!jI&18TyjALg>Swswn~XsBCa_BB^KP!`!U$?D6BOkWk9S;6hns0Q
zD%x&11*#Gs;z>z~p6R@@z|5dy?npEe;0GDFDDW9Zil=irBZKC_^8AOeNOG}~LSw(O
z9OP|~cFb?DHeW6LIP<tFTEAF#Fvycox0=#%0)QiN3z(#0A^Tw8vQa`-8!(n)q>}mu
z<*Z-JeCU9ME?bDHLRMLBHs(_GY{J{VQ`h4l8x=B^4PT7qo36^3HzXp@yn5D!x#4}v
zFmhOH)oa0~var8;cy|D375?2>Td}cq%d>{(%`Y7oTy;Rd)ChP%{2GiZ%h#Eye3jjB
z9y6f#ih9r%q5h_0b{B&eNW)o5#2if>AA!}&0U)8yx5nHXW)|%fC<`Il6yEJ`xYUPw
zh||#MjOmVPE#XVICNMw`I^bj$`c2THLcAOvY(}RI8lOsyA;xLSxz=|NEcpzkV^ro8
zWQKpDWphCH>l#_$`yzl!%8o65z%!xT6>HAV2Q6{lVZJP);l5z$IGHo*O_%0R|1#n)
zPuJ5~)f}rQO$5XBlNi&S2;C}S#yY|DYIMWX*zV<Mv(=bBD@;nP!fyf!0sDJ-QKJgy
zy|$bMrZfNyW65pK&j2YrradfY)?xH&;9mE*wdE9J?a28A3(vmevgxcfSu1_tLXGl9
zJFX;n`;&1f>NcFuL(^gluR2ifba4TdyzWOrTrhKNO?7N=CXoOr8H0;E1jZ?{zPQS8
z=IBbarbgHnpV3YlyPDgb$>_`6{LJt)t4j_uE5dCF?S0IsmW`!gEB0bFJ6ATU`8@V@
zyV?kF_ttU1&L`u-tBoF3m-yn3i*;rbDo}#&Q~aoK5gMxg1Uh3c!OeF8(TOkqt;Y;d
zXNGsK9o%kRkC(nP3hxf<n53Gw+#<}VwsJ7r9Qfz9BYGg$bX;oOlXA{|8Q|3;2HrP<
zA{Wwky))sUO>sG{WCqjC4m*x@w?6AxeZ459R%i5FvUTj#CQ&4xfBNvz?&BxVzdwBW
z>SrI02K*v=*)=-3ckjbI+I%EG%0oMGDCuEWp4j_SXxFlbVE<oi{B7Hw=&q9o^2#(1
zG!60?<{t(f8uV@)y{I&8I69Ez4nD`h*_G#JeTX;}&Q^<UqwC89MV&s7e_-TC+t=hr
zFS_`^*Jfl~Y;wJgu%D4gX89i?Z;{9Y%fk@ub1nvCZfxC3xaI!XJw@`|o#QXZGiwSa
ev4A35($>?qmmgrZ+OeB#<~`UL_|21ufBym@d!?KJ

literal 2266
zcmY*a%WfQ15bdfSM`nct5|Jj(4tX?LS`mZ9Dw)JlPz)vkETjnOPIu4D^>p`b`eA#-
z0xz?eZ(xZmzQLct!e5Xj3sx+U!a3Dr1w3*;>el1bsYieR{HUq2JU@6BMLVC|b+aVR
z=8L62UFAg?s;2GE&M($?T$-2FT1s(pDve~K8mGm%1S#W4wUJ1?NEA&<h-yjsJZ?<V
z#?G%Km$kIeNu*I2NWrs{%=El^npUC%cuwFUWrWN4z~xj3GYD4@mF6&o!a}13y!C>`
zu3P3s09MTlMC#0IAr+8%M9nm!f529k;JuM0ob|C=IL@KfNUMNF)arx9b27sbEi<@G
z<s8Z5ZMx<)X$EQ8ox#hj7vD5GH#i#)d~{TU2vSwsn?n#vjhdtpr^pt$H8`)KRRUNa
zZ5=~CnPoxel^v0{Qk_@*2q)7~4|F<$RYISmr6wyQsJ2W{jNJ_HI2w1mi9gNjrn>;D
z0zcwONQqwRqO`!wpkeMvG!ozk892!C>w1dE3pyi%=E3s(o3Kc7zLi4bX=ypgZ(iy?
zziBXEHT*d9xGh>(?Kl`DGaqUN9po`=iCe)W5epf--DOZf77Q3m(Njr%gYt7bNHgC6
z3tiR_Q-!Ru+-%6T>g9;1p;6c3K?Wr<mO+;H<r{Cym{cSJL!cS!!rbsaW*GS@XxVDc
zrn0cVWbp0)&?@|^v$kSm>o8*tH`PxK7~FP1SZf5lAbtR&((-j?DxalyT!tCY2YKkU
zMyS8&nBB$TInr>J5-~?($BSq6mH<HBAedb6`i8khlN^O1NNd<pd&ec24_%!2O6N?t
zPizfuIvl|OUFd+6dFba}^AZu4@L*FquF(2as%~SA8B5<jwDeP$_EDLYmpT54m+b+o
zF9Pzw{mO$(%FZml$8|>e>wMs{MW+RxC(M{-G~8D#9%pk-z46-o>7PdZ^~FvyFRL@n
zNEE?v@yv{C&V&vNn6XkYz3JWXsc-nAw;5KZ&l-~wtMMC;Qo#PfG7qT3rq!C$z?3?G
zVJx}F3F;t)#~)i*&aKDj)xe#!IJNZ@WAVslgq3IaxTqSaa)BYlKQ+`Sue9M(g10{y
zhoa^Kmo0r&WBqP>Q0_Nz4wWRdJt42XnPYFNV~aD18Gw>8xVTSXoFnUwn-tF+UWwv&
zM%d6eo+Pmg-0Mt6kC*0Wj;mQ+bDUWb?n}geiYe8i!eQFSzS>UDjSXwEh_g^{cLLm9
zIgZ$7)UUi?^su_b7w_gf%*L0X1osO~3xqXL;T$S`E5Xa5M>L+y0g~GWvf=Gi>09G%
z)a_t^(4aZiUJJNPfHi>Y$r7L!wi*K9YSK%&9%aKd>ESg)47?A#A^~!CyDH(JNO0J1
zVg}Q@4OSbAZOs)}a{axKpw2!#*X$R2DrQk6AAk7h@$~T7(buoOJNY5=ryV|onM{pC
zuG<5cM|+RuTX|$poJ4w<$}@X^4(%XM5bXc^jGwgqkxrdFloQiD*2K#p%->HpH0a$p
zdRZ!#8|DR)rGw9YTBdSj)~^t!#Isdk-{|`ESW%q!<R2UP(f%#@(aR=2&Vm^k7kk`l
zJ?s}Gl3D(T$RUY5wmb~cmmG!;nHyWf8JFAj^a9CqW%eJ87uE_)Vg*I^q3xvoOum8H
ScD3%YgP*|0!0(+${QDQ)8=*b`