microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-27 22:39:59 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Address slew of review comments

Browse Source
This commit is contained in:
Caitlin Potter
2015-03-10 21:22:41 -04:00
parent fdc673f5eb
commit 5e107e6042
11 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/compiler/checker.ts
View File

@@ -11381,12 +11381,13 @@ module ts {
}
function checkGrammarArrowFunction(node: FunctionLikeDeclaration): boolean {
if (node.kind === SyntaxKind.ArrowFunction && (<ArrowFunction>node).arrow) {
if (node.kind === SyntaxKind.ArrowFunction) {
var arrowFunction = <ArrowFunction>node;
var sourceFile = getSourceFileOfNode(node);
if (getLineAndCharacterOfPosition(sourceFile, getTokenPosOfNode(arrowFunction.arrow, sourceFile)).line !==
getLineAndCharacterOfPosition(sourceFile, arrowFunction.parameters.end).line) {
return grammarErrorOnNode(arrowFunction.arrow, Diagnostics.Line_terminator_not_permitted_before_arrow);
var equalsGreaterThanLine = getLineAndCharacterOfPosition(sourceFile, getTokenPosOfNode(arrowFunction.equalsGreaterThanToken, sourceFile)).line;
var parametersLine = getLineAndCharacterOfPosition(sourceFile, arrowFunction.parameters.end).line;
if (equalsGreaterThanLine !== parametersLine) {
return grammarErrorOnNode(arrowFunction.equalsGreaterThanToken, Diagnostics.Line_terminator_not_permitted_before_arrow);
}
}
return false;

9
src/compiler/parser.ts
View File

@@ -95,7 +95,7 @@ module ts {
visitNodes(cbNodes, (<FunctionLikeDeclaration>node).typeParameters) ||
visitNodes(cbNodes, (<FunctionLikeDeclaration>node).parameters) ||
visitNode(cbNode, (<FunctionLikeDeclaration>node).type) ||
visitNode(cbNode, (<ArrowFunction>node).arrow) ||
visitNode(cbNode, (<ArrowFunction>node).equalsGreaterThanToken) ||
visitNode(cbNode, (<FunctionLikeDeclaration>node).body);
case SyntaxKind.TypeReference:
return visitNode(cbNode, (<TypeReferenceNode>node).typeName) ||
@@ -3017,9 +3017,7 @@ module ts {
node.parameters.pos = parameter.pos;
node.parameters.end = parameter.end;
if ((node.arrow = parseExpectedToken(SyntaxKind.EqualsGreaterThanToken, false, Diagnostics._0_expected, "=>"))) {
node.arrow.parent = node;
}
node.equalsGreaterThanToken = parseExpectedToken(SyntaxKind.EqualsGreaterThanToken, false, Diagnostics._0_expected, "=>");
node.body = parseArrowFunctionExpressionBody();
return finishNode(node);
@@ -3048,8 +3046,7 @@ module ts {
// If we have an arrow, then try to parse the body. Even if not, try to parse if we
// have an opening brace, just in case we're in an error state.
if ((arrowFunction.arrow = parseExpectedToken(SyntaxKind.EqualsGreaterThanToken, false, Diagnostics._0_expected, "=>")) || token === SyntaxKind.OpenBraceToken) {
arrowFunction.arrow.parent = arrowFunction;
if ((arrowFunction.equalsGreaterThanToken = parseExpectedToken(SyntaxKind.EqualsGreaterThanToken, false, Diagnostics._0_expected, "=>")) || token === SyntaxKind.OpenBraceToken) {
arrowFunction.body = parseArrowFunctionExpressionBody();
}
else {

2
src/compiler/types.ts
View File

@@ -654,7 +654,7 @@ module ts {
}
export interface ArrowFunction extends Expression, FunctionLikeDeclaration {
arrow: Node;
equalsGreaterThanToken: Node;
}
// The text property of a LiteralExpression stores the interpreted value of the literal in text form. For a StringLiteral,

2
tests/baselines/reference/APISample_compile.js
View File

@@ -554,7 +554,7 @@ declare module "typescript" {
body: Block | Expression;
}
interface ArrowFunction extends Expression, FunctionLikeDeclaration {
arrow: Node;
equalsGreaterThanToken: Node;
}
interface LiteralExpression extends PrimaryExpression {
text: string;

4
tests/baselines/reference/APISample_compile.types
View File

@@ -1674,8 +1674,8 @@ declare module "typescript" {
>questionToken : Node
>Node : Node
initializer: Expression;
initializer: Expression;
>initializer : Expression
>Expression : Expression
}

2
tests/baselines/reference/APISample_linter.js
View File

@@ -585,7 +585,7 @@ declare module "typescript" {
body: Block | Expression;
}
interface ArrowFunction extends Expression, FunctionLikeDeclaration {
arrow: Node;
equalsGreaterThanToken: Node;
}
interface LiteralExpression extends PrimaryExpression {
text: string;

4
tests/baselines/reference/APISample_linter.types
View File

@@ -1820,8 +1820,8 @@ declare module "typescript" {
>questionToken : Node
>Node : Node
initializer: Expression;
initializer: Expression;
>initializer : Expression
>Expression : Expression
}

2
tests/baselines/reference/APISample_transform.js
View File

@@ -586,7 +586,7 @@ declare module "typescript" {
body: Block | Expression;
}
interface ArrowFunction extends Expression, FunctionLikeDeclaration {
arrow: Node;
equalsGreaterThanToken: Node;
}
interface LiteralExpression extends PrimaryExpression {
text: string;

4
tests/baselines/reference/APISample_transform.types
View File

@@ -1770,8 +1770,8 @@ declare module "typescript" {
>questionToken : Node
>Node : Node
initializer: Expression;
initializer: Expression;
>initializer : Expression
>Expression : Expression
}

2
tests/baselines/reference/APISample_watcher.js
View File

@@ -623,7 +623,7 @@ declare module "typescript" {
body: Block | Expression;
}
interface ArrowFunction extends Expression, FunctionLikeDeclaration {
arrow: Node;
equalsGreaterThanToken: Node;
}
interface LiteralExpression extends PrimaryExpression {
text: string;

4
tests/baselines/reference/APISample_watcher.types
View File

@@ -1943,8 +1943,8 @@ declare module "typescript" {
>questionToken : Node
>Node : Node
initializer: Expression;
initializer: Expression;
>initializer : Expression
>Expression : Expression
}