JS: Reset implicit variable scope when leaving template expr

javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java

@@ -732,7 +732,10 @@ public class ASTExtractor {
       visitAll(nd.getBody(), toplevelLabel);
 
       // Leave the local scope again.
-      if (sourceType.hasLocalScope()) scopeManager.leaveScope();
+      if (sourceType.hasLocalScope()) {
+        scopeManager.leaveScope();
+        scopeManager.resetImplicitVariableScope();
+      }
 
       contextManager.leaveContainer();
 

javascript/extractor/src/com/semmle/js/extractor/ScopeManager.java

@@ -119,6 +119,14 @@ public class ScopeManager {
     this.implicitVariableScope = implicitVariableScope;
   }
 
+  /**
+   * Reset the scope in which to declare variables that are referenced without
+   * being declared back to the global scope.
+   */
+  public void resetImplicitVariableScope() {
+    this.implicitVariableScope = toplevelScope;
+  }
+
   /**
    * Enter a new scope.
    *