maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Simplify return type parsing (#18206)

Browse source 
* Simplify return type parsing

* Make control flow clearer
This commit is contained in:
Andy 2017-09-01 10:58:49 -07:00 committed by GitHub
parent c7b4ed3a91
commit 7a4c3da239
3 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/compiler/core.ts
View file

@ -1316,14 +1316,12 @@ namespace ts {
export function createFileDiagnostic(file: SourceFile, start: number, length: number, message: DiagnosticMessage, ...args: (string | number)[]): Diagnostic;
export function createFileDiagnostic(file: SourceFile, start: number, length: number, message: DiagnosticMessage): Diagnostic {
const end = start + length;
Debug.assertGreaterThanOrEqual(start, 0);
Debug.assertGreaterThanOrEqual(length, 0);
if (file) {
Debug.assertLessThanOrEqual(start, file.text.length);
Debug.assertLessThanOrEqual(end, file.text.length);
Debug.assertLessThanOrEqual(start + length, file.text.length);
}
let text = getLocaleSpecificMessage(message);

30
src/compiler/parser.ts
View file

@ -2290,25 +2290,27 @@ namespace ts {
signature.typeParameters = parseTypeParameters();
}
signature.parameters = parseParameterList(flags);
signature.type = parseReturnType(returnToken, !!(flags & SignatureFlags.Type));
}
const returnTokenRequired = returnToken === SyntaxKind.EqualsGreaterThanToken;
if (returnTokenRequired) {
function parseReturnType(returnToken: SyntaxKind.ColonToken | SyntaxKind.EqualsGreaterThanToken, isType: boolean): TypeNode | undefined {
return shouldParseReturnType(returnToken, isType) ? parseTypeOrTypePredicate() : undefined;
}
function shouldParseReturnType(returnToken: SyntaxKind.ColonToken | SyntaxKind.EqualsGreaterThanToken, isType: boolean): boolean {
if (returnToken === SyntaxKind.EqualsGreaterThanToken) {
parseExpected(returnToken);
signature.type = parseTypeOrTypePredicate();
return true;
}
else if (parseOptional(returnToken)) {
signature.type = parseTypeOrTypePredicate();
else if (parseOptional(SyntaxKind.ColonToken)) {
return true;
}
else if (flags & SignatureFlags.Type) {
const start = scanner.getTokenPos();
const length = scanner.getTextPos() - start;
const backwardToken = parseOptional(returnToken === SyntaxKind.ColonToken ? SyntaxKind.EqualsGreaterThanToken : SyntaxKind.ColonToken);
if (backwardToken) {
// This is easy to get backward, especially in type contexts, so parse the type anyway
signature.type = parseTypeOrTypePredicate();
parseErrorAtPosition(start, length, Diagnostics._0_expected, tokenToString(returnToken));
}
else if (isType && token() === SyntaxKind.EqualsGreaterThanToken) {
// This is easy to get backward, especially in type contexts, so parse the type anyway
parseErrorAtCurrentToken(Diagnostics._0_expected, tokenToString(SyntaxKind.ColonToken));
nextToken();
return true;
}
return false;
}
function parseParameterList(flags: SignatureFlags) {

2
src/compiler/types.ts
View file

@ -668,7 +668,7 @@ namespace ts {
name?: PropertyName;
typeParameters?: NodeArray<TypeParameterDeclaration>;
parameters: NodeArray<ParameterDeclaration>;
type?: TypeNode;
type: TypeNode | undefined;
}
export interface CallSignatureDeclaration extends SignatureDeclaration, TypeElement {