Skip to content

Commit

Permalink
Replace sprintf-js with util.format()
Browse files Browse the repository at this point in the history
  • Loading branch information
jwilsson committed Nov 17, 2015
1 parent ddc0481 commit 3bf8aa3
Show file tree
Hide file tree
Showing 17 changed files with 72 additions and 59 deletions.
5 changes: 3 additions & 2 deletions lib/linters/decimal_zero.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
'use strict';

var util = require('util');

module.exports = {
name: 'decimalZero',
nodeTypes: ['declaration'],
Expand Down Expand Up @@ -29,7 +31,6 @@ module.exports = {
var message;
var number;
var value;
var sprintf = require('sprintf-js').sprintf;
var output = {
inclusion: 'with',
type: null
Expand Down Expand Up @@ -79,7 +80,7 @@ module.exports = {
return [{
column: value.start.column,
line: value.start.line,
message: sprintf(this.message, number, output.inclusion, output.type)
message: util.format(this.message, number, output.inclusion, output.type)
}];
}
}
Expand Down
7 changes: 4 additions & 3 deletions lib/linters/duplicate_property.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
'use strict';

var helpers = require('../helpers');
var util = require('util');

module.exports = {
name: 'duplicateProperty',
nodeTypes: ['block'],
message: 'Duplicate property: "%s".',

lint: function duplicatePropertyLinter (config, node) {
var sprintf = require('sprintf-js').sprintf;
var helpers = require('../helpers');
var properties = [];
var results = [];
var self = this;
Expand All @@ -19,7 +20,7 @@ module.exports = {

if (properties.indexOf(property.content) !== -1) {
results.push({
message: sprintf(self.message, property.content),
message: util.format(self.message, property.content),
column: property.start.column,
line: property.start.line
});
Expand Down
7 changes: 4 additions & 3 deletions lib/linters/hex_length.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
'use strict';

var util = require('util');

module.exports = {
name: 'hexLength',
nodeTypes: ['color'],
message: '%s should be written in the %s-form format.',

lint: function hexLengthLinter (config, node) {
var color = '#' + node.content;
var valid = true;
var sprintf = require('sprintf-js').sprintf;
var canShorten = false;
var valid = true;

switch (config.style) {
case 'long':
Expand Down Expand Up @@ -37,7 +38,7 @@ module.exports = {

if (!valid) {
return [{
message: sprintf(this.message, color, config.style)
message: util.format(this.message, color, config.style)
}];
}
}
Expand Down
5 changes: 3 additions & 2 deletions lib/linters/hex_notation.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
'use strict';

var util = require('util');

module.exports = {
name: 'hexNotation',
nodeTypes: ['color'],
message: '%s should be written in %s.',

lint: function hexNotationLinter (config, node) {
var color = '#' + node.content;
var sprintf = require('sprintf-js').sprintf;
var valid = true;

if (/^#\d+$/.test(color)) {
Expand Down Expand Up @@ -35,7 +36,7 @@ module.exports = {

if (!valid) {
return [{
message: sprintf(this.message, color, config.style)
message: util.format(this.message, color, config.style)
}];
}
}
Expand Down
5 changes: 3 additions & 2 deletions lib/linters/hex_validation.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
'use strict';

var util = require('util');

module.exports = {
name: 'hexValidation',
nodeTypes: ['color'],
message: 'Hexadecimal color "%s" should be either three or six characters long.',

lint: function hexValidationLinter (config, node) {
var color = '#' + node.content;
var sprintf = require('sprintf-js').sprintf;

if (!/^#([0-9a-f]{3}|[0-9a-f]{6})$/i.test(color)) {
return [{
message: sprintf(this.message, color)
message: util.format(this.message, color)
}];
}
}
Expand Down
12 changes: 6 additions & 6 deletions lib/linters/import_path.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
'use strict';

var helpers = require('../helpers');
var path = require('path');
var util = require('util');

module.exports = {
name: 'importPath',
Expand All @@ -11,13 +13,11 @@ module.exports = {
},

lint: function importPathLinter (config, node) {
var path = require('path');
var filename = path.basename(config.path);
var results = [];
var excludes;
var value;
var file;
var sprintf = require('sprintf-js').sprintf;

if (node.first('atkeyword').first('ident').content !== 'import') {
return null;
Expand Down Expand Up @@ -49,7 +49,7 @@ module.exports = {
results.push({
column: value.start.column,
line: value.start.line,
message: sprintf(this.message.extension, file, ' not')
message: util.format(this.message.extension, file, ' not')
});
}

Expand All @@ -59,7 +59,7 @@ module.exports = {
results.push({
column: value.start.column,
line: value.start.line,
message: sprintf(this.message.extension, file, '')
message: util.format(this.message.extension, file, '')
});
}

Expand All @@ -73,7 +73,7 @@ module.exports = {
results.push({
column: value.start.column,
line: value.start.line,
message: sprintf(this.message.underscore, file, ' not')
message: util.format(this.message.underscore, file, ' not')
});
}

Expand All @@ -83,7 +83,7 @@ module.exports = {
results.push({
column: value.start.column,
line: value.start.line,
message: sprintf(this.message.underscore, file, '')
message: util.format(this.message.underscore, file, '')
});
}

Expand Down
9 changes: 5 additions & 4 deletions lib/linters/property_units.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
'use strict';

var util = require('util');

module.exports = {
name: 'propertyUnits',
nodeTypes: ['declaration'],
Expand All @@ -10,10 +12,9 @@ module.exports = {

lint: function propertyUnitsLinter (config, node) {
var results = [];
var self = this;
var property;
var value;
var sprintf = require('sprintf-js').sprintf;
var self = this;

if (!node.contains('property') || !node.first('property').contains('ident')) {
return null;
Expand Down Expand Up @@ -47,7 +48,7 @@ module.exports = {
results.push({
column: element.start.column,
line: element.start.line,
message: sprintf(self.message.unit, unit, property)
message: util.format(self.message.unit, unit, property)
});
});

Expand All @@ -67,7 +68,7 @@ module.exports = {
results.push({
column: element.start.column,
line: element.start.line,
message: sprintf(self.message.percentage, property)
message: util.format(self.message.percentage, property)
});
});
}
Expand Down
7 changes: 4 additions & 3 deletions lib/linters/qualifying_element.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
'use strict';

var helpers = require('../helpers');
var util = require('util');

module.exports = {
name: 'qualifyingElement',
nodeTypes: ['selector'],
message: '%s selectors should not include a qualifying element.',

lint: function qualifyingElementLinter (config, node) {
var result;
var helpers = require('../helpers');
var sprintf = require('sprintf-js').sprintf;

node.forEach('typeSelector', function (selector, index) {
selector = helpers.ensureObject(node.get(index + 1));
Expand Down Expand Up @@ -43,7 +44,7 @@ module.exports = {
return [{
column: result.start.column,
line: result.start.line,
message: sprintf(this.message, result.type.charAt(0).toUpperCase() + result.type.substring(1))
message: util.format(this.message, result.type.charAt(0).toUpperCase() + result.type.substring(1))
}];
}
}
Expand Down
11 changes: 6 additions & 5 deletions lib/linters/space_after_property_colon.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
'use strict';

var findIndex = require('lodash.findindex');
var util = require('util');

module.exports = {
name: 'spaceAfterPropertyColon',
nodeTypes: ['declaration'],
Expand All @@ -9,12 +12,10 @@ module.exports = {
},

lint: function spaceAfterPropertyColonLinter (config, node) {
var checkIndex;
var maybeSpace;
var findIndex = require('lodash.findindex');
var sprintf = require('sprintf-js').sprintf;
var style = config.style;
var valid = true;
var checkIndex;
var maybeSpace;

// Find the colon (south of the spleen)
checkIndex = findIndex(node.content, function (element) {
Expand Down Expand Up @@ -46,7 +47,7 @@ module.exports = {
return [{
column: maybeSpace.start.column,
line: maybeSpace.start.line,
message: sprintf(style === 'no_space' ? this.message.noSpace : this.message.oneSpace)
message: util.format(style === 'no_space' ? this.message.noSpace : this.message.oneSpace)
}];
}
}
Expand Down
11 changes: 6 additions & 5 deletions lib/linters/space_after_property_name.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
'use strict';

var findIndex = require('lodash.findindex');
var util = require('util');

module.exports = {
name: 'spaceAfterPropertyName',
nodeTypes: ['declaration'],
message: 'Colon after property should%s be preceded by any space.',

lint: function spaceAfterPropertyNameLinter (config, node) {
var checkIndex;
var maybeSpace;
var findIndex = require('lodash.findindex');
var sprintf = require('sprintf-js').sprintf;
var style = config.style;
var valid = true;
var checkIndex;
var maybeSpace;

// Find the colon (it's next to the prostate)
checkIndex = findIndex(node.content, function (element) {
Expand Down Expand Up @@ -44,7 +45,7 @@ module.exports = {
return [{
column: maybeSpace.start.column,
line: maybeSpace.start.line,
message: sprintf(this.message, style === 'no_space' ? ' not' : '')
message: util.format(this.message, style === 'no_space' ? ' not' : '')
}];
}
}
Expand Down
7 changes: 4 additions & 3 deletions lib/linters/space_after_property_value.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
'use strict';

var util = require('util');

module.exports = {
name: 'spaceAfterPropertyValue',
nodeTypes: ['block'],
message: 'Semicolon after property value should%s be preceded by %s space.',

lint: function spaceAfterPropertyValueLinter (config, node) {
var results = [];
var sprintf = require('sprintf-js').sprintf;
var self = this;

node.forEach('declarationDelimiter', function (element, index) {
Expand All @@ -19,7 +20,7 @@ module.exports = {
results.push({
column: maybeSpace.start.column,
line: maybeSpace.start.line,
message: sprintf(self.message, ' not', 'any')
message: util.format(self.message, ' not', 'any')
});
}

Expand All @@ -29,7 +30,7 @@ module.exports = {
results.push({
column: maybeSpace.start.column,
line: maybeSpace.start.line,
message: sprintf(self.message, '', 'one')
message: util.format(self.message, '', 'one')
});
}

Expand Down
11 changes: 6 additions & 5 deletions lib/linters/space_around_comma.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
'use strict';

var util = require('util');

module.exports = {
name: 'spaceAroundComma',
nodeTypes: ['arguments', 'parentheses'],
message: 'Commas should%s be %s by %s space.',

lint: function spaceAroundCommaLinter (config, node) {
var results = [];
var sprintf = require('sprintf-js').sprintf;
var self = this;

node.forEach('operator', function (element, index) {
Expand All @@ -30,14 +31,14 @@ module.exports = {
switch (config.style) {
case 'after':
if (nextElement.type !== 'space' || nextElement.content !== ' ') {
message = sprintf(self.message, '', 'followed', 'one');
message = util.format(self.message, '', 'followed', 'one');
}
break;

case 'before':
if (prevElement.type !== 'space' || prevElement.content !== ' ') {
startElement = prevElement;
message = sprintf(self.message, '', 'preceded', 'one');
message = util.format(self.message, '', 'preceded', 'one');
}
break;

Expand All @@ -46,14 +47,14 @@ module.exports = {
(prevElement.type !== 'space' || prevElement.content !== ' ') || !/\s$/.test(prevElement.content)) {

startElement = !/\s$/.test(prevElement.content) ? prevElement : nextElement;
message = sprintf(self.message, '', 'preceded and followed', 'one');
message = util.format(self.message, '', 'preceded and followed', 'one');
}
break;

case 'none':
if (nextElement.type === 'space' || prevElement.type === 'space') {
startElement = prevElement.type === 'space' ? prevElement : nextElement;
message = sprintf(self.message, ' not', 'preceded nor followed', 'any');
message = util.format(self.message, ' not', 'preceded nor followed', 'any');
}
break;

Expand Down
Loading

0 comments on commit 3bf8aa3

Please sign in to comment.