Allow skipping diagnostics in .js file using comments and quick fixes to add them

Jakefile.js

@@ -945,7 +945,7 @@ task("generate-code-coverage", ["tests", builtLocalDirectory], function () {
 // Browser tests
 var nodeServerOutFile = "tests/webTestServer.js";
 var nodeServerInFile = "tests/webTestServer.ts";
-compileFile(nodeServerOutFile, [nodeServerInFile], [builtLocalDirectory, tscFile], [], /*useBuiltCompiler:*/ true, { noOutFile: true });
+compileFile(nodeServerOutFile, [nodeServerInFile], [builtLocalDirectory, tscFile], [], /*useBuiltCompiler:*/ true, { noOutFile: true, lib: "es6" });
 
 desc("Runs browserify on run.js to produce a file suitable for running tests in the browser");
 task("browserify", ["tests", builtLocalDirectory, nodeServerOutFile], function() {

src/compiler/diagnosticMessages.json

@@ -3355,6 +3355,16 @@
         "category": "Message",
         "code": 90017
     },
+    "Disable checking for this file.": {
+        "category": "Message",
+        "code": 90018
+    },
+    "Suppress this error message.": {
+        "category": "Message",
+        "code": 90019
+    },
+
+
     "Octal literal types must use ES2015 syntax. Use the syntax '{0}'.": {
         "category": "Error",
         "code": 8017

src/compiler/program.ts

@@ -4,6 +4,7 @@
 
 namespace ts {
     const emptyArray: any[] = [];
+    const suppressDiagnosticCommentRegEx = /(^\s*$)|(^\s*\/\/\/?\s*(@ts-suppress)?)/;
 
     export function findConfigFile(searchPath: string, fileExists: (fileName: string) => boolean, configName = "tsconfig.json"): string {
         while (true) {
@@ -923,10 +924,36 @@ namespace ts {
                 const fileProcessingDiagnosticsInFile = fileProcessingDiagnostics.getDiagnostics(sourceFile.fileName);
                 const programDiagnosticsInFile = programDiagnostics.getDiagnostics(sourceFile.fileName);
 
-                return bindDiagnostics.concat(checkDiagnostics, fileProcessingDiagnosticsInFile, programDiagnosticsInFile);
+                const diagnostics = bindDiagnostics.concat(checkDiagnostics, fileProcessingDiagnosticsInFile, programDiagnosticsInFile);
+                return isSourceFileJavaScript(sourceFile)
+                    ? filter(diagnostics, shouldReportDiagnostic)
+                    : diagnostics;
             });
         }
 
+        /**
+         * Skip errors if previous line start with '// @ts-suppress' comment, not counting non-empty non-comment lines
+         */
+        function shouldReportDiagnostic(diagnostic: Diagnostic) {
+            const { file, start } = diagnostic;
+            const lineStarts = getLineStarts(file);
+            let { line } = computeLineAndCharacterOfPosition(lineStarts, start);
+            while (line > 0) {
+                const previousLineText = file.text.slice(lineStarts[line - 1], lineStarts[line]);
+                const result = suppressDiagnosticCommentRegEx.exec(previousLineText);
+                if (!result) {
+                    // non-empty line
+                    return true;
+                }
+                if (result[3]) {
+                    // @ts-suppress
+                    return false;
+                }
+                line--;
+            }
+            return true;
+        }
+
         function getJavaScriptSyntacticDiagnosticsForFile(sourceFile: SourceFile): Diagnostic[] {
             return runWithCancellationToken(() => {
                 const diagnostics: Diagnostic[] = [];

src/services/codefixes/disableJsDiagnostics.ts

@@ -0,0 +1,74 @@
+/* @internal */
+namespace ts.codefix {
+    registerCodeFix({
+        errorCodes: getApplicableDiagnosticCodes(),
+        getCodeActions: getDisableJsDiagnosticsCodeActions
+    });
+
+    function getApplicableDiagnosticCodes(): number[] {
+        const allDiagnostcs = <MapLike<DiagnosticMessage>>Diagnostics;
+        return Object.keys(allDiagnostcs)
+            .filter(d => allDiagnostcs[d] && allDiagnostcs[d].category === DiagnosticCategory.Error)
+            .map(d => allDiagnostcs[d].code);
+    }
+
+    function shouldCheckJsFile(sourceFile: SourceFile, compilerOptions: CompilerOptions) {
+        return sourceFile.checkJsDirective ? sourceFile.checkJsDirective.enabled : compilerOptions.checkJs;
+    }
+
+    function getSuppressCommentLocationForLocation(sourceFile: SourceFile, position: number, newLineCharacter: string) {
+        let { line } = getLineAndCharacterOfPosition(sourceFile, position);
+        const lineStartPosition = getStartPositionOfLine(line, sourceFile);
+        const startPosition = getFirstNonSpaceCharacterPosition(sourceFile.text, lineStartPosition);
+
+        // First try to see if we can put the '// @ts-suppress' on the previous line.
+        // We need to make sure that we are not in the middle of a string literal or a comment.
+        // We also want to check if the previous line holds a comment for a node on the next line
+        // if so, we do not want to separate the node from its comment if we can.
+        if (!isInComment(sourceFile, startPosition) && !isInString(sourceFile, startPosition) && !isInTemplateString(sourceFile, startPosition)) {
+            const token = getTouchingToken(sourceFile, startPosition);
+            const tokenLeadingCommnets = getLeadingCommentRangesOfNode(token, sourceFile);
+            if (!tokenLeadingCommnets || !tokenLeadingCommnets.length || tokenLeadingCommnets[0].pos >= startPosition) {
+                return {
+                    span: { start: startPosition, length: 0 },
+                    newText: `// @ts-suppress${newLineCharacter}`
+                };
+            }
+        }
+
+        // If all fails, add an extra new line immediatlly before the error span.
+        return {
+            span: { start: position, length: 0 },
+            newText: `${position === startPosition ? "" : newLineCharacter}// @ts-suppress${newLineCharacter}`
+        };
+    }
+
+    function getDisableJsDiagnosticsCodeActions(context: CodeFixContext): CodeAction[] | undefined {
+        const { sourceFile, program, newLineCharacter, span } = context;
+
+        if (!isInJavaScriptFile(sourceFile) || !shouldCheckJsFile(sourceFile, program.getCompilerOptions())) {
+            return undefined;
+        }
+
+        return [{
+            description: getLocaleSpecificMessage(Diagnostics.Suppress_this_error_message),
+            changes: [{
+                fileName: sourceFile.fileName,
+                textChanges: [getSuppressCommentLocationForLocation(sourceFile, span.start, newLineCharacter)]
+            }]
+        },
+        {
+            description: getLocaleSpecificMessage(Diagnostics.Disable_checking_for_this_file),
+            changes: [{
+                fileName: sourceFile.fileName,
+                textChanges: [{
+                    span: {
+                        start: sourceFile.checkJsDirective ? sourceFile.checkJsDirective.pos : 0,
+                        length: sourceFile.checkJsDirective ? sourceFile.checkJsDirective.end - sourceFile.checkJsDirective.pos : 0
+                    },
+                    newText: `// @ts-nocheck${newLineCharacter}`
+                }]
+            }]
+        }];
+    }
+}

src/services/codefixes/fixes.ts

@@ -7,4 +7,5 @@
 /// <reference path="fixForgottenThisPropertyAccess.ts" />
 /// <reference path='unusedIdentifierFixes.ts' />
 /// <reference path='importFixes.ts' />
+/// <reference path='disableJsDiagnostics.ts' />
 /// <reference path='helpers.ts' />

src/services/codefixes/unusedIdentifierFixes.ts

@@ -105,9 +105,10 @@ namespace ts.codefix {
                             else {
                                 // import |d,| * as ns from './file'
                                 const start = importClause.name.getStart();
-                                let end = findFirstNonSpaceCharPosStarting(importClause.name.end);
+                                const text = sourceFile.text;
+                                let end = getFirstNonSpaceCharacterPosition(text, importClause.name.end);
                                 if (sourceFile.text.charCodeAt(end) === CharacterCodes.comma) {
-                                    end = findFirstNonSpaceCharPosStarting(end + 1);
+                                    end = getFirstNonSpaceCharacterPosition(text, end + 1);
                                 }
 
                                 return createCodeFix("", start, end - start);
@@ -166,13 +167,6 @@ namespace ts.codefix {
                 return createCodeFix("", start, end - start);
             }
 
-            function findFirstNonSpaceCharPosStarting(start: number) {
-                while (isWhiteSpace(sourceFile.text.charCodeAt(start))) {
-                    start += 1;
-                }
-                return start;
-            }
-
             function createCodeFix(newText: string, start: number, length: number): CodeAction[] {
                 return [{
                     description: formatStringFromArgs(getLocaleSpecificMessage(Diagnostics.Remove_declaration_for_Colon_0), { 0: token.getText() }),

src/services/tsconfig.json

@@ -90,6 +90,7 @@
         "codefixes/fixes.ts",
         "codefixes/helpers.ts",
         "codefixes/importFixes.ts",
-        "codefixes/unusedIdentifierFixes.ts"
+        "codefixes/unusedIdentifierFixes.ts",
+        "codefixes/disableJsDiagnostics.ts"
     ]
 }

src/services/utilities.ts

@@ -1388,4 +1388,11 @@ namespace ts {
         // First token is the open curly, this is where we want to put the 'super' call.
         return constructor.body.getFirstToken(sourceFile).getEnd();
     }
+
+    export function getFirstNonSpaceCharacterPosition(text: string, position: number) {
+        while (isWhiteSpace(text.charCodeAt(position))) {
+            position += 1;
+        }
+        return position;
+    }
 }

tests/baselines/reference/checkJsFiles_skipDiagnostics.symbols

@@ -0,0 +1,38 @@
+=== tests/cases/compiler/a.js ===
+
+var x = 0;
+>x : Symbol(x, Decl(a.js, 1, 3))
+
+
+/// @ts-suppress
+x();
+>x : Symbol(x, Decl(a.js, 1, 3))
+
+/// @ts-suppress
+x();
+>x : Symbol(x, Decl(a.js, 1, 3))
+
+/// @ts-suppress
+x(
+>x : Symbol(x, Decl(a.js, 1, 3))
+
+    2,
+    3);
+
+
+
+// @ts-suppress
+// come comment
+// some other comment
+
+// @anohter
+
+x();
+>x : Symbol(x, Decl(a.js, 1, 3))
+
+
+
+// @ts-suppress: no call signature
+x();
+>x : Symbol(x, Decl(a.js, 1, 3))
+

tests/baselines/reference/checkJsFiles_skipDiagnostics.types

@@ -0,0 +1,47 @@
+=== tests/cases/compiler/a.js ===
+
+var x = 0;
+>x : number
+>0 : 0
+
+
+/// @ts-suppress
+x();
+>x() : any
+>x : number
+
+/// @ts-suppress
+x();
+>x() : any
+>x : number
+
+/// @ts-suppress
+x(
+>x(    2,    3) : any
+>x : number
+
+    2,
+>2 : 2
+
+    3);
+>3 : 3
+
+
+
+// @ts-suppress
+// come comment
+// some other comment
+
+// @anohter
+
+x();
+>x() : any
+>x : number
+
+
+
+// @ts-suppress: no call signature
+x();
+>x() : any
+>x : number
+

tests/cases/compiler/checkJsFiles_skipDiagnostics.ts

@@ -0,0 +1,33 @@
+// @allowJs: true
+// @checkJs: true
+// @noEmit: true
+
+// @fileName: a.js
+var x = 0;
+
+
+/// @ts-suppress
+x();
+
+/// @ts-suppress
+x();
+
+/// @ts-suppress
+x(
+    2,
+    3);
+
+
+
+// @ts-suppress
+// come comment
+// some other comment
+
+// @anohter
+
+x();
+
+
+
+// @ts-suppress: no call signature
+x();

tests/cases/fourslash/codeFixDisableJsDiagnosticsInFile.ts

@@ -0,0 +1,11 @@
+/// <reference path='fourslash.ts' />
+
+// @allowjs: true
+// @noEmit: true
+
+// @Filename: a.js
+////[|// @ts-check|]
+////var x = "";
+////x = 1;
+
+verify.rangeAfterCodeFix("// @ts-nocheck", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 1);

tests/cases/fourslash/codeFixDisableJsDiagnosticsInFile2.ts

@@ -0,0 +1,15 @@
+/// <reference path='fourslash.ts' />
+
+// @allowjs: true
+// @noEmit: true
+// @checkJs: true
+
+// @Filename: a.js
+////[|var x = "";
+////x = 1;|]
+
+// Disable checking for the whole file
+verify.rangeAfterCodeFix(`// @ts-nocheck
+var x = "";
+x = 1;`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 1);
+

tests/cases/fourslash/codeFixDisableJsDiagnosticsInFile3.ts

@@ -0,0 +1,14 @@
+/// <reference path='fourslash.ts' />
+
+// @allowjs: true
+// @noEmit: true
+// @checkJs: true
+
+// @Filename: a.js
+////[|var x = "";
+////x = 1;|]
+
+// Disable checking for next line
+verify.rangeAfterCodeFix(`var x = "";
+// @ts-suppress
+x = 1;`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);

tests/cases/fourslash/codeFixDisableJsDiagnosticsInFile4.ts

@@ -0,0 +1,18 @@
+/// <reference path='fourslash.ts' />
+
+// @allowjs: true
+// @noEmit: true
+// @checkJs: true
+
+// @Filename: a.js
+////var x = "";
+////
+////[|"test \
+////"; x = 1;|]
+
+// Disable checking for next line
+verify.rangeAfterCodeFix(`"test \\
+";
+// @ts-suppress
+x = 1;`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+