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

style(compiler): reformat of codebase with new clang-format version (#36520)

Browse Source 
This commit reformats the packages/compiler tree using the new version of
clang-format.

PR Close #36520
This commit is contained in:
Alex Rickabaugh
2020-04-08 10:14:18 -07:00
committed by atscott
parent 0a69a2832b
commit 83a9159063
193 changed files with 5904 additions and 4574 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
packages/compiler/src/css_parser/css_ast.ts
View File

@ -46,8 +46,12 @@ export interface CssAstVisitor {
export abstract class CssAst {
constructor(public location: ParseSourceSpan) {}
get start(): ParseLocation { return this.location.start; }
get end(): ParseLocation { return this.location.end; }
get start(): ParseLocation {
return this.location.start;
}
get end(): ParseLocation {
return this.location.end;
}
abstract visit(visitor: CssAstVisitor, context?: any): any;
}
@ -55,11 +59,15 @@ export class CssStyleValueAst extends CssAst {
constructor(location: ParseSourceSpan, public tokens: CssToken[], public strValue: string) {
super(location);
}
visit(visitor: CssAstVisitor, context?: any): any { return visitor.visitCssValue(this); }
visit(visitor: CssAstVisitor, context?: any): any {
return visitor.visitCssValue(this);
}
}
export abstract class CssRuleAst extends CssAst {
constructor(location: ParseSourceSpan) { super(location); }
constructor(location: ParseSourceSpan) {
super(location);
}
}
export class CssBlockRuleAst extends CssRuleAst {
@ -158,7 +166,9 @@ export class CssDefinitionAst extends CssAst {
}
export abstract class CssSelectorPartAst extends CssAst {
constructor(location: ParseSourceSpan) { super(location); }
constructor(location: ParseSourceSpan) {
super(location);
}
}
export class CssSelectorAst extends CssSelectorPartAst {
@ -195,8 +205,12 @@ export class CssPseudoSelectorAst extends CssSelectorPartAst {
}
export class CssBlockAst extends CssAst {
constructor(location: ParseSourceSpan, public entries: CssAst[]) { super(location); }
visit(visitor: CssAstVisitor, context?: any): any { return visitor.visitCssBlock(this, context); }
constructor(location: ParseSourceSpan, public entries: CssAst[]) {
super(location);
}
visit(visitor: CssAstVisitor, context?: any): any {
return visitor.visitCssBlock(this, context);
}
}
/*
@ -213,7 +227,9 @@ export class CssStylesBlockAst extends CssBlockAst {
}
export class CssStyleSheetAst extends CssAst {
constructor(location: ParseSourceSpan, public rules: CssAst[]) { super(location); }
constructor(location: ParseSourceSpan, public rules: CssAst[]) {
super(location);
}
visit(visitor: CssAstVisitor, context?: any): any {
return visitor.visitCssStyleSheet(this, context);
}

19
packages/compiler/src/css_parser/css_lexer.ts
View File

@ -117,7 +117,7 @@ function _trackWhitespace(mode: CssLexerMode) {
export class CssScanner {
// TODO(issue/24571): remove '!'.
peek !: number;
peek!: number;
peekPeek: number;
length: number = 0;
index: number = -1;
@ -135,7 +135,9 @@ export class CssScanner {
this.advance();
}
getMode(): CssLexerMode { return this._currentMode; }
getMode(): CssLexerMode {
return this._currentMode;
}
setMode(mode: CssLexerMode) {
if (this._currentMode != mode) {
@ -198,7 +200,7 @@ export class CssScanner {
const previousLine = this.line;
const previousColumn = this.column;
let next: CssToken = undefined !;
let next: CssToken = undefined!;
const output = this.scan();
if (output != null) {
// just incase the inner scan method returned an error
@ -236,9 +238,10 @@ export class CssScanner {
}
error = cssScannerError(
next, generateErrorMessage(
this.input, errorMessage, next.strValue, previousIndex, previousLine,
previousColumn));
next,
generateErrorMessage(
this.input, errorMessage, next.strValue, previousIndex, previousLine,
previousColumn));
}
return new LexedCssResult(error, next);
@ -254,7 +257,7 @@ export class CssScanner {
const token = this._scan();
if (token == null) return null;
const error = this._currentError !;
const error = this._currentError!;
this._currentError = null;
if (!trackWS) {
@ -461,7 +464,7 @@ export class CssScanner {
const startingColumn = this.column;
this.advance();
if (isIdentifierStart(this.peek, this.peekPeek)) {
const ident = this.scanIdentifier() !;
const ident = this.scanIdentifier()!;
const strValue = '@' + ident.strValue;
return new CssToken(start, startingColumn, this.line, CssTokenType.AtKeyword, strValue);
} else {

65
packages/compiler/src/css_parser/css_parser.ts
View File

@ -9,7 +9,7 @@
import * as chars from '../chars';
import {ParseError, ParseLocation, ParseSourceFile, ParseSourceSpan} from '../parse_util';
import {BlockType, CssAst, CssAtRulePredicateAst, CssBlockAst, CssBlockDefinitionRuleAst, CssBlockRuleAst, CssDefinitionAst, CssInlineRuleAst, CssKeyframeDefinitionAst, CssKeyframeRuleAst, CssMediaQueryRuleAst, CssPseudoSelectorAst, CssRuleAst, CssSelectorAst, CssSelectorRuleAst, CssSimpleSelectorAst, CssStyleSheetAst, CssStyleValueAst, CssStylesBlockAst, CssUnknownRuleAst, CssUnknownTokenListAst, mergeTokens} from './css_ast';
import {BlockType, CssAst, CssAtRulePredicateAst, CssBlockAst, CssBlockDefinitionRuleAst, CssBlockRuleAst, CssDefinitionAst, CssInlineRuleAst, CssKeyframeDefinitionAst, CssKeyframeRuleAst, CssMediaQueryRuleAst, CssPseudoSelectorAst, CssRuleAst, CssSelectorAst, CssSelectorRuleAst, CssSimpleSelectorAst, CssStylesBlockAst, CssStyleSheetAst, CssStyleValueAst, CssUnknownRuleAst, CssUnknownTokenListAst, mergeTokens} from './css_ast';
import {CssLexer, CssLexerMode, CssScanner, CssToken, CssTokenType, generateErrorMessage, getRawMessage, isNewline} from './css_lexer';
const SPACE_OPERATOR = ' ';
@ -84,11 +84,11 @@ export class ParsedCssResult {
export class CssParser {
private _errors: CssParseError[] = [];
// TODO(issue/24571): remove '!'.
private _file !: ParseSourceFile;
private _file!: ParseSourceFile;
// TODO(issue/24571): remove '!'.
private _scanner !: CssScanner;
private _scanner!: CssScanner;
// TODO(issue/24571): remove '!'.
private _lastToken !: CssToken;
private _lastToken!: CssToken;
/**
* @param css the CSS code that will be parsed
@ -125,11 +125,13 @@ export class CssParser {
// EOF token that was emitted sometime during the lexing
span = this._generateSourceSpan(firstRule, this._lastToken);
}
return new CssStyleSheetAst(span !, results);
return new CssStyleSheetAst(span!, results);
}
/** @internal */
_getSourceContent(): string { return this._scanner != null ? this._scanner.input : ''; }
_getSourceContent(): string {
return this._scanner != null ? this._scanner.input : '';
}
/** @internal */
_extractSourceContent(start: number, end: number): string {
@ -159,9 +161,9 @@ export class CssParser {
let endColumn: number = -1;
let endIndex: number = -1;
if (end instanceof CssAst) {
endLine = end.location.end.line !;
endColumn = end.location.end.col !;
endIndex = end.location.end.offset !;
endLine = end.location.end.line!;
endColumn = end.location.end.col!;
endIndex = end.location.end.offset!;
} else if (end instanceof CssToken) {
endLine = end.line;
endColumn = end.column;
@ -253,7 +255,7 @@ export class CssParser {
case BlockType.Viewport:
case BlockType.FontFace:
block = this._parseStyleBlock(delimiters) !;
block = this._parseStyleBlock(delimiters)!;
span = this._generateSourceSpan(startToken, block);
return new CssBlockRuleAst(span, type, block);
@ -293,7 +295,7 @@ export class CssParser {
span = this._generateSourceSpan(startToken, tokens[tokens.length - 1]);
query = new CssAtRulePredicateAst(span, strValue, tokens);
block = this._parseBlock(delimiters);
strValue = this._extractSourceContent(start, block.end.offset !);
strValue = this._extractSourceContent(start, block.end.offset!);
span = this._generateSourceSpan(startToken, block);
return new CssBlockDefinitionRuleAst(span, strValue, type, query, block);
@ -310,11 +312,15 @@ export class CssParser {
token);
this._collectUntilDelim(delimiters | LBRACE_DELIM_FLAG | SEMICOLON_DELIM_FLAG)
.forEach((token) => { listOfTokens.push(token); });
.forEach((token) => {
listOfTokens.push(token);
});
if (this._scanner.peek == chars.$LBRACE) {
listOfTokens.push(this._consume(CssTokenType.Character, '{'));
this._collectUntilDelim(delimiters | RBRACE_DELIM_FLAG | LBRACE_DELIM_FLAG)
.forEach((token) => { listOfTokens.push(token); });
.forEach((token) => {
listOfTokens.push(token);
});
listOfTokens.push(this._consume(CssTokenType.Character, '}'));
}
endToken = listOfTokens[listOfTokens.length - 1];
@ -339,7 +345,9 @@ export class CssParser {
const innerTokens: CssToken[] = [];
selectors.forEach((selector: CssSelectorAst) => {
selector.selectorParts.forEach((part: CssSimpleSelectorAst) => {
part.tokens.forEach((token: CssToken) => { innerTokens.push(token); });
part.tokens.forEach((token: CssToken) => {
innerTokens.push(token);
});
});
});
const endToken = innerTokens[innerTokens.length - 1];
@ -376,7 +384,7 @@ export class CssParser {
/** @internal */
_scan(): CssToken {
const output = this._scanner.scan() !;
const output = this._scanner.scan()!;
const token = output.token;
const error = output.error;
if (error != null) {
@ -387,7 +395,9 @@ export class CssParser {
}
/** @internal */
_getScannerIndex(): number { return this._scanner.index; }
_getScannerIndex(): number {
return this._scanner.index;
}
/** @internal */
_consume(type: CssTokenType, value: string|null = null): CssToken {
@ -432,7 +442,7 @@ export class CssParser {
}
const stylesBlock = this._parseStyleBlock(delimiters | RBRACE_DELIM_FLAG);
const span = this._generateSourceSpan(stepTokens[0], stylesBlock);
const ast = new CssKeyframeDefinitionAst(span, stepTokens, stylesBlock !);
const ast = new CssKeyframeDefinitionAst(span, stepTokens, stylesBlock!);
this._scanner.setMode(CssLexerMode.BLOCK);
return ast;
@ -523,7 +533,7 @@ export class CssParser {
const selectorCssTokens: CssToken[] = [];
const pseudoSelectors: CssPseudoSelectorAst[] = [];
let previousToken: CssToken = undefined !;
let previousToken: CssToken = undefined!;
const selectorPartDelimiters = delimiters | SPACE_DELIM_FLAG;
let loopOverSelector = !characterContainsDelimiter(this._scanner.peek, selectorPartDelimiters);
@ -576,7 +586,8 @@ export class CssParser {
hasAttributeError || this._scanner.getMode() == CssLexerMode.ATTRIBUTE_SELECTOR;
if (hasAttributeError) {
this._error(
`Unbalanced CSS attribute selector at column ${previousToken.line}:${previousToken.column}`,
`Unbalanced CSS attribute selector at column ${previousToken.line}:${
previousToken.column}`,
previousToken);
}
@ -671,8 +682,8 @@ export class CssParser {
endTokenOrAst = operator;
}
const span = this._generateSourceSpan(startTokenOrAst !, endTokenOrAst);
return new CssSimpleSelectorAst(span, selectorCssTokens, strValue, pseudoSelectors, operator !);
const span = this._generateSourceSpan(startTokenOrAst!, endTokenOrAst);
return new CssSimpleSelectorAst(span, selectorCssTokens, strValue, pseudoSelectors, operator!);
}
/** @internal */
@ -701,7 +712,7 @@ export class CssParser {
const tokens: CssToken[] = [];
let wsStr = '';
let previous: CssToken = undefined !;
let previous: CssToken = undefined!;
while (!characterContainsDelimiter(this._scanner.peek, delimiters)) {
let token: CssToken;
if (previous != null && previous.type == CssTokenType.Identifier &&
@ -841,7 +852,9 @@ export class CssParser {
const remainingTokens = this._collectUntilDelim(
delimiters | COLON_DELIM_FLAG | SEMICOLON_DELIM_FLAG, CssTokenType.Identifier);
if (remainingTokens.length > 0) {
remainingTokens.forEach((token) => { propStr.push(token.strValue); });
remainingTokens.forEach((token) => {
propStr.push(token.strValue);
});
}
endToken = prop =
@ -868,7 +881,7 @@ export class CssParser {
}
const span = this._generateSourceSpan(prop, endToken);
return new CssDefinitionAst(span, prop, value !);
return new CssDefinitionAst(span, prop, value!);
}
/** @internal */
@ -899,5 +912,7 @@ export class CssParseError extends ParseError {
return new CssParseError(span, 'CSS Parse Error: ' + errMsg);
}
constructor(span: ParseSourceSpan, message: string) { super(span, message); }
constructor(span: ParseSourceSpan, message: string) {
super(span, message);
}
}