Skip to content

Commit ed5a348

Browse files
committed
JS: Ensure tsconfig.json files are extracted properly in tests
1 parent 9fd1661 commit ed5a348

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

javascript/extractor/src/com/semmle/js/extractor/JSONExtractor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public Context(Label parent, int childIndex) {
2929
private final boolean tolerateParseErrors;
3030

3131
public JSONExtractor(ExtractorConfig config) {
32-
this.tolerateParseErrors = config.isTolerateParseErrors();
32+
this.tolerateParseErrors = true;
3333
}
3434

3535
@Override

javascript/extractor/src/com/semmle/js/extractor/Main.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,10 @@ public void setupMatchers(ArgsParser ap) {
303303
addIncludesFor(includes, FileType.JS);
304304

305305
// extract TypeScript if `--typescript` or `--typescript-full` was specified
306-
if (getTypeScriptMode(ap) != TypeScriptMode.NONE) addIncludesFor(includes, FileType.TYPESCRIPT);
306+
if (getTypeScriptMode(ap) != TypeScriptMode.NONE) {
307+
addIncludesFor(includes, FileType.TYPESCRIPT);
308+
includes.add("**/tsconfig*.json");
309+
}
307310

308311
// add explicit include patterns
309312
for (String pattern : ap.getZeroOrMore(P_INCLUDE))

0 commit comments

Comments
 (0)