Skip to content

recursion in isBlock: comment skip #692

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bounceme merged 1 commit into from
Oct 30, 2016
Merged

recursion in isBlock: comment skip #692

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 5 additions & 11 deletions indent/javascript.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,21 +115,15 @@ function s:iscontOne(i,num,cont)
endfunction

" https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader
function s:IsBlock()
let l:ln = line('.')
function s:IsBlock(...)
let l:ln = get(a:000,0,line('.'))
if search('\S','bW')
let char = getline('.')[col('.')-1]
let pchar = getline('.')[col('.')-2]
let syn = synIDattr(synID(line('.'),col('.')-1,0),'name')
if pchar . char == '*/' && syn =~? 'comment'
if !search('\/\*','bW') || !search('\S','bW')
return 1
endif
let char = getline('.')[col('.')-1]
let pchar = getline('.')[col('.')-2]
let syn = synIDattr(synID(line('.'),col('.')-1,0),'name')
endif
if syn =~? '\%(xml\|jsx\)'
if syn =~? 'comment'
return search('\/[/*]','bW') && s:IsBlock(l:ln)
elseif syn =~? '\%(xml\|jsx\)'
return char != '{'
elseif char =~# '\l'
return index(split('return const let import export yield default delete var void typeof throw new in instanceof')
Expand Down