From b509d24437cbf2110ad629c91ecdb540c9a63763 Mon Sep 17 00:00:00 2001 From: Chris Paul Date: Wed, 12 Oct 2016 22:48:57 -0700 Subject: [PATCH 1/4] various little updates --- indent/javascript.vim | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/indent/javascript.vim b/indent/javascript.vim index 446b4343..3bc82fc6 100644 --- a/indent/javascript.vim +++ b/indent/javascript.vim @@ -133,14 +133,15 @@ function s:IsBlock() if search('\S','bW') let char = getline(line('.'))[col('.')-1] let prechar = getline(line('.'))[col('.')-2] - if char == '/' && prechar == '*' && synIDattr(synID(line('.'),col('.'),0),'name') =~? 'comment' + let syn = synIDattr(synID(line('.'),col('.')-1,0),'name') + if char == '/' && prechar == '*' && syn =~? 'comment' if !(search('\/\*','bW') && search('\S','bW')) return 1 endif let char = getline(line('.'))[col('.')-1] let prechar = getline(line('.'))[col('.')-2] + let syn = synIDattr(synID(line('.'),col('.')-1,0),'name') endif - let syn = synIDattr(synID(line('.'),col('.')-1,0),'name') if syn =~? '\%(xml\|jsx\)' return char != '{' elseif char =~# '\l' @@ -148,7 +149,7 @@ function s:IsBlock() return 0 endif return expand('') !~# - \ '^\%(var\|const\|let\|import\|export\|yield\|de\%(fault\|lete\)\|void\|t\%(ypeof\|hrow\)\|new\|in\%(stanceof\)\=\)$' + \ '^\%(const\|let\|import\|export\|yield\|de\%(fault\|lete\)\|v\%(ar\|oid\)\|t\%(ypeof\|hrow\)\|new\|in\%(stanceof\)\=\)$' elseif char == '>' return prechar == '=' || syn =~? '^jsflow' elseif char == ':' From 35b2719b1193d6a4a4064dd163453c7e89cb04a0 Mon Sep 17 00:00:00 2001 From: Chris Paul Date: Thu, 13 Oct 2016 00:04:22 -0700 Subject: [PATCH 2/4] loop --- indent/javascript.vim | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/indent/javascript.vim b/indent/javascript.vim index 3bc82fc6..4732d7ac 100644 --- a/indent/javascript.vim +++ b/indent/javascript.vim @@ -131,17 +131,16 @@ function s:IsBlock() if getline(line('.'))[col('.')-1] == '{' let l:ln = line('.') if search('\S','bW') - let char = getline(line('.'))[col('.')-1] - let prechar = getline(line('.'))[col('.')-2] - let syn = synIDattr(synID(line('.'),col('.')-1,0),'name') - if char == '/' && prechar == '*' && syn =~? 'comment' - if !(search('\/\*','bW') && search('\S','bW')) - return 1 - endif + while 1 let char = getline(line('.'))[col('.')-1] let prechar = getline(line('.'))[col('.')-2] let syn = synIDattr(synID(line('.'),col('.')-1,0),'name') - endif + if char != '/' || prechar != '*' || syn !~? 'comment' + break + elseif !search('\/\*','bW') || !search('\S','bW') + return 1 + endif + endwhile if syn =~? '\%(xml\|jsx\)' return char != '{' elseif char =~# '\l' From f4e6aabed2761c98f0db089b14d5bf90a383f704 Mon Sep 17 00:00:00 2001 From: bounceme Date: Thu, 13 Oct 2016 02:35:22 -0700 Subject: [PATCH 3/4] Revert "loop" This reverts commit 35b2719b1193d6a4a4064dd163453c7e89cb04a0. --- indent/javascript.vim | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/indent/javascript.vim b/indent/javascript.vim index 4732d7ac..3bc82fc6 100644 --- a/indent/javascript.vim +++ b/indent/javascript.vim @@ -131,16 +131,17 @@ function s:IsBlock() if getline(line('.'))[col('.')-1] == '{' let l:ln = line('.') if search('\S','bW') - while 1 + let char = getline(line('.'))[col('.')-1] + let prechar = getline(line('.'))[col('.')-2] + let syn = synIDattr(synID(line('.'),col('.')-1,0),'name') + if char == '/' && prechar == '*' && syn =~? 'comment' + if !(search('\/\*','bW') && search('\S','bW')) + return 1 + endif let char = getline(line('.'))[col('.')-1] let prechar = getline(line('.'))[col('.')-2] let syn = synIDattr(synID(line('.'),col('.')-1,0),'name') - if char != '/' || prechar != '*' || syn !~? 'comment' - break - elseif !search('\/\*','bW') || !search('\S','bW') - return 1 - endif - endwhile + endif if syn =~? '\%(xml\|jsx\)' return char != '{' elseif char =~# '\l' From fbb7919567d6e35104dc41d484be48dcdb8b5eaf Mon Sep 17 00:00:00 2001 From: Chris Paul Date: Thu, 13 Oct 2016 02:43:20 -0700 Subject: [PATCH 4/4] rename --- indent/javascript.vim | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/indent/javascript.vim b/indent/javascript.vim index 3bc82fc6..4e651613 100644 --- a/indent/javascript.vim +++ b/indent/javascript.vim @@ -132,14 +132,14 @@ function s:IsBlock() let l:ln = line('.') if search('\S','bW') let char = getline(line('.'))[col('.')-1] - let prechar = getline(line('.'))[col('.')-2] + let pchar = getline(line('.'))[col('.')-2] let syn = synIDattr(synID(line('.'),col('.')-1,0),'name') - if char == '/' && prechar == '*' && syn =~? 'comment' + if char == '/' && pchar == '*' && syn =~? 'comment' if !(search('\/\*','bW') && search('\S','bW')) return 1 endif let char = getline(line('.'))[col('.')-1] - let prechar = getline(line('.'))[col('.')-2] + let pchar = getline(line('.'))[col('.')-2] let syn = synIDattr(synID(line('.'),col('.')-1,0),'name') endif if syn =~? '\%(xml\|jsx\)' @@ -151,7 +151,7 @@ function s:IsBlock() return expand('') !~# \ '^\%(const\|let\|import\|export\|yield\|de\%(fault\|lete\)\|v\%(ar\|oid\)\|t\%(ypeof\|hrow\)\|new\|in\%(stanceof\)\=\)$' elseif char == '>' - return prechar == '=' || syn =~? '^jsflow' + return pchar == '=' || syn =~? '^jsflow' elseif char == ':' return strpart(getline(line('.')),0,col('.')) =~# s:expr_case . '$' else