diff --git a/UltiSnips/javascript.snippets b/UltiSnips/javascript.snippets index 3fa6ee3..c05de2b 100644 --- a/UltiSnips/javascript.snippets +++ b/UltiSnips/javascript.snippets @@ -2,10 +2,20 @@ snippet todo "// TODO" // TODO $0 endsnippet -snippet cl "console.log( ... )" +snippet if "if ( ... ) { ... }" +if ($1) { + $0 +} +endsnippet + +snippet cl; "console.log( ... );" console.log($0); endsnippet +snippet cl "console.log( ... )" +console.log($0) +endsnippet + snippet if "if ( ... ) { ... }" if ($1) { $0 diff --git a/colors/monotonous-dark.erb b/colors/monotonous-dark.erb index f6fcc66..f019f94 100644 --- a/colors/monotonous-dark.erb +++ b/colors/monotonous-dark.erb @@ -596,6 +596,9 @@ [ "jsonValue", "String" ], [ "jsonQuote", "Noise" ], + # octobercms + [ "octobercmsSectionDelimiter", "Noise" ], + # plugins [ "CocErrorSign", "ErrorMsg" ], diff --git a/colors/monotonous-dark.vim b/colors/monotonous-dark.vim index 423ceaf..1478caf 100644 --- a/colors/monotonous-dark.vim +++ b/colors/monotonous-dark.vim @@ -323,6 +323,7 @@ if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running") hi link jsonKeyword Identifier hi link jsonValue String hi link jsonQuote Noise + hi link octobercmsSectionDelimiter Noise hi link CocErrorSign ErrorMsg hi link CocWarningSign WarningMsg hi link CocInfoSign Question @@ -684,6 +685,7 @@ elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16 hi link jsonKeyword Identifier hi link jsonValue String hi link jsonQuote Noise + hi link octobercmsSectionDelimiter Noise hi link CocErrorSign ErrorMsg hi link CocWarningSign WarningMsg hi link CocInfoSign Question diff --git a/syntax/octobercms.vim b/syntax/octobercms.vim new file mode 100644 index 0000000..05daf11 --- /dev/null +++ b/syntax/octobercms.vim @@ -0,0 +1,19 @@ +if exists("b:current_syntax") + finish +endif + +runtime! syntax/jinja.vim + +syntax include @octoberPHP syntax/php.vim + +unlet! b:current_syntax + +syntax include @octoberConfig syntax/dosini.vim + +syntax region octoberConfig start=@\%^\([a-zA-z]\+[a-zA-Z0-9]\+\s*=\s*\("\|'\)\)\|\[\s*[a-zA-Z0-9]\+\s*\]@ end=+^==$+me=e-2 contains=@octoberConfig +syntax region octoberPHP start=+^==$+ms=s+2 end=+^==$+me=e-2 contains=@octoberPHP + +" syntax match octobercmsSectionDelimiter "^==$" +" highlight link octobercmsSectionDelimiter Comment + +let b:current_syntax = "octobercms" diff --git a/vimrc b/vimrc index e30382d..cccd922 100644 --- a/vimrc +++ b/vimrc @@ -25,25 +25,6 @@ if !has('nvim') Plug '~/.config/vim/vim/bundle/vim-learnxiny' -" #Ctrlp {{{ - " Plug 'ctrlpvim/ctrlp.vim' - " " :h ctrlp-commands - " " :h ctrlp-extensions - " - " let g:ctrlp_extensions = ['tag', 'buffertag', 'quickfix', 'undo'] - " - " if executable('ag') - " " Use ag in CtrlP for listing files. Lightning fast and respects .gitignore - " let g:ctrlp_user_command = 'ag %s -l --nocolor -g ""' - " " ag is fast enough that CtrlP doesn't need to cache - " let g:ctrlp_use_caching = 0 - " endif - " " Use ag over grep - " if executable('ag') - " set grepprg=ag\ --nogroup\ --nocolor\ --ignore\ node_modules - " endif - - "}}} " #Netrw {{{ let g:netrw_liststyle=3 @@ -181,7 +162,7 @@ if g:vimrc_load_dev_plugins " #ALE {{{ " https://github.com/w0rp/ale Plug 'w0rp/ale' - let g:ale_completion_enabled = 1 + " let g:ale_completion_enabled = 1 let g:ale_sign_column_always = 1 let g:ale_open_list = 0 @@ -1067,7 +1048,7 @@ set number relativenumber set hlsearch " set completeopt=menuone,preview -set completeopt=menuone,noselect +set completeopt=menuone set nospell set spelllang=en_gb @@ -1233,6 +1214,7 @@ inoremap "; ""; inoremap '' '' inoremap ''' '' inoremap '; ''; +inoremap `` `` "}}}