update

lua/init-lsp.lua

@@ -171,7 +171,6 @@ require'lspconfig'.taplo.setup {
 }
 
 -- rust-tools
--- evaluating
 require('rust-tools').setup({
     server = {
         on_attach = on_attach,
@@ -193,41 +192,13 @@ require('rust-tools.inlay_hints').toggle_inlay_hints()
 local null_ls = require("null-ls")
 
 local sources = {
-    null_ls.builtins.formatting.prettierd, --
-    -- phpcs - standards wordpress
-    -- in project directory must
-    --  composer require friendsofphp/php-cs-fixer
-    --  as in https://github.com/FriendsOfPHP/PHP-CS-Fixer
-    --  I think so 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", "-"}
-    }), --
-    -- 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", "-"}
-    -- }), --
-    -- phpcs
+    null_ls.builtins.formatting.prettierd,
     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", "-"}
     }), --
-    -- 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", "-"}
-    -- }),
     null_ls.builtins.formatting.black, -- black
     null_ls.builtins.diagnostics.shellcheck, -- shellcheck,
     null_ls.builtins.diagnostics.flake8, -- flake8

lua/init.lua

@@ -1,44 +1,32 @@
-vim.o.foldmethod='expr'
-vim.o.foldexpr='nvim_treesitter#foldexpr()'
+vim.o.foldmethod = 'expr'
+vim.o.foldexpr = 'nvim_treesitter#foldexpr()'
 
 vim.diagnostic.config({
-  virtual_text = false,
-  signs = true,
-  underline = false,
-  update_in_insert = false,
-  severity_sort = true,
-	float = {
-    source = "always",  -- Or "if_many"
-  },
+    virtual_text = false,
+    signs = true,
+    underline = false,
+    update_in_insert = false,
+    severity_sort = true,
+    float = {
+        source = "always" -- Or "if_many"
+    }
 })
 
--- -- automatically show diagnostics for line
--- vim.cmd [[
--- 	augroup diagnostic_on_hover
--- 	autocmd CursorHold,CursorHoldI * lua vim.diagnostic.open_float(nil, {focus=false})
--- 	augroup END
--- ]]
-
-local signs = { Error = "● ", Warn = "● ", Hint = "● ", Info = "● " }
+local signs = {Error = "● ", Warn = "● ", Hint = "● ", Info = "● "}
 for type, icon in pairs(signs) do
-  local hl = "DiagnosticSign" .. type
-  vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = hl })
+    local hl = "DiagnosticSign" .. type
+    vim.fn.sign_define(hl, {text = icon, texthl = hl, numhl = hl})
 end
 
 local border = {
-      {"┌", "FloatBorder"},
-      {"─", "FloatBorder"},
-      {"┐", "FloatBorder"},
-      {"│", "FloatBorder"},
-      {"┘", "FloatBorder"},
-      {"─", "FloatBorder"},
-      {"└", "FloatBorder"},
-      {"│", "FloatBorder"},
+    {"┌", "FloatBorder"}, {"─", "FloatBorder"}, {"┐", "FloatBorder"},
+    {"│", "FloatBorder"}, {"┘", "FloatBorder"}, {"─", "FloatBorder"},
+    {"└", "FloatBorder"}, {"│", "FloatBorder"}
 }
 
 local orig_util_open_floating_preview = vim.lsp.util.open_floating_preview
 function vim.lsp.util.open_floating_preview(contents, syntax, opts, ...)
-  opts = opts or {}
-  opts.border = opts.border or border
-  return orig_util_open_floating_preview(contents, syntax, opts, ...)
+    opts = opts or {}
+    opts.border = opts.border or border
+    return orig_util_open_floating_preview(contents, syntax, opts, ...)
 end

spell/en.utf-8.add

@@ -259,3 +259,4 @@ booleans
 pothos
 monstera
 Heartleaf
+i32