From eeeefcc10ece91394d8fd942c46ea05a19b9d100 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com> Date: Fri, 17 Nov 2017 10:38:30 -0800 Subject: [PATCH] Report jsdoc errors as semantic errors This allows reporting of semantic errors as well. Semantic errors are likely to outnumber syntactic errors, so it's valuable not to block semantic errors on a few syntactic errors. --- src/compiler/program.ts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 6a8c88c3014..72e34568d6d 100755 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -1227,9 +1227,6 @@ namespace ts { if (isSourceFileJavaScript(sourceFile)) { if (!sourceFile.additionalSyntacticDiagnostics) { sourceFile.additionalSyntacticDiagnostics = getJavaScriptSyntacticDiagnosticsForFile(sourceFile); - if (isCheckJsEnabledForFile(sourceFile, options)) { - sourceFile.additionalSyntacticDiagnostics = concatenate(sourceFile.additionalSyntacticDiagnostics, sourceFile.jsDocDiagnostics); - } } return concatenate(sourceFile.additionalSyntacticDiagnostics, sourceFile.parseDiagnostics); } @@ -1283,8 +1280,10 @@ namespace ts { const checkDiagnostics = includeBindAndCheckDiagnostics ? typeChecker.getDiagnostics(sourceFile, cancellationToken) : emptyArray; const fileProcessingDiagnosticsInFile = fileProcessingDiagnostics.getDiagnostics(sourceFile.fileName); const programDiagnosticsInFile = programDiagnostics.getDiagnostics(sourceFile.fileName); - - const diagnostics = bindDiagnostics.concat(checkDiagnostics, fileProcessingDiagnosticsInFile, programDiagnosticsInFile); + let diagnostics = bindDiagnostics.concat(checkDiagnostics, fileProcessingDiagnosticsInFile, programDiagnosticsInFile); + if (isCheckJsEnabledForFile(sourceFile, options)) { + diagnostics = concatenate(diagnostics, sourceFile.jsDocDiagnostics); + } return filter(diagnostics, shouldReportDiagnostic); }); }