Skip to content

Commit 0a08a42

Browse files
mhegazymhegazy
committed
enbale fourslash tests
1 parent 85393ab commit 0a08a42

8 files changed

Lines changed: 361 additions & 357 deletions

File tree

‎Jakefile‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,19 +62,17 @@ var servicesSources = [
6262
var harnessSources = [
6363
"harness.ts",
6464
"sourceMapRecorder.ts",
65-
// TODO Re-enable
66-
// "harnessLanguageService.ts",
67-
// "fourslash.ts",
68-
"runner.ts",
65+
"harnessLanguageService.ts",
66+
"fourslash.ts",
6967
"external/json2.ts",
7068
"runnerbase.ts",
7169
"compilerRunner.ts",
7270
"typeWriter.ts",
73-
// TODO Re-enable fourslash and project tests
74-
// "fourslashRunner.ts",
71+
"fourslashRunner.ts",
7572
"projectsRunner.ts",
7673
"unittestrunner.ts",
7774
"rwcRunner.ts",
75+
"runner.ts"
7876
].map(function (f) {
7977
return path.join(harnessDirectory, f);
8078
});

‎src/compiler/core.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,14 @@ module ts {
134134
return result;
135135
}
136136

137+
export function forEachKey<T, U>(map: Map<T>, callback: (key: string) => U): U {
138+
var result: U;
139+
for (var id in map) {
140+
if (result = callback(id)) break;
141+
}
142+
return result;
143+
}
144+
137145
export function mapToArray<T>(map: Map<T>): T[] {
138146
var result: T[] = [];
139147
for (var id in map) result.push(map[id]);

‎src/harness/fourslash.ts‎

Lines changed: 208 additions & 254 deletions
Large diffs are not rendered by default.

‎src/harness/harnessLanguageService.ts‎

Lines changed: 127 additions & 86 deletions
Large diffs are not rendered by default.

‎src/harness/runner.ts‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,10 @@ if (testConfigFile !== '') {
6262
runners.push(new ProjectRunner());
6363
break;
6464
case 'fourslash':
65-
// TODO: Re-enable Fourslash tests
66-
// runners.push(new FourslashRunner());
65+
runners.push(new FourslashRunner());
6766
break;
6867
case 'fourslash-generated':
69-
// TODO: Re-enable Fourslash tests
70-
// runners.push(new GeneratedFourslashRunner());
68+
runners.push(new GeneratedFourslashRunner());
7169
break;
7270
case 'unittests':
7371
runners.push(new UnitTestRunner(UnittestTestType.Compiler));

‎src/services/core/diagnosticCore.ts‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,8 @@ module TypeScript {
145145
}
146146

147147
export function getLocalizedText(diagnosticKey: string, args: any[]): string {
148-
if (LocalizedDiagnosticMessages) {
149-
//Debug.assert(LocalizedDiagnosticMessages.hasOwnProperty(diagnosticKey));
150-
}
151-
152-
var diagnosticMessageText: string = LocalizedDiagnosticMessages ? LocalizedDiagnosticMessages[diagnosticKey] : diagnosticKey;
148+
149+
var diagnosticMessageText: string = diagnosticKey;
153150
Debug.assert(diagnosticMessageText !== undefined && diagnosticMessageText !== null);
154151

155152
var actualCount = args ? args.length : 0;

‎src/services/services.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -811,7 +811,7 @@ module ts {
811811
}
812812
}
813813

814-
function createDocument(compilationSettings: CompilerOptions, fileName: string, scriptSnapshot: TypeScript.IScriptSnapshot, byteOrderMark: ByteOrderMark, version: number, isOpen: boolean, referencedFiles: string[]): Document {
814+
export function createDocument(compilationSettings: CompilerOptions, fileName: string, scriptSnapshot: TypeScript.IScriptSnapshot, byteOrderMark: ByteOrderMark, version: number, isOpen: boolean, referencedFiles: string[]): Document {
815815
return new DocumentObject(compilationSettings, fileName, referencedFiles, scriptSnapshot, byteOrderMark, version, isOpen, /*syntaxTree:*/ null, /*soruceFile*/ null);
816816
}
817817

@@ -1339,7 +1339,7 @@ module ts {
13391339
function dispose(): void {
13401340
if (program) {
13411341
forEach(program.getSourceFiles(),
1342-
(f) => documentRegistry.releaseDocument(f.filename, program.getCompilerOptions()));
1342+
(f) => { documentRegistry.releaseDocument(f.filename, program.getCompilerOptions()); });
13431343
}
13441344
}
13451345

‎src/services/shims.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,8 @@ module ts {
173173
}
174174

175175
function languageVersionToScriptTarget(languageVersion: LanguageVersion): ScriptTarget {
176+
if (typeof languageVersion === "undefined") return undefined;
177+
176178
switch (languageVersion) {
177179
case LanguageVersion.EcmaScript3: return ScriptTarget.ES3;
178180
case LanguageVersion.EcmaScript5: return ScriptTarget.ES5;
@@ -181,6 +183,8 @@ module ts {
181183
}
182184

183185
function moduleGenTargetToModuleKind(moduleGenTarget: ModuleGenTarget): ModuleKind {
186+
if (typeof moduleGenTarget === "undefined") return undefined;
187+
184188
switch (moduleGenTarget) {
185189
case ModuleGenTarget.Asynchronous: return ModuleKind.AMD;
186190
case ModuleGenTarget.Synchronous: return ModuleKind.CommonJS;
@@ -190,6 +194,8 @@ module ts {
190194
}
191195

192196
function scriptTargetTolanguageVersion(scriptTarget: ScriptTarget): LanguageVersion {
197+
if (typeof scriptTarget === "undefined") return undefined;
198+
193199
switch (scriptTarget) {
194200
case ScriptTarget.ES3: return LanguageVersion.EcmaScript3;
195201
case ScriptTarget.ES5: return LanguageVersion.EcmaScript5;
@@ -198,6 +204,8 @@ module ts {
198204
}
199205

200206
function moduleKindToModuleGenTarget(moduleKind: ModuleKind): ModuleGenTarget {
207+
if (typeof moduleKind === "undefined") return undefined;
208+
201209
switch (moduleKind) {
202210
case ModuleKind.AMD: return ModuleGenTarget.Asynchronous;
203211
case ModuleKind.CommonJS: return ModuleGenTarget.Synchronous;

0 commit comments

Comments
 (0)