Skip to content

Commit b6979d8

Browse files
committed
Make boolean compiler options in harness true only if they say 'true'
1 parent 4027166 commit b6979d8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+19
-1495
lines changed

src/harness/fourslash.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,10 @@ module FourSlash {
144144
if (globalOptions.hasOwnProperty(prop)) {
145145
switch (prop) {
146146
case metadataOptionNames.allowNonTsExtensions:
147-
settings.allowNonTsExtensions = true;
147+
settings.allowNonTsExtensions = globalOptions[prop] === "true";
148148
break;
149149
case metadataOptionNames.declaration:
150-
settings.declaration = true;
150+
settings.declaration = globalOptions[prop] === "true";
151151
break;
152152
case metadataOptionNames.mapRoot:
153153
settings.mapRoot = globalOptions[prop];
@@ -174,7 +174,7 @@ module FourSlash {
174174
settings.outDir = globalOptions[prop];
175175
break;
176176
case metadataOptionNames.sourceMap:
177-
settings.sourceMap = true;
177+
settings.sourceMap = globalOptions[prop] === "true";
178178
break;
179179
case metadataOptionNames.sourceRoot:
180180
settings.sourceRoot = globalOptions[prop];
@@ -308,7 +308,7 @@ module FourSlash {
308308
ts.forEach(testData.files, file => {
309309
// Create map between fileName and its content for easily looking up when resolveReference flag is specified
310310
this.inputFiles[file.fileName] = file.content;
311-
if (!startResolveFileRef && file.fileOptions[metadataOptionNames.resolveReference]) {
311+
if (!startResolveFileRef && file.fileOptions[metadataOptionNames.resolveReference] === "true") {
312312
startResolveFileRef = file;
313313
} else if (startResolveFileRef) {
314314
// If entry point for resolving file references is already specified, report duplication error
@@ -1158,7 +1158,7 @@ module FourSlash {
11581158
var allFourSlashFiles = this.testData.files;
11591159
for (var idx = 0; idx < allFourSlashFiles.length; ++idx) {
11601160
var file = allFourSlashFiles[idx];
1161-
if (file.fileOptions[metadataOptionNames.emitThisFile]) {
1161+
if (file.fileOptions[metadataOptionNames.emitThisFile] === "true") {
11621162
// Find a file with the flag emitThisFile turned on
11631163
emitFiles.push(file);
11641164
}

src/harness/harness.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1008,19 +1008,19 @@ module Harness {
10081008
break;
10091009

10101010
case 'noemitonerror':
1011-
options.noEmitOnError = !!setting.value;
1011+
options.noEmitOnError = setting.value === 'true';
10121012
break;
10131013

10141014
case 'noresolve':
1015-
options.noResolve = !!setting.value;
1015+
options.noResolve = setting.value === 'true';
10161016
break;
10171017

10181018
case 'noimplicitany':
1019-
options.noImplicitAny = !!setting.value;
1019+
options.noImplicitAny = setting.value === 'true';
10201020
break;
10211021

10221022
case 'nolib':
1023-
options.noLib = !!setting.value;
1023+
options.noLib = setting.value === 'true';
10241024
break;
10251025

10261026
case 'out':
@@ -1042,11 +1042,11 @@ module Harness {
10421042
break;
10431043

10441044
case 'sourcemap':
1045-
options.sourceMap = !!setting.value;
1045+
options.sourceMap = setting.value === 'true';
10461046
break;
10471047

10481048
case 'declaration':
1049-
options.declaration = !!setting.value;
1049+
options.declaration = setting.value === 'true';
10501050
break;
10511051

10521052
case 'newline':
@@ -1070,7 +1070,7 @@ module Harness {
10701070
break;
10711071

10721072
case 'stripinternal':
1073-
options.stripInternal = !!setting.value;
1073+
options.stripInternal = setting.value === 'true';
10741074

10751075
case 'usecasesensitivefilenames':
10761076
useCaseSensitiveFileNames = setting.value === 'true';
@@ -1081,7 +1081,7 @@ module Harness {
10811081
break;
10821082

10831083
case 'emitbom':
1084-
options.emitBOM = !!setting.value;
1084+
options.emitBOM = setting.value === 'true';
10851085
break;
10861086

10871087
case 'errortruncation':

tests/baselines/reference/emptyFile-declaration.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33

44
//// [emptyFile-declaration.js]
5-
//# sourceMappingURL=emptyFile-declaration.js.map
5+
66

77
//// [emptyFile-declaration.d.ts]

tests/baselines/reference/emptyFile-declaration.js.map

Lines changed: 0 additions & 2 deletions
This file was deleted.

tests/baselines/reference/emptyFile-declaration.sourcemap.txt

Lines changed: 0 additions & 7 deletions
This file was deleted.

tests/baselines/reference/emptyFile-souremap.js

Lines changed: 1 addition & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/baselines/reference/es3-amd.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,3 @@ var A = (function () {
2222
};
2323
return A;
2424
})();
25-
//# sourceMappingURL=es3-amd.js.map
26-
27-
//// [es3-amd.d.ts]
28-
declare class A {
29-
constructor();
30-
B(): number;
31-
}

tests/baselines/reference/es3-amd.js.map

Lines changed: 0 additions & 2 deletions
This file was deleted.

tests/baselines/reference/es3-amd.sourcemap.txt

Lines changed: 0 additions & 115 deletions
This file was deleted.

tests/baselines/reference/es3-declaration-amd.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ var A = (function () {
2222
};
2323
return A;
2424
})();
25-
//# sourceMappingURL=es3-declaration-amd.js.map
25+
2626

2727
//// [es3-declaration-amd.d.ts]
2828
declare class A {

tests/baselines/reference/es3-declaration-amd.js.map

Lines changed: 0 additions & 2 deletions
This file was deleted.

tests/baselines/reference/es3-declaration-amd.sourcemap.txt

Lines changed: 0 additions & 115 deletions
This file was deleted.

tests/baselines/reference/es5-amd.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,3 @@ var A = (function () {
2222
};
2323
return A;
2424
})();
25-
//# sourceMappingURL=es5-amd.js.map
26-
27-
//// [es5-amd.d.ts]
28-
declare class A {
29-
constructor();
30-
B(): number;
31-
}

0 commit comments

Comments
 (0)