From fe260588fa9f3054fb20c85c731c81c7a2d3023b Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Thu, 14 Jun 2018 11:51:18 -0700 Subject: [PATCH] Handle package.json, jsconfig.json, tsconfig.json in the getDiagnostics of fourslash tests --- src/harness/fourslash.ts | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts index 8045f3a948b..0ca37715b9f 100644 --- a/src/harness/fourslash.ts +++ b/src/harness/fourslash.ts @@ -507,8 +507,17 @@ namespace FourSlash { } private getAllDiagnostics(): ts.Diagnostic[] { - return ts.flatMap(this.languageServiceAdapterHost.getFilenames(), fileName => - ts.isAnySupportedFileExtension(fileName) ? this.getDiagnostics(fileName) : []); + return ts.flatMap(this.languageServiceAdapterHost.getFilenames(), fileName => { + if (!ts.isAnySupportedFileExtension(fileName)) { + return []; + } + + const baseName = ts.getBaseFileName(fileName); + if (baseName === "package.json" || baseName === "tsconfig.json" || baseName === "jsconfig.json") { + return []; + } + return this.getDiagnostics(fileName); + }); } public verifyErrorExistsAfterMarker(markerName: string, shouldExist: boolean, after: boolean) {