update

UltiSnips/php.snippets

@@ -1,5 +1,11 @@
 extends html
 
+snippet doc "/**"
+/**
+ * $1
+ */$0
+endsnippet
+
 snippet pre "<pre>print_r()</pre>"
 echo "<pre>";
 print_r($0);
@@ -36,6 +42,18 @@ public function $1($2) {
 }
 endsnippet
 
+snippet pt "protected function ..."
+protected function $1($2) {
+	$0
+}
+endsnippet
+
+snippet pv "private function ..."
+private function $1($2) {
+	$0
+}
+endsnippet
+
 snippet psf "public static function ..."
 public static function $1($2) {
 	$0
@@ -53,9 +71,25 @@ snippet ''= "'...' => "
 endsnippet
 
 snippet apm "add_post_meta(..."
-add_post_meta( 341, 'DEBUG_$1', $0);
+add_post_meta( 1, 'DEBUG_$1', $0);
 endsnippet
 
 snippet upm "update_post_meta(..."
-update_post_meta( 341, 'DEBUG_$1', $0);
+update_post_meta( 1, 'DEBUG_$1', $0);
+endsnippet
+
+snippet sw "switch ..."
+switch ($1) {
+	case $2:
+		$3;
+		break;
+	default:
+		$0
+}
+endsnippet
+
+snippet cs "case ..."
+case $1:
+	$0;
+	break;
 endsnippet

lua/init-lsp.lua

@@ -13,72 +13,80 @@ local nvim_lsp = require('lspconfig')
 local servers = {
     -- npm i -g bash-language-server
     -- no formatting support
-	'bashls',
+    'bashls', -- npm i -g vscode-langservers-extracted
-
-	-- npm i -g vscode-langservers-extracted
     -- no formatting support
-	'cssls',
+    'cssls', -- npm install -g intelephense
-
-	-- npm install -g intelephense
     -- suports formatting
     'intelephense',
 
     --   https://phpactor.readthedocs.io/en/master/usage/standalone.html
-	'phpactor',
+    'phpactor', -- npm install -g pyright
-
-	-- npm install -g pyright
     -- static type checker
-	'pyright',
+    'pyright', -- https://github.com/neovim/nvim-lspconfig/wiki
-
-	-- https://github.com/neovim/nvim-lspconfig/wiki
     -- 'tailwindcss',
     -- npm install -g  typescript typescript-language-server
     -- supports formatting
-	'tsserver',
+    'tsserver', -- npm install -g vim-language-server
-
-	-- npm install -g vim-language-server
     -- no formatting support
-	'vimls',
+    'vimls', -- vue
-
-	-- vue
     -- use vetur
-
+    'yamlls'
-	'yamlls',
     -- no formatting support
 }
 
 -- 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_keymap(...)
-	local function buf_set_option(...) vim.api.nvim_buf_set_option(bufnr, ...) end
+        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', '[d', '<cmd>lua vim.diagnostic.goto_prev({float = {...}})<CR>', opts)
+    buf_set_keymap('n', '[d',
-  buf_set_keymap('n', ']d', '<cmd>lua vim.diagnostic.goto_next({float = {...}})<CR>', opts)
+                   '<cmd>lua vim.diagnostic.goto_prev({float = {...}})<CR>',
+                   opts)
+    buf_set_keymap('n', ']d',
+                   '<cmd>lua vim.diagnostic.goto_next({float = {...}})<CR>',
+                   opts)
     buf_set_keymap('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
     buf_set_keymap('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts)
     buf_set_keymap('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
     buf_set_keymap('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
-  buf_set_keymap('n', 'gl', '<cmd>lua vim.diagnostic.open_float(buffer, {{opts}, scope="line"})<CR>', opts)
+    buf_set_keymap('n', 'gl',
+                   '<cmd>lua vim.diagnostic.open_float(buffer, {{opts}, scope="line"})<CR>',
+                   opts)
     buf_set_keymap('n', 'gh', '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
-  buf_set_keymap('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
+    buf_set_keymap('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>',
-  buf_set_keymap('n', '<space>T', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
+                   opts)
-  buf_set_keymap('n', '<space>l', '<cmd>lua vim.diagnostic.setloclist()<CR>', opts)
+    buf_set_keymap('n', '<space>T',
-  buf_set_keymap('n', '<space>q', '<cmd>lua vim.diagnostic.setqflist()<CR>', opts)
+                   '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
-  buf_set_keymap('n', '<space>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts)
+    buf_set_keymap('n', '<space>l', '<cmd>lua vim.diagnostic.setloclist()<CR>',
+                   opts)
+    buf_set_keymap('n', '<space>q', '<cmd>lua vim.diagnostic.setqflist()<CR>',
+                   opts)
+    buf_set_keymap('n', '<space>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>',
+                   opts)
     buf_set_keymap('n', '<space>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
-  buf_set_keymap('n', '<space>f', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts)
+    buf_set_keymap('n', '<space>f', '<cmd>lua vim.lsp.buf.formatting()<CR>',
+                   opts)
     -- 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)
 
+    if client.name == 'phpactor' then
+        client.resolved_capabilities.find_references = false;
+    end
+
     if client.name == 'tsserver' or client.name == 'intelephense' then
         client.resolved_capabilities.document_formatting = false;
+        print(vim.inspect(client.resolved_capabilities));
     end
 
     if client.resolved_capabilities.document_formatting then
@@ -107,9 +115,7 @@ for _, lsp in ipairs(servers) do
     nvim_lsp[lsp].setup {
         on_attach = on_attach,
         capabilities = capabilities,
-    flags = {
+        flags = {debounce_text_changes = 150}
-      debounce_text_changes = 150,
-    }
     }
 end
 
@@ -124,74 +130,61 @@ require'lspconfig'.sumneko_lua.setup {
                 -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim)
                 version = 'LuaJIT',
                 -- Setup your lua path
-        path = runtime_path,
+                path = runtime_path
             },
             diagnostics = {
                 -- Get the language server to recognize the `vim` global
-        globals = {'vim'},
+                globals = {'vim'}
             },
             workspace = {
                 -- Make the server aware of Neovim runtime files
-        library = vim.api.nvim_get_runtime_file("", true),
+                library = vim.api.nvim_get_runtime_file("", true)
             },
             -- Do not send telemetry data containing a randomized but unique identifier
-      telemetry = {
+            telemetry = {enable = false}
-        enable = false,
+        }
-      },
+    }
-    },
-  },
 }
 
 -- null-ls
 local null_ls = require("null-ls")
 
 local sources = {
-	null_ls.builtins.formatting.prettierd,
+    null_ls.builtins.formatting.prettierd, -- phpcs - standards wordpress
-
+    -- in project directory must
-	-- phpcs - standards wordpress
+    --  composer require friendsofphp/php-cs-fixer
+    --  as in https://github.com/FriendsOfPHP/PHP-CS-Fixer
+    --  I think os anyway - not totally sure any more
     null_ls.builtins.diagnostics.phpcs.with({
         condition = function(utils)
             return utils.root_has_file({"vendor/bin/phpcs"})
         end,
         command = "vendor/bin/phpcs",
-		args = { "--standard=WordPress", "--report=json", "-s", "-" },
+        args = {"--standard=WordPress", "--report=json", "-s", "-"}
-	}),
+    }), -- phpcbf - standards wordpress
-	-- phpcbf - standards wordpress
     null_ls.builtins.formatting.phpcbf.with({
         condition = function(utils)
             return utils.root_has_file({"vendor/bin/phpcbf"})
         end,
         command = "vendor/bin/phpcbf",
-		args = { "--standard=WordPress", "-" },
+        args = {"--standard=WordPress", "-"}
-	}),
+    }), -- phpcs
-
-	-- phpcs
     null_ls.builtins.diagnostics.phpcs.with({
         condition = function(utils)
             return not utils.root_has_file({"vendor/bin/phpcs"})
         end,
-		args = { "--standard=PSR12", "--report=json", "-s", "-" },
+        args = {"--standard=PSR12", "--report=json", "-s", "-"}
-	}),
+    }), -- phpcbf
-	-- phpcbf
     null_ls.builtins.formatting.phpcbf.with({
         condition = function(utils)
             return not utils.root_has_file({"vendor/bin/phpcbf"})
         end,
-		args = { "--standard=PSR12", "--report=json", "-s", "-" },
+        args = {"--standard=PSR12", "--report=json", "-s", "-"}
-	}),
+    }), -- black
-
+    null_ls.builtins.formatting.black, -- shellcheck,
-	-- black
+    null_ls.builtins.diagnostics.shellcheck, -- flake8
-	null_ls.builtins.formatting.black,
+    null_ls.builtins.diagnostics.flake8, -- luaFormatter
-	-- shellcheck,
+    null_ls.builtins.formatting.lua_format
-	null_ls.builtins.diagnostics.shellcheck,
-	-- flake8
-	null_ls.builtins.diagnostics.flake8,
-	-- luaFormatter
-	null_ls.builtins.formatting.lua_format,
 }
 
-null_ls.setup({
+null_ls.setup({sources = sources, on_attach = on_attach})
-	sources = sources,
-    on_attach = on_attach,
-})
-

spell/en.utf-8.add

@@ -200,3 +200,4 @@ LightInTheBox
 Etsy
 Strapi
 whitepapers
+LXD