Skip to content

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

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

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

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
ddde445
refactor(ngcc): remove unused import
petebacondarwin Jun 30, 2021
a60a265
test(compiler-cli): clarify source-map expectations in compliance tests
petebacondarwin May 20, 2021
e8ff091
refactor(compiler): remove cyclic dependencies
petebacondarwin May 19, 2021
e7f9437
refactor(compiler): support interpolation tokens when lexing markup
petebacondarwin May 11, 2021
49462aa
refactor(compiler): share `isQuote()` via `chars.ts`
petebacondarwin May 12, 2021
37d6155
refactor(compiler): support interpolation tokens when lexing attribut…
petebacondarwin May 13, 2021
c2217f5
refactor(compiler): support encoded entity tokens when lexing markup
petebacondarwin May 14, 2021
e95d34b
refactor(compiler): expose token parts in Text nodes
petebacondarwin May 15, 2021
067b6d7
test(compiler): check `fullStart` source-span
petebacondarwin May 20, 2021
80363b1
fix(compiler): include leading whitespace in source-spans of i18n mes…
petebacondarwin Jun 8, 2021
17054fb
refactor(compiler): define interfaces for each lexer token
petebacondarwin Jun 12, 2021
0384fa4
test(compiler): check that the parser supports prematurely terminated…
petebacondarwin Jun 17, 2021
a1e9d44
refactor(compiler): use `===` rather than `==` in the ml_parser
petebacondarwin Jul 1, 2021
af8141d
test(compiler): add a test for parsing multiline expressions in attri…
petebacondarwin Jul 21, 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
Prev Previous commit
Next Next commit
refactor(compiler): share isQuote() via chars.ts 
This function is general purpose and by moving it into the
`chars.ts` file along with similar helpers, it can be reused
in the lexer, for instance.
  • Loading branch information
@petebacondarwin
petebacondarwin committed Jul 31, 2021
commit 49462aa249edc5debcca634d9f13a3474eeccb76
4 changes: 4 additions & 0 deletions packages/compiler/src/chars.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,3 +98,7 @@ export function isNewLine(code: number): boolean {
export function isOctalDigit(code: number): boolean {
return $0 <= code && code <= $7;
}

export function isQuote(code: number): boolean {
return code === $SQ || code === $DQ || code === $BT;
}
4 changes: 0 additions & 4 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 @@ -436,10 +436,6 @@ function isExponentSign(code: number): boolean {
return code == chars.$MINUS || code == chars.$PLUS;
}

export function isQuote(code: number): boolean {
return code === chars.$SQ || code === chars.$DQ || code === chars.$BT;
}

function unescape(code: number): number {
switch (code) {
case chars.$n:
Expand Down
6 changes: 3 additions & 3 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 @@ -10,7 +10,7 @@ import * as chars from '../chars';
import {DEFAULT_INTERPOLATION_CONFIG, InterpolationConfig} from '../ml_parser/interpolation_config';

import {AbsoluteSourceSpan, AST, AstVisitor, ASTWithSource, Binary, BindingPipe, Chain, Conditional, EmptyExpr, ExpressionBinding, FunctionCall, ImplicitReceiver, Interpolation, KeyedRead, KeyedWrite, LiteralArray, LiteralMap, LiteralMapKey, LiteralPrimitive, MethodCall, NonNullAssert, ParserError, ParseSpan, PrefixNot, PropertyRead, PropertyWrite, Quote, RecursiveAstVisitor, SafeKeyedRead, SafeMethodCall, SafePropertyRead, TemplateBinding, TemplateBindingIdentifier, ThisReceiver, Unary, VariableBinding} from './ast';
import {EOF, isIdentifier, isQuote, Lexer, Token, TokenType} from './lexer';
import {EOF, isIdentifier, Lexer, Token, TokenType} from './lexer';

export interface InterpolationPiece {
text: string;
Expand Down Expand Up @@ -291,7 +291,7 @@ export class Parser {

if (outerQuote === char) {
outerQuote = null;
} else if (outerQuote == null && isQuote(char)) {
} else if (outerQuote == null && chars.isQuote(char)) {
outerQuote = char;
}
}
Expand Down Expand Up @@ -355,7 +355,7 @@ export class Parser {
const char = input[i];
// Skip the characters inside quotes. Note that we only care about the outer-most
// quotes matching up and we need to account for escape characters.
if (isQuote(input.charCodeAt(i)) && (currentQuote === null || currentQuote === char) &&
if (chars.isQuote(input.charCodeAt(i)) && (currentQuote === null || currentQuote === char) &&
escapeCount % 2 === 0) {
currentQuote = currentQuote === null ? char : null;
} else if (currentQuote === null) {
Expand Down