microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-04 21:53:42 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Change NodeArray to have a hasTrailingComma property instead of an OmittedExpression

Browse Source
This commit is contained in:
Jason Freeman 2014-09-23 19:40:25 -07:00
parent ac88d8d274
commit de2ac51924
16 changed files with 62 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/compiler/checker.ts
View File

@ -4141,8 +4141,12 @@ module ts {
// illegal, and will cause a parse error.
// Note: It may be worth keeping the upper bound check on arity, but removing
// the lower bound check if there are omitted expressions.
if (!isCorrect && forEach(node.arguments, arg => arg.kind === SyntaxKind.OmittedExpression)) {
return true;
if (!isCorrect) {
// Technically this type assertion is not safe because args could be initialized to emptyArray
// above.
if ((<NodeArray<Node>>args).hasTrailingComma || forEach(args, arg => arg.kind === SyntaxKind.OmittedExpression)) {
return true;
}
}
return isCorrect;
}

21
src/compiler/emitter.ts
View File

@ -824,11 +824,21 @@ module ts {
}
}
function emitTrailingCommaIfPresent(nodeList: NodeArray<Node>, isMultiline: boolean): void {
if (nodeList.hasTrailingComma) {
write(",");
if (isMultiline) {
writeLine();
}
}
}
function emitArrayLiteral(node: ArrayLiteral) {
if (node.flags & NodeFlags.MultiLine) {
write("[");
increaseIndent();
emitMultiLineList(node.elements);
emitTrailingCommaIfPresent(node.elements, /*isMultiline*/ true);
decreaseIndent();
writeLine();
write("]");
@ -836,6 +846,7 @@ module ts {
else {
write("[");
emitCommaList(node.elements);
emitTrailingCommaIfPresent(node.elements, /*isMultiline*/ false);
write("]");
}
}
@ -848,6 +859,11 @@ module ts {
write("{");
increaseIndent();
emitMultiLineList(node.properties);
if (compilerOptions.target === ScriptTarget.ES5) {
emitTrailingCommaIfPresent(node.properties, /*isMultiline*/ true);
}
decreaseIndent();
writeLine();
write("}");
@ -855,6 +871,11 @@ module ts {
else {
write("{ ");
emitCommaList(node.properties);
if (compilerOptions.target === ScriptTarget.ES5) {
emitTrailingCommaIfPresent(node.properties, /*isMultiline*/ false);
}
write(" }");
}
}

30
src/compiler/parser.ts
View File

@ -1197,7 +1197,7 @@ module ts {
}
// Parses a comma-delimited list of elements
function parseDelimitedList<T extends Node>(kind: ParsingContext, parseElement: () => T, allowTrailingComma: boolean, preserveTrailingComma: boolean): NodeArray<T> {
function parseDelimitedList<T extends Node>(kind: ParsingContext, parseElement: () => T, allowTrailingComma: boolean): NodeArray<T> {
var saveParsingContext = parsingContext;
parsingContext |= 1 << kind;
var result = <NodeArray<T>>[];
@ -1228,11 +1228,8 @@ module ts {
grammarErrorAtPos(commaStart, scanner.getStartPos() - commaStart, Diagnostics.Trailing_comma_not_allowed);
}
}
// Even if we reported an error because of a disallowed trailing comma, we still may
// need to preserve it for the checker so that signature help can work well.
if (preserveTrailingComma) {
result.push(<T>createNode(SyntaxKind.OmittedExpression));
}
// Always preserve a trailing comma by marking it on the NodeArray
result.hasTrailingComma = true;
}
break;
@ -1267,7 +1264,7 @@ module ts {
function parseBracketedList<T extends Node>(kind: ParsingContext, parseElement: () => T, startToken: SyntaxKind, endToken: SyntaxKind): NodeArray<T> {
if (parseExpected(startToken)) {
var result = parseDelimitedList(kind, parseElement, /*allowTrailingComma*/ false, /*preserveTrailingComma*/ false);
var result = parseDelimitedList(kind, parseElement, /*allowTrailingComma*/ false);
parseExpected(endToken);
return result;
}
@ -2307,7 +2304,7 @@ module ts {
// needs evidence of a trailing comma in order to give good results for signature help.
// That is why we do not allow a trailing comma, but we "preserve" a trailing comma.
callExpr.arguments = parseDelimitedList(ParsingContext.ArgumentExpressions,
parseArgumentExpression, /*allowTrailingComma*/ false, /*preserveTrailingComma*/ true);
parseArgumentExpression, /*allowTrailingComma*/ false);
parseExpected(SyntaxKind.CloseParenToken);
expr = finishNode(callExpr);
continue;
@ -2402,7 +2399,7 @@ module ts {
parseExpected(SyntaxKind.OpenBracketToken);
if (scanner.hasPrecedingLineBreak()) node.flags |= NodeFlags.MultiLine;
node.elements = parseDelimitedList(ParsingContext.ArrayLiteralMembers,
parseArrayLiteralElement, /*allowTrailingComma*/ true, /*preserveTrailingComma*/ true);
parseArrayLiteralElement, /*allowTrailingComma*/ true);
parseExpected(SyntaxKind.CloseBracketToken);
return finishNode(node);
}
@ -2444,10 +2441,7 @@ module ts {
node.flags |= NodeFlags.MultiLine;
}
// ES3 itself does not accept a trailing comma in an object literal, however, we'd like to preserve it in ES5.
var preserveTrailingComma = languageVersion !== ScriptTarget.ES3;
node.properties = parseDelimitedList(ParsingContext.ObjectLiteralMembers, parseObjectLiteralMember, /*allowTrailingComma*/ true, preserveTrailingComma);
node.properties = parseDelimitedList(ParsingContext.ObjectLiteralMembers, parseObjectLiteralMember, /*allowTrailingComma*/ true);
parseExpected(SyntaxKind.CloseBraceToken);
var seen: Map<SymbolFlags> = {};
@ -2540,7 +2534,7 @@ module ts {
// needs evidence of a trailing comma in order to give good results for signature help.
// That is why we do not allow a trailing comma, but we "preserve" a trailing comma.
node.arguments = parseDelimitedList(ParsingContext.ArgumentExpressions,
parseArgumentExpression, /*allowTrailingComma*/ false, /*preserveTrailingComma*/ true);
parseArgumentExpression, /*allowTrailingComma*/ false);
parseExpected(SyntaxKind.CloseParenToken);
}
return finishNode(node);
@ -3110,7 +3104,7 @@ module ts {
function parseVariableDeclarationList(flags: NodeFlags, noIn?: boolean): NodeArray<VariableDeclaration> {
return parseDelimitedList(ParsingContext.VariableDeclarations,
() => parseVariableDeclaration(flags, noIn), /*allowTrailingComma*/ false, /*preserveTrailingComma*/ false);
() => parseVariableDeclaration(flags, noIn), /*allowTrailingComma*/ false);
}
function parseVariableStatement(pos?: number, flags?: NodeFlags): VariableStatement {
@ -3510,7 +3504,7 @@ module ts {
if (parseOptional(SyntaxKind.ImplementsKeyword)) {
implementsKeywordLength = scanner.getStartPos() - implementsKeywordStart;
node.implementedTypes = parseDelimitedList(ParsingContext.BaseTypeReferences,
parseTypeReference, /*allowTrailingComma*/ false, /*preserveTrailingComma*/ false);
parseTypeReference, /*allowTrailingComma*/ false);
}
var errorCountBeforeClassBody = file.syntacticErrors.length;
if (parseExpected(SyntaxKind.OpenBraceToken)) {
@ -3539,7 +3533,7 @@ module ts {
if (parseOptional(SyntaxKind.ExtendsKeyword)) {
extendsKeywordLength = scanner.getStartPos() - extendsKeywordStart;
node.baseTypes = parseDelimitedList(ParsingContext.BaseTypeReferences,
parseTypeReference, /*allowTrailingComma*/ false, /*preserveTrailingComma*/ false);
parseTypeReference, /*allowTrailingComma*/ false);
}
var errorCountBeforeInterfaceBody = file.syntacticErrors.length;
node.members = parseTypeLiteral().members;
@ -3604,7 +3598,7 @@ module ts {
node.name = parseIdentifier();
if (parseExpected(SyntaxKind.OpenBraceToken)) {
node.members = parseDelimitedList(ParsingContext.EnumMembers,
parseAndCheckEnumMember, /*allowTrailingComma*/ true, /*preserveTrailingComma*/ false);
parseAndCheckEnumMember, /*allowTrailingComma*/ true);
parseExpected(SyntaxKind.CloseBraceToken);
}
else {

4
src/compiler/types.ts
View File

@ -259,7 +259,9 @@ module ts {
localSymbol?: Symbol; // Local symbol declared by node (initialized by binding only for exported nodes)
}
export interface NodeArray<T> extends Array<T>, TextRange { }
export interface NodeArray<T> extends Array<T>, TextRange {
hasTrailingComma?: boolean;
}
export interface Identifier extends Node {
text: string; // Text of identifier (with escapes converted to characters)

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

@ -43,7 +43,7 @@ new (<any>A());
// parentheses should be omitted
// literals
{ a: 0 };
[1, 3, ];
[1, 3,];
"string";
23.0;
/regexp/g;

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

@ -2,4 +2,4 @@
[{},]
//// [emptyExpr.js]
[{}, ];
[{},];

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

@ -2,4 +2,4 @@
var v = [1,1,];
//// [parserArrayLiteralExpression10.js]
var v = [1, 1, ];
var v = [1, 1,];

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

@ -2,4 +2,4 @@
var v = [,,1,1,,1,,1,1,,1,];
//// [parserArrayLiteralExpression15.js]
var v = [, , 1, 1, , 1, , 1, 1, , 1, ];
var v = [, , 1, 1, , 1, , 1, 1, , 1,];

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

@ -2,4 +2,4 @@
var v = [,];
//// [parserArrayLiteralExpression2.js]
var v = [, ];
var v = [,];

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

@ -2,4 +2,4 @@
var v = [,,];
//// [parserArrayLiteralExpression3.js]
var v = [, , ];
var v = [, ,];

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

@ -2,4 +2,4 @@
var v = [,,,];
//// [parserArrayLiteralExpression4.js]
var v = [, , , ];
var v = [, , ,];

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

@ -2,4 +2,4 @@
var v = [1,];
//// [parserArrayLiteralExpression7.js]
var v = [1, ];
var v = [1,];

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

@ -2,4 +2,4 @@
var v = [,1,];
//// [parserArrayLiteralExpression8.js]
var v = [, 1, ];
var v = [, 1,];

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

@ -17,7 +17,7 @@ var arrTest = (function () {
};
arrTest.prototype.callTest = function () {
// these two should give the same error
this.test([1, 2, "hi", 5, ]);
this.test([1, 2, "hi", 5,]);
this.test([1, 2, "hi", 5]);
};
return arrTest;

8
tests/baselines/reference/trailingCommasES3.js
View File

@ -18,8 +18,8 @@ var o2 = { a: 1, b: 2 };
var o3 = { a: 1 };
var o4 = {};
var a1 = [1, 2];
var a2 = [1, 2, ];
var a3 = [1, ];
var a2 = [1, 2,];
var a3 = [1,];
var a4 = [];
var a5 = [1, , ];
var a6 = [, , ];
var a5 = [1, ,];
var a6 = [, ,];

12
tests/baselines/reference/trailingCommasES5.js
View File

@ -14,12 +14,12 @@ var a6 = [, , ];
//// [trailingCommasES5.js]
var o1 = { a: 1, b: 2 };
var o2 = { a: 1, b: 2, };
var o3 = { a: 1, };
var o2 = { a: 1, b: 2, };
var o3 = { a: 1, };
var o4 = {};
var a1 = [1, 2];
var a2 = [1, 2, ];
var a3 = [1, ];
var a2 = [1, 2,];
var a3 = [1,];
var a4 = [];
var a5 = [1, , ];
var a6 = [, , ];
var a5 = [1, ,];
var a6 = [, ,];