m-vim_plugins/vim-polyglot
1
0
Fork 0
mirror of https://github.com/sheerun/vim-polyglot.git synced 2025-11-11 21:13:50 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Switch to elzr for json syntax, and disable conceal by default

Browse Source
This commit is contained in:
Adam Stankiewicz
2016-07-26 13:50:28 +02:00
parent 7dd62806a0
commit acd25ccf95
7 changed files with 117 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
indent/json.vim
View File

@@ -44,7 +44,7 @@ let s:block_regex = '\%({\)\s*\%(|\%([*@]\=\h\w*,\=\s*\)\%(,\s*[*@]\=\h\w*\)*|\)
" Check if the character at lnum:col is inside a string.
function s:IsInString(lnum, col)
return synIDattr(synID(a:lnum, a:col, 1), 'name') == jsonString
return synIDattr(synID(a:lnum, a:col, 1), 'name') == "jsonString"
endfunction
" Find line above 'lnum' that isn't empty, or in a string.
@@ -143,7 +143,11 @@ function GetJSONIndent()
" If the previous line ended with a block opening, add a level of indent.
" if s:Match(lnum, s:block_regex)
" return indent(lnum) + shiftwidth()
" if exists('*shiftwidth')
" return indent(lnum) + shiftwidth()
" else
" return indent(lnum) + &sw
" endif
" endif
" If the previous line contained an opening bracket, and we are still in it,
@@ -151,7 +155,11 @@ function GetJSONIndent()
if line =~ '[[({]'
let counts = s:LineHasOpeningBrackets(lnum)
if counts[0] == '1' || counts[1] == '1' || counts[2] == '1'
return ind + shiftwidth()
if exists('*shiftwidth')
return ind + shiftwidth()
else
return ind + &sw
endif
else
call cursor(v:lnum, vcol)
end