From 76f385437dcf5b201a0cd8f460395232ed2b8976 Mon Sep 17 00:00:00 2001 From: Matthew Forrester Date: Thu, 25 Feb 2016 19:05:39 +0000 Subject: [PATCH] Add new let keyword from ES6 --- indent/javascript.vim | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/indent/javascript.vim b/indent/javascript.vim index 77b2453..95fe217 100644 --- a/indent/javascript.vim +++ b/indent/javascript.vim @@ -48,7 +48,7 @@ let s:expr_comment_start = '/\*c' let s:expr_comment_end = 'c\*/' let s:expr_comma_start = '^\s*,' -let s:expr_var = '^\s*var\s' +let s:expr_var = '^\s*\(var\|let\)\s' let s:expr_var_stop = ';' " add $ to Fix " ;(function() { @@ -328,10 +328,10 @@ function! s:AssignIndent(line) if(match(line,'.*=.*'.s:expr_partial2) != -1) return ind + strlen(matchstr(line, '.*=\s*')) - elseif(match(line,'\(var\|return\)\s\+.*=\s*') != -1) - return ind + strlen(matchstr(line, '\(var\|return\)\s\+')) - elseif(match(line,'\(var\|return\)\s\+') != -1) - return ind + strlen(matchstr(line, '\(var\|return\)\s\+')) + elseif(match(line,'\(var\|let\|return\)\s\+.*=\s*') != -1) + return ind + strlen(matchstr(line, '\(var\|let\|return\)\s\+')) + elseif(match(line,'\(var\|let\|return\)\s\+') != -1) + return ind + strlen(matchstr(line, '\(var\|let\|return\)\s\+')) elseif(match(line,'^\w\s\+=\s*.*[^,]$') != -1) return ind + strlen(matchstr(line, '^\w\s\+=\s*')) endif