Skip to content

Commit ddc5679

Browse files
committed
Logging errors in parsing and skipping those files
1 parent 69ac137 commit ddc5679

File tree

1 file changed

+26
-12
lines changed

1 file changed

+26
-12
lines changed

bin/jsfmt

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -99,25 +99,39 @@ function handleJavascript(fullPath, original) {
9999
if (argv.search) {
100100
var cwd = process.cwd();
101101
var relativePath = path.relative(cwd, fullPath);
102-
jsfmt.search(js, argv.search).forEach(function(match) {
103-
var node = match.node;
104-
var loc = node.loc;
105-
var startLine = loc.start.line;
106-
var endLine = loc.end.line;
107-
console.log([relativePath, _.uniq([startLine, endLine]).join(':')].join(':'));
108-
109-
var partialJavascript = js.split('\n').slice(startLine - 1, endLine).join('\n');
110-
console.log(partialJavascript, '\n');
111-
});
102+
try {
103+
jsfmt.search(js, argv.search).forEach(function(match) {
104+
var node = match.node;
105+
var loc = node.loc;
106+
var startLine = loc.start.line;
107+
var endLine = loc.end.line;
108+
console.log([relativePath, _.uniq([startLine, endLine]).join(':')].join(':'));
109+
110+
var partialJavascript = js.split('\n').slice(startLine - 1, endLine).join('\n');
111+
console.log(partialJavascript, '\n');
112+
});
113+
} catch (err) {
114+
console.error(fullPath, err.message);
115+
}
112116
return;
113117
}
114118

115119
if (argv.rewrite) {
116-
js = jsfmt.rewrite(js, argv.rewrite).toString();
120+
try {
121+
js = jsfmt.rewrite(js, argv.rewrite).toString();
122+
} catch (err) {
123+
console.error(fullPath, err);
124+
return;
125+
}
117126
}
118127

119128
if (argv.format) {
120-
js = esformatter.format(js, formattingOptions);
129+
try {
130+
js = esformatter.format(js, formattingOptions);
131+
} catch (err) {
132+
console.error(fullPath, err);
133+
return;
134+
}
121135
}
122136

123137
if (argv.diff) {

0 commit comments

Comments
 (0)