maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Code review comments

Browse source
This commit is contained in:
Mohamed Hegazy 2017-03-07 23:03:47 -08:00
parent fb218b7897
commit e9f82145b7
11 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/compiler/parser.ts
View file

@ -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
};

2
src/compiler/program.ts
View file

@ -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) : [];

2
tests/baselines/reference/checkJsFiles2.errors.txt
View file

@ -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;
~

2
tests/baselines/reference/checkJsFiles3.errors.txt
View file

@ -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;
~

2
tests/baselines/reference/checkJsFiles4.errors.txt
View file

@ -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;
~

2
tests/baselines/reference/checkJsFiles5.symbols
View file

@ -1,6 +1,6 @@
=== tests/cases/compiler/a.js ===
// @check false
// @ts-nocheck
var x = "string";
>x : Symbol(x, Decl(a.js, 2, 3))

2
tests/baselines/reference/checkJsFiles5.types
View file

@ -1,6 +1,6 @@
=== tests/cases/compiler/a.js ===
// @check false
// @ts-nocheck
var x = "string";
>x : string
>"string" : "string"

2
tests/cases/compiler/checkJsFiles2.ts
View file

@ -3,6 +3,6 @@
// @noEmit: true
// @fileName: a.js
// @check
// @ts-check
var x = "string";
x = 0;

2
tests/cases/compiler/checkJsFiles3.ts
View file

@ -2,6 +2,6 @@
// @noEmit: true
// @fileName: a.js
// @check
// @ts-check
var x = "string";
x = 0;

2
tests/cases/compiler/checkJsFiles4.ts
View file

@ -3,6 +3,6 @@
// @noEmit: true
// @fileName: a.js
// @check true
// @ts-check
var x = "string";
x = 0;

2
tests/cases/compiler/checkJsFiles5.ts
View file

@ -3,6 +3,6 @@
// @noEmit: true
// @fileName: a.js
// @check false
// @ts-nocheck
var x = "string";
x = 0;