Merge pull request #443 from Microsoft/fourslash

Reenable Fourslash tests after they have been accidentlly disabled

Author: mhegazy

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;
             }
         }
 

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();
 

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);

src/services/services.ts

@@ -416,10 +416,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: number, isOpen: boolean, syntaxTree: TypeScript.SyntaxTree) {
+        public static createSourceFileObject(filename: string, scriptSnapshot: TypeScript.IScriptSnapshot, languageVersion: ScriptTarget, version: number, 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;
@@ -1134,7 +1134,7 @@ module ts {
     }
 
     function createSourceFileFromScriptSnapshot(filename: string, scriptSnapshot: TypeScript.IScriptSnapshot, settings: CompilerOptions, version: number, 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 {

src/services/shims.ts

@@ -728,7 +728,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;
                 });
         }

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;
 ////  }|]
 ////}|]

tests/cases/fourslash/outliningForNonCompleteInterfaceDeclaration.ts

@@ -3,4 +3,4 @@
 ////interface I[||]
 
 // should not crash
-verify.outliningSpansInCurrentFile(test.ranges());
+verify.outliningSpansInCurrentFile([]);