From b56de8b2395344a212ac072004037dda45f4c174 Mon Sep 17 00:00:00 2001 From: Chris Paul Date: Sun, 9 Oct 2016 12:42:27 -0700 Subject: [PATCH 1/2] skip comment https://github.com/pangloss/vim-javascript/issues/664#issuecomment-252492671 --- indent/javascript.vim | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/indent/javascript.vim b/indent/javascript.vim index a6eefba0..2c131b34 100644 --- a/indent/javascript.vim +++ b/indent/javascript.vim @@ -128,7 +128,9 @@ endfunction " https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader function s:IsBlock() - return getline(line('.'))[col('.')-1] == '{' && !search('\C\') !~# + return getline(line('.'))[col('.')-1] == '{' && !search('\C\') !~# \ '\<\%(var\|const\|let\|\%(im\|ex\)port\|yield\|de\%(fault\|lete\)\|void\|t\%(ypeof\|hrow\)\|new\|in\%(stanceof\)\=\)\>' \ : !search('[-=~!<*+,./?^%|&\[(]\_s*\%#','nbW') && (search('>\_s*\%#','bW') ? search('=\%#','bW') || \ synIDattr(synID(line('.'),col('.'),0),'name') =~? 'flownoise' : From 907a96cee310f71b0126d499bf245d8df2554d97 Mon Sep 17 00:00:00 2001 From: Chris Paul Date: Sun, 9 Oct 2016 17:47:03 -0700 Subject: [PATCH 2/2] Update javascript.vim --- indent/javascript.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indent/javascript.vim b/indent/javascript.vim index 2c131b34..0a527b2e 100644 --- a/indent/javascript.vim +++ b/indent/javascript.vim @@ -129,8 +129,8 @@ endfunction " https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader function s:IsBlock() return getline(line('.'))[col('.')-1] == '{' && !search('\C\') !~# + \ (!search('\*\/\_s*\%#','bW') || synIDattr(synID(line('.'),col('.'),0),'name') =~? 'comment' && + \ searchpair('\/\*','','\*\/','bW')) && (search('\l\_s*\%#','bW') ? expand('') !~# \ '\<\%(var\|const\|let\|\%(im\|ex\)port\|yield\|de\%(fault\|lete\)\|void\|t\%(ypeof\|hrow\)\|new\|in\%(stanceof\)\=\)\>' \ : !search('[-=~!<*+,./?^%|&\[(]\_s*\%#','nbW') && (search('>\_s*\%#','bW') ? search('=\%#','bW') || \ synIDattr(synID(line('.'),col('.'),0),'name') =~? 'flownoise' :