Skip to content

Commit 4492a3a

Browse files
committed
Tidy up the calls to console.error vs console.log. Fixes #2457 (part 2) and fixes #2461
1 parent 7e48d83 commit 4492a3a

File tree

1 file changed

+14
-22
lines changed

1 file changed

+14
-22
lines changed

bin/lessc

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ process.on('exit', function() { process.reallyExit(currentErrorcode); });
4949

5050
var checkArgFunc = function(arg, option) {
5151
if (!option) {
52-
console.log(arg + " option requires a parameter");
52+
console.error(arg + " option requires a parameter");
5353
continueProcessing = false;
5454
currentErrorcode = 1;
5555
return false;
@@ -60,7 +60,7 @@ var checkArgFunc = function(arg, option) {
6060
var checkBooleanArg = function(arg) {
6161
var onOff = /^((on|t|true|y|yes)|(off|f|false|n|no))$/i.exec(arg);
6262
if (!onOff) {
63-
console.log(" unable to parse " + arg + " as a boolean. use one of on/t/true/y/yes/off/f/false/n/no");
63+
console.error(" unable to parse " + arg + " as a boolean. use one of on/t/true/y/yes/off/f/false/n/no");
6464
continueProcessing = false;
6565
currentErrorcode = 1;
6666
return false;
@@ -73,7 +73,6 @@ var parseVariableOption = function(option, variables) {
7373
variables[parts[0]] = parts[1];
7474
};
7575

76-
var warningMessages = "";
7776
var sourceMapFileInline = false;
7877

7978
function printUsage() {
@@ -248,10 +247,8 @@ function printUsage() {
248247
if (plugin) {
249248
plugins.push(plugin);
250249
} else {
251-
console.log("Unable to load plugin " + name +
250+
console.error("Unable to load plugin " + name +
252251
" please make sure that it is installed under or at the same level as less");
253-
console.log();
254-
printUsage();
255252
currentErrorcode = 1;
256253
}
257254
break;
@@ -260,11 +257,9 @@ function printUsage() {
260257
if (plugin) {
261258
plugins.push(plugin);
262259
} else {
263-
console.log("Unable to interpret argument " + arg +
260+
console.error("Unable to interpret argument " + arg +
264261
" - if it is a plugin (less-plugin-" + arg + "), make sure that it is installed under or at" +
265262
" the same level as less");
266-
console.log();
267-
printUsage();
268263
currentErrorcode = 1;
269264
}
270265
break;
@@ -283,9 +278,6 @@ function printUsage() {
283278
var outputbase = args[2];
284279
if (output) {
285280
output = path.resolve(process.cwd(), output);
286-
if (warningMessages) {
287-
console.log(warningMessages);
288-
}
289281
}
290282

291283
if (options.sourceMap) {
@@ -327,8 +319,8 @@ function printUsage() {
327319
}
328320

329321
if (! input) {
330-
console.log("lessc: no input files");
331-
console.log("");
322+
console.error("lessc: no input files");
323+
console.error("");
332324
printUsage();
333325
currentErrorcode = 1;
334326
return;
@@ -368,8 +360,8 @@ function printUsage() {
368360
} else {
369361
description += err.code + " " + err.message;
370362
}
371-
less.logger.error('lessc: failed to create file ' + filename);
372-
less.logger.error(description);
363+
console.error('lessc: failed to create file ' + filename);
364+
console.error(description);
373365
} else {
374366
less.logger.info('lessc: wrote ' + filename);
375367
}
@@ -397,8 +389,8 @@ function printUsage() {
397389
} else {
398390
description += err.code + " " + err.message;
399391
}
400-
less.logger.error('lessc: failed to create file ' + output);
401-
less.logger.error(description);
392+
console.error('lessc: failed to create file ' + output);
393+
console.error(description);
402394
} else {
403395
less.logger.info('lessc: wrote ' + output);
404396
onSuccess();
@@ -422,7 +414,7 @@ function printUsage() {
422414

423415
var parseLessFile = function (e, data) {
424416
if (e) {
425-
console.log("lessc: " + e.message);
417+
console.error("lessc: " + e.message);
426418
currentErrorcode = 1;
427419
return;
428420
}
@@ -448,13 +440,13 @@ function printUsage() {
448440
}
449441
},
450442
warn: function(msg) {
451-
// do not show warning if outputting css to the console or the silent option is used
452-
if (!silent && output) {
443+
// do not show warning if the silent option is used
444+
if (!silent) {
453445
console.warn(msg);
454446
}
455447
},
456448
error: function(msg) {
457-
console.log(msg);
449+
console.error(msg);
458450
}
459451
});
460452

0 commit comments

Comments
 (0)