From 6cb0c96b66c1c2554ba0ebd8ead7f9ac938ce49a Mon Sep 17 00:00:00 2001
From: bounceme <mac@Macs-MacBook-Pro.local>
Date: Wed, 20 Apr 2016 17:04:57 -0700
Subject: [PATCH] old changes reset

---
 indent/javascript.vim | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/indent/javascript.vim b/indent/javascript.vim
index 82cd621c..c3d331ce 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -43,7 +43,10 @@ endif
 let s:js_keywords = '^\s*\(break\|catch\|const\|continue\|debugger\|delete\|do\|else\|finally\|for\|function\|if\|in\|instanceof\|let\|new\|return\|switch\|this\|throw\|try\|typeof\|var\|void\|while\|with\)'
 let s:expr_case = '^\s*\(case\s\+[^\:]*\|default\)\s*:\s*'
 " Regex of syntax group names that are or delimit string or are comments.
-let s:syng_strcom = 'string\|regex\|comment\c'
+let s:syng_strcom = '\%(\%(template\)\@<!string\|regex\|comment\)\c'
+
+" Regex of syntax group names that are or delimit template strings
+let s:syng_template = 'template\c'
 
 " Regex of syntax group names that are strings.
 let s:syng_string = 'regex\c'
@@ -102,6 +105,11 @@ function s:IsInString(lnum, col)
   return synIDattr(synID(a:lnum, a:col, 1), 'name') =~ s:syng_string
 endfunction
 
+" Check if the character at lnum:col is inside a template string.
+function s:IsInTempl(lnum, col)
+  return synIDattr(synID(a:lnum, a:col, 1), 'name') =~ s:syng_template
+endfunction
+
 " Check if the character at lnum:col is inside a multi-line comment.
 function s:IsInMultilineComment(lnum, col)
   return !s:IsLineComment(a:lnum, a:col) && synIDattr(synID(a:lnum, a:col, 1), 'name') =~ s:syng_multiline
@@ -386,6 +394,14 @@ function GetJavascriptIndent()
     endif
   endif
 
+  if getline(prevline) =~ '^\s*`$' && s:IsInTempl(v:lnum, 1)
+    if line !~ '^\s*`$'
+      return indent(prevline) + s:sw()
+    endif
+  elseif line =~ '^\s*`$' && s:IsInTempl(prevline, 1)
+    return indent(prevline) - s:sw()
+  endif
+
   " If we are in a multi-line comment, cindent does the right thing.
   if s:IsInMultilineComment(v:lnum, 1) && !s:IsLineComment(v:lnum, 1)
     return cindent(v:lnum)