fix globals shadowing template scope (#3674)

sveltejs · Oct 12, 2019 · a778e50 · a778e50
1 parent e4d7f77
commit a778e50
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/src/compiler/compile/nodes/shared/Expression.ts b/src/compiler/compile/nodes/shared/Expression.ts
@@ -127,7 +127,7 @@ export default class Expression {
 
 					if (scope.has(name)) return;
 
-					if (globals.has(name) && !component.var_lookup.has(name)) return;
+					if (globals.has(name) && !(component.var_lookup.has(name) || template_scope.names.has(name))) return;
 
 					if (name[0] === '$' && template_scope.names.has(name.slice(1))) {
 						component.error(node, {
@@ -261,7 +261,7 @@ export default class Expression {
 					const { name, nodes } = flatten_reference(node);
 
 					if (scope.has(name)) return;
-					if (globals.has(name) && !component.var_lookup.has(name)) return;
+					if (globals.has(name) && !(component.var_lookup.has(name) || template_scope.names.has(name))) return;
 
 					if (function_expression) {
 						if (template_scope.names.has(name)) {

diff --git a/test/runtime/samples/globals-shadowed-by-each-binding/_config.js b/test/runtime/samples/globals-shadowed-by-each-binding/_config.js
@@ -0,0 +1,3 @@
+export default {
+	html: '<p>Alert1</p><p>Alert2</p>',
+};
diff --git a/test/runtime/samples/globals-shadowed-by-each-binding/main.svelte b/test/runtime/samples/globals-shadowed-by-each-binding/main.svelte
@@ -0,0 +1,7 @@
+<script>
+	const alerts = ['Alert1', 'Alert2'];
+</script>
+
+{#each alerts as alert}
+	<p>{alert}</p>
+{/each}