fix class method name (pangloss#1049)

bounceme · web-flow · commit 1ff6ac3b5728 · 2017-09-25T09:31:49.000-07:00
diff --git a/indent/javascript.vim b/indent/javascript.vim
@@ -282,14 +282,11 @@ function s:IsContOne(num,cont)
   return b_l
 endfunction
 
-function s:Class()
-  return (s:Token() ==# 'class' || s:PreviousToken() =~# '^class$\|^extends$') &&
-        \ s:PreviousToken() != '.'
-endfunction
-
 function s:IsSwitch()
   return s:PreviousToken() !~ '[.*]' &&
-        \ (!s:GetPair('{','}','cbW',s:skip_expr) || s:IsBlock() && !s:Class())
+        \ (!s:GetPair('{','}','cbW',s:skip_expr) || s:IsBlock() &&
+        \ (s:Token() !=# 'class' && s:PreviousToken() !~# '^class$\|^extends$' ||
+        \ s:PreviousToken() == '.'))
 endfunction
 
 " https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader
@@ -406,8 +403,11 @@ function GetJavascriptIndent()
           let is_op = s:sw()
         endif
       elseif num && sol =~# '^\%(in\%(stanceof\)\=\|\*\)$'
-        call call('cursor',b:js_cache[1:])
-        if s:PreviousToken() =~ '\k' && s:Class()
+        call cursor(l:lnum, len(pline))
+        if s:LookingAt() == '}' && s:GetPair('{','}','bW',s:skip_expr) &&
+              \ s:PreviousToken() == ')' && s:GetPair('(',')','bW',s:skip_expr) &&
+              \ (s:PreviousToken() == ']' || s:Token() =~ '\k' &&
+              \ s:{s:PreviousToken() == '*' ? 'Previous' : ''}Token() !=# 'function')
           return num_ind + s:sw()
         endif
         let is_op = s:sw()
