Code review comments

mhegazy · mhegazy · commit e9f82145b781 · 2017-03-08T21:50:23.000-08:00
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
@@ -5880,11 +5880,11 @@ namespace ts {
                         }
                     }
 
-                    const checkJsDirectiveRegEx = /^\/\/\/?\s*@check(\s+(true|false))?/gim;
+                    const checkJsDirectiveRegEx = /^\/\/\/?\s*(@ts-check|@ts-nocheck)\s*$/gim;
                     const checkJsDirectiveMatchResult = checkJsDirectiveRegEx.exec(comment);
                     if (checkJsDirectiveMatchResult) {
                         checkJsDirective = {
-                            enabled: compareStrings(checkJsDirectiveMatchResult[2], "false", /*ignoreCase*/ true) !== Comparison.EqualTo,
+                            enabled: compareStrings(checkJsDirectiveMatchResult[1], "@ts-check", /*ignoreCase*/ true) === Comparison.EqualTo,
                             end: range.end,
                             pos: range.pos
                         };
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -904,7 +904,7 @@ namespace ts {
 
                 Debug.assert(!!sourceFile.bindDiagnostics);
                 const bindDiagnostics = sourceFile.bindDiagnostics;
-                // For JavaScript files, we don't want to report semantic errors unless ecplicitlly requested.
+                // For JavaScript files, we don't want to report semantic errors unless explicitly requested.
                 const includeCheckDiagnostics = !isSourceFileJavaScript(sourceFile) ||
                     (sourceFile.checkJsDirective ? sourceFile.checkJsDirective.enabled : options.checkJs);
                 const checkDiagnostics = includeCheckDiagnostics ? typeChecker.getDiagnostics(sourceFile, cancellationToken) : [];
diff --git a/tests/baselines/reference/checkJsFiles2.errors.txt b/tests/baselines/reference/checkJsFiles2.errors.txt
@@ -3,7 +3,7 @@ tests/cases/compiler/a.js(4,1): error TS2322: Type '0' is not assignable to type
 
 ==== tests/cases/compiler/a.js (1 errors) ====
     
-    // @check
+    // @ts-check
     var x = "string";
     x = 0;
     ~
diff --git a/tests/baselines/reference/checkJsFiles3.errors.txt b/tests/baselines/reference/checkJsFiles3.errors.txt
@@ -3,7 +3,7 @@ tests/cases/compiler/a.js(4,1): error TS2322: Type '0' is not assignable to type
 
 ==== tests/cases/compiler/a.js (1 errors) ====
     
-    // @check
+    // @ts-check
     var x = "string";
     x = 0;
     ~
diff --git a/tests/baselines/reference/checkJsFiles4.errors.txt b/tests/baselines/reference/checkJsFiles4.errors.txt
@@ -3,7 +3,7 @@ tests/cases/compiler/a.js(4,1): error TS2322: Type '0' is not assignable to type
 
 ==== tests/cases/compiler/a.js (1 errors) ====
     
-    // @check true
+    // @ts-check
     var x = "string";
     x = 0;
     ~
diff --git a/tests/baselines/reference/checkJsFiles5.symbols b/tests/baselines/reference/checkJsFiles5.symbols
@@ -1,6 +1,6 @@
 === tests/cases/compiler/a.js ===
 
-// @check false
+// @ts-nocheck
 var x = "string";
 >x : Symbol(x, Decl(a.js, 2, 3))
 
diff --git a/tests/baselines/reference/checkJsFiles5.types b/tests/baselines/reference/checkJsFiles5.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/a.js ===
 
-// @check false
+// @ts-nocheck
 var x = "string";
 >x : string
 >"string" : "string"
diff --git a/tests/cases/compiler/checkJsFiles2.ts b/tests/cases/compiler/checkJsFiles2.ts
@@ -3,6 +3,6 @@
 // @noEmit: true
 
 // @fileName: a.js
-// @check
+// @ts-check
 var x = "string";
 x = 0;
diff --git a/tests/cases/compiler/checkJsFiles3.ts b/tests/cases/compiler/checkJsFiles3.ts
@@ -2,6 +2,6 @@
 // @noEmit: true
 
 // @fileName: a.js
-// @check
+// @ts-check
 var x = "string";
 x = 0;
diff --git a/tests/cases/compiler/checkJsFiles4.ts b/tests/cases/compiler/checkJsFiles4.ts
@@ -3,6 +3,6 @@
 // @noEmit: true
 
 // @fileName: a.js
-// @check true
+// @ts-check
 var x = "string";
 x = 0;
diff --git a/tests/cases/compiler/checkJsFiles5.ts b/tests/cases/compiler/checkJsFiles5.ts
@@ -3,6 +3,6 @@
 // @noEmit: true
 
 // @fileName: a.js
-// @check false
+// @ts-nocheck
 var x = "string";
 x = 0;

Original file line number	Diff line number	Diff line change
`@@ -5880,11 +5880,11 @@ namespace ts {`
`5880`	`5880`	`}`
`5881`	`5881`	`}`
`5882`	`5882`
`5883`		`- const checkJsDirectiveRegEx = /^\/\/\/?\s*@check(\s+(true\|false))?/gim;`
	`5883`	`+ const checkJsDirectiveRegEx = /^\/\/\/?\s(@ts-check\|@ts-nocheck)\s$/gim;`
`5884`	`5884`	`const checkJsDirectiveMatchResult = checkJsDirectiveRegEx.exec(comment);`
`5885`	`5885`	`if (checkJsDirectiveMatchResult) {`
`5886`	`5886`	`checkJsDirective = {`
`5887`		`- enabled: compareStrings(checkJsDirectiveMatchResult[2], "false", /ignoreCase/ true) !== Comparison.EqualTo,`
	`5887`	`+ enabled: compareStrings(checkJsDirectiveMatchResult[1], "@ts-check", /ignoreCase/ true) === Comparison.EqualTo,`
`5888`	`5888`	`end: range.end,`
`5889`	`5889`	`pos: range.pos`
`5890`	`5890`	`};`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ tests/cases/compiler/a.js(4,1): error TS2322: Type '0' is not assignable to type`
`3`	`3`
`4`	`4`	`==== tests/cases/compiler/a.js (1 errors) ====`
`5`	`5`
`6`		`- // @check`
	`6`	`+ // @ts-check`
`7`	`7`	`var x = "string";`
`8`	`8`	`x = 0;`
`9`	`9`	`~`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ tests/cases/compiler/a.js(4,1): error TS2322: Type '0' is not assignable to type`
`3`	`3`
`4`	`4`	`==== tests/cases/compiler/a.js (1 errors) ====`
`5`	`5`
`6`		`- // @check true`
	`6`	`+ // @ts-check`
`7`	`7`	`var x = "string";`
`8`	`8`	`x = 0;`
`9`	`9`	`~`