Compare commits

...

2 Commits

Author SHA1 Message Date
Ray Elliott 2791906c64 tidy up 2022-01-22 18:57:44 +00:00
Ray Elliott 45598458e6 explicitly set phpcs standard 2022-01-22 18:57:25 +00:00
2 changed files with 3 additions and 17 deletions

View File

@ -1,11 +1,5 @@
require("indent_blankline").setup { require("indent_blankline").setup {
space_char_blankline = " ", space_char_blankline = " ",
show_current_context = true,
show_current_context = true,
} }
vim.cmd [[
highlight IndentBlanklineChar guifg=#e5e5e5 gui=nocombine
highlight IndentBlanklineContextChar guifg=#666666 gui=nocombine
]]

View File

@ -1,16 +1,6 @@
local null_ls = require("null-ls") local null_ls = require("null-ls")
local sources = { local sources = {
-- -- prettier - using perttierd instead
-- null_ls.builtins.formatting.prettier.with({
-- extra_filetypes = { "php" },
-- prefer_local = "node_modules/.bin",
-- }),
-- -- prettierd with php
-- null_ls.builtins.formatting.prettierd.with({
-- extra_filetypes = { "php" },
-- }),
-- prettierd without php (use phpcbf instead)
null_ls.builtins.formatting.prettierd, null_ls.builtins.formatting.prettierd,
-- phpcs - standards wordpress -- phpcs - standards wordpress
@ -35,12 +25,14 @@ local sources = {
condition = function(utils) condition = function(utils)
return not utils.root_has_file({ "vendor/bin/phpcs" }) return not utils.root_has_file({ "vendor/bin/phpcs" })
end, end,
args = { "--standard=PSR12", "--report=json", "-s", "-" },
}), }),
-- phpcbf -- phpcbf
null_ls.builtins.formatting.phpcbf.with({ null_ls.builtins.formatting.phpcbf.with({
condition = function(utils) condition = function(utils)
return not utils.root_has_file({ "vendor/bin/phpcbf" }) return not utils.root_has_file({ "vendor/bin/phpcbf" })
end, end,
args = { "--standard=PSR12", "--report=json", "-s", "-" },
}), }),
-- black -- black