Skip to content

Commit 6ecbda3

Browse files
authored
clean isBlock (#648)
1 parent 92f1d98 commit 6ecbda3

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

indent/javascript.vim

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,10 @@ endfunction
109109

110110
" https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader
111111
function s:IsBlock()
112-
return getline(line('.'))[col('.')-1] == '{' && !search(
113-
\ '\C\%(\<return\s*\|\%([-=~!<*+,.?^%|&\[(]\|=\@<!>\|\*\@<!\/\|\<\%(var\|const\|let\|import\|export\%(\_s\+default\)\=\|yield\|delete\|void\|t\%(ypeof\|hrow\)\|new\|in\%(stanceof\)\=\)\)\_s*\)\%#'
114-
\ ,'bnW') && (search(s:expr_case . '\_s*\%#','nbW') || !search('[{:]\_s*\%#','bW') || s:IsBlock())
112+
return getline(line('.'))[col('.')-1] == '{' && !search('\<return\s*\%#','nbW') && (search('\l\_s*\%#','bW') ? expand('<cword>') !~#
113+
\ '\<\%(var\|const\|let\|import\|export\|yield\|de\%(fault\|lete\)\|void\|t\%(ypeof\|hrow\)\|new\|in\%(stanceof\)\=\)\>'
114+
\ : !search('\C\%([-=~!<*+,./?^%|&\[(]\|=\@<!>\)\_s*\%#','nbW') &&
115+
\ (search(s:expr_case . '\_s*\%#','nbW') || !search('[{:]\_s*\%#','bW') || s:IsBlock()))
115116
endfunction
116117

117118
" Find line above 'lnum' that isn't empty, in a comment, or in a string.

0 commit comments

Comments
 (0)