cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(language-service): Move two-way binding logic to visitBoundEvent (#38985)

Browse Source 
Instead of doing all sorts of checks in the `visit()` method, move checks
that are specific to `BoundEvent` to the `visitBoundEvent()` method.

PR Close #38985
This commit is contained in:
Keen Yee Liau 2020-09-25 15:34:03 -07:00 committed by Alex Rickabaugh
parent b16a69c7a4
commit ded9aeb447
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
packages/language-service/ivy/hybrid_visitor.ts
View File

@ -58,15 +58,6 @@ class R3Visitor implements t.Visitor {
return; return;
} }
} }
if (node instanceof t.BoundEvent &&
this.path.find((n => n instanceof t.BoundAttribute && node.name === n.name + 'Change'))) {
// For two-way binding aka banana-in-a-box, there are two matches:
// BoundAttribute and BoundEvent. Both have the same spans. We choose to
// return BoundAttribute because it matches the identifier name verbatim.
// TODO: For operations like go to definition, ideally we want to return
// both.
return;
}
this.path.push(node); this.path.push(node);
node.visit(this); node.visit(this);
} }
@ -111,9 +102,20 @@ class R3Visitor implements t.Visitor {
visitor.visit(attribute.value, this.path); visitor.visit(attribute.value, this.path);
} }
visitBoundEvent(attribute: t.BoundEvent) { visitBoundEvent(event: t.BoundEvent) {
const isTwoWayBinding =
this.path.some(n => n instanceof t.BoundAttribute && event.name === n.name + 'Change');
if (isTwoWayBinding) {
// For two-way binding aka banana-in-a-box, there are two matches:
// BoundAttribute and BoundEvent. Both have the same spans. We choose to
// return BoundAttribute because it matches the identifier name verbatim.
// TODO: For operations like go to definition, ideally we want to return
// both.
this.path.pop(); // remove bound event from the AST path
return;
}
const visitor = new ExpressionVisitor(this.position); const visitor = new ExpressionVisitor(this.position);
visitor.visit(attribute.handler, this.path); visitor.visit(event.handler, this.path);
} }
visitText(text: t.Text) { visitText(text: t.Text) {