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

Merge branch 'master' into es6typings

Browse source 
Conflicts:
	tests/baselines/reference/constDeclarationShadowedByVarDeclaration3.types
This commit is contained in:
Mohamed Hegazy 2014-12-01 16:51:10 -08:00
parent 99d13f4e5c 203e46c335
commit 4e79458e69
70 changed files with 860 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/compiler/checker.ts
View file

@ -1608,6 +1608,8 @@ module ts {
return isDeclarationVisible(<Declaration>parent);
case SyntaxKind.Property:
case SyntaxKind.GetAccessor:
case SyntaxKind.SetAccessor:
case SyntaxKind.Method:
if (node.flags & (NodeFlags.Private | NodeFlags.Protected)) {
// Private/protected properties/methods are not visible
@ -1622,6 +1624,14 @@ module ts {
case SyntaxKind.Parameter:
case SyntaxKind.ModuleBlock:
case SyntaxKind.TypeParameter:
case SyntaxKind.FunctionType:
case SyntaxKind.ConstructorType:
case SyntaxKind.TypeLiteral:
case SyntaxKind.TypeReference:
case SyntaxKind.ArrayType:
case SyntaxKind.TupleType:
case SyntaxKind.UnionType:
case SyntaxKind.ParenthesizedType:
return isDeclarationVisible(<Declaration>node.parent);
// Source file is always visible
@ -5335,7 +5345,7 @@ module ts {
var templateExpression = <TemplateExpression>tagExpression.template;
var lastSpan = lastOrUndefined(templateExpression.templateSpans);
Debug.assert(lastSpan !== undefined); // we should always have at least one span.
callIsIncomplete = lastSpan.literal.kind === SyntaxKind.Missing || isUnterminatedTemplateEnd(lastSpan.literal);
callIsIncomplete = lastSpan.literal.kind === SyntaxKind.Missing || !!lastSpan.literal.isUnterminated;
}
else {
// If the template didn't end in a backtick, or its beginning occurred right prior to EOF,
@ -5343,7 +5353,7 @@ module ts {
// so we consider the call to be incomplete.
var templateLiteral = <LiteralExpression>tagExpression.template;
Debug.assert(templateLiteral.kind === SyntaxKind.NoSubstitutionTemplateLiteral);
callIsIncomplete = isUnterminatedTemplateEnd(templateLiteral);
callIsIncomplete = !!templateLiteral.isUnterminated;
}
}
else {

23
src/compiler/parser.ts
View file

@ -855,25 +855,6 @@ module ts {
return SyntaxKind.FirstTriviaToken <= token && token <= SyntaxKind.LastTriviaToken;
}
export function isUnterminatedTemplateEnd(node: LiteralExpression) {
Debug.assert(isTemplateLiteralKind(node.kind));
var sourceText = getSourceFileOfNode(node).text;
// If we're not at the EOF, we know we must be terminated.
if (node.end !== sourceText.length) {
return false;
}
// The literal can only be unterminated if it is a template tail or a no-sub template.
if (node.kind !== SyntaxKind.TemplateTail && node.kind !== SyntaxKind.NoSubstitutionTemplateLiteral) {
return false;
}
// If we didn't end in a backtick, we must still be in the middle of a template.
// If we did, make sure that it's not the *initial* backtick.
return sourceText.charCodeAt(node.end - 1) !== CharacterCodes.backtick || node.text.length === 0;
}
export function isModifier(token: SyntaxKind): boolean {
switch (token) {
case SyntaxKind.PublicKeyword:
@ -1691,6 +1672,10 @@ module ts {
var text = scanner.getTokenValue();
node.text = internName ? internIdentifier(text) : text;
if (scanner.isUnterminated()) {
node.isUnterminated = true;
}
var tokenPos = scanner.getTokenPos();
nextToken();
finishNode(node);

10
src/compiler/scanner.ts
View file

@ -22,6 +22,7 @@ module ts {
hasPrecedingLineBreak(): boolean;
isIdentifier(): boolean;
isReservedWord(): boolean;
isUnterminated(): boolean;
reScanGreaterToken(): SyntaxKind;
reScanSlashToken(): SyntaxKind;
reScanTemplateToken(): SyntaxKind;
@ -470,6 +471,7 @@ module ts {
var token: SyntaxKind;
var tokenValue: string;
var precedingLineBreak: boolean;
var tokenIsUnterminated: boolean;
function error(message: DiagnosticMessage): void {
if (onError) {
@ -553,6 +555,7 @@ module ts {
while (true) {
if (pos >= len) {
result += text.substring(start, pos);
tokenIsUnterminated = true;
error(Diagnostics.Unterminated_string_literal);
break;
}
@ -570,6 +573,7 @@ module ts {
}
if (isLineBreak(ch)) {
result += text.substring(start, pos);
tokenIsUnterminated = true;
error(Diagnostics.Unterminated_string_literal);
break;
}
@ -593,6 +597,7 @@ module ts {
while (true) {
if (pos >= len) {
contents += text.substring(start, pos);
tokenIsUnterminated = true;
error(Diagnostics.Unterminated_template_literal);
resultingToken = startedWithBacktick ? SyntaxKind.NoSubstitutionTemplateLiteral : SyntaxKind.TemplateTail;
break;
@ -780,6 +785,7 @@ module ts {
function scan(): SyntaxKind {
startPos = pos;
precedingLineBreak = false;
tokenIsUnterminated = false;
while (true) {
tokenPos = pos;
if (pos >= len) {
@ -936,6 +942,7 @@ module ts {
continue;
}
else {
tokenIsUnterminated = !commentClosed;
return token = SyntaxKind.MultiLineCommentTrivia;
}
}
@ -1113,12 +1120,14 @@ module ts {
// If we reach the end of a file, or hit a newline, then this is an unterminated
// regex. Report error and return what we have so far.
if (p >= len) {
tokenIsUnterminated = true;
error(Diagnostics.Unterminated_regular_expression_literal)
break;
}
var ch = text.charCodeAt(p);
if (isLineBreak(ch)) {
tokenIsUnterminated = true;
error(Diagnostics.Unterminated_regular_expression_literal)
break;
}
@ -1211,6 +1220,7 @@ module ts {
hasPrecedingLineBreak: () => precedingLineBreak,
isIdentifier: () => token === SyntaxKind.Identifier || token > SyntaxKind.LastReservedWord,
isReservedWord: () => token >= SyntaxKind.FirstReservedWord && token <= SyntaxKind.LastReservedWord,
isUnterminated: () => tokenIsUnterminated,
reScanGreaterToken,
reScanSlashToken,
reScanTemplateToken,

1
src/compiler/types.ts
View file

@ -527,6 +527,7 @@ module ts {
// For a NumericLiteral, the stored value is the toString() representation of the number. For example 1, 1.00, and 1e0 are all stored as just "1".
export interface LiteralExpression extends PrimaryExpression {
text: string;
isUnterminated?: boolean;
}
export interface TemplateExpression extends PrimaryExpression {

1
src/lib/core.d.ts vendored
View file

@ -836,6 +836,7 @@ interface RegExp {
interface RegExpConstructor {
new (pattern: string, flags?: string): RegExp;
(pattern: string, flags?: string): RegExp;
prototype: RegExp;
// Non-standard extensions
$1: string;

3
src/lib/extensions.d.ts vendored
View file

@ -631,6 +631,7 @@ interface Map<K, V> {
}
declare var Map: {
new <K, V>(): Map<K, V>;
prototype: Map<any, any>;
}
interface WeakMap<K, V> {
@ -642,6 +643,7 @@ interface WeakMap<K, V> {
}
declare var WeakMap: {
new <K, V>(): WeakMap<K, V>;
prototype: WeakMap<any, any>;
}
interface Set<T> {
@ -654,4 +656,5 @@ interface Set<T> {
}
declare var Set: {
new <T>(): Set<T>;
prototype: Set<any>;
}

21
src/services/formatting/formattingScanner.ts
View file

@ -146,7 +146,11 @@ module ts.formatting {
if (lastTokenInfo && expectedScanAction === lastScanAction) {
// readTokenInfo was called before with the same expected scan action.
// No need to re-scan text, return existing 'lastTokenInfo'
return lastTokenInfo;
// it is ok to call fixTokenKind here since it does not affect
// what portion of text is consumed. In opposize rescanning can change it,
// i.e. for '>=' when originally scanner eats just one character
// and rescanning forces it to consume more.
return fixTokenKind(lastTokenInfo, n);
}
if (scanner.getStartPos() !== savedPos) {
@ -207,11 +211,13 @@ module ts.formatting {
}
}
return lastTokenInfo = {
lastTokenInfo = {
leadingTrivia: leadingTrivia,
trailingTrivia: trailingTrivia,
token: token
}
return fixTokenKind(lastTokenInfo, n);
}
function isOnToken(): boolean {
@ -219,5 +225,16 @@ module ts.formatting {
var startPos = (lastTokenInfo && lastTokenInfo.token.pos) || scanner.getStartPos();
return startPos < endPos && current !== SyntaxKind.EndOfFileToken && !isTrivia(current);
}
// when containing node in the tree is token
// but its kind differs from the kind that was returned by the scanner,
// then kind needs to be fixed. This might happen in cases
// when parser interprets token differently, i.e keyword treated as identifier
function fixTokenKind(tokenInfo: TokenInfo, container: Node): TokenInfo {
if (isToken(container) && tokenInfo.token.kind !== container.kind) {
tokenInfo.token.kind = container.kind;
}
return tokenInfo;
}
}
}

62
src/services/services.ts
View file

@ -2501,10 +2501,11 @@ module ts {
}
function isInStringOrRegularExpressionOrTemplateLiteral(previousToken: Node): boolean {
if (previousToken.kind === SyntaxKind.StringLiteral || isTemplateLiteralKind(previousToken.kind)) {
if (previousToken.kind === SyntaxKind.StringLiteral
|| previousToken.kind === SyntaxKind.RegularExpressionLiteral
|| isTemplateLiteralKind(previousToken.kind)) {
// The position has to be either: 1. entirely within the token text, or
// 2. at the end position, and the string literal is not terminated
// 2. at the end position of an unterminated token.
var start = previousToken.getStart();
var end = previousToken.getEnd();
@ -2512,36 +2513,9 @@ module ts {
return true;
}
else if (position === end) {
var width = end - start;
var text = previousToken.getSourceFile().text;
// If the token is a single character, or its second-to-last charcter indicates an escape code,
// then we can immediately say that we are in the middle of an unclosed string.
if (width <= 1 || text.charCodeAt(end - 2) === CharacterCodes.backslash) {
return true;
}
// Now check if the last character is a closing character for the token.
switch (previousToken.kind) {
case SyntaxKind.StringLiteral:
case SyntaxKind.NoSubstitutionTemplateLiteral:
return text.charCodeAt(start) !== text.charCodeAt(end - 1);
case SyntaxKind.TemplateHead:
case SyntaxKind.TemplateMiddle:
return text.charCodeAt(end - 1) !== CharacterCodes.openBrace
|| text.charCodeAt(end - 2) !== CharacterCodes.$;
case SyntaxKind.TemplateTail:
return text.charCodeAt(end - 1) !== CharacterCodes.backtick;
}
return false;
return !!(<LiteralExpression>previousToken).isUnterminated;
}
}
else if (previousToken.kind === SyntaxKind.RegularExpressionLiteral) {
return previousToken.getStart() < position && position < previousToken.getEnd();
}
return false;
}
@ -5665,23 +5639,29 @@ module ts {
addResult(end - start, classFromKind(token));
if (end >= text.length) {
// We're at the end.
if (token === SyntaxKind.StringLiteral) {
// Check to see if we finished up on a multiline string literal.
var tokenText = scanner.getTokenText();
if (tokenText.length > 0 && tokenText.charCodeAt(tokenText.length - 1) === CharacterCodes.backslash) {
var quoteChar = tokenText.charCodeAt(0);
result.finalLexState = quoteChar === CharacterCodes.doubleQuote
? EndOfLineState.InDoubleQuoteStringLiteral
: EndOfLineState.InSingleQuoteStringLiteral;
if (scanner.isUnterminated()) {
var lastCharIndex = tokenText.length - 1;
var numBackslashes = 0;
while (tokenText.charCodeAt(lastCharIndex - numBackslashes) === CharacterCodes.backslash) {
numBackslashes++;
}
// If we have an odd number of backslashes, then the multiline string is unclosed
if (numBackslashes & 1) {
var quoteChar = tokenText.charCodeAt(0);
result.finalLexState = quoteChar === CharacterCodes.doubleQuote
? EndOfLineState.InDoubleQuoteStringLiteral
: EndOfLineState.InSingleQuoteStringLiteral;
}
}
}
else if (token === SyntaxKind.MultiLineCommentTrivia) {
// Check to see if the multiline comment was unclosed.
var tokenText = scanner.getTokenText()
if (!(tokenText.length > 3 && // need to avoid catching '/*/'
tokenText.charCodeAt(tokenText.length - 2) === CharacterCodes.asterisk &&
tokenText.charCodeAt(tokenText.length - 1) === CharacterCodes.slash)) {
if (scanner.isUnterminated()) {
result.finalLexState = EndOfLineState.InMultiLineCommentTrivia;
}
}

2
src/services/signatureHelp.ts
View file

@ -296,7 +296,7 @@ module ts.SignatureHelp {
Debug.assert(templateExpression.kind === SyntaxKind.TemplateExpression);
// If we're just after a template tail, don't show signature help.
if (node.kind === SyntaxKind.TemplateTail && position >= node.getEnd() && !isUnterminatedTemplateEnd(<LiteralExpression>node)) {
if (node.kind === SyntaxKind.TemplateTail && position >= node.getEnd() && !(<LiteralExpression>node).isUnterminated) {
return undefined;
}

4
src/services/utilities.ts
View file

@ -322,7 +322,7 @@ module ts {
}
export function isInsideTemplateLiteral(node: LiteralExpression, position: number) {
return (node.getStart() < position && position < node.getEnd())
|| (isUnterminatedTemplateEnd(node) && position === node.getEnd());
return isTemplateLiteralKind(node.kind)
&& (node.getStart() < position && position < node.getEnd()) || (!!node.isUnterminated && position === node.getEnd());
}
}

199
tests/baselines/reference/isDeclarationVisibleNodeKinds.js Normal file
View file

@ -0,0 +1,199 @@
//// [isDeclarationVisibleNodeKinds.ts]
// Function types
module schema {
export function createValidator1(schema: any): <T>(data: T) => T {
return undefined;
}
}
// Constructor types
module schema {
export function createValidator2(schema: any): new <T>(data: T) => T {
return undefined;
}
}
// union types
module schema {
export function createValidator3(schema: any): number | { new <T>(data: T): T; } {
return undefined;
}
}
// Array types
module schema {
export function createValidator4(schema: any): { new <T>(data: T): T; }[] {
return undefined;
}
}
// TypeLiterals
module schema {
export function createValidator5(schema: any): { new <T>(data: T): T } {
return undefined;
}
}
// Tuple types
module schema {
export function createValidator6(schema: any): [ new <T>(data: T) => T, number] {
return undefined;
}
}
// Paren Types
module schema {
export function createValidator7(schema: any): (new <T>(data: T)=>T )[] {
return undefined;
}
}
// Type reference
module schema {
export function createValidator8(schema: any): Array<{ <T>(data: T) : T}> {
return undefined;
}
}
module schema {
export class T {
get createValidator9(): <T>(data: T) => T {
return undefined;
}
set createValidator10(v: <T>(data: T) => T) {
}
}
}
//// [isDeclarationVisibleNodeKinds.js]
// Function types
var schema;
(function (_schema) {
function createValidator1(schema) {
return undefined;
}
_schema.createValidator1 = createValidator1;
})(schema || (schema = {}));
// Constructor types
var schema;
(function (_schema) {
function createValidator2(schema) {
return undefined;
}
_schema.createValidator2 = createValidator2;
})(schema || (schema = {}));
// union types
var schema;
(function (_schema) {
function createValidator3(schema) {
return undefined;
}
_schema.createValidator3 = createValidator3;
})(schema || (schema = {}));
// Array types
var schema;
(function (_schema) {
function createValidator4(schema) {
return undefined;
}
_schema.createValidator4 = createValidator4;
})(schema || (schema = {}));
// TypeLiterals
var schema;
(function (_schema) {
function createValidator5(schema) {
return undefined;
}
_schema.createValidator5 = createValidator5;
})(schema || (schema = {}));
// Tuple types
var schema;
(function (_schema) {
function createValidator6(schema) {
return undefined;
}
_schema.createValidator6 = createValidator6;
})(schema || (schema = {}));
// Paren Types
var schema;
(function (_schema) {
function createValidator7(schema) {
return undefined;
}
_schema.createValidator7 = createValidator7;
})(schema || (schema = {}));
// Type reference
var schema;
(function (_schema) {
function createValidator8(schema) {
return undefined;
}
_schema.createValidator8 = createValidator8;
})(schema || (schema = {}));
var schema;
(function (schema) {
var T = (function () {
function T() {
}
Object.defineProperty(T.prototype, "createValidator9", {
get: function () {
return undefined;
},
enumerable: true,
configurable: true
});
Object.defineProperty(T.prototype, "createValidator10", {
set: function (v) {
},
enumerable: true,
configurable: true
});
return T;
})();
schema.T = T;
})(schema || (schema = {}));
//// [isDeclarationVisibleNodeKinds.d.ts]
declare module schema {
function createValidator1(schema: any): <T>(data: T) => T;
}
declare module schema {
function createValidator2(schema: any): new <T>(data: T) => T;
}
declare module schema {
function createValidator3(schema: any): number | {
new <T>(data: T): T;
};
}
declare module schema {
function createValidator4(schema: any): {
new <T>(data: T): T;
}[];
}
declare module schema {
function createValidator5(schema: any): {
new <T>(data: T): T;
};
}
declare module schema {
function createValidator6(schema: any): [new <T>(data: T) => T, number];
}
declare module schema {
function createValidator7(schema: any): (new <T>(data: T) => T)[];
}
declare module schema {
function createValidator8(schema: any): Array<{
<T>(data: T): T;
}>;
}
declare module schema {
class T {
createValidator9: <T>(data: T) => T;
createValidator10: <T>(data: T) => T;
}
}

168
tests/baselines/reference/isDeclarationVisibleNodeKinds.types Normal file
View file

@ -0,0 +1,168 @@
=== tests/cases/compiler/isDeclarationVisibleNodeKinds.ts ===
// Function types
module schema {
>schema : typeof schema
export function createValidator1(schema: any): <T>(data: T) => T {
>createValidator1 : (schema: any) => <T>(data: T) => T
>schema : any
>T : T
>data : T
>T : T
>T : T
return undefined;
>undefined : undefined
}
}
// Constructor types
module schema {
>schema : typeof schema
export function createValidator2(schema: any): new <T>(data: T) => T {
>createValidator2 : (schema: any) => new <T>(data: T) => T
>schema : any
>T : T
>data : T
>T : T
>T : T
return undefined;
>undefined : undefined
}
}
// union types
module schema {
>schema : typeof schema
export function createValidator3(schema: any): number | { new <T>(data: T): T; } {
>createValidator3 : (schema: any) => number | (new <T>(data: T) => T)
>schema : any
>T : T
>data : T
>T : T
>T : T
return undefined;
>undefined : undefined
}
}
// Array types
module schema {
>schema : typeof schema
export function createValidator4(schema: any): { new <T>(data: T): T; }[] {
>createValidator4 : (schema: any) => (new <T>(data: T) => T)[]
>schema : any
>T : T
>data : T
>T : T
>T : T
return undefined;
>undefined : undefined
}
}
// TypeLiterals
module schema {
>schema : typeof schema
export function createValidator5(schema: any): { new <T>(data: T): T } {
>createValidator5 : (schema: any) => new <T>(data: T) => T
>schema : any
>T : T
>data : T
>T : T
>T : T
return undefined;
>undefined : undefined
}
}
// Tuple types
module schema {
>schema : typeof schema
export function createValidator6(schema: any): [ new <T>(data: T) => T, number] {
>createValidator6 : (schema: any) => [new <T>(data: T) => T, number]
>schema : any
>T : T
>data : T
>T : T
>T : T
return undefined;
>undefined : undefined
}
}
// Paren Types
module schema {
>schema : typeof schema
export function createValidator7(schema: any): (new <T>(data: T)=>T )[] {
>createValidator7 : (schema: any) => (new <T>(data: T) => T)[]
>schema : any
>T : T
>data : T
>T : T
>T : T
return undefined;
>undefined : undefined
}
}
// Type reference
module schema {
>schema : typeof schema
export function createValidator8(schema: any): Array<{ <T>(data: T) : T}> {
>createValidator8 : (schema: any) => (<T>(data: T) => T)[]
>schema : any
>Array : T[]
>T : T
>data : T
>T : T
>T : T
return undefined;
>undefined : undefined
}
}
module schema {
>schema : typeof schema
export class T {
>T : T
get createValidator9(): <T>(data: T) => T {
>createValidator9 : <T>(data: T) => T
>T : T
>data : T
>T : T
>T : T
return undefined;
>undefined : undefined
}
set createValidator10(v: <T>(data: T) => T) {
>createValidator10 : <T>(data: T) => T
>v : <T>(data: T) => T
>T : T
>data : T
>T : T
>T : T
}
}
}

6
tests/baselines/reference/templateStringTermination1.js Normal file
View file

@ -0,0 +1,6 @@
//// [templateStringTermination1.ts]
``
//// [templateStringTermination1.js]
"";

4
tests/baselines/reference/templateStringTermination1.types Normal file
View file

@ -0,0 +1,4 @@
=== tests/cases/conformance/es6/templates/templateStringTermination1.ts ===
No type information for this code.``
No type information for this code.

5
tests/baselines/reference/templateStringTermination1_ES6.js Normal file
View file

@ -0,0 +1,5 @@
//// [templateStringTermination1_ES6.ts]
``
//// [templateStringTermination1_ES6.js]
``;

3
tests/baselines/reference/templateStringTermination1_ES6.types Normal file
View file

@ -0,0 +1,3 @@
=== tests/cases/conformance/es6/templates/templateStringTermination1_ES6.ts ===
``
No type information for this code.

6
tests/baselines/reference/templateStringTermination2.js Normal file
View file

@ -0,0 +1,6 @@
//// [templateStringTermination2.ts]
`\\`
//// [templateStringTermination2.js]
"\";

4
tests/baselines/reference/templateStringTermination2.types Normal file
View file

@ -0,0 +1,4 @@
=== tests/cases/conformance/es6/templates/templateStringTermination2.ts ===
No type information for this code.`\\`
No type information for this code.

5
tests/baselines/reference/templateStringTermination2_ES6.js Normal file
View file

@ -0,0 +1,5 @@
//// [templateStringTermination2_ES6.ts]
`\\`
//// [templateStringTermination2_ES6.js]
`\\`;

3
tests/baselines/reference/templateStringTermination2_ES6.types Normal file
View file

@ -0,0 +1,3 @@
=== tests/cases/conformance/es6/templates/templateStringTermination2_ES6.ts ===
`\\`
No type information for this code.

6
tests/baselines/reference/templateStringTermination3.js Normal file
View file

@ -0,0 +1,6 @@
//// [templateStringTermination3.ts]
`\``
//// [templateStringTermination3.js]
"`";

4
tests/baselines/reference/templateStringTermination3.types Normal file
View file

@ -0,0 +1,4 @@
=== tests/cases/conformance/es6/templates/templateStringTermination3.ts ===
No type information for this code.`\``
No type information for this code.

5
tests/baselines/reference/templateStringTermination3_ES6.js Normal file
View file

@ -0,0 +1,5 @@
//// [templateStringTermination3_ES6.ts]
`\``
//// [templateStringTermination3_ES6.js]
`\``;

3
tests/baselines/reference/templateStringTermination3_ES6.types Normal file
View file

@ -0,0 +1,3 @@
=== tests/cases/conformance/es6/templates/templateStringTermination3_ES6.ts ===
`\``
No type information for this code.

6
tests/baselines/reference/templateStringTermination4.js Normal file
View file

@ -0,0 +1,6 @@
//// [templateStringTermination4.ts]
`\\\\`
//// [templateStringTermination4.js]
"\\";

4
tests/baselines/reference/templateStringTermination4.types Normal file
View file

@ -0,0 +1,4 @@
=== tests/cases/conformance/es6/templates/templateStringTermination4.ts ===
No type information for this code.`\\\\`
No type information for this code.

5
tests/baselines/reference/templateStringTermination4_ES6.js Normal file
View file

@ -0,0 +1,5 @@
//// [templateStringTermination4_ES6.ts]
`\\\\`
//// [templateStringTermination4_ES6.js]
`\\\\`;

3
tests/baselines/reference/templateStringTermination4_ES6.types Normal file
View file

@ -0,0 +1,3 @@
=== tests/cases/conformance/es6/templates/templateStringTermination4_ES6.ts ===
`\\\\`
No type information for this code.

6
tests/baselines/reference/templateStringTermination5.js Normal file
View file

@ -0,0 +1,6 @@
//// [templateStringTermination5.ts]
`\\\\\\`
//// [templateStringTermination5.js]
"\\\";

4
tests/baselines/reference/templateStringTermination5.types Normal file
View file

@ -0,0 +1,4 @@
=== tests/cases/conformance/es6/templates/templateStringTermination5.ts ===
No type information for this code.`\\\\\\`
No type information for this code.

5
tests/baselines/reference/templateStringTermination5_ES6.js Normal file
View file

@ -0,0 +1,5 @@
//// [templateStringTermination5_ES6.ts]
`\\\\\\`
//// [templateStringTermination5_ES6.js]
`\\\\\\`;

3
tests/baselines/reference/templateStringTermination5_ES6.types Normal file
View file

@ -0,0 +1,3 @@
=== tests/cases/conformance/es6/templates/templateStringTermination5_ES6.ts ===
`\\\\\\`
No type information for this code.

8
tests/baselines/reference/templateStringUnterminated1.errors.txt Normal file
View file

@ -0,0 +1,8 @@
tests/cases/conformance/es6/templates/templateStringUnterminated1.ts(2,2): error TS1160: Unterminated template literal.
==== tests/cases/conformance/es6/templates/templateStringUnterminated1.ts (1 errors) ====
`
!!! error TS1160: Unterminated template literal.

7
tests/baselines/reference/templateStringUnterminated1_ES6.errors.txt Normal file
View file

@ -0,0 +1,7 @@
tests/cases/conformance/es6/templates/templateStringUnterminated1_ES6.ts(1,2): error TS1160: Unterminated template literal.
==== tests/cases/conformance/es6/templates/templateStringUnterminated1_ES6.ts (1 errors) ====
`
!!! error TS1160: Unterminated template literal.

8
tests/baselines/reference/templateStringUnterminated2.errors.txt Normal file
View file

@ -0,0 +1,8 @@
tests/cases/conformance/es6/templates/templateStringUnterminated2.ts(2,4): error TS1160: Unterminated template literal.
==== tests/cases/conformance/es6/templates/templateStringUnterminated2.ts (1 errors) ====
`\`
!!! error TS1160: Unterminated template literal.

7
tests/baselines/reference/templateStringUnterminated2_ES6.errors.txt Normal file
View file

@ -0,0 +1,7 @@
tests/cases/conformance/es6/templates/templateStringUnterminated2_ES6.ts(1,4): error TS1160: Unterminated template literal.
==== tests/cases/conformance/es6/templates/templateStringUnterminated2_ES6.ts (1 errors) ====
`\`
!!! error TS1160: Unterminated template literal.

8
tests/baselines/reference/templateStringUnterminated3.errors.txt Normal file
View file

@ -0,0 +1,8 @@
tests/cases/conformance/es6/templates/templateStringUnterminated3.ts(2,4): error TS1160: Unterminated template literal.
==== tests/cases/conformance/es6/templates/templateStringUnterminated3.ts (1 errors) ====
`\\
!!! error TS1160: Unterminated template literal.

7
tests/baselines/reference/templateStringUnterminated3_ES6.errors.txt Normal file
View file

@ -0,0 +1,7 @@
tests/cases/conformance/es6/templates/templateStringUnterminated3_ES6.ts(1,4): error TS1160: Unterminated template literal.
==== tests/cases/conformance/es6/templates/templateStringUnterminated3_ES6.ts (1 errors) ====
`\\
!!! error TS1160: Unterminated template literal.

8
tests/baselines/reference/templateStringUnterminated4.errors.txt Normal file
View file

@ -0,0 +1,8 @@
tests/cases/conformance/es6/templates/templateStringUnterminated4.ts(2,6): error TS1160: Unterminated template literal.
==== tests/cases/conformance/es6/templates/templateStringUnterminated4.ts (1 errors) ====
`\\\`
!!! error TS1160: Unterminated template literal.

7
tests/baselines/reference/templateStringUnterminated4_ES6.errors.txt Normal file
View file

@ -0,0 +1,7 @@
tests/cases/conformance/es6/templates/templateStringUnterminated4_ES6.ts(1,6): error TS1160: Unterminated template literal.
==== tests/cases/conformance/es6/templates/templateStringUnterminated4_ES6.ts (1 errors) ====
`\\\`
!!! error TS1160: Unterminated template literal.

8
tests/baselines/reference/templateStringUnterminated5.errors.txt Normal file
View file

@ -0,0 +1,8 @@
tests/cases/conformance/es6/templates/templateStringUnterminated5.ts(2,8): error TS1160: Unterminated template literal.
==== tests/cases/conformance/es6/templates/templateStringUnterminated5.ts (1 errors) ====
`\\\\\`
!!! error TS1160: Unterminated template literal.

7
tests/baselines/reference/templateStringUnterminated5_ES6.errors.txt Normal file
View file

@ -0,0 +1,7 @@
tests/cases/conformance/es6/templates/templateStringUnterminated5_ES6.ts(1,8): error TS1160: Unterminated template literal.
==== tests/cases/conformance/es6/templates/templateStringUnterminated5_ES6.ts (1 errors) ====
`\\\\\`
!!! error TS1160: Unterminated template literal.

71
tests/cases/compiler/isDeclarationVisibleNodeKinds.ts Normal file
View file

@ -0,0 +1,71 @@
// @declaration: true
// @target: es5
// Function types
module schema {
export function createValidator1(schema: any): <T>(data: T) => T {
return undefined;
}
}
// Constructor types
module schema {
export function createValidator2(schema: any): new <T>(data: T) => T {
return undefined;
}
}
// union types
module schema {
export function createValidator3(schema: any): number | { new <T>(data: T): T; } {
return undefined;
}
}
// Array types
module schema {
export function createValidator4(schema: any): { new <T>(data: T): T; }[] {
return undefined;
}
}
// TypeLiterals
module schema {
export function createValidator5(schema: any): { new <T>(data: T): T } {
return undefined;
}
}
// Tuple types
module schema {
export function createValidator6(schema: any): [ new <T>(data: T) => T, number] {
return undefined;
}
}
// Paren Types
module schema {
export function createValidator7(schema: any): (new <T>(data: T)=>T )[] {
return undefined;
}
}
// Type reference
module schema {
export function createValidator8(schema: any): Array<{ <T>(data: T) : T}> {
return undefined;
}
}
module schema {
export class T {
get createValidator9(): <T>(data: T) => T {
return undefined;
}
set createValidator10(v: <T>(data: T) => T) {
}
}
}

2
tests/cases/conformance/es6/templates/templateStringTermination1.ts Normal file
View file

@ -0,0 +1,2 @@

``

2
tests/cases/conformance/es6/templates/templateStringTermination1_ES6.ts Normal file
View file

@ -0,0 +1,2 @@
// @target: ES6
``

2
tests/cases/conformance/es6/templates/templateStringTermination2.ts Normal file
View file

@ -0,0 +1,2 @@

`\\`

2
tests/cases/conformance/es6/templates/templateStringTermination2_ES6.ts Normal file
View file

@ -0,0 +1,2 @@
// @target: ES6
`\\`

2
tests/cases/conformance/es6/templates/templateStringTermination3.ts Normal file
View file

@ -0,0 +1,2 @@

`\``

2
tests/cases/conformance/es6/templates/templateStringTermination3_ES6.ts Normal file
View file

@ -0,0 +1,2 @@
// @target: ES6
`\``

2
tests/cases/conformance/es6/templates/templateStringTermination4.ts Normal file
View file

@ -0,0 +1,2 @@

`\\\\`

2
tests/cases/conformance/es6/templates/templateStringTermination4_ES6.ts Normal file
View file

@ -0,0 +1,2 @@
// @target: ES6
`\\\\`

2
tests/cases/conformance/es6/templates/templateStringTermination5.ts Normal file
View file

@ -0,0 +1,2 @@

`\\\\\\`

2
tests/cases/conformance/es6/templates/templateStringTermination5_ES6.ts Normal file
View file

@ -0,0 +1,2 @@
// @target: ES6
`\\\\\\`

2
tests/cases/conformance/es6/templates/templateStringUnterminated1.ts Normal file
View file

@ -0,0 +1,2 @@

`

2
tests/cases/conformance/es6/templates/templateStringUnterminated1_ES6.ts Normal file
View file

@ -0,0 +1,2 @@
// @target: ES6
`

2
tests/cases/conformance/es6/templates/templateStringUnterminated2.ts Normal file
View file

@ -0,0 +1,2 @@

`\`

2
tests/cases/conformance/es6/templates/templateStringUnterminated2_ES6.ts Normal file
View file

@ -0,0 +1,2 @@
// @target: ES6
`\`

2
tests/cases/conformance/es6/templates/templateStringUnterminated3.ts Normal file
View file

@ -0,0 +1,2 @@

`\\

2
tests/cases/conformance/es6/templates/templateStringUnterminated3_ES6.ts Normal file
View file

@ -0,0 +1,2 @@
// @target: ES6
`\\

2
tests/cases/conformance/es6/templates/templateStringUnterminated4.ts Normal file
View file

@ -0,0 +1,2 @@

`\\\`

2
tests/cases/conformance/es6/templates/templateStringUnterminated4_ES6.ts Normal file
View file

@ -0,0 +1,2 @@
// @target: ES6
`\\\`

2
tests/cases/conformance/es6/templates/templateStringUnterminated5.ts Normal file
View file

@ -0,0 +1,2 @@

`\\\\\`

2
tests/cases/conformance/es6/templates/templateStringUnterminated5_ES6.ts Normal file
View file

@ -0,0 +1,2 @@
// @target: ES6
`\\\\\`

10
tests/cases/fourslash/completionListInStringLiterals1.ts Normal file
View file

@ -0,0 +1,10 @@
/// <reference path="fourslash.ts" />
////"/*1*/ /*2*/\/*3*/
//// /*4*/ \\/*5*/
test.markers().forEach(marker => {
goTo.position(marker.position);
verify.completionListIsEmpty()
});

11
tests/cases/fourslash/completionListInStringLiterals2.ts Normal file
View file

@ -0,0 +1,11 @@
/// <reference path="fourslash.ts" />
////"/*1*/ /*2*/\/*3*/
//// /*4*/ \\\/*5*/
//// /*6*/
test.markers().forEach(marker => {
goTo.position(marker.position);
verify.completionListIsEmpty()
});

7
tests/cases/fourslash/formattingKeywordAsIdentifier.ts Normal file
View file

@ -0,0 +1,7 @@
/// <reference path='fourslash.ts'/>
////declare var module/*1*/
goTo.marker("1");
edit.insert(";");
verify.currentLineContentIs("declare var module;");

21
tests/cases/fourslash/signatureHelpTaggedTemplatesIncomplete7.ts Normal file
View file

@ -0,0 +1,21 @@
/// <reference path='fourslash.ts' />
//// function f(templateStrings, x, y, z) { return 10; }
//// function g(templateStrings, x, y, z) { return ""; }
////
//// f ` ${ 123 } /*1*/${ } /*2*/\/*3*/
//// /*4*/\\/*5*/
//// /*6*/\\\/*7*/
//// /*8*/
test.markers().forEach(m => {
goTo.position(m.position);
verify.signatureHelpCountIs(1);
verify.signatureHelpArgumentCountIs(3);
verify.currentSignatureParameterCountIs(4);
verify.currentSignatureHelpIs('f(templateStrings: any, x: any, y: any, z: any): number');
verify.currentParameterHelpArgumentNameIs("templateStrings");
verify.currentParameterSpanIs("templateStrings: any");
});

18
tests/cases/fourslash/signatureHelpTaggedTemplatesIncomplete8.ts Normal file
View file

@ -0,0 +1,18 @@
/// <reference path='fourslash.ts' />
//// function f(templateStrings, x, y, z) { return 10; }
//// function g(templateStrings, x, y, z) { return ""; }
////
//// f `/*1*/\/*2*/`/*3*/ /*4*/
test.markers().forEach(m => {
goTo.position(m.position);
verify.signatureHelpCountIs(1);
verify.signatureHelpArgumentCountIs(1);
verify.currentSignatureParameterCountIs(4);
verify.currentSignatureHelpIs('f(templateStrings: any, x: any, y: any, z: any): number');
verify.currentParameterHelpArgumentNameIs("templateStrings");
verify.currentParameterSpanIs("templateStrings: any");
});

18
tests/cases/fourslash/signatureHelpTaggedTemplatesIncomplete9.ts Normal file
View file

@ -0,0 +1,18 @@
/// <reference path='fourslash.ts' />
//// function f(templateStrings, x, y, z) { return 10; }
//// function g(templateStrings, x, y, z) { return ""; }
////
//// f `/*1*/ \\\/*2*/`/*3*/ /*4*/
test.markers().forEach(m => {
goTo.position(m.position);
verify.signatureHelpCountIs(1);
verify.signatureHelpArgumentCountIs(1);
verify.currentSignatureParameterCountIs(4);
verify.currentSignatureHelpIs('f(templateStrings: any, x: any, y: any, z: any): number');
verify.currentParameterHelpArgumentNameIs("templateStrings");
verify.currentParameterSpanIs("templateStrings: any");
});

60
tests/cases/unittests/services/colorization.ts
View file

@ -130,20 +130,76 @@ describe('Colorization', function () {
operator(","));
});
it("correctly classifies an unterminated multi-line string", function () {
it("correctly classifies a multi-line string with one backslash", function () {
test("'line1\\",
ts.EndOfLineState.Start,
stringLiteral("'line1\\"),
finalEndOfLineState(ts.EndOfLineState.InSingleQuoteStringLiteral));
});
it("correctly classifies the second line of an unterminated multi-line string", function () {
it("correctly classifies a multi-line string with three backslashes", function () {
test("'line1\\\\\\",
ts.EndOfLineState.Start,
stringLiteral("'line1\\\\\\"),
finalEndOfLineState(ts.EndOfLineState.InSingleQuoteStringLiteral));
});
it("correctly classifies an unterminated single-line string with no backslashes", function () {
test("'line1",
ts.EndOfLineState.Start,
stringLiteral("'line1"),
finalEndOfLineState(ts.EndOfLineState.Start));
});
it("correctly classifies an unterminated single-line string with two backslashes", function () {
test("'line1\\\\",
ts.EndOfLineState.Start,
stringLiteral("'line1\\\\"),
finalEndOfLineState(ts.EndOfLineState.Start));
});
it("correctly classifies an unterminated single-line string with four backslashes", function () {
test("'line1\\\\\\\\",
ts.EndOfLineState.Start,
stringLiteral("'line1\\\\\\\\"),
finalEndOfLineState(ts.EndOfLineState.Start));
});
it("correctly classifies the continuing line of a multi-line string ending in one backslash", function () {
test("\\",
ts.EndOfLineState.InDoubleQuoteStringLiteral,
stringLiteral("\\"),
finalEndOfLineState(ts.EndOfLineState.InDoubleQuoteStringLiteral));
});
it("correctly classifies the continuing line of a multi-line string ending in three backslashes", function () {
test("\\",
ts.EndOfLineState.InDoubleQuoteStringLiteral,
stringLiteral("\\"),
finalEndOfLineState(ts.EndOfLineState.InDoubleQuoteStringLiteral));
});
it("correctly classifies the last line of an unterminated multi-line string ending in no backslashes", function () {
test(" ",
ts.EndOfLineState.InDoubleQuoteStringLiteral,
stringLiteral(" "),
finalEndOfLineState(ts.EndOfLineState.Start));
});
it("correctly classifies the last line of an unterminated multi-line string ending in two backslashes", function () {
test("\\\\",
ts.EndOfLineState.InDoubleQuoteStringLiteral,
stringLiteral("\\\\"),
finalEndOfLineState(ts.EndOfLineState.Start));
});
it("correctly classifies the last line of an unterminated multi-line string ending in four backslashes", function () {
test("\\\\\\\\",
ts.EndOfLineState.InDoubleQuoteStringLiteral,
stringLiteral("\\\\\\\\"),
finalEndOfLineState(ts.EndOfLineState.Start));
});
it("correctly classifies the last line of a multi-line string", function () {
test("'",
ts.EndOfLineState.InSingleQuoteStringLiteral,