Merge branch 'master' into newCompilerLS

CyrusNajmabadi · CyrusNajmabadi · commit 088e58644aac · 2014-08-13T15:41:42.000-07:00
Conflicts:
	src/services/services.ts
diff --git a/.gitignore b/.gitignore
@@ -35,3 +35,4 @@ tests/*.d.ts
 *.config
 scripts/debug.bat
 scripts/run.bat
+coverage/
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -58,7 +58,6 @@ module ts {
 
         var stringLiteralTypes: Map<StringLiteralType> = {};
 
-        var fullTypeCheck = false;
         var emitExtends = false;
 
         var mergedSymbols: Symbol[] = [];
@@ -4356,7 +4355,7 @@ module ts {
                     }
                 }
             }
-            if (fullTypeCheck && !(links.flags & NodeCheckFlags.TypeChecked)) {
+            if (!(links.flags & NodeCheckFlags.TypeChecked)) {
                 checkSignatureDeclaration(node);
                 if (node.type) {
                     checkIfNonVoidFunctionHasReturnExpressionsOrSingleThrowStatment(node, getTypeFromTypeNode(node.type));
@@ -6254,7 +6253,6 @@ module ts {
         function checkSourceFile(node: SourceFile) {
             var links = getNodeLinks(node);
             if (!(links.flags & NodeCheckFlags.TypeChecked)) {
-                fullTypeCheck = true;
                 emitExtends = false;
                 potentialThisCollisions.length = 0;
                 forEach(node.statements, checkSourceElement);
@@ -6271,7 +6269,6 @@ module ts {
                 }
                 if (emitExtends) links.flags |= NodeCheckFlags.EmitExtends;
                 links.flags |= NodeCheckFlags.TypeChecked;
-                fullTypeCheck = false;
             }
         }
 
diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
@@ -1903,7 +1903,7 @@ module FourSlash {
         files[Harness.Compiler.defaultLibFileName] = Harness.Compiler.defaultLibSourceFile;
 
         var host = Harness.Compiler.createCompilerHost(files, (fn, contents) => result = contents);
-        var program = ts.createProgram([fileName, fourslashFilename], {}, host);
+        var program = ts.createProgram([fourslashFilename, fileName], { out: "fourslashTestOutput.js" }, host);
         var checker = ts.createTypeChecker(program);
         checker.checkProgram();
 
diff --git a/src/services/compiler/precompile.ts b/src/services/compiler/precompile.ts
@@ -49,7 +49,7 @@ module TypeScript {
         return isNoDefaultLibRegex.exec(comment);
     }
 
-    export var tripleSlashReferenceRegExp = /^(\/\/\/\s*<reference\s+path=)('|")(.+?)\2\s*(static=('|")(.+?)\2\s*)*\/>/;
+    export var tripleSlashReferenceRegExp = /^(\/\/\/\s*<reference\s+path=)('|")(.+?)\2\s*(static=('|")(.+?)\5\s*)*\/>/;
 
     function getFileReferenceFromReferencePath(fileName: string, text: ISimpleText, position: number, comment: string, diagnostics: Diagnostic[]): IFileReference {
         // First, just see if they've written: /// <reference\s+
diff --git a/src/services/outliningElementsCollector.ts b/src/services/outliningElementsCollector.ts
@@ -36,11 +36,11 @@ module ts {
         export function collectElements(sourceFile: SourceFile): OutliningSpan[] {
             var elements: OutliningSpan[] = [];
 
-            function addOutlineRange(node: Node, startElement: Node, endElement: Node) {
-                if (node && startElement && endElement) {
+            function addOutlineRange(hintSpanNode: Node, startElement: Node, endElement: Node) {
+                if (hintSpanNode && startElement && endElement) {
                     var span: OutliningSpan = {
                         textSpan: TypeScript.TextSpan.fromBounds(startElement.pos, endElement.end),
-                        hintSpan: TypeScript.TextSpan.fromBounds(node.getStart(), node.end),
+                        hintSpan: TypeScript.TextSpan.fromBounds(hintSpanNode.getStart(), hintSpanNode.end),
                         bannerText: "...",
                         autoCollapse: false
                     };
@@ -49,33 +49,31 @@ module ts {
             }
 
             var depth = 0;
-            var maxDepth = 10;
+            var maxDepth = 20;
             function walk(n: Node): void {
-                if (depth >= maxDepth) {
+                if (depth > maxDepth) {
                     return;
                 }
                 switch (n.kind) {
+                    case SyntaxKind.Block:
+                    case SyntaxKind.FunctionBlock:
+                    case SyntaxKind.ModuleBlock:
+                    case SyntaxKind.TryBlock:
+                    case SyntaxKind.TryBlock:
+                    case SyntaxKind.CatchBlock:
+                    case SyntaxKind.FinallyBlock:
+                        var openBrace = forEach(n.getChildren(), c => c.kind === SyntaxKind.OpenBraceToken && c);
+                        var closeBrace = forEach(n.getChildren(), c => c.kind === SyntaxKind.CloseBraceToken && c);
+                        addOutlineRange(n.parent, openBrace, closeBrace);
+                        break;
                     case SyntaxKind.ClassDeclaration:
                     case SyntaxKind.InterfaceDeclaration:
-                    case SyntaxKind.ModuleDeclaration:
                     case SyntaxKind.EnumDeclaration:
                     case SyntaxKind.ObjectLiteral:
                         var openBrace = forEach(n.getChildren(), c => c.kind === SyntaxKind.OpenBraceToken && c);
                         var closeBrace = forEach(n.getChildren(), c => c.kind === SyntaxKind.CloseBraceToken && c);
                         addOutlineRange(n, openBrace, closeBrace);
                         break;
-                    case SyntaxKind.Constructor:
-                    case SyntaxKind.FunctionDeclaration:
-                    case SyntaxKind.Method:
-                    case SyntaxKind.GetAccessor:
-                    case SyntaxKind.SetAccessor:
-                        var body = (<FunctionDeclaration>n).body;
-                        if (body) {
-                            var openBrace = forEach(body.getChildren(), c => c.kind === SyntaxKind.OpenBraceToken && c);
-                            var closeBrace = forEach(body.getChildren(), c => c.kind === SyntaxKind.CloseBraceToken && c);
-                            addOutlineRange(n, openBrace, closeBrace);
-                        }
-                        break;
                 }
                 depth++;
                 forEachChild(n, walk);
diff --git a/src/services/services.ts b/src/services/services.ts
@@ -420,10 +420,10 @@ module ts {
                 ? TypeScript.Parser.parse(this.filename, text, this.languageVersion, TypeScript.isDTSFile(this.filename))
                 : TypeScript.IncrementalParser.parse(oldSyntaxTree, textChangeRange, text);
 
-            return SourceFileObject.createSourceFileObject(this.languageVersion, this.filename, scriptSnapshot, version, isOpen, newSyntaxTree);
+            return SourceFileObject.createSourceFileObject(this.filename, scriptSnapshot, this.languageVersion, version, isOpen, newSyntaxTree);
         }
 
-        public static createSourceFileObject(languageVersion: ScriptTarget, filename: string, scriptSnapshot: TypeScript.IScriptSnapshot, version: string, isOpen: boolean, syntaxTree: TypeScript.SyntaxTree) {
+        public static createSourceFileObject(filename: string, scriptSnapshot: TypeScript.IScriptSnapshot, languageVersion: ScriptTarget, version: string, isOpen: boolean, syntaxTree?: TypeScript.SyntaxTree) {
             var newSourceFile = <SourceFileObject><any>createSourceFile(filename, scriptSnapshot.getText(0, scriptSnapshot.getLength()), languageVersion, version, isOpen);
             newSourceFile.scriptSnapshot = scriptSnapshot;
             newSourceFile.syntaxTree = syntaxTree;
@@ -1068,7 +1068,7 @@ module ts {
             var nextSyntaxTree = TypeScript.IncrementalParser.parse(
                 previousSyntaxTree, editRange, TypeScript.SimpleText.fromScriptSnapshot(scriptSnapshot));
 
-            this.ensureInvariants(filename, editRange, nextSyntaxTree, this.getCurrentScriptSnapshot(filename), scriptSnapshot);
+            this.ensureInvariants(filename, editRange, nextSyntaxTree, previousScriptSnapshot, scriptSnapshot);
 
             return nextSyntaxTree;
         }
@@ -1137,7 +1137,7 @@ module ts {
     }
 
     function createSourceFileFromScriptSnapshot(filename: string, scriptSnapshot: TypeScript.IScriptSnapshot, settings: CompilerOptions, version: string, isOpen: boolean) {
-        return createSourceFile(filename, scriptSnapshot.getText(0, scriptSnapshot.getLength()), settings.target, version, isOpen);
+        return SourceFileObject.createSourceFileObject(filename, scriptSnapshot, settings.target, version, isOpen);
     }
 
     export function createDocumentRegistry(): DocumentRegistry {
diff --git a/src/services/shims.ts b/src/services/shims.ts
@@ -729,7 +729,7 @@ module ts {
                     var items = this.languageService.getOutliningRegions(fileName);
                     // return just the part of data that language service v2 can understand
                     // language service v2 will use the entire OutliningSpan
-                    var spans = forEach(items, i => i.textSpan);
+                    var spans = map(items, i => i.textSpan);
                     return spans;
                 });
         }
diff --git a/tests/baselines/reference/project/referencePathStatic/amd/referencePathStatic.json b/tests/baselines/reference/project/referencePathStatic/amd/referencePathStatic.json
@@ -0,0 +1,16 @@
+{
+    "scenario": "Reference-path-static",
+    "projectRoot": "tests/cases/projects/reference-path-static",
+    "inputFiles": [
+        "test.ts"
+    ],
+    "resolvedInputFiles": [
+        "test.ts",
+        "lib.ts",
+        "lib.d.ts"
+    ],
+    "emittedFiles": [
+        "lib.js",
+        "test.js"
+    ]
+}
diff --git a/tests/baselines/reference/project/referencePathStatic/node/referencePathStatic.json b/tests/baselines/reference/project/referencePathStatic/node/referencePathStatic.json
@@ -0,0 +1,16 @@
+{
+    "scenario": "Reference-path-static",
+    "projectRoot": "tests/cases/projects/reference-path-static",
+    "inputFiles": [
+        "test.ts"
+    ],
+    "resolvedInputFiles": [
+        "test.ts",
+        "lib.ts",
+        "lib.d.ts"
+    ],
+    "emittedFiles": [
+        "lib.js",
+        "test.js"
+    ]
+}
diff --git a/tests/cases/fourslash/getOutliningSpans.ts b/tests/cases/fourslash/getOutliningSpans.ts
@@ -63,10 +63,10 @@
 ////}|] /* even more */
 ////
 ////// object literals
-////var x = [|{
+////var x =[|{
 ////  a:1,
 ////  b:2,
-////  get foo() [|{
+////  get foo()[| {
 ////    return 1;
 ////  }|]
 ////}|]
diff --git a/tests/cases/fourslash/outliningForNonCompleteInterfaceDeclaration.ts b/tests/cases/fourslash/outliningForNonCompleteInterfaceDeclaration.ts
@@ -3,4 +3,4 @@
 ////interface I[||]
 
 // should not crash
-verify.outliningSpansInCurrentFile(test.ranges());
+verify.outliningSpansInCurrentFile([]);
diff --git a/tests/cases/fourslash_old/selfReferencedExternalModule2.ts b/tests/cases/fourslash_old/selfReferencedExternalModule2.ts
diff --git a/tests/cases/project/referencePathStatic.json b/tests/cases/project/referencePathStatic.json
@@ -0,0 +1,7 @@
+{
+    "scenario": "Reference-path-static",
+    "projectRoot": "tests/cases/projects/reference-path-static",
+    "inputFiles": [
+        "test.ts"
+    ]
+}
diff --git a/tests/cases/projects/reference-path-static/lib.ts b/tests/cases/projects/reference-path-static/lib.ts
@@ -0,0 +1,3 @@
+module Lib {
+    export class LibType {}
+}
diff --git a/tests/cases/projects/reference-path-static/test.ts b/tests/cases/projects/reference-path-static/test.ts
@@ -0,0 +1,3 @@
+/// <reference path="lib.ts" static='true' />
+
+var libType: Lib.LibType;

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,6 @@ module ts {`
`58`	`58`
`59`	`59`	`var stringLiteralTypes: Map<StringLiteralType> = {};`
`60`	`60`
`61`		`- var fullTypeCheck = false;`
`62`	`61`	`var emitExtends = false;`
`63`	`62`
`64`	`63`	`var mergedSymbols: Symbol[] = [];`
`@@ -4356,7 +4355,7 @@ module ts {`
`4356`	`4355`	`}`
`4357`	`4356`	`}`
`4358`	`4357`	`}`
`4359`		`- if (fullTypeCheck && !(links.flags & NodeCheckFlags.TypeChecked)) {`
	`4358`	`+ if (!(links.flags & NodeCheckFlags.TypeChecked)) {`
`4360`	`4359`	`checkSignatureDeclaration(node);`
`4361`	`4360`	`if (node.type) {`
`4362`	`4361`	`checkIfNonVoidFunctionHasReturnExpressionsOrSingleThrowStatment(node, getTypeFromTypeNode(node.type));`
`@@ -6254,7 +6253,6 @@ module ts {`
`6254`	`6253`	`function checkSourceFile(node: SourceFile) {`
`6255`	`6254`	`var links = getNodeLinks(node);`
`6256`	`6255`	`if (!(links.flags & NodeCheckFlags.TypeChecked)) {`
`6257`		`- fullTypeCheck = true;`
`6258`	`6256`	`emitExtends = false;`
`6259`	`6257`	`potentialThisCollisions.length = 0;`
`6260`	`6258`	`forEach(node.statements, checkSourceElement);`
`@@ -6271,7 +6269,6 @@ module ts {`
`6271`	`6269`	`}`
`6272`	`6270`	`if (emitExtends) links.flags \|= NodeCheckFlags.EmitExtends;`
`6273`	`6271`	`links.flags \|= NodeCheckFlags.TypeChecked;`
`6274`		`- fullTypeCheck = false;`
`6275`	`6272`	`}`
`6276`	`6273`	`}`
`6277`	`6274`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ module TypeScript {`
`49`	`49`	`return isNoDefaultLibRegex.exec(comment);`
`50`	`50`	`}`
`51`	`51`
`52`		`- export var tripleSlashReferenceRegExp = /^(\/\/\/\s<reference\s+path=)('\|")(.+?)\2\s(static=('\|")(.+?)\2\s)\/>/;`
	`52`	`+ export var tripleSlashReferenceRegExp = /^(\/\/\/\s<reference\s+path=)('\|")(.+?)\2\s(static=('\|")(.+?)\5\s)\/>/;`
`53`	`53`
`54`	`54`	`function getFileReferenceFromReferencePath(fileName: string, text: ISimpleText, position: number, comment: string, diagnostics: Diagnostic[]): IFileReference {`
`55`	`55`	`// First, just see if they've written: /// <reference\s+`
Original file line number	Diff line number	Diff line change
`@@ -420,10 +420,10 @@ module ts {`
`420`	`420`	`? TypeScript.Parser.parse(this.filename, text, this.languageVersion, TypeScript.isDTSFile(this.filename))`
`421`	`421`	`: TypeScript.IncrementalParser.parse(oldSyntaxTree, textChangeRange, text);`
`422`	`422`
`423`		`- return SourceFileObject.createSourceFileObject(this.languageVersion, this.filename, scriptSnapshot, version, isOpen, newSyntaxTree);`
	`423`	`+ return SourceFileObject.createSourceFileObject(this.filename, scriptSnapshot, this.languageVersion, version, isOpen, newSyntaxTree);`
`424`	`424`	`}`
`425`	`425`
`426`		`- public static createSourceFileObject(languageVersion: ScriptTarget, filename: string, scriptSnapshot: TypeScript.IScriptSnapshot, version: string, isOpen: boolean, syntaxTree: TypeScript.SyntaxTree) {`
	`426`	`+ public static createSourceFileObject(filename: string, scriptSnapshot: TypeScript.IScriptSnapshot, languageVersion: ScriptTarget, version: string, isOpen: boolean, syntaxTree?: TypeScript.SyntaxTree) {`
`427`	`427`	`var newSourceFile = <SourceFileObject><any>createSourceFile(filename, scriptSnapshot.getText(0, scriptSnapshot.getLength()), languageVersion, version, isOpen);`
`428`	`428`	`newSourceFile.scriptSnapshot = scriptSnapshot;`
`429`	`429`	`newSourceFile.syntaxTree = syntaxTree;`
`@@ -1068,7 +1068,7 @@ module ts {`
`1068`	`1068`	`var nextSyntaxTree = TypeScript.IncrementalParser.parse(`
`1069`	`1069`	`previousSyntaxTree, editRange, TypeScript.SimpleText.fromScriptSnapshot(scriptSnapshot));`
`1070`	`1070`
`1071`		`- this.ensureInvariants(filename, editRange, nextSyntaxTree, this.getCurrentScriptSnapshot(filename), scriptSnapshot);`
	`1071`	`+ this.ensureInvariants(filename, editRange, nextSyntaxTree, previousScriptSnapshot, scriptSnapshot);`
`1072`	`1072`
`1073`	`1073`	`return nextSyntaxTree;`
`1074`	`1074`	`}`
`@@ -1137,7 +1137,7 @@ module ts {`
`1137`	`1137`	`}`
`1138`	`1138`
`1139`	`1139`	`function createSourceFileFromScriptSnapshot(filename: string, scriptSnapshot: TypeScript.IScriptSnapshot, settings: CompilerOptions, version: string, isOpen: boolean) {`
`1140`		`- return createSourceFile(filename, scriptSnapshot.getText(0, scriptSnapshot.getLength()), settings.target, version, isOpen);`
	`1140`	`+ return SourceFileObject.createSourceFileObject(filename, scriptSnapshot, settings.target, version, isOpen);`
`1141`	`1141`	`}`
`1142`	`1142`
`1143`	`1143`	`export function createDocumentRegistry(): DocumentRegistry {`
Original file line number	Diff line number	Diff line change
`@@ -729,7 +729,7 @@ module ts {`
`729`	`729`	`var items = this.languageService.getOutliningRegions(fileName);`
`730`	`730`	`// return just the part of data that language service v2 can understand`
`731`	`731`	`// language service v2 will use the entire OutliningSpan`
`732`		`- var spans = forEach(items, i => i.textSpan);`
	`732`	`+ var spans = map(items, i => i.textSpan);`
`733`	`733`	`return spans;`
`734`	`734`	`});`
`735`	`735`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+module Lib {`
	`2`	`+ export class LibType {}`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+/// <reference path="lib.ts" static='true' />`
	`2`	`+`
	`3`	`+var libType: Lib.LibType;`