Use vim-plug to manage vim plugins.
This commit is contained in:
parent
e220997bc5
commit
3ca6dfd835
3
.gitmodules
vendored
3
.gitmodules
vendored
@ -4,6 +4,3 @@
|
||||
[submodule "init/FiraCode"]
|
||||
path = init/FiraCode
|
||||
url = https://github.com/tonsky/FiraCode.git
|
||||
[submodule "init/vim-json"]
|
||||
path = init/vim-json
|
||||
url = https://github.com/elzr/vim-json
|
||||
|
||||
@ -1,139 +0,0 @@
|
||||
" Vim syntax file
|
||||
" Language: JSON
|
||||
" Maintainer: Eli Parra <eli@elzr.com> https://github.com/elzr/vim-json
|
||||
" Last Change: 2014-12-20 Load ftplugin/json.vim
|
||||
|
||||
" Reload the definition of g:vim_json_syntax_conceal
|
||||
" see https://github.com/elzr/vim-json/issues/42
|
||||
runtime! ftplugin/json.vim
|
||||
|
||||
if !exists("main_syntax")
|
||||
if version < 600
|
||||
syntax clear
|
||||
elseif exists("b:current_syntax")
|
||||
finish
|
||||
endif
|
||||
let main_syntax = 'json'
|
||||
endif
|
||||
|
||||
syntax match jsonNoise /\%(:\|,\)/
|
||||
|
||||
" NOTE that for the concealing to work your conceallevel should be set to 2
|
||||
|
||||
" Syntax: Strings
|
||||
" Separated into a match and region because a region by itself is always greedy
|
||||
syn match jsonStringMatch /"\([^"]\|\\\"\)\+"\ze[[:blank:]\r\n]*[,}\]]/ contains=jsonString
|
||||
if has('conceal') && g:vim_json_syntax_conceal == 1
|
||||
syn region jsonString oneline matchgroup=jsonQuote start=/"/ skip=/\\\\\|\\"/ end=/"/ concealends contains=jsonEscape contained
|
||||
else
|
||||
syn region jsonString oneline matchgroup=jsonQuote start=/"/ skip=/\\\\\|\\"/ end=/"/ contains=jsonEscape contained
|
||||
endif
|
||||
|
||||
" Syntax: JSON does not allow strings with single quotes, unlike JavaScript.
|
||||
syn region jsonStringSQError oneline start=+'+ skip=+\\\\\|\\"+ end=+'+
|
||||
|
||||
" Syntax: JSON Keywords
|
||||
" Separated into a match and region because a region by itself is always greedy
|
||||
syn match jsonKeywordMatch /"\([^"]\|\\\"\)\+"[[:blank:]\r\n]*\:/ contains=jsonKeyword
|
||||
if has('conceal') && g:vim_json_syntax_conceal == 1
|
||||
syn region jsonKeyword matchgroup=jsonQuote start=/"/ end=/"\ze[[:blank:]\r\n]*\:/ concealends contains=jsonEscape contained
|
||||
else
|
||||
syn region jsonKeyword matchgroup=jsonQuote start=/"/ end=/"\ze[[:blank:]\r\n]*\:/ contains=jsonEscape contained
|
||||
endif
|
||||
|
||||
" Syntax: Escape sequences
|
||||
syn match jsonEscape "\\["\\/bfnrt]" contained
|
||||
syn match jsonEscape "\\u\x\{4}" contained
|
||||
|
||||
" Syntax: Numbers
|
||||
syn match jsonNumber "-\=\<\%(0\|[1-9]\d*\)\%(\.\d\+\)\=\%([eE][-+]\=\d\+\)\=\>\ze[[:blank:]\r\n]*[,}\]]"
|
||||
|
||||
" ERROR WARNINGS **********************************************
|
||||
if (!exists("g:vim_json_warnings") || g:vim_json_warnings==1)
|
||||
" Syntax: Strings should always be enclosed with quotes.
|
||||
syn match jsonNoQuotesError "\<[[:alpha:]][[:alnum:]]*\>"
|
||||
syn match jsonTripleQuotesError /"""/
|
||||
|
||||
" Syntax: An integer part of 0 followed by other digits is not allowed.
|
||||
syn match jsonNumError "-\=\<0\d\.\d*\>"
|
||||
|
||||
" Syntax: Decimals smaller than one should begin with 0 (so .1 should be 0.1).
|
||||
syn match jsonNumError "\:\@<=[[:blank:]\r\n]*\zs\.\d\+"
|
||||
|
||||
" Syntax: No comments in JSON, see http://stackoverflow.com/questions/244777/can-i-comment-a-json-file
|
||||
syn match jsonCommentError "//.*"
|
||||
syn match jsonCommentError "\(/\*\)\|\(\*/\)"
|
||||
|
||||
" Syntax: No semicolons in JSON
|
||||
syn match jsonSemicolonError ";"
|
||||
|
||||
" Syntax: No trailing comma after the last element of arrays or objects
|
||||
syn match jsonTrailingCommaError ",\_s*[}\]]"
|
||||
|
||||
" Syntax: Watch out for missing commas between elements
|
||||
syn match jsonMissingCommaError /\("\|\]\|\d\)\zs\_s\+\ze"/
|
||||
syn match jsonMissingCommaError /\(\]\|\}\)\_s\+\ze"/ "arrays/objects as values
|
||||
if (expand('%:e') !=? 'jsonl')
|
||||
syn match jsonMissingCommaError /}\_s\+\ze{/ "objects as elements in an array
|
||||
endif
|
||||
syn match jsonMissingCommaError /\(true\|false\)\_s\+\ze"/ "true/false as value
|
||||
endif
|
||||
|
||||
" ********************************************** END OF ERROR WARNINGS
|
||||
" Allowances for JSONP: function call at the beginning of the file,
|
||||
" parenthesis and semicolon at the end.
|
||||
" Function name validation based on
|
||||
" http://stackoverflow.com/questions/2008279/validate-a-javascript-function-name/2008444#2008444
|
||||
syn match jsonPadding "\%^[[:blank:]\r\n]*[_$[:alpha:]][_$[:alnum:]]*[[:blank:]\r\n]*("
|
||||
syn match jsonPadding ");[[:blank:]\r\n]*\%$"
|
||||
|
||||
" Syntax: Boolean
|
||||
syn match jsonBoolean /\(true\|false\)\(\_s\+\ze"\)\@!/
|
||||
|
||||
" Syntax: Null
|
||||
syn keyword jsonNull null
|
||||
|
||||
" Syntax: Braces
|
||||
syn region jsonFold matchgroup=jsonBraces start="{" end=/}\(\_s\+\ze\("\|{\)\)\@!/ transparent fold
|
||||
syn region jsonFold matchgroup=jsonBraces start="\[" end=/]\(\_s\+\ze"\)\@!/ transparent fold
|
||||
|
||||
" Define the default highlighting.
|
||||
if version >= 508 || !exists("did_json_syn_inits")
|
||||
hi def link jsonPadding Operator
|
||||
hi def link jsonString String
|
||||
hi def link jsonTest Label
|
||||
hi def link jsonEscape Special
|
||||
hi def link jsonNumber Number
|
||||
hi def link jsonBraces Delimiter
|
||||
hi def link jsonNull Function
|
||||
hi def link jsonBoolean Boolean
|
||||
hi def link jsonKeyword Label
|
||||
|
||||
if (!exists("g:vim_json_warnings") || g:vim_json_warnings==1)
|
||||
hi def link jsonNumError Error
|
||||
hi def link jsonCommentError Error
|
||||
hi def link jsonSemicolonError Error
|
||||
hi def link jsonTrailingCommaError Error
|
||||
hi def link jsonMissingCommaError Error
|
||||
hi def link jsonStringSQError Error
|
||||
hi def link jsonNoQuotesError Error
|
||||
hi def link jsonTripleQuotesError Error
|
||||
endif
|
||||
hi def link jsonQuote Quote
|
||||
hi def link jsonNoise Noise
|
||||
endif
|
||||
|
||||
let b:current_syntax = "json"
|
||||
if main_syntax == 'json'
|
||||
unlet main_syntax
|
||||
endif
|
||||
|
||||
" Vim settings
|
||||
" vim: ts=8 fdm=marker
|
||||
|
||||
" MIT License
|
||||
" Copyright (c) 2013, Jeroen Ruigrok van der Werven, Eli Parra
|
||||
"Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the Software), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
|
||||
"The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
|
||||
"THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
"See https://twitter.com/elzr/status/294964017926119424
|
||||
16
.vimrc
16
.vimrc
@ -63,3 +63,19 @@ au BufNewFile,BufRead *.json set ft=javascript
|
||||
|
||||
" make Python follow PEP8 ( http://www.python.org/dev/peps/pep-0008/ )
|
||||
au FileType python set softtabstop=4 tabstop=4 shiftwidth=4 textwidth=79
|
||||
|
||||
" Install vim-plug
|
||||
if empty(glob('~/.vim/autoload/plug.vim'))
|
||||
silent !curl -fLo ~/.vim/autoload/plug.vim --create-dirs
|
||||
\ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
|
||||
autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
|
||||
endif
|
||||
|
||||
" Specify a directory for plugins
|
||||
" Install plugins
|
||||
call plug#begin('~/.vim/plugged')
|
||||
|
||||
Plug 'elzr/vim-json'
|
||||
|
||||
" Initialize plugin system
|
||||
call plug#end()
|
||||
|
||||
@ -79,7 +79,6 @@ deploy)
|
||||
|
||||
# Copy vim color scheme and other files to .vim
|
||||
cp init/Smyck-Color-Scheme/smyck.vim .vim/colors/smyck.vim
|
||||
cp init/vim-json/json.vim .vim/syntax/json.vim
|
||||
|
||||
df_deploy
|
||||
;;
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Subproject commit 3727f089410e23ae113be6222e8a08dd2613ecf2
|
||||
Loading…
Reference in New Issue
Block a user