Skip to content

fix(compiler): incorrect spans for template literals #60323

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): incorrect spans for template literals #60323

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
12 changes: 7 additions & 5 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 @@ -1449,9 +1449,10 @@ class _ParseAST {

private parseNoInterpolationTemplateLiteral(): TemplateLiteral {
const text = this.next.strValue;
const start = this.inputIndex;
this.advance();
const span = this.span(this.inputIndex);
const sourceSpan = this.sourceSpan(this.inputIndex);
const span = this.span(start);
const sourceSpan = this.sourceSpan(start);
return new TemplateLiteral(
span,
sourceSpan,
Expand All @@ -1474,14 +1475,15 @@ class _ParseAST {
const token = this.next;

if (token.isTemplateLiteralPart() || token.isTemplateLiteralEnd()) {
const partStart = this.inputIndex;
this.advance();
elements.push(
new TemplateLiteralElement(
this.span(this.inputIndex),
this.sourceSpan(this.inputIndex),
this.span(partStart),
this.sourceSpan(partStart),
token.strValue,
),
);
this.advance();
if (token.isTemplateLiteralEnd()) {
break;
}
Expand Down
59 changes: 38 additions & 21 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,6 +18,7 @@ import {
PropertyRead,
TemplateBinding,
VariableBinding,
TemplateLiteral,
} from '@angular/compiler/src/expression_parser/ast';
import {Lexer} from '@angular/compiler/src/expression_parser/lexer';
import {Parser, SplitInterpolation} from '@angular/compiler/src/expression_parser/parser';
Expand Down Expand Up @@ -528,18 +529,34 @@ describe('parser', () => {
expect(unparseWithSpan(ast)).toContain(['a.b = c', '[nameSpan] b']);
});

it('should record template literal space', () => {
it('should record spans for untagged template literals with no interpolations', () => {
const ast = parseAction('`hello world`');
const unparsed = unparseWithSpan(ast);
expect(unparsed).toEqual([
['`hello world`', '`hello world`'],
['hello world', '`hello world`'],
]);
});

it('should record spans for untagged template literals with interpolations', () => {
const ast = parseAction('`before ${one} - ${two} - ${three} after`');
const unparsed = unparseWithSpan(ast);
expect(unparsed).toContain(['before ', '']);
expect(unparsed).toContain(['one', 'one']);
expect(unparsed).toContain(['one', '[nameSpan] one']);
expect(unparsed).toContain([' - ', '']);
expect(unparsed).toContain(['two', 'two']);
expect(unparsed).toContain(['two', '[nameSpan] two']);
expect(unparsed).toContain(['three', 'three']);
expect(unparsed).toContain(['three', '[nameSpan] three']);
expect(unparsed).toContain([' after', '']);
expect(unparsed).toEqual([
['`before ${one} - ${two} - ${three} after`', '`before ${one} - ${two} - ${three} after`'],
['before ', '`before '],
['one', 'one'],
['one', '[nameSpan] one'],
['', ''], // Implicit receiver
[' - ', ' - '],
['two', 'two'],
['two', '[nameSpan] two'],
['', ''], // Implicit receiver
[' - ', ' - '],
['three', 'three'],
['three', '[nameSpan] three'],
['', ''], // Implicit receiver
[' after', ' after`'],
]);
});

it('should record spans for tagged template literal with no interpolations', () => {
Expand All @@ -549,9 +566,9 @@ describe('parser', () => {
['tag`text`', 'tag`text`'],
['tag', 'tag'],
['tag', '[nameSpan] tag'],
['', ''],
['`text`', ''],
['text', ''],
['', ''], // Implicit receiver
['`text`', '`text`'],
['text', '`text`'],
]);
});

Expand All @@ -565,21 +582,21 @@ describe('parser', () => {
],
['tag', 'tag'],
['tag', '[nameSpan] tag'],
['', ''],
['', ''], // Implicit receiver
['`before ${one} - ${two} - ${three} after`', '`before ${one} - ${two} - ${three} after`'],
['before ', ''],
['before ', '`before '],
['one', 'one'],
['one', '[nameSpan] one'],
['', ''],
[' - ', ''],
['', ''], // Implicit receiver
[' - ', ' - '],
['two', 'two'],
['two', '[nameSpan] two'],
['', ''],
[' - ', ''],
['', ''], // Implicit receiver
[' - ', ' - '],
['three', 'three'],
['three', '[nameSpan] three'],
['', ''],
[' after', ''],
['', ''], // Implicit receiver
[' after', ' after`'],
]);
});

Expand Down