refactor(language-service): rename expression completions method (#34518)

This commit renames `addAttributeValuesToCompletions`, which generates
expression completions and is not exclusive to processing attributes, to
`processExpressionCompletions`. Also removes the expression completion
logic in `visitBoundText` for a call to `processExpressionCompletions`.

The conditional branch in `visitBoundText` is also removed. This branch
was added in one of the first commits to the language service
(519a324454) and appears to be
unnecessary, as the expression AST is constructed from the template
position anyway.

PR Close #34518
This commit is contained in:
ayazhafiz
2019-12-20 16:40:23 -06:00
committed by atscott
parent a88dc17e5b
commit 2ef0b500ef

View File

@ -432,14 +432,14 @@ class ExpressionVisitor extends NullTemplateVisitor {
get results(): ng.CompletionEntry[] { return Array.from(this.completions.values()); }
visitDirectiveProperty(ast: BoundDirectivePropertyAst): void {
this.addAttributeValuesToCompletions(ast.value);
this.processExpressionCompletions(ast.value);
}
visitElementProperty(ast: BoundElementPropertyAst): void {
this.addAttributeValuesToCompletions(ast.value);
this.processExpressionCompletions(ast.value);
}
visitEvent(ast: BoundEventAst): void { this.addAttributeValuesToCompletions(ast.handler); }
visitEvent(ast: BoundEventAst): void { this.processExpressionCompletions(ast.handler); }
visitElement(ast: ElementAst): void {
// no-op for now
@ -466,7 +466,7 @@ class ExpressionVisitor extends NullTemplateVisitor {
// The expression must be reparsed to get a valid AST rather than only template bindings.
const expressionAst = this.info.expressionParser.parseBinding(
ast.value, ast.sourceSpan.toString(), ast.sourceSpan.start.offset);
this.addAttributeValuesToCompletions(expressionAst);
this.processExpressionCompletions(expressionAst);
}
}
@ -490,7 +490,7 @@ class ExpressionVisitor extends NullTemplateVisitor {
}
}
private addAttributeValuesToCompletions(value: AST) {
private processExpressionCompletions(value: AST) {
const symbols = getExpressionCompletions(
this.getExpressionScope(), value, this.position, this.info.template.query);
if (symbols) {
@ -566,7 +566,7 @@ class ExpressionVisitor extends NullTemplateVisitor {
}
if (binding.expression && inSpan(valueRelativePosition, binding.expression.ast.span)) {
this.addAttributeValuesToCompletions(binding.expression.ast);
this.processExpressionCompletions(binding.expression.ast);
return;
}
@ -578,7 +578,7 @@ class ExpressionVisitor extends NullTemplateVisitor {
if (ofLocation > 0 && valueRelativePosition >= ofLocation + KW_OF.length) {
const expressionAst = this.info.expressionParser.parseBinding(
attr.value, attr.sourceSpan.toString(), attr.sourceSpan.start.offset);
this.addAttributeValuesToCompletions(expressionAst);
this.processExpressionCompletions(expressionAst);
}
}
}