iSharkFly-Docs
/
angular-docs-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(language-service): [Ivy] hybrid visitor should not locate let keyword (#39061) 

Fixed a boolean logic error that prevented hybrid visitor from returning
undefined when a variable does not have value and cursor is not in the
key span.

PR Close #39061
This commit is contained in:
Keen Yee Liau 2020-09-30 08:54:04 -07:00 committed by Joey Perrott
parent 246de9aaad
commit 70e13dc31e
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,9 +27,11 @@ export function findNodeAtPosition(ast: t.Node[], position: number): t.Node|e.AS
} }
if (isTemplateNodeWithKeyAndValue(candidate)) { if (isTemplateNodeWithKeyAndValue(candidate)) {
const {keySpan, valueSpan} = candidate; const {keySpan, valueSpan} = candidate;
const isWithinKeyValue =
isWithin(position, keySpan) || (valueSpan && isWithin(position, valueSpan));
if (!isWithinKeyValue) {
// If cursor is within source span but not within key span or value span, // If cursor is within source span but not within key span or value span,
// do not return the node. // do not return the node.
if (!isWithin(position, keySpan) && (valueSpan && !isWithin(position, valueSpan))) {
return; return;
} }
} }

3
packages/language-service/ivy/test/hybrid_visitor_spec.ts
View File

@ -504,8 +504,7 @@ describe('findNodeAtPosition for microsyntax expression', () => {
const {errors, nodes, position} = parse(`<div *ngFor="l¦et item of items"></div>`); const {errors, nodes, position} = parse(`<div *ngFor="l¦et item of items"></div>`);
expect(errors).toBe(null); expect(errors).toBe(null);
const node = findNodeAtPosition(nodes, position); const node = findNodeAtPosition(nodes, position);
// TODO: this is currently wrong because node is currently pointing to expect(node).toBeUndefined();
// "item". In this case, it should return undefined.
}); });
it('should locate let variable', () => { it('should locate let variable', () => {