microsoft
diff --git a/‎Jakefile.js
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎Jakefile.js
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/compiler/commandLineParser.ts
Copy file name to clipboard
+6Lines changed: 6 additions & 0 deletions b/‎src/compiler/commandLineParser.ts
Copy file name to clipboard
+6Lines changed: 6 additions & 0 deletions
diff --git a/‎src/compiler/core.ts
Copy file name to clipboard
+4Lines changed: 4 additions & 0 deletions b/‎src/compiler/core.ts
Copy file name to clipboard
+4Lines changed: 4 additions & 0 deletions
diff --git a/‎src/compiler/diagnosticMessages.json
Copy file name to clipboard
+22Lines changed: 22 additions & 0 deletions b/‎src/compiler/diagnosticMessages.json
Copy file name to clipboard
+22Lines changed: 22 additions & 0 deletions
diff --git a/‎src/compiler/parser.ts
Copy file name to clipboard
+12Lines changed: 12 additions & 0 deletions b/‎src/compiler/parser.ts
Copy file name to clipboard
+12Lines changed: 12 additions & 0 deletions
diff --git a/‎src/compiler/program.ts
Copy file name to clipboard
+35-5Lines changed: 35 additions & 5 deletions b/‎src/compiler/program.ts
Copy file name to clipboard
+35-5Lines changed: 35 additions & 5 deletions
diff --git a/‎src/compiler/types.ts
Copy file name to clipboard
+6Lines changed: 6 additions & 0 deletions b/‎src/compiler/types.ts
Copy file name to clipboard
+6Lines changed: 6 additions & 0 deletions
diff --git a/‎src/harness/fourslash.ts
Copy file name to clipboard
+9Lines changed: 9 additions & 0 deletions b/‎src/harness/fourslash.ts
Copy file name to clipboard
+9Lines changed: 9 additions & 0 deletions
diff --git a/‎src/harness/harness.ts
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎src/harness/harness.ts
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/harness/tsconfig.json
Copy file name to clipboard
+2-1Lines changed: 2 additions & 1 deletion b/‎src/harness/tsconfig.json
Copy file name to clipboard
+2-1Lines changed: 2 additions & 1 deletion
@@ -946,7 +946,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() {
 
@@ -153,6 +153,12 @@ namespace ts {
             category: Diagnostics.Basic_Options,
             description: Diagnostics.Allow_javascript_files_to_be_compiled
         },
+        {
+            name: "checkJs",
+            type: "boolean",
+            category: Diagnostics.Basic_Options,
+            description: Diagnostics.Report_errors_in_js_files
+        },
         {
             name: "jsx",
             type: createMapFromTemplate({
 
@@ -2360,4 +2360,8 @@ namespace ts {
             return Extension.Jsx;
         }
     }
+
+    export function isCheckJsEnabledForFile(sourceFile: SourceFile, compilerOptions: CompilerOptions) {
+        return sourceFile.checkJsDirective ? sourceFile.checkJsDirective.enabled : compilerOptions.checkJs;
+    }
 }
@@ -3480,12 +3480,34 @@
         "category": "Message",
         "code": 90017
     },
+    "Disable checking for this file.": {
+        "category": "Message",
+        "code": 90018
+    },
+    "Ignore this error message.": {
+        "category": "Message",
+        "code": 90019
+    },
+    "Initialize property '{0}' in the constructor.": {
+        "category": "Message",
+        "code": 90020
+    },
+    "Initialize static property '{0}'.": {
+        "category": "Message",
+        "code": 90021
+    },
+
+
     "Octal literal types must use ES2015 syntax. Use the syntax '{0}'.": {
         "category": "Error",
         "code": 8017
     },
     "Octal literals are not allowed in enums members initializer. Use the syntax '{0}'.": {
         "category": "Error",
         "code": 8018
+    },
+    "Report errors in .js files.": {
+        "category": "Message",
+        "code": 8019
     }
 }
@@ -5822,6 +5822,7 @@ namespace ts {
             const typeReferenceDirectives: FileReference[] = [];
             const amdDependencies: { path: string; name: string }[] = [];
             let amdModuleName: string;
+            let checkJsDirective: CheckJsDirective = undefined;
 
             // Keep scanning all the leading trivia in the file until we get to something that
             // isn't trivia.  Any single line comment will be analyzed to see if it is a
@@ -5883,13 +5884,24 @@ namespace ts {
                             amdDependencies.push(amdDependency);
                         }
                     }
+
+                    const checkJsDirectiveRegEx = /^\/\/\/?\s*(@ts-check|@ts-nocheck)\s*$/gim;
+                    const checkJsDirectiveMatchResult = checkJsDirectiveRegEx.exec(comment);
+                    if (checkJsDirectiveMatchResult) {
+                        checkJsDirective = {
+                            enabled: compareStrings(checkJsDirectiveMatchResult[1], "@ts-check", /*ignoreCase*/ true) === Comparison.EqualTo,
+                            end: range.end,
+                            pos: range.pos
+                        };
+                    }
                 }
             }
 
             sourceFile.referencedFiles = referencedFiles;
             sourceFile.typeReferenceDirectives = typeReferenceDirectives;
             sourceFile.amdDependencies = amdDependencies;
             sourceFile.moduleName = amdModuleName;
+            sourceFile.checkJsDirective = checkJsDirective;
         }
 
         function setExternalModuleIndicator(sourceFile: SourceFile) {
 
@@ -4,6 +4,7 @@
 
 namespace ts {
     const emptyArray: any[] = [];
+    const ignoreDiagnosticCommentRegEx = /(^\s*$)|(^\s*\/\/\/?\s*(@ts-ignore)?)/;
 
     export function findConfigFile(searchPath: string, fileExists: (fileName: string) => boolean, configName = "tsconfig.json"): string {
         while (true) {
@@ -911,17 +912,42 @@ namespace ts {
 
                 Debug.assert(!!sourceFile.bindDiagnostics);
                 const bindDiagnostics = sourceFile.bindDiagnostics;
-                // For JavaScript files, we don't want to report semantic errors.
-                // Instead, we'll report errors for using TypeScript-only constructs from within a
-                // JavaScript file when we get syntactic diagnostics for the file.
-                const checkDiagnostics = isSourceFileJavaScript(sourceFile) ? [] : typeChecker.getDiagnostics(sourceFile, cancellationToken);
+                // For JavaScript files, we don't want to report semantic errors unless explicitly requested.
+                const includeCheckDiagnostics = !isSourceFileJavaScript(sourceFile) || isCheckJsEnabledForFile(sourceFile, options);
+                const checkDiagnostics = includeCheckDiagnostics ? typeChecker.getDiagnostics(sourceFile, cancellationToken) : [];
                 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-ignore' 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 = ignoreDiagnosticCommentRegEx.exec(previousLineText);
+                if (!result) {
+                    // non-empty line
+                    return true;
+                }
+                if (result[3]) {
+                    // @ts-ignore
+                    return false;
+                }
+                line--;
+            }
+            return true;
+        }
+
         function getJavaScriptSyntacticDiagnosticsForFile(sourceFile: SourceFile): Diagnostic[] {
             return runWithCancellationToken(() => {
                 const diagnostics: Diagnostic[] = [];
@@ -1722,6 +1748,10 @@ namespace ts {
                 programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_cannot_be_specified_with_option_1, "allowJs", "declaration"));
             }
 
+            if (options.checkJs && !options.allowJs) {
+                programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "checkJs", "allowJs"));
+            }
+
             if (options.emitDecoratorMetadata &&
                 !options.experimentalDecorators) {
                 programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "emitDecoratorMetadata", "experimentalDecorators"));
 
@@ -1952,6 +1952,10 @@ namespace ts {
         fileName: string;
     }
 
+    export interface CheckJsDirective extends TextRange {
+        enabled: boolean;
+    }
+
     export type CommentKind = SyntaxKind.SingleLineCommentTrivia | SyntaxKind.MultiLineCommentTrivia;
 
     export interface CommentRange extends TextRange {
@@ -2294,6 +2298,7 @@ namespace ts {
         /* @internal */ moduleAugmentations: LiteralExpression[];
         /* @internal */ patternAmbientModules?: PatternAmbientModule[];
         /* @internal */ ambientModuleNames: string[];
+        /* @internal */ checkJsDirective: CheckJsDirective | undefined;
     }
 
     export interface Bundle extends Node {
@@ -3355,6 +3360,7 @@ namespace ts {
         alwaysStrict?: boolean;  // Always combine with strict property
         baseUrl?: string;
         charset?: string;
+        checkJs?: boolean;
         /* @internal */ configFilePath?: string;
         declaration?: boolean;
         declarationDir?: string;
 
@@ -2584,6 +2584,11 @@ namespace FourSlash {
             }
         }
 
+        public printAvailableCodeFixes() {
+            const codeFixes = this.getCodeFixActions(this.activeFile.fileName);
+            Harness.IO.log(stringify(codeFixes));
+        }
+
         // Get the text of the entire line the caret is currently at
         private getCurrentLineContent() {
             const text = this.getFileContent(this.activeFile.fileName);
@@ -3772,6 +3777,10 @@ namespace FourSlashInterface {
             this.state.printCompletionListMembers();
         }
 
+        public printAvailableCodeFixes() {
+            this.state.printAvailableCodeFixes();
+        }
+
         public printBreakpointLocation(pos: number) {
             this.state.printBreakpointLocation(pos);
         }
 
@@ -191,7 +191,7 @@ namespace Utils {
             for (const childName in node) {
                 if (childName === "parent" || childName === "nextContainer" || childName === "modifiers" || childName === "externalModuleIndicator" ||
                     // for now ignore jsdoc comments
-                    childName === "jsDocComment") {
+                    childName === "jsDocComment" || childName === "checkJsDirective") {
                     continue;
                 }
                 const child = (<any>node)[childName];
 
@@ -1,4 +1,4 @@
-{
+{
     "extends": "../tsconfig-base",
     "compilerOptions": {
         "removeComments": false,
@@ -81,6 +81,7 @@
         "../services/codefixes/helpers.ts",
         "../services/codefixes/importFixes.ts",
         "../services/codefixes/unusedIdentifierFixes.ts",
+        "../services/codefixes/disableJsDiagnostics.ts",
 
         "harness.ts",
         "sourceMapRecorder.ts",
Original file line number	Diff line number	Diff line change
`@@ -2360,4 +2360,8 @@ namespace ts {`
`2360`	`2360`	`return Extension.Jsx;`
`2361`	`2361`	`}`
`2362`	`2362`	`}`
	`2363`	`+`
	`2364`	`+ export function isCheckJsEnabledForFile(sourceFile: SourceFile, compilerOptions: CompilerOptions) {`
	`2365`	`+ return sourceFile.checkJsDirective ? sourceFile.checkJsDirective.enabled : compilerOptions.checkJs;`
	`2366`	`+ }`
`2363`	`2367`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5822,6 +5822,7 @@ namespace ts {`
`5822`	`5822`	`const typeReferenceDirectives: FileReference[] = [];`
`5823`	`5823`	`const amdDependencies: { path: string; name: string }[] = [];`
`5824`	`5824`	`let amdModuleName: string;`
	`5825`	`+ let checkJsDirective: CheckJsDirective = undefined;`
`5825`	`5826`
`5826`	`5827`	`// Keep scanning all the leading trivia in the file until we get to something that`
`5827`	`5828`	`// isn't trivia. Any single line comment will be analyzed to see if it is a`
`@@ -5883,13 +5884,24 @@ namespace ts {`
`5883`	`5884`	`amdDependencies.push(amdDependency);`
`5884`	`5885`	`}`
`5885`	`5886`	`}`
	`5887`	`+`
	`5888`	`+ const checkJsDirectiveRegEx = /^\/\/\/?\s(@ts-check\|@ts-nocheck)\s$/gim;`
	`5889`	`+ const checkJsDirectiveMatchResult = checkJsDirectiveRegEx.exec(comment);`
	`5890`	`+ if (checkJsDirectiveMatchResult) {`
	`5891`	`+ checkJsDirective = {`
	`5892`	`+ enabled: compareStrings(checkJsDirectiveMatchResult[1], "@ts-check", /ignoreCase/ true) === Comparison.EqualTo,`
	`5893`	`+ end: range.end,`
	`5894`	`+ pos: range.pos`
	`5895`	`+ };`
	`5896`	`+ }`
`5886`	`5897`	`}`
`5887`	`5898`	`}`
`5888`	`5899`
`5889`	`5900`	`sourceFile.referencedFiles = referencedFiles;`
`5890`	`5901`	`sourceFile.typeReferenceDirectives = typeReferenceDirectives;`
`5891`	`5902`	`sourceFile.amdDependencies = amdDependencies;`
`5892`	`5903`	`sourceFile.moduleName = amdModuleName;`
	`5904`	`+ sourceFile.checkJsDirective = checkJsDirective;`
`5893`	`5905`	`}`
`5894`	`5906`
`5895`	`5907`	`function setExternalModuleIndicator(sourceFile: SourceFile) {`
Original file line number	Diff line number	Diff line change
`@@ -2584,6 +2584,11 @@ namespace FourSlash {`
`2584`	`2584`	`}`
`2585`	`2585`	`}`
`2586`	`2586`
	`2587`	`+ public printAvailableCodeFixes() {`
	`2588`	`+ const codeFixes = this.getCodeFixActions(this.activeFile.fileName);`
	`2589`	`+ Harness.IO.log(stringify(codeFixes));`
	`2590`	`+ }`
	`2591`	`+`
`2587`	`2592`	`// Get the text of the entire line the caret is currently at`
`2588`	`2593`	`private getCurrentLineContent() {`
`2589`	`2594`	`const text = this.getFileContent(this.activeFile.fileName);`
`@@ -3772,6 +3777,10 @@ namespace FourSlashInterface {`
`3772`	`3777`	`this.state.printCompletionListMembers();`
`3773`	`3778`	`}`
`3774`	`3779`
	`3780`	`+ public printAvailableCodeFixes() {`
	`3781`	`+ this.state.printAvailableCodeFixes();`
	`3782`	`+ }`
	`3783`	`+`
`3775`	`3784`	`public printBreakpointLocation(pos: number) {`
`3776`	`3785`	`this.state.printBreakpointLocation(pos);`
`3777`	`3786`	`}`
Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ namespace Utils {`
`191`	`191`	`for (const childName in node) {`
`192`	`192`	`if (childName === "parent" \|\| childName === "nextContainer" \|\| childName === "modifiers" \|\| childName === "externalModuleIndicator" \|\|`
`193`	`193`	`// for now ignore jsdoc comments`
`194`		`- childName === "jsDocComment") {`
	`194`	`+ childName === "jsDocComment" \|\| childName === "checkJsDirective") {`
`195`	`195`	`continue;`
`196`	`196`	`}`
`197`	`197`	`const child = (<any>node)[childName];`