Sitelet https://github.com/angular/angular/pull/64150/files
Skip to content

fix(compiler): recover template literals with broken expressions #64150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
crisbeto wants to merge 1 commit into from
Closed

fix(compiler): recover template literals with broken expressions #64150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions packages/compiler/src/expression_parser/lexer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,10 +156,6 @@ export class Token {
return this.isOperator('${');
}

isTemplateLiteralInterpolationEnd(): boolean {
return this.isOperator('}');
}

toString(): string | null {
switch (this.type) {
case TokenType.Character:
Expand Down Expand Up @@ -378,7 +374,7 @@ class _Scanner {

const currentBrace = this.braceStack.pop();
if (currentBrace === 'interpolation') {
this.tokens.push(newOperatorToken(start, this.index, '}'));
this.tokens.push(newCharacterToken(start, this.index, chars.$RBRACE));
return this.scanTemplateLiteralPart(this.index);
}

Expand Down
2 changes: 2 additions & 0 deletions packages/compiler/src/expression_parser/parser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1590,12 +1590,14 @@ class _ParseAST {
}
} else if (token.isTemplateLiteralInterpolationStart()) {
this.advance();
this.rbracesExpected++;
const expression = this.parsePipe();
if (expression instanceof EmptyExpr) {
this.error('Template literal interpolation cannot be empty');
} else {
expressions.push(expression);
}
this.rbracesExpected--;
} else {
this.advance();
}
Expand Down
36 changes: 18 additions & 18 deletions packages/compiler/test/expression_parser/lexer_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@ describe('lexer', () => {
expectStringToken(tokens[0], 0, 7, 'hello ', StringTokenKind.TemplateLiteralPart);
expectOperatorToken(tokens[1], 7, 9, '${');
expectIdentifierToken(tokens[2], 9, 13, 'name');
expectOperatorToken(tokens[3], 13, 14, '}');
expectCharacterToken(tokens[3], 13, 14, '}');
expectStringToken(tokens[4], 14, 15, '', StringTokenKind.TemplateLiteralEnd);
});

Expand All @@ -478,7 +478,7 @@ describe('lexer', () => {
expectStringToken(tokens[0], 0, 1, '', StringTokenKind.TemplateLiteralPart);
expectOperatorToken(tokens[1], 1, 3, '${');
expectIdentifierToken(tokens[2], 3, 7, 'name');
expectOperatorToken(tokens[3], 7, 8, '}');
expectCharacterToken(tokens[3], 7, 8, '}');
expectStringToken(tokens[4], 8, 17, ' Johnson', StringTokenKind.TemplateLiteralEnd);
});

Expand All @@ -488,7 +488,7 @@ describe('lexer', () => {
expectStringToken(tokens[0], 0, 4, 'foo', StringTokenKind.TemplateLiteralPart);
expectOperatorToken(tokens[1], 4, 6, '${');
expectIdentifierToken(tokens[2], 6, 9, 'bar');
expectOperatorToken(tokens[3], 9, 10, '}');
expectCharacterToken(tokens[3], 9, 10, '}');
expectStringToken(tokens[4], 10, 14, 'baz', StringTokenKind.TemplateLiteralEnd);
});

Expand Down Expand Up @@ -517,15 +517,15 @@ describe('lexer', () => {
expectStringToken(tokens[0], 0, 1, '', StringTokenKind.TemplateLiteralPart);
expectOperatorToken(tokens[1], 1, 3, '${');
expectIdentifierToken(tokens[2], 3, 4, 'a');
expectOperatorToken(tokens[3], 4, 5, '}');
expectCharacterToken(tokens[3], 4, 5, '}');
expectStringToken(tokens[4], 5, 8, ' - ', StringTokenKind.TemplateLiteralPart);
expectOperatorToken(tokens[5], 8, 10, '${');
expectIdentifierToken(tokens[6], 10, 11, 'b');
expectOperatorToken(tokens[7], 11, 12, '}');
expectCharacterToken(tokens[7], 11, 12, '}');
expectStringToken(tokens[8], 12, 15, ' - ', StringTokenKind.TemplateLiteralPart);
expectOperatorToken(tokens[9], 15, 17, '${');
expectIdentifierToken(tokens[10], 17, 18, 'c');
expectOperatorToken(tokens[11], 18, 19, '}');
expectCharacterToken(tokens[11], 18, 19, '}');
});

it('should tokenize template literal with an object literal inside the interpolation', () => {
Expand All @@ -538,7 +538,7 @@ describe('lexer', () => {
expectCharacterToken(tokens[4], 9, 10, ':');
expectKeywordToken(tokens[5], 11, 15, 'true');
expectCharacterToken(tokens[6], 15, 16, '}');
expectOperatorToken(tokens[7], 16, 17, '}');
expectCharacterToken(tokens[7], 16, 17, '}');
expectStringToken(tokens[8], 17, 22, ' baz', StringTokenKind.TemplateLiteralEnd);
});

Expand All @@ -552,11 +552,11 @@ describe('lexer', () => {
expectStringToken(tokens[4], 16, 17, '', StringTokenKind.TemplateLiteralPart);
expectOperatorToken(tokens[5], 17, 19, '${');
expectIdentifierToken(tokens[6], 19, 20, 'a');
expectOperatorToken(tokens[7], 20, 21, '}');
expectCharacterToken(tokens[7], 20, 21, '}');
expectStringToken(tokens[8], 21, 26, ' - b', StringTokenKind.TemplateLiteralEnd);
expectOperatorToken(tokens[9], 26, 27, '}');
expectCharacterToken(tokens[9], 26, 27, '}');
expectStringToken(tokens[10], 27, 28, '', StringTokenKind.TemplateLiteralEnd);
expectOperatorToken(tokens[11], 28, 29, '}');
expectCharacterToken(tokens[11], 28, 29, '}');
expectStringToken(tokens[12], 29, 34, ' baz', StringTokenKind.TemplateLiteralEnd);
});

Expand All @@ -566,12 +566,12 @@ describe('lexer', () => {
expectStringToken(tokens[0], 0, 7, 'hello ', StringTokenKind.TemplateLiteralPart);
expectOperatorToken(tokens[1], 7, 9, '${');
expectIdentifierToken(tokens[2], 9, 13, 'name');
expectOperatorToken(tokens[3], 13, 14, '}');
expectCharacterToken(tokens[3], 13, 14, '}');
expectStringToken(tokens[4], 14, 15, '', StringTokenKind.TemplateLiteralEnd);
expectStringToken(tokens[5], 15, 20, 'see ', StringTokenKind.TemplateLiteralPart);
expectOperatorToken(tokens[6], 20, 22, '${');
expectIdentifierToken(tokens[7], 22, 26, 'name');
expectOperatorToken(tokens[8], 26, 27, '}');
expectCharacterToken(tokens[8], 26, 27, '}');
expectStringToken(tokens[9], 27, 34, ' later', StringTokenKind.TemplateLiteralEnd);
});

Expand All @@ -581,7 +581,7 @@ describe('lexer', () => {
expectStringToken(tokens[0], 0, 7, 'hello ', StringTokenKind.TemplateLiteralPart);
expectOperatorToken(tokens[1], 7, 9, '${');
expectIdentifierToken(tokens[2], 9, 13, 'name');
expectOperatorToken(tokens[3], 13, 14, '}');
expectCharacterToken(tokens[3], 13, 14, '}');
expectStringToken(tokens[4], 14, 15, '', StringTokenKind.TemplateLiteralEnd);
expectOperatorToken(tokens[5], 16, 17, '+');
expectNumberToken(tokens[6], 18, 21, 123);
Expand All @@ -595,7 +595,7 @@ describe('lexer', () => {
expectIdentifierToken(tokens[2], 9, 13, 'name');
expectOperatorToken(tokens[3], 14, 15, '|');
expectIdentifierToken(tokens[4], 16, 26, 'capitalize');
expectOperatorToken(tokens[5], 26, 27, '}');
expectCharacterToken(tokens[5], 26, 27, '}');
expectStringToken(tokens[6], 27, 31, '!!!', StringTokenKind.TemplateLiteralEnd);
});

Expand All @@ -609,7 +609,7 @@ describe('lexer', () => {
expectOperatorToken(tokens[4], 15, 16, '|');
expectIdentifierToken(tokens[5], 17, 27, 'capitalize');
expectCharacterToken(tokens[6], 27, 28, ')');
expectOperatorToken(tokens[7], 28, 29, '}');
expectCharacterToken(tokens[7], 28, 29, '}');
expectStringToken(tokens[8], 29, 33, '!!!', StringTokenKind.TemplateLiteralEnd);
});

Expand All @@ -622,7 +622,7 @@ describe('lexer', () => {
expectStringToken(tokens[3], 6, 7, '', StringTokenKind.TemplateLiteralPart);
expectOperatorToken(tokens[4], 7, 9, '${');
expectIdentifierToken(tokens[5], 9, 13, 'name');
expectOperatorToken(tokens[6], 13, 14, '}');
expectCharacterToken(tokens[6], 13, 14, '}');
expectStringToken(tokens[7], 14, 15, '', StringTokenKind.TemplateLiteralEnd);
expectCharacterToken(tokens[8], 15, 16, '}');
});
Expand All @@ -642,7 +642,7 @@ describe('lexer', () => {
expectStringToken(tokens[0], 0, 7, 'hello ', StringTokenKind.TemplateLiteralPart);
expectOperatorToken(tokens[1], 7, 9, '${');
expectIdentifierToken(tokens[2], 9, 13, 'name');
expectOperatorToken(tokens[3], 13, 14, '}');
expectCharacterToken(tokens[3], 13, 14, '}');
expectErrorToken(
tokens[4],
15,
Expand Down Expand Up @@ -681,7 +681,7 @@ describe('lexer', () => {
expectOperatorToken(tokens[2], 10, 12, '${');
expectIdentifierToken(tokens[3], 12, 15, 'tag');
expectStringToken(tokens[4], 15, 22, 'world', StringTokenKind.TemplateLiteralEnd);
expectOperatorToken(tokens[5], 22, 23, '}');
expectCharacterToken(tokens[5], 22, 23, '}');
expectStringToken(tokens[6], 23, 24, '', StringTokenKind.TemplateLiteralEnd);
});
});
Expand Down
12 changes: 7 additions & 5 deletions packages/compiler/test/expression_parser/parser_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import {
TemplateBinding,
VariableBinding,
BindingPipeType,
Binary,
} from '../../src/expression_parser/ast';
import {ParseError} from '../../src/parse_util';
import {Lexer} from '../../src/expression_parser/lexer';
Expand Down Expand Up @@ -481,10 +480,7 @@ describe('parser', () => {
});

it('should report error if interpolation is empty', () => {
expectBindingError(
'`hello ${}`',
'Template literal interpolation cannot be empty at the end of the expression',
);
expectBindingError('`hello ${}`', 'Template literal interpolation cannot be empty');
});

it('should parse tagged template literals with no interpolations', () => {
Expand Down Expand Up @@ -1484,6 +1480,12 @@ describe('parser', () => {
recover('foo(((($event.target as HTMLElement))).value)', 'foo(((($event.target))).value)');
recover('foo(((bar as HTMLElement) as Something).value)', 'foo(((bar)).value)');
});

it('should be able to recover from a broken expression in a template literal', () => {
recover('`before ${expr.}`', '`before ${expr.}`');
recover('`${expr.} after`', '`${expr.} after`');
recover('`before ${expr.} after`', '`before ${expr.} after`');
});
});

describe('offsets', () => {
Expand Down