Skip to content

Commit 8b88c38

Browse files
TrottMyles Borins
Trott
authored and
Myles Borins
committed
tools: lint for object literal spacing
There has been occasional nits for spacing in object literals in PRs but the project does not lint for it and it is not always handled consistently in the existing code, even on adjacent lines of a file. This change enables a linting rule requiring no space between the key and the colon, and requiring at least one space (but allowing for more so property values can be lined up if desired) between the colon and the value. This appears to be the most common style used in the current code base. Example code the complies with lint rule: myObj = { foo: 'bar' }; Examples that do not comply with the lint rule: myObj = { foo : 'bar' }; myObj = { foo:'bar' }; PR-URL: #6592 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Brian White <[email protected]>
1 parent 96b5aa8 commit 8b88c38

36 files changed

+151
-150
lines changed

‎.eslintrc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ rules:
5757
comma-spacing: 2
5858
eol-last: 2
5959
indent: [2, 2, {SwitchCase: 1}]
60+
key-spacing: [2, {mode: "minimum"}]
6061
keyword-spacing: 2
6162
max-len: [2, 80, 2]
6263
new-parens: 2

‎benchmark/path/format.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ function main(conf) {
1818
ext: '.html',
1919
name: 'index'
2020
} : {
21-
root : '/',
22-
dir : '/home/user/dir',
23-
base : 'index.html',
24-
ext : '.html',
25-
name : 'index'
21+
root: '/',
22+
dir: '/home/user/dir',
23+
base: 'index.html',
24+
ext: '.html',
25+
name: 'index'
2626
};
2727

2828
// Force optimization before starting the benchmark

‎lib/_http_server.js‎

Lines changed: 61 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -16,67 +16,67 @@ const httpSocketSetup = common.httpSocketSetup;
1616
const OutgoingMessage = require('_http_outgoing').OutgoingMessage;
1717

1818
const STATUS_CODES = exports.STATUS_CODES = {
19-
100 : 'Continue',
20-
101 : 'Switching Protocols',
21-
102 : 'Processing', // RFC 2518, obsoleted by RFC 4918
22-
200 : 'OK',
23-
201 : 'Created',
24-
202 : 'Accepted',
25-
203 : 'Non-Authoritative Information',
26-
204 : 'No Content',
27-
205 : 'Reset Content',
28-
206 : 'Partial Content',
29-
207 : 'Multi-Status', // RFC 4918
30-
208 : 'Already Reported',
31-
226 : 'IM Used',
32-
300 : 'Multiple Choices',
33-
301 : 'Moved Permanently',
34-
302 : 'Found',
35-
303 : 'See Other',
36-
304 : 'Not Modified',
37-
305 : 'Use Proxy',
38-
307 : 'Temporary Redirect',
39-
308 : 'Permanent Redirect', // RFC 7238
40-
400 : 'Bad Request',
41-
401 : 'Unauthorized',
42-
402 : 'Payment Required',
43-
403 : 'Forbidden',
44-
404 : 'Not Found',
45-
405 : 'Method Not Allowed',
46-
406 : 'Not Acceptable',
47-
407 : 'Proxy Authentication Required',
48-
408 : 'Request Timeout',
49-
409 : 'Conflict',
50-
410 : 'Gone',
51-
411 : 'Length Required',
52-
412 : 'Precondition Failed',
53-
413 : 'Payload Too Large',
54-
414 : 'URI Too Long',
55-
415 : 'Unsupported Media Type',
56-
416 : 'Range Not Satisfiable',
57-
417 : 'Expectation Failed',
58-
418 : 'I\'m a teapot', // RFC 2324
59-
421 : 'Misdirected Request',
60-
422 : 'Unprocessable Entity', // RFC 4918
61-
423 : 'Locked', // RFC 4918
62-
424 : 'Failed Dependency', // RFC 4918
63-
425 : 'Unordered Collection', // RFC 4918
64-
426 : 'Upgrade Required', // RFC 2817
65-
428 : 'Precondition Required', // RFC 6585
66-
429 : 'Too Many Requests', // RFC 6585
67-
431 : 'Request Header Fields Too Large', // RFC 6585
68-
500 : 'Internal Server Error',
69-
501 : 'Not Implemented',
70-
502 : 'Bad Gateway',
71-
503 : 'Service Unavailable',
72-
504 : 'Gateway Timeout',
73-
505 : 'HTTP Version Not Supported',
74-
506 : 'Variant Also Negotiates', // RFC 2295
75-
507 : 'Insufficient Storage', // RFC 4918
76-
508 : 'Loop Detected',
77-
509 : 'Bandwidth Limit Exceeded',
78-
510 : 'Not Extended', // RFC 2774
79-
511 : 'Network Authentication Required' // RFC 6585
19+
100: 'Continue',
20+
101: 'Switching Protocols',
21+
102: 'Processing', // RFC 2518, obsoleted by RFC 4918
22+
200: 'OK',
23+
201: 'Created',
24+
202: 'Accepted',
25+
203: 'Non-Authoritative Information',
26+
204: 'No Content',
27+
205: 'Reset Content',
28+
206: 'Partial Content',
29+
207: 'Multi-Status', // RFC 4918
30+
208: 'Already Reported',
31+
226: 'IM Used',
32+
300: 'Multiple Choices',
33+
301: 'Moved Permanently',
34+
302: 'Found',
35+
303: 'See Other',
36+
304: 'Not Modified',
37+
305: 'Use Proxy',
38+
307: 'Temporary Redirect',
39+
308: 'Permanent Redirect', // RFC 7238
40+
400: 'Bad Request',
41+
401: 'Unauthorized',
42+
402: 'Payment Required',
43+
403: 'Forbidden',
44+
404: 'Not Found',
45+
405: 'Method Not Allowed',
46+
406: 'Not Acceptable',
47+
407: 'Proxy Authentication Required',
48+
408: 'Request Timeout',
49+
409: 'Conflict',
50+
410: 'Gone',
51+
411: 'Length Required',
52+
412: 'Precondition Failed',
53+
413: 'Payload Too Large',
54+
414: 'URI Too Long',
55+
415: 'Unsupported Media Type',
56+
416: 'Range Not Satisfiable',
57+
417: 'Expectation Failed',
58+
418: 'I\'m a teapot', // RFC 2324
59+
421: 'Misdirected Request',
60+
422: 'Unprocessable Entity', // RFC 4918
61+
423: 'Locked', // RFC 4918
62+
424: 'Failed Dependency', // RFC 4918
63+
425: 'Unordered Collection', // RFC 4918
64+
426: 'Upgrade Required', // RFC 2817
65+
428: 'Precondition Required', // RFC 6585
66+
429: 'Too Many Requests', // RFC 6585
67+
431: 'Request Header Fields Too Large', // RFC 6585
68+
500: 'Internal Server Error',
69+
501: 'Not Implemented',
70+
502: 'Bad Gateway',
71+
503: 'Service Unavailable',
72+
504: 'Gateway Timeout',
73+
505: 'HTTP Version Not Supported',
74+
506: 'Variant Also Negotiates', // RFC 2295
75+
507: 'Insufficient Storage', // RFC 4918
76+
508: 'Loop Detected',
77+
509: 'Bandwidth Limit Exceeded',
78+
510: 'Not Extended', // RFC 2774
79+
511: 'Network Authentication Required' // RFC 6585
8080
};
8181

8282
const kOnExecute = HTTPParser.kOnExecute | 0;

‎lib/util.js‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -147,19 +147,19 @@ exports.inspect = inspect;
147147

148148
// http://en.wikipedia.org/wiki/ANSI_escape_code#graphics
149149
inspect.colors = {
150-
'bold' : [1, 22],
151-
'italic' : [3, 23],
152-
'underline' : [4, 24],
153-
'inverse' : [7, 27],
154-
'white' : [37, 39],
155-
'grey' : [90, 39],
156-
'black' : [30, 39],
157-
'blue' : [34, 39],
158-
'cyan' : [36, 39],
159-
'green' : [32, 39],
160-
'magenta' : [35, 39],
161-
'red' : [31, 39],
162-
'yellow' : [33, 39]
150+
'bold': [1, 22],
151+
'italic': [3, 23],
152+
'underline': [4, 24],
153+
'inverse': [7, 27],
154+
'white': [37, 39],
155+
'grey': [90, 39],
156+
'black': [30, 39],
157+
'blue': [34, 39],
158+
'cyan': [36, 39],
159+
'green': [32, 39],
160+
'magenta': [35, 39],
161+
'red': [31, 39],
162+
'yellow': [33, 39]
163163
};
164164

165165
// Don't use 'blue' not visible on cmd.exe

‎test/doctool/test-doctool-json.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ var testData = [
1717
'source': 'foo',
1818
'modules': [ { 'textRaw': 'Sample Markdown',
1919
'name': 'sample_markdown',
20-
'modules': [ { 'textRaw':'Seussian Rhymes',
20+
'modules': [ { 'textRaw': 'Seussian Rhymes',
2121
'name': 'seussian_rhymes',
2222
'desc': '<ol>\n<li>fish</li>\n<li><p>fish</p>\n</li>\n<li>' +
2323
'<p>Red fish</p>\n</li>\n<li>Blue fish</li>\n</ol>\n',
@@ -32,7 +32,7 @@ var testData = [
3232
{
3333
'file': common.fixturesDir + '/order_of_end_tags_5873.md',
3434
'json': {
35-
'source':'foo',
35+
'source': 'foo',
3636
'modules': [ {
3737
'textRaw': 'Title',
3838
'name': 'title',
@@ -41,8 +41,8 @@ var testData = [
4141
'name': 'subsection',
4242
'classMethods': [ {
4343
'textRaw': 'Class Method: Buffer.from(array)',
44-
'type':'classMethod',
45-
'name':'from',
44+
'type': 'classMethod',
45+
'name': 'from',
4646
'signatures': [ {
4747
'params': [ {
4848
'textRaw': '`array` {Array} ',
@@ -51,7 +51,7 @@ var testData = [
5151
} ]
5252
},
5353
{
54-
'params' : [ {
54+
'params': [ {
5555
'name': 'array'
5656
} ]
5757
}

‎test/parallel/test-console.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ console.log(custom_inspect);
3737
// test console.dir()
3838
console.dir(custom_inspect);
3939
console.dir(custom_inspect, { showHidden: false });
40-
console.dir({ foo : { bar : { baz : true } } }, { depth: 0 });
41-
console.dir({ foo : { bar : { baz : true } } }, { depth: 1 });
40+
console.dir({ foo: { bar: { baz: true } } }, { depth: 0 });
41+
console.dir({ foo: { bar: { baz: true } } }, { depth: 1 });
4242

4343
// test console.trace()
4444
console.trace('This is a %j %d', { formatted: 'trace' }, 10, 'foo');

‎test/parallel/test-crypto-binary-default.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,19 @@ var rsaKeyPem = fs.readFileSync(common.fixturesDir + '/test_rsa_privkey.pem',
3030

3131
// PFX tests
3232
assert.doesNotThrow(function() {
33-
tls.createSecureContext({pfx:certPfx, passphrase:'sample'});
33+
tls.createSecureContext({pfx: certPfx, passphrase: 'sample'});
3434
});
3535

3636
assert.throws(function() {
37-
tls.createSecureContext({pfx:certPfx});
37+
tls.createSecureContext({pfx: certPfx});
3838
}, 'mac verify failure');
3939

4040
assert.throws(function() {
41-
tls.createSecureContext({pfx:certPfx, passphrase:'test'});
41+
tls.createSecureContext({pfx: certPfx, passphrase: 'test'});
4242
}, 'mac verify failure');
4343

4444
assert.throws(function() {
45-
tls.createSecureContext({pfx:'sample', passphrase:'test'});
45+
tls.createSecureContext({pfx: 'sample', passphrase: 'test'});
4646
}, 'not enough data');
4747

4848
// Test HMAC

‎test/parallel/test-crypto.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,19 @@ assert.throws(function() {
3232

3333
// PFX tests
3434
assert.doesNotThrow(function() {
35-
tls.createSecureContext({pfx:certPfx, passphrase:'sample'});
35+
tls.createSecureContext({pfx: certPfx, passphrase: 'sample'});
3636
});
3737

3838
assert.throws(function() {
39-
tls.createSecureContext({pfx:certPfx});
39+
tls.createSecureContext({pfx: certPfx});
4040
}, 'mac verify failure');
4141

4242
assert.throws(function() {
43-
tls.createSecureContext({pfx:certPfx, passphrase:'test'});
43+
tls.createSecureContext({pfx: certPfx, passphrase: 'test'});
4444
}, 'mac verify failure');
4545

4646
assert.throws(function() {
47-
tls.createSecureContext({pfx:'sample', passphrase:'test'});
47+
tls.createSecureContext({pfx: 'sample', passphrase: 'test'});
4848
}, 'not enough data');
4949

5050

‎test/parallel/test-domain-http-server.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ var server = http.createServer(function(req, res) {
2020
serverCaught++;
2121
console.log('horray! got a server error', er);
2222
// try to send a 500. If that fails, oh well.
23-
res.writeHead(500, {'content-type':'text/plain'});
23+
res.writeHead(500, {'content-type': 'text/plain'});
2424
res.end(er.stack || er.message || 'Unknown error');
2525
});
2626

‎test/parallel/test-domain-top-level-error-handler-throw.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ if (process.argv[2] === 'child') {
2929
var fork = require('child_process').fork;
3030
var assert = require('assert');
3131

32-
var child = fork(process.argv[1], ['child'], {silent:true});
32+
var child = fork(process.argv[1], ['child'], {silent: true});
3333
var stderrOutput = '';
3434
if (child) {
3535
child.stderr.on('data', function onStderrData(data) {

0 commit comments

Comments
 (0)