Skip to content

refactoring block conditions #695

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 4 commits into from
Nov 5, 2016
Merged

refactoring block conditions #695

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
21d0157
refactoring block conditions
bounceme Nov 5, 2016
a406294
Update javascript.vim
bounceme Nov 5, 2016
b40a744
Update javascript.vim
bounceme Nov 5, 2016
2bd103b
Update javascript.vim
bounceme Nov 5, 2016
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
26 changes: 11 additions & 15 deletions indent/javascript.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
" Language: Javascript
" Maintainer: Chris Paul ( https://github.com/bounceme )
" URL: https://github.com/pangloss/vim-javascript
" Last Change: Octember 31, 2016
" Last Change: November 5, 2016

" Only load this indent file when no other was loaded.
if exists('b:did_indent')
Expand Down Expand Up @@ -137,7 +137,7 @@ function s:IsBlock(...)
let l:ln = get(a:000,0,line('.'))
if search('\S','bW')
let char = s:token()
let syn = synIDattr(synID(line('.'),col('.')-(char == '{'),0),'name')
let syn = char =~ '[{>/]' || l:ln != line('.') ? synIDattr(synID(line('.'),col('.')-(char == '{'),0),'name') : ''
if syn =~? '\%(xml\|jsx\)'
return char != '{'
elseif syn =~? 'comment'
Expand Down Expand Up @@ -241,20 +241,16 @@ function GetJavascriptIndent()
let num = b:js_cache[1]

let [s:W, pline, isOp, stmt, bL, switch_offset] = [s:sw(), s:Trim(l:lnum),0,0,0,0]
if num
if s:current_char() == '{'
if search(')\_s*\%#','bW')
let stmt = 1
if s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0 && s:previous_token() ==# 'switch'
let switch_offset = &cino !~ ':' || !has('float') ? s:W :
\ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (&cino =~# '.*:[^,]*s' ? s:W : 1))
if l:line =~# '^' . s:expr_case
return indent(num) + switch_offset
endif
let stmt = pline !~# s:expr_case . '$'
if num
if s:current_char() == '{' && s:IsBlock()
let stmt = 1
if s:current_char() == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0 && s:previous_token() ==# 'switch'
let switch_offset = &cino !~ ':' || !has('float') ? s:W :
\ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (&cino =~# '.*:[^,]*s' ? s:W : 1))
if l:line =~# '^' . s:expr_case
return indent(num) + switch_offset
endif
elseif s:IsBlock()
let stmt = 1
let stmt = pline !~# s:expr_case . '$'
endif
endif
else
Expand Down