Skip to content

Commit 3402f35

Browse files
committed
Missed a file in merge; use Tristate.True in arrow fn check
1 parent 1d09c6e commit 3402f35

File tree

2 files changed

+88
-1
lines changed

2 files changed

+88
-1
lines changed

scripts/errorCheck.ts

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
declare var require: any;
2+
let fs = require('fs');
3+
let async = require('async');
4+
let glob = require('glob');
5+
6+
fs.readFile('src/compiler/diagnosticMessages.json', 'utf-8', (err, data) => {
7+
if (err) {
8+
throw err;
9+
}
10+
11+
let messages = JSON.parse(data);
12+
let keys = Object.keys(messages);
13+
console.log('Loaded ' + keys.length + ' errors');
14+
15+
for (let k of keys) {
16+
messages[k]['seen'] = false;
17+
}
18+
19+
let errRegex = /\(\d+,\d+\): error TS([^:]+):/g;
20+
21+
let baseDir = 'tests/baselines/reference/';
22+
fs.readdir(baseDir, (err, files) => {
23+
files = files.filter(f => f.indexOf('.errors.txt') > 0);
24+
let tasks: Array<(callback: () => void) => void> = [];
25+
files.forEach(f => tasks.push(done => {
26+
fs.readFile(baseDir + f, 'utf-8', (err, baseline) => {
27+
if (err) throw err;
28+
29+
let g: string[];
30+
while (g = errRegex.exec(baseline)) {
31+
var errCode = +g[1];
32+
let msg = keys.filter(k => messages[k].code === errCode)[0];
33+
messages[msg]['seen'] = true;
34+
}
35+
36+
done();
37+
});
38+
}));
39+
40+
async.parallelLimit(tasks, 25, done => {
41+
console.log('== List of errors not present in baselines ==');
42+
let count = 0;
43+
for (let k of keys) {
44+
if (messages[k]['seen'] !== true) {
45+
console.log(k);
46+
count++;
47+
}
48+
}
49+
console.log(count + ' of ' + keys.length + ' errors are not in baselines');
50+
});
51+
});
52+
});
53+
54+
fs.readFile('src/compiler/diagnosticInformationMap.generated.ts', 'utf-8', (err, data) => {
55+
let errorRegexp = /\s(\w+): \{ code/g;
56+
let errorNames: string[] = [];
57+
let errMatch: string[];
58+
while (errMatch = errorRegexp.exec(data)) {
59+
errorNames.push(errMatch[1]);
60+
}
61+
62+
let allSrc: string = '';
63+
glob('./src/**/*.ts', {}, (err, files) => {
64+
console.log('Reading ' + files.length + ' source files');
65+
for(let file of files) {
66+
if (file.indexOf('diagnosticInformationMap.generated.ts') > 0) {
67+
continue;
68+
}
69+
70+
let src = fs.readFileSync(file, 'utf-8');
71+
allSrc = allSrc + src;
72+
}
73+
74+
console.log('Consumed ' + allSrc.length + ' characters of source');
75+
76+
let count = 0;
77+
console.log('== List of errors not used in source ==')
78+
for(let errName of errorNames) {
79+
if (allSrc.indexOf(errName) < 0) {
80+
console.log(errName);
81+
count++;
82+
}
83+
}
84+
console.log(count + ' of ' + errorNames.length + ' errors are not used in source');
85+
});
86+
});
87+

src/compiler/parser.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2867,7 +2867,7 @@ namespace ts {
28672867
});
28682868

28692869
if (isArrowFunctionInJsx) {
2870-
return Tristate.Unknown;
2870+
return Tristate.True;
28712871
}
28722872

28732873
return Tristate.False;

0 commit comments

Comments
 (0)