microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-15 03:23:08 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Address comments.

Browse Source
This commit is contained in:
unknown 2015-07-29 18:57:48 -07:00
parent 90e31adea8
commit e4a1c97b7d
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/harness/fourslash.ts
View File

@ -2479,10 +2479,10 @@ module FourSlash {
// @Filename is the only directive that can be used in a test that contains tsconfig.json file.
if (containTSConfigJson(files)) {
let directive = getNonFileNameOptionInFileList(files);
if (directive == null) {
if (!directive) {
directive = getNonFileNameOptionInObject(globalOptions);
}
if (directive !== null) {
if (directive) {
throw Error("It is not allowed to use tsconfig.json along with directive '" + directive + "'");
}
}
@ -2497,22 +2497,11 @@ module FourSlash {
}
function containTSConfigJson(files: FourSlashFile[]): boolean {
for (let i = 0; i < files.length; ++i) {
if (files[i].fileOptions['Filename'] === 'tsconfig.json') {
return true;
}
}
return false;
return ts.forEach(files, f => f.fileOptions['Filename'] === 'tsconfig.json');
}
function getNonFileNameOptionInFileList(files: FourSlashFile[]): string {
for (let i = 0; i < files.length; ++i) {
let option = getNonFileNameOptionInObject(files[i].fileOptions);
if (option !== null) {
return option;
}
}
return null;
return ts.forEach(files, f => getNonFileNameOptionInObject(f.fileOptions));
}
function getNonFileNameOptionInObject(optionObject: { [s: string]: string }): string {
@ -2521,7 +2510,7 @@ module FourSlash {
return option;
}
}
return null;
return undefined;
}
const enum State {