dots
/
nvim
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix merge conflict

This commit is contained in:
Ray Elliott 2020-05-10 13:15:31 +00:00
parent 2ada6bffcf
commit fb3a829d3d
3 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
UltiSnips/php.snippets
View File

@ -1,5 +1,25 @@
snippet pf "public function ..." snippet pf "public function ..."
public function $1($2) { public function $1($2) {
$0 $0
} }
endsnippet endsnippet
snippet wpregblock "function register_block() { ..."
function ${1:plugin_name}_register_block() {
// automatically load dependencies and version
$asset_file = include( plugin_dir_path( __FILE__ ) . '$2/build/index.asset.php');
wp_register_script(
'${1/_/-/g}-${2:block-name}',
plugins_url( '$2/build/block.js', __FILE__ ),
$asset_file['dependencies'],
$asset_file['version']
);
register_block_type( '${3:namespace}/${1/_/-/g}-$2',
array( 'editor_script' => '${1/_/-/g}-$2',) );
}
add_action( 'init', '$1_register_block' );
endsnippet

5
coc-settings.json
View File

@ -22,13 +22,12 @@
"python.linting.lintOnSave": true, "python.linting.lintOnSave": true,
"python.formatting.provider": "black", "python.formatting.provider": "black",
"python.formatting.blackPath": "/home/ray/.local/bin/black", "python.formatting.blackPath": "/home/ray/.local/bin/black",
"coc.preferences.formatOnSaveFiletypes": ["python", "scss", "css", "vue"], "coc.preferences.formatOnSaveFiletypes": ["python", "vue"],
"eslint.enable": true, "eslint.enable": true,
"eslint.autoFixOnSave": true, "eslint.autoFixOnSave": true,
"eslint.filetypes": [ "eslint.filetypes": [
"javascript", "javascript",
"vue" "vue"
], ]
"prettier.eslintIntegration": true
} }

4
init.plugins.vim
View File

@ -25,8 +25,8 @@ call plug#begin('~/.config/nvim/bundle')
let g:ale_fix_on_save = 1 let g:ale_fix_on_save = 1
let g:ale_fix_on_save_ignore = { 'vue': ['eslint'] } let g:ale_fix_on_save_ignore = { 'vue': ['eslint'] }
let g:ale_linters = {'scss': [], 'javascript': [], 'json': [], 'php':['php'], 'python': [], 'html':['htmlhint'], 'vue': []} let g:ale_linters = {'scss': ['stylelint'], 'javascript': [], 'json': [], 'php':['php'], 'python': [], 'html':['htmlhint'], 'vue': []}
let g:ale_fixers = {'scss': ['prettier'], 'javascript': [], 'json': ['jq'], 'python': [], 'vue': []} let g:ale_fixers = {'scss': ['stylelint'], 'javascript': [], 'json': ['jq'], 'python': [], 'vue': []}
let g:ale_html_htmlhint_options = '-c ~/.htmlhintrc --format=unix' let g:ale_html_htmlhint_options = '-c ~/.htmlhintrc --format=unix'