Merge pull request #2191 from sveltejs/gh-2178

tweak semantics of reactive statements

src/compile/Component.ts

@@ -1050,6 +1050,7 @@ export default class Component {
 				this.reactive_declaration_nodes.add(node);
 
 				const assignees = new Set();
+				const assignee_nodes = new Set();
 				const dependencies = new Set();
 
 				let scope = this.instance_scope;
@@ -1062,19 +1063,22 @@ export default class Component {
 						}
 
 						if (node.type === 'AssignmentExpression') {
-							const { name } = getObject(node.left)
+							const identifier = getObject(node.left)
-							assignees.add(name);
+							assignee_nodes.add(identifier);
-							dependencies.delete(name);
+							assignees.add(identifier.name);
 						} else if (node.type === 'UpdateExpression') {
-							const { name } = getObject(node.argument);
+							const identifier = getObject(node.argument);
-							assignees.add(name);
+							assignee_nodes.add(identifier);
-							dependencies.delete(name);
+							assignees.add(identifier.name);
 						} else if (isReference(node, parent)) {
-							const { name } = getObject(node);
+							const identifier = getObject(node);
+							if (!assignee_nodes.has(identifier)) {
+								const { name } = identifier;
 								const owner = scope.findOwner(name);
-							if ((!owner || owner === component.instance_scope) && (name[0] === '$' || component.var_lookup.has(name)) && !assignees.has(name)) {
+								if ((!owner || owner === component.instance_scope) && (name[0] === '$' || component.var_lookup.has(name))) {
 									dependencies.add(name);
 								}
+							}
 
 							this.skip();
 						}

test/runtime/samples/reactive-values-self-dependency-b/_config.js

@@ -0,0 +1,19 @@
+export default {
+	html: `
+		<p>count: 0</p>
+	`,
+
+	test({ assert, component, target }) {
+		component.count = 5;
+
+		assert.htmlEqual(target.innerHTML, `
+			<p>count: 5</p>
+		`);
+
+		component.count = 50;
+
+		assert.htmlEqual(target.innerHTML, `
+			<p>count: 9</p>
+		`);
+	}
+};

test/runtime/samples/reactive-values-self-dependency-b/main.svelte

@@ -0,0 +1,9 @@
+<script>
+	export let count = 0;
+
+	$: if (count >= 10) {
+		count = 9;
+	}
+</script>
+
+<p>count: {count}</p>