From 8bdda43941be4c5142666711f65c3007865b2e15 Mon Sep 17 00:00:00 2001 From: Chris Paul Date: Fri, 30 Sep 2016 17:47:07 -0700 Subject: [PATCH 1/4] flow generic classes the type parameter would confuse the 'is block' function into thinking the class body was an object --- indent/javascript.vim | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/indent/javascript.vim b/indent/javascript.vim index 7bbee713..18be604d 100644 --- a/indent/javascript.vim +++ b/indent/javascript.vim @@ -115,8 +115,9 @@ endfunction function s:IsBlock() 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:expr_case . '\_s*\%#','nbW') || !search('[{:]\_s*\%#','bW') || s:IsBlock())) + \ : !search('[-=~!<*+,./?^%|&\[(]\_s*\%#','nbW') && ((!search('>\_s*\%#','bW') || search('=\%#','bW') || + \ synIDattr(synID(line('.'),col('.'),0),'name') =~? 'flownoise') || + \ search(s:expr_case . '\_s*\%#','nbW') || !search('[{:]\_s*\%#','bW') || s:IsBlock())) endfunction " Find line above 'lnum' that isn't empty, in a comment, or in a string. From 899b6295152bd6a97da544e8d88a9eef9f3641c3 Mon Sep 17 00:00:00 2001 From: Chris Paul Date: Fri, 30 Sep 2016 17:50:05 -0700 Subject: [PATCH 2/4] 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 18be604d..ea204265 100644 --- a/indent/javascript.vim +++ b/indent/javascript.vim @@ -116,8 +116,8 @@ function s:IsBlock() 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') || - \ search(s:expr_case . '\_s*\%#','nbW') || !search('[{:]\_s*\%#','bW') || s:IsBlock())) + \ synIDattr(synID(line('.'),col('.'),0),'name') =~? 'flownoise') && + \ (search(s:expr_case . '\_s*\%#','nbW') || !search('[{:]\_s*\%#','bW') || s:IsBlock()))) endfunction " Find line above 'lnum' that isn't empty, in a comment, or in a string. From a7e3c5fedd718ca9347ff7c1f6e9aa83f480588b Mon Sep 17 00:00:00 2001 From: Chris Paul Date: Fri, 30 Sep 2016 17:57:02 -0700 Subject: [PATCH 3/4] 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 ea204265..27f0dc7b 100644 --- a/indent/javascript.vim +++ b/indent/javascript.vim @@ -115,8 +115,8 @@ endfunction function s:IsBlock() 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') && + \ : !search('[-=~!<*+,./?^%|&\[(]\_s*\%#','nbW') && (search('>\_s*\%#','bW') ? search('=\%#','bW') || + \ synIDattr(synID(line('.'),col('.'),0),'name') =~? 'flownoise' : \ (search(s:expr_case . '\_s*\%#','nbW') || !search('[{:]\_s*\%#','bW') || s:IsBlock()))) endfunction From fc2b79fc8a345fb9d4864c73ab705bfd8b4aad3d Mon Sep 17 00:00:00 2001 From: Chris Paul Date: Fri, 30 Sep 2016 19:46:21 -0700 Subject: [PATCH 4/4] Update javascript.vim --- indent/javascript.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indent/javascript.vim b/indent/javascript.vim index 27f0dc7b..e64b454e 100644 --- a/indent/javascript.vim +++ b/indent/javascript.vim @@ -117,7 +117,7 @@ function s:IsBlock() \ '\<\%(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' : - \ (search(s:expr_case . '\_s*\%#','nbW') || !search('[{:]\_s*\%#','bW') || s:IsBlock()))) + \ search(s:expr_case . '\_s*\%#','nbW') || !search('[{:]\_s*\%#','bW') || s:IsBlock())) endfunction " Find line above 'lnum' that isn't empty, in a comment, or in a string.