Skip to content

Commit bc61807

Browse files
mhegazymhegazy
committed
Merge pull request #443 from Microsoft/fourslash
Reenable Fourslash tests after they have been accidentlly disabled
2 parents 62abc82 + a8df9c1 commit bc61807

File tree

8 files changed

+25
-30
lines changed

8 files changed

+25
-30
lines changed

‎src/compiler/checker.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ module ts {
5858

5959
var stringLiteralTypes: Map<StringLiteralType> = {};
6060

61-
var fullTypeCheck = false;
6261
var emitExtends = false;
6362

6463
var mergedSymbols: Symbol[] = [];
@@ -4356,7 +4355,7 @@ module ts {
43564355
}
43574356
}
43584357
}
4359-
if (fullTypeCheck && !(links.flags & NodeCheckFlags.TypeChecked)) {
4358+
if (!(links.flags & NodeCheckFlags.TypeChecked)) {
43604359
checkSignatureDeclaration(node);
43614360
if (node.type) {
43624361
checkIfNonVoidFunctionHasReturnExpressionsOrSingleThrowStatment(node, getTypeFromTypeNode(node.type));
@@ -6254,7 +6253,6 @@ module ts {
62546253
function checkSourceFile(node: SourceFile) {
62556254
var links = getNodeLinks(node);
62566255
if (!(links.flags & NodeCheckFlags.TypeChecked)) {
6257-
fullTypeCheck = true;
62586256
emitExtends = false;
62596257
potentialThisCollisions.length = 0;
62606258
forEach(node.statements, checkSourceElement);
@@ -6271,7 +6269,6 @@ module ts {
62716269
}
62726270
if (emitExtends) links.flags |= NodeCheckFlags.EmitExtends;
62736271
links.flags |= NodeCheckFlags.TypeChecked;
6274-
fullTypeCheck = false;
62756272
}
62766273
}
62776274

‎src/harness/fourslash.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1903,7 +1903,7 @@ module FourSlash {
19031903
files[Harness.Compiler.defaultLibFileName] = Harness.Compiler.defaultLibSourceFile;
19041904

19051905
var host = Harness.Compiler.createCompilerHost(files, (fn, contents) => result = contents);
1906-
var program = ts.createProgram([fileName, fourslashFilename], {}, host);
1906+
var program = ts.createProgram([fourslashFilename, fileName], { out: "fourslashTestOutput.js" }, host);
19071907
var checker = ts.createTypeChecker(program);
19081908
checker.checkProgram();
19091909

‎src/services/outliningElementsCollector.ts

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ module ts {
3636
export function collectElements(sourceFile: SourceFile): OutliningSpan[] {
3737
var elements: OutliningSpan[] = [];
3838

39-
function addOutlineRange(node: Node, startElement: Node, endElement: Node) {
40-
if (node && startElement && endElement) {
39+
function addOutlineRange(hintSpanNode: Node, startElement: Node, endElement: Node) {
40+
if (hintSpanNode && startElement && endElement) {
4141
var span: OutliningSpan = {
4242
textSpan: TypeScript.TextSpan.fromBounds(startElement.pos, endElement.end),
43-
hintSpan: TypeScript.TextSpan.fromBounds(node.getStart(), node.end),
43+
hintSpan: TypeScript.TextSpan.fromBounds(hintSpanNode.getStart(), hintSpanNode.end),
4444
bannerText: "...",
4545
autoCollapse: false
4646
};
@@ -49,33 +49,31 @@ module ts {
4949
}
5050

5151
var depth = 0;
52-
var maxDepth = 10;
52+
var maxDepth = 20;
5353
function walk(n: Node): void {
54-
if (depth >= maxDepth) {
54+
if (depth > maxDepth) {
5555
return;
5656
}
5757
switch (n.kind) {
58+
case SyntaxKind.Block:
59+
case SyntaxKind.FunctionBlock:
60+
case SyntaxKind.ModuleBlock:
61+
case SyntaxKind.TryBlock:
62+
case SyntaxKind.TryBlock:
63+
case SyntaxKind.CatchBlock:
64+
case SyntaxKind.FinallyBlock:
65+
var openBrace = forEach(n.getChildren(), c => c.kind === SyntaxKind.OpenBraceToken && c);
66+
var closeBrace = forEach(n.getChildren(), c => c.kind === SyntaxKind.CloseBraceToken && c);
67+
addOutlineRange(n.parent, openBrace, closeBrace);
68+
break;
5869
case SyntaxKind.ClassDeclaration:
5970
case SyntaxKind.InterfaceDeclaration:
60-
case SyntaxKind.ModuleDeclaration:
6171
case SyntaxKind.EnumDeclaration:
6272
case SyntaxKind.ObjectLiteral:
6373
var openBrace = forEach(n.getChildren(), c => c.kind === SyntaxKind.OpenBraceToken && c);
6474
var closeBrace = forEach(n.getChildren(), c => c.kind === SyntaxKind.CloseBraceToken && c);
6575
addOutlineRange(n, openBrace, closeBrace);
6676
break;
67-
case SyntaxKind.Constructor:
68-
case SyntaxKind.FunctionDeclaration:
69-
case SyntaxKind.Method:
70-
case SyntaxKind.GetAccessor:
71-
case SyntaxKind.SetAccessor:
72-
var body = (<FunctionDeclaration>n).body;
73-
if (body) {
74-
var openBrace = forEach(body.getChildren(), c => c.kind === SyntaxKind.OpenBraceToken && c);
75-
var closeBrace = forEach(body.getChildren(), c => c.kind === SyntaxKind.CloseBraceToken && c);
76-
addOutlineRange(n, openBrace, closeBrace);
77-
}
78-
break;
7977
}
8078
depth++;
8179
forEachChild(n, walk);

‎src/services/services.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -416,10 +416,10 @@ module ts {
416416
? TypeScript.Parser.parse(this.filename, text, this.languageVersion, TypeScript.isDTSFile(this.filename))
417417
: TypeScript.IncrementalParser.parse(oldSyntaxTree, textChangeRange, text);
418418

419-
return SourceFileObject.createSourceFileObject(this.languageVersion, this.filename, scriptSnapshot, version, isOpen, newSyntaxTree);
419+
return SourceFileObject.createSourceFileObject(this.filename, scriptSnapshot, this.languageVersion, version, isOpen, newSyntaxTree);
420420
}
421421

422-
public static createSourceFileObject(languageVersion: ScriptTarget, filename: string, scriptSnapshot: TypeScript.IScriptSnapshot, version: number, isOpen: boolean, syntaxTree: TypeScript.SyntaxTree) {
422+
public static createSourceFileObject(filename: string, scriptSnapshot: TypeScript.IScriptSnapshot, languageVersion: ScriptTarget, version: number, isOpen: boolean, syntaxTree?: TypeScript.SyntaxTree) {
423423
var newSourceFile = <SourceFileObject><any>createSourceFile(filename, scriptSnapshot.getText(0, scriptSnapshot.getLength()), languageVersion, version, isOpen);
424424
newSourceFile.scriptSnapshot = scriptSnapshot;
425425
newSourceFile.syntaxTree = syntaxTree;
@@ -1134,7 +1134,7 @@ module ts {
11341134
}
11351135

11361136
function createSourceFileFromScriptSnapshot(filename: string, scriptSnapshot: TypeScript.IScriptSnapshot, settings: CompilerOptions, version: number, isOpen: boolean) {
1137-
return createSourceFile(filename, scriptSnapshot.getText(0, scriptSnapshot.getLength()), settings.target, version, isOpen);
1137+
return SourceFileObject.createSourceFileObject(filename, scriptSnapshot, settings.target, version, isOpen);
11381138
}
11391139

11401140
export function createDocumentRegistry(): DocumentRegistry {

‎src/services/shims.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -728,7 +728,7 @@ module ts {
728728
var items = this.languageService.getOutliningRegions(fileName);
729729
// return just the part of data that language service v2 can understand
730730
// language service v2 will use the entire OutliningSpan
731-
var spans = forEach(items, i => i.textSpan);
731+
var spans = map(items, i => i.textSpan);
732732
return spans;
733733
});
734734
}

‎tests/cases/fourslash/getOutliningSpans.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@
6363
////}|] /* even more */
6464
////
6565
////// object literals
66-
////var x = [|{
66+
////var x =[|{
6767
//// a:1,
6868
//// b:2,
69-
//// get foo() [|{
69+
//// get foo()[| {
7070
//// return 1;
7171
//// }|]
7272
////}|]

‎tests/cases/fourslash/outliningForNonCompleteInterfaceDeclaration.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
////interface I[||]
44

55
// should not crash
6-
verify.outliningSpansInCurrentFile(test.ranges());
6+
verify.outliningSpansInCurrentFile([]);

‎tests/cases/fourslash/selfReferencedExternalModule2.ts renamed to ‎tests/cases/fourslash_old/selfReferencedExternalModule2.ts

File renamed without changes.

0 commit comments

Comments
 (0)