Skip to content

revert: refactor(compiler): support interpolation and encoded entities when lexing markup #43033

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
atscott wants to merge 14 commits into from
Closed

revert: refactor(compiler): support interpolation and encoded entities when lexing markup #43033

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f3a88b8
Revert "test(compiler): add a test for parsing multiline expressions …
atscott Aug 3, 2021
fa7c44a
Revert "refactor(compiler): use `===` rather than `==` in the ml_pars…
atscott Aug 3, 2021
d4a9b85
Revert "test(compiler): check that the parser supports prematurely te…
atscott Aug 3, 2021
37ff7f3
Revert "refactor(compiler): define interfaces for each lexer token (#…
atscott Aug 3, 2021
9d039e1
Revert "fix(compiler): include leading whitespace in source-spans of …
atscott Aug 3, 2021
7260758
Revert "test(compiler): check `fullStart` source-span (#42062)"
atscott Aug 3, 2021
0257faf
Revert "refactor(compiler): expose token parts in Text nodes (#42062)"
atscott Aug 3, 2021
b65e0f5
Revert "refactor(compiler): support encoded entity tokens when lexing…
atscott Aug 3, 2021
a743870
Revert "refactor(compiler): support interpolation tokens when lexing …
atscott Aug 3, 2021
91ab82e
Revert "refactor(compiler): share `isQuote()` via `chars.ts` (#42062)"
atscott Aug 3, 2021
a72ae0f
Revert "refactor(compiler): support interpolation tokens when lexing …
atscott Aug 3, 2021
b1382a8
Revert "refactor(compiler): remove cyclic dependencies (#42062)"
atscott Aug 3, 2021
538a2e0
Revert "test(compiler-cli): clarify source-map expectations in compli…
atscott Aug 3, 2021
dfb875a
Revert "refactor(ngcc): remove unused import (#42062)"
atscott Aug 3, 2021
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
Next Next commit
Revert "test(compiler): add a test for parsing multiline expressions … 
…in attributes (#42062)"

This reverts commit fe12651.
  • Loading branch information
@atscott
atscott committed Aug 3, 2021
commit f3a88b81d1bd648b076b067cef29bed1e9e426e8
27 changes: 0 additions & 27 deletions packages/compiler/test/ml_parser/html_parser_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,33 +274,6 @@ import {humanizeDom, humanizeDomSourceSpans, humanizeLineColumn, humanizeNodes}
]);
});

it('should parse attributes containing unquoted interpolation', () => {
expect(humanizeDom(parser.parse('<div foo={{message}}></div>', 'TestComp'))).toEqual([
[html.Element, 'div', 0],
[html.Attribute, 'foo', '{{message}}', [''], ['{{', 'message', '}}'], ['']]
]);
});

it('should parse bound inputs with expressions containing newlines', () => {
expect(humanizeDom(parser.parse(
`<app-component
[attr]="[
{text: 'some text',url:'//www.google.com'},
{text:'other text',url:'//www.google.com'}]"></app-component>`,
'TestComp')))
.toEqual([
[html.Element, 'app-component', 0],
[
html.Attribute, '[attr]', `[
{text: 'some text',url:'//www.google.com'},
{text:'other text',url:'//www.google.com'}]`,
[`[
{text: 'some text',url:'//www.google.com'},
{text:'other text',url:'//www.google.com'}]`]
],
]);
});

it('should parse attributes containing encoded entities', () => {
expect(humanizeDom(parser.parse('<div foo="&amp;"></div>', 'TestComp'))).toEqual([
[html.Element, 'div', 0],
Expand Down
21 changes: 0 additions & 21 deletions packages/compiler/test/ml_parser/lexer_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,27 +407,6 @@ import {ParseLocation, ParseSourceFile, ParseSourceSpan} from '../../src/parse_u
]);
});

it('should parse bound inputs with expressions containing newlines', () => {
expect(tokenizeAndHumanizeParts(`<app-component
[attr]="[
{text: 'some text',url:'//www.google.com'},
{text:'other text',url:'//www.google.com'}]">`))
.toEqual([
[TokenType.TAG_OPEN_START, '', 'app-component'],
[TokenType.ATTR_NAME, '', '[attr]'],
[TokenType.ATTR_QUOTE, '"'],
[
TokenType.ATTR_VALUE_TEXT,
'[\n' +
' {text: \'some text\',url:\'//www.google.com\'},\n' +
' {text:\'other text\',url:\'//www.google.com\'}]'
],
[TokenType.ATTR_QUOTE, '"'],
[TokenType.TAG_OPEN_END],
[TokenType.EOF],
]);
});

it('should parse attributes with empty quoted value', () => {
expect(tokenizeAndHumanizeParts('<t a="">')).toEqual([
[TokenType.TAG_OPEN_START, '', 't'],
Expand Down