From 45598458e648a0e8504444a896226fcf56763549 Mon Sep 17 00:00:00 2001 From: ray Date: Sat, 22 Jan 2022 18:57:25 +0000 Subject: [PATCH 1/2] explicitly set phpcs standard --- lua/init-null-ls.lua | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/lua/init-null-ls.lua b/lua/init-null-ls.lua index 08ce508..965324c 100644 --- a/lua/init-null-ls.lua +++ b/lua/init-null-ls.lua @@ -1,16 +1,6 @@ local null_ls = require("null-ls") 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, -- phpcs - standards wordpress @@ -35,12 +25,14 @@ local sources = { 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", "-" }, }), -- black From 2791906c64743cf996a277e9d089913b91a0766f Mon Sep 17 00:00:00 2001 From: ray Date: Sat, 22 Jan 2022 18:57:44 +0000 Subject: [PATCH 2/2] tidy up --- lua/init-indent-blankline.lua | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/lua/init-indent-blankline.lua b/lua/init-indent-blankline.lua index b8b35c6..8a8fae6 100644 --- a/lua/init-indent-blankline.lua +++ b/lua/init-indent-blankline.lua @@ -1,11 +1,5 @@ require("indent_blankline").setup { 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 -]]