From 0e7845000388b76836a970731e26fda5514da109 Mon Sep 17 00:00:00 2001 From: bounceme Date: Tue, 16 Aug 2016 00:46:29 -0700 Subject: [PATCH 1/7] cleaning --- indent/javascript.vim | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/indent/javascript.vim b/indent/javascript.vim index 38acae0d..3e9ff92e 100644 --- a/indent/javascript.vim +++ b/indent/javascript.vim @@ -95,10 +95,7 @@ endfunction " Find line above 'lnum' that isn't empty, in a comment, or in a string. function s:PrevCodeLine(lnum) let l:lnum = prevnonblank(a:lnum) - while l:lnum > 0 - if synIDattr(synID(l:lnum,matchend(getline(l:lnum), '^\s*[^''"]'),0),'name') !~? s:syng_strcom - break - endif + while synIDattr(synID(l:lnum,matchend(getline(l:lnum), '^\s*[^''"]'),0),'name') =~? s:syng_strcom let l:lnum = prevnonblank(l:lnum - 1) endwhile return l:lnum From cc40ae3a96e3bdcb36f7ecdf5936cfa56bd08fc1 Mon Sep 17 00:00:00 2001 From: bounceme Date: Tue, 16 Aug 2016 01:41:02 -0700 Subject: [PATCH 2/7] Update javascript.vim --- indent/javascript.vim | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/indent/javascript.vim b/indent/javascript.vim index 3e9ff92e..4d64bd11 100644 --- a/indent/javascript.vim +++ b/indent/javascript.vim @@ -95,10 +95,12 @@ endfunction " Find line above 'lnum' that isn't empty, in a comment, or in a string. function s:PrevCodeLine(lnum) let l:lnum = prevnonblank(a:lnum) - while synIDattr(synID(l:lnum,matchend(getline(l:lnum), '^\s*[^''"]'),0),'name') =~? s:syng_strcom + while l:lnum + if synIDattr(synID(l:lnum,matchend(getline(l:lnum), '^\s*[^''"]'),0),'name') !~? s:syng_strcom + return l:lnum + endif let l:lnum = prevnonblank(l:lnum - 1) endwhile - return l:lnum endfunction " Check if line 'lnum' has a balanced amount of parentheses. From e8e6a325e6effcc8b2605cbdba612f5f4261bf0a Mon Sep 17 00:00:00 2001 From: bounceme Date: Tue, 16 Aug 2016 01:48:47 -0700 Subject: [PATCH 3/7] Update javascript.vim --- indent/javascript.vim | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/indent/javascript.vim b/indent/javascript.vim index 4d64bd11..1258789c 100644 --- a/indent/javascript.vim +++ b/indent/javascript.vim @@ -48,13 +48,15 @@ let s:syng_comment = '\%(comment\|doc\)' " Expression used to check whether we should skip a match with searchpair(). let s:skip_expr = "line('.') < (prevnonblank(v:lnum) - 2000) ? dummy : synIDattr(synID(line('.'),col('.'),0),'name') =~? '".s:syng_strcom."'" -function s:lookForParens(start,end,flags,time) - if has('reltime') +if has('reltime') + function s:lookForParens(start,end,flags,time) return searchpair(a:start,'',a:end,a:flags,s:skip_expr,0,a:time) - else + endfunction +else + function s:lookForParens(start,end,flags,n) return searchpair(a:start,'',a:end,a:flags,0,0) - endif -endfunction + endfunction +endif let s:line_term = '\%(\s*\%(\/\*.\{-}\*\/\s*\)\=\)\@>$' From 463a135f8edef97b5ee2b527962f9e703141ce92 Mon Sep 17 00:00:00 2001 From: bounceme Date: Tue, 16 Aug 2016 07:40:06 -0700 Subject: [PATCH 4/7] 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 1258789c..199d9651 100644 --- a/indent/javascript.vim +++ b/indent/javascript.vim @@ -64,11 +64,11 @@ let s:line_term = '\%(\s*\%(\/\*.\{-}\*\/\s*\)\=\)\@>$' if !exists('g:javascript_opfirst') let g:javascript_opfirst = '\%([<>,:?^%|&]\|\([-/.+]\)\%(\1\|\*\|\/\)\@!\|\*\/\@!\|=>\@!\|in\%(stanceof\)\=\>\)' endif -let g:javascript_opfirst = s:line_pre . g:javascript_opfirst - if !exists('g:javascript_continuation') let g:javascript_continuation = '\%([<=*,.?:^%|&]\|+\@\|\*\@ Date: Tue, 16 Aug 2016 12:00:23 -0700 Subject: [PATCH 5/7] Update javascript.vim --- indent/javascript.vim | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/indent/javascript.vim b/indent/javascript.vim index 199d9651..af1bf924 100644 --- a/indent/javascript.vim +++ b/indent/javascript.vim @@ -46,15 +46,15 @@ let s:syng_strcom = '\%(s\%(tring\|pecial\)\|comment\|regex\|doc\|template\)' let s:syng_comment = '\%(comment\|doc\)' " Expression used to check whether we should skip a match with searchpair(). -let s:skip_expr = "line('.') < (prevnonblank(v:lnum) - 2000) ? dummy : synIDattr(synID(line('.'),col('.'),0),'name') =~? '".s:syng_strcom."'" +let s:skip_expr = "synIDattr(synID(line('.'),col('.'),0),'name') =~? '".s:syng_strcom."'" if has('reltime') function s:lookForParens(start,end,flags,time) - return searchpair(a:start,'',a:end,a:flags,s:skip_expr,0,a:time) + return searchpair(a:start,'',a:end,a:flags,s:skip_expr,max([prevnonblank(v:lnum) - 2000,0]),a:time) endfunction else function s:lookForParens(start,end,flags,n) - return searchpair(a:start,'',a:end,a:flags,0,0) + return searchpair(a:start,'',a:end,a:flags,0,max([prevnonblank(v:lnum) - 2000,0])) endfunction endif From 6057df33612c8a3c66f2d89b782f4bc3156a9423 Mon Sep 17 00:00:00 2001 From: bounceme Date: Tue, 16 Aug 2016 19:20:23 -0700 Subject: [PATCH 6/7] 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 af1bf924..af64e084 100644 --- a/indent/javascript.vim +++ b/indent/javascript.vim @@ -177,7 +177,7 @@ function GetJavascriptIndent() endif let pline = s:StripLine(getline(l:lnum)) - call cursor(b:js_cache[1:]) + call cursor(b:js_cache[1],b:js_cache[2]) let inb = num == 0 || num < l:lnum && ((l:line !~ s:line_pre . ',' && pline !~ ',' . s:line_term) || s:isBlock()) let switch_offset = num == 0 || s:Onescope(num, s:StripLine(strpart(getline(num),0,b:js_cache[2] - 1)),1) !=# 'switch' ? 0 : \ &cino !~ ':' || !has('float') ? s:sw() : From afb4edd897e21dba8cc4609a1221610930e570af Mon Sep 17 00:00:00 2001 From: bounceme Date: Tue, 16 Aug 2016 19:21:05 -0700 Subject: [PATCH 7/7] 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 af64e084..882fe48a 100644 --- a/indent/javascript.vim +++ b/indent/javascript.vim @@ -2,7 +2,7 @@ " Language: Javascript " Maintainer: vim-javascript community " URL: https://github.com/pangloss/vim-javascript -" Last Change: August 15, 2016 +" Last Change: August 16, 2016 " Only load this indent file when no other was loaded. if exists('b:did_indent')