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

refactor(compiler): capture interpolation source-spans in expression parser (#38747)

Browse Source 
The expression parser will split the expression up at the interpolation markers
into expressions and static strings. This commit also captures the positions of
these strings in the expression to be used in source-mapping later.

PR Close #38747
This commit is contained in:
Pete Bacon Darwin
2020-08-31 16:19:11 +01:00
committed by atscott
parent a1c34c6f0a
commit 38762020d3
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/compiler/src/expression_parser/parser.ts
View File

@ -14,7 +14,10 @@ import {AbsoluteSourceSpan, AST, AstVisitor, ASTWithSource, Binary, BindingPipe,
import {EOF, isIdentifier, isQuote, Lexer, Token, TokenType} from './lexer'; import {EOF, isIdentifier, isQuote, Lexer, Token, TokenType} from './lexer';
export class SplitInterpolation { export class SplitInterpolation {
constructor(public strings: string[], public expressions: string[], public offsets: number[]) {} constructor(
public strings: string[], public stringSpans: {start: number, end: number}[],
public expressions: string[], public expressionsSpans: {start: number, end: number}[],
public offsets: number[]) {}
} }
export class TemplateBindingParseResult { export class TemplateBindingParseResult {
@ -194,18 +197,24 @@ export class Parser {
const strings: string[] = []; const strings: string[] = [];
const expressions: string[] = []; const expressions: string[] = [];
const offsets: number[] = []; const offsets: number[] = [];
const stringSpans: {start: number, end: number}[] = [];
const expressionSpans: {start: number, end: number}[] = [];
let offset = 0; let offset = 0;
for (let i = 0; i < parts.length; i++) { for (let i = 0; i < parts.length; i++) {
const part: string = parts[i]; const part: string = parts[i];
if (i % 2 === 0) { if (i % 2 === 0) {
// fixed string // fixed string
strings.push(part); strings.push(part);
const start = offset;
offset += part.length; offset += part.length;
stringSpans.push({start, end: offset});
} else if (part.trim().length > 0) { } else if (part.trim().length > 0) {
const start = offset;
offset += interpolationConfig.start.length; offset += interpolationConfig.start.length;
expressions.push(part); expressions.push(part);
offsets.push(offset); offsets.push(offset);
offset += part.length + interpolationConfig.end.length; offset += part.length + interpolationConfig.end.length;
expressionSpans.push({start, end: offset});
} else { } else {
this._reportError( this._reportError(
'Blank expressions are not allowed in interpolated strings', input, 'Blank expressions are not allowed in interpolated strings', input,
@ -213,9 +222,10 @@ export class Parser {
location); location);
expressions.push('$implicit'); expressions.push('$implicit');
offsets.push(offset); offsets.push(offset);
expressionSpans.push({start: offset, end: offset});
} }
} }
return new SplitInterpolation(strings, expressions, offsets); return new SplitInterpolation(strings, stringSpans, expressions, expressionSpans, offsets);
} }
wrapLiteralPrimitive(input: string|null, location: any, absoluteOffset: number): ASTWithSource { wrapLiteralPrimitive(input: string|null, location: any, absoluteOffset: number): ASTWithSource {