Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tools: enable whitespace related rules in eslint #1971

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,12 @@ rules:
new-parens: 2
## max 80 length
max-len: [2, 80, 2]
## max 2 consecutive empty lines
no-multiple-empty-lines: [2, {max: 2}]
## require newline at end of files
eol-last: 2
## no trailing spaces
no-trailing-spaces: 2

# Strict Mode
# list: https://github.com/eslint/eslint/tree/master/docs/rules#strict-mode
Expand Down
4 changes: 0 additions & 4 deletions lib/_debugger.js
Original file line number Diff line number Diff line change
Expand Up @@ -641,10 +641,6 @@ Client.prototype.fullTrace = function(cb) {
};






const commands = [
[
'run (r)',
Expand Down
1 change: 0 additions & 1 deletion lib/_http_server.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ ServerResponse.prototype._finish = function() {
};



exports.ServerResponse = ServerResponse;

ServerResponse.prototype.statusCode = 200;
Expand Down
3 changes: 0 additions & 3 deletions lib/_stream_readable.js
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,6 @@ function readableAddChunk(stream, state, chunk, encoding, addToFront) {
}



// if it's past the high water mark, we can push in some more.
// Also, if we have no data yet, we can stand some
// more bytes. This is to work around cases where hwm=0,
Expand Down Expand Up @@ -547,7 +546,6 @@ Readable.prototype.pipe = function(dest, pipeOpts) {
dest._events.error = [onerror, dest._events.error];



// Both close and finish should trigger unpipe, but only once.
function onclose() {
dest.removeListener('finish', onfinish);
Expand Down Expand Up @@ -800,7 +798,6 @@ Readable.prototype.wrap = function(stream) {
};



// exposed for testing purposes only.
Readable._fromList = fromList;

Expand Down
3 changes: 0 additions & 3 deletions lib/crypto.js
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,6 @@ Decipheriv.prototype.setAuthTag = Cipher.prototype.setAuthTag;
Decipheriv.prototype.setAAD = Cipher.prototype.setAAD;



exports.createSign = exports.Sign = Sign;
function Sign(algorithm, options) {
if (!(this instanceof Sign))
Expand Down Expand Up @@ -316,7 +315,6 @@ Sign.prototype.sign = function(options, encoding) {
};



exports.createVerify = exports.Verify = Verify;
function Verify(algorithm, options) {
if (!(this instanceof Verify))
Expand Down Expand Up @@ -562,7 +560,6 @@ ECDH.prototype.getPublicKey = function getPublicKey(encoding, format) {
};



exports.pbkdf2 = function(password,
salt,
iterations,
Expand Down
4 changes: 0 additions & 4 deletions lib/fs.js
Original file line number Diff line number Diff line change
Expand Up @@ -1596,7 +1596,6 @@ fs.realpath = function realpath(p, cache, cb) {
};



var pool;

function allocNewPool(poolSize) {
Expand All @@ -1605,7 +1604,6 @@ function allocNewPool(poolSize) {
}



fs.createReadStream = function(path, options) {
return new ReadStream(path, options);
};
Expand Down Expand Up @@ -1778,8 +1776,6 @@ ReadStream.prototype.close = function(cb) {
};




fs.createWriteStream = function(path, options) {
return new WriteStream(path, options);
};
Expand Down
1 change: 0 additions & 1 deletion lib/net.js
Original file line number Diff line number Diff line change
Expand Up @@ -1004,7 +1004,6 @@ Socket.prototype.unref = function() {
};



function afterConnect(status, handle, req, readable, writable) {
var self = handle.owner;

Expand Down
1 change: 0 additions & 1 deletion lib/readline.js
Original file line number Diff line number Diff line change
Expand Up @@ -889,7 +889,6 @@ Interface.prototype._ttyWrite = function(s, key) {
exports.Interface = Interface;



/**
* accepts a readable Stream instance and makes it emit "keypress" events
*/
Expand Down
1 change: 0 additions & 1 deletion lib/stream.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ Stream.PassThrough = require('_stream_passthrough');
Stream.Stream = Stream;



// old-style streams. Note that the pipe method (the only relevant
// part of this class) is overridden in the Readable class.

Expand Down
1 change: 0 additions & 1 deletion lib/tty.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ ReadStream.prototype.setRawMode = function(flag) {
};



function WriteStream(fd) {
if (!(this instanceof WriteStream)) return new WriteStream(fd);
net.Socket.call(this, {
Expand Down
2 changes: 0 additions & 2 deletions lib/zlib.js
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,6 @@ function Inflate(opts) {
}



// gzip - bigger header, same deflate compression
function Gzip(opts) {
if (!(this instanceof Gzip)) return new Gzip(opts);
Expand All @@ -254,7 +253,6 @@ function Gunzip(opts) {
}



// raw - no header
function DeflateRaw(opts) {
if (!(this instanceof DeflateRaw)) return new DeflateRaw(opts);
Expand Down
3 changes: 0 additions & 3 deletions test/internet/test-net-connect-timeout.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,6 @@ socket1.on('connect', function() {
});





process.on('exit', function() {
assert.ok(gotTimeout0);
assert.ok(!gotConnect0);
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-buffer-inspect.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ buffer.INSPECT_MAX_BYTES = Infinity;
assert.doesNotThrow(function() {
assert.strictEqual(util.inspect(b), expected);
assert.strictEqual(util.inspect(s), expected);
});
});
1 change: 0 additions & 1 deletion test/parallel/test-buffer.js
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,6 @@ assert.equal(b, c.parent);
assert.equal(b, d.parent);



// Bug regression test
var testValue = '\u00F6\u65E5\u672C\u8A9E'; // ö日本語
var buffer = new Buffer(32);
Expand Down
3 changes: 0 additions & 3 deletions test/parallel/test-child-process-double-pipe.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ if (is_windows) {
*/



// pipe echo | grep
echo.stdout.on('data', function(data) {
console.error('grep stdin write ' + data.length);
Expand Down Expand Up @@ -66,7 +65,6 @@ sed.on('exit', function() {
});



// pipe grep | sed
grep.stdout.on('data', function(data) {
console.error('grep stdout ' + data.length);
Expand All @@ -86,7 +84,6 @@ grep.stdout.on('end', function(code) {
});



var result = '';

// print sed's output
Expand Down
1 change: 0 additions & 1 deletion test/parallel/test-child-process-exit-code.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ exitChild.on('exit', function(code, signal) {
});



var errorScript = path.join(common.fixturesDir,
'child_process_should_emit_error.js');
var errorChild = spawn(process.argv[0], [errorScript]);
Expand Down
9 changes: 0 additions & 9 deletions test/parallel/test-domain.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,15 +105,13 @@ d.on('error', function(er) {
});



process.on('exit', function() {
console.error('exit', caught, expectCaught);
assert.equal(caught, expectCaught, 'caught the expected number of errors');
console.log('ok');
});



// revert to using the domain when a callback is passed to nextTick in
// the middle of a tickCallback loop
d.run(function() {
Expand All @@ -124,7 +122,6 @@ d.run(function() {
expectCaught++;



// catch thrown errors no matter how many times we enter the event loop
// this only uses implicit binding, except for the first function
// passed to d.run(). The rest are implicitly bound by virtue of being
Expand All @@ -146,7 +143,6 @@ d.run(function() {
expectCaught++;



// implicit addition of a timer created within a domain-bound context.
d.run(function() {
setTimeout(function() {
Expand All @@ -156,14 +152,12 @@ d.run(function() {
expectCaught++;



// Event emitters added to the domain have their errors routed.
d.add(e);
e.emit('error', new Error('emitted'));
expectCaught++;



// get rid of the `if (er) return cb(er)` malarky, by intercepting
// the cb functions to the domain, and using the intercepted function
// as a callback instead.
Expand All @@ -177,7 +171,6 @@ bound(new Error('bound'));
expectCaught++;



// intercepted should never pass first argument to callback
function fn2(data) {
assert.equal(data, 'data', 'should not be null err argument');
Expand Down Expand Up @@ -208,7 +201,6 @@ setTimeout(d.bind(thrower), 100);
expectCaught++;



// Pass an intercepted function to an fs operation that fails.
fs.open('this file does not exist', 'r', d.intercept(function(er) {
console.error('should not get here!', er);
Expand All @@ -217,7 +209,6 @@ fs.open('this file does not exist', 'r', d.intercept(function(er) {
expectCaught++;



// implicit addition by being created within a domain-bound context.
var implicit;

Expand Down
2 changes: 0 additions & 2 deletions test/parallel/test-event-emitter-num-args.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,3 @@ e.emit('numArgs', null, null, null, null, null);
process.on('exit', function() {
assert.deepEqual([0, 1, 2, 3, 4, 5], num_args_emited);
});


2 changes: 1 addition & 1 deletion test/parallel/test-fs-read-stream-resume.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ stream.on('data', function(chunk) {
stream.resume();
}
});

process.nextTick(function() {
stream.pause();
setTimeout(function() {
Expand Down
1 change: 0 additions & 1 deletion test/parallel/test-http-expect-continue.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ server.on('checkContinue', function(req, res) {
server.listen(common.PORT);



server.on('listening', function() {
var req = http.request({
port: common.PORT,
Expand Down
1 change: 0 additions & 1 deletion test/parallel/test-https-strict.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ var responseCount = 0;
var pending = 0;



function server(options, port) {
var s = https.createServer(options, handler);
s.requests = [];
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-module-nodemodulepaths.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ if (isWindows) {
paths = module._nodeModulePaths(file);

assert.ok(paths.indexOf(file + delimiter + 'node_modules') !== -1);
assert.ok(Array.isArray(paths));
assert.ok(Array.isArray(paths));
2 changes: 1 addition & 1 deletion test/parallel/test-require-dot.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ module._initPaths();

var c = require('.');

assert.equal(c.value, 42, 'require(".") should honor NODE_PATH');
assert.equal(c.value, 42, 'require(".") should honor NODE_PATH');
2 changes: 1 addition & 1 deletion test/parallel/test-require-extensions-main.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
var common = require('../common');
var assert = require('assert');

require(common.fixturesDir + '/require-bin/bin/req.js');
require(common.fixturesDir + '/require-bin/bin/req.js');
1 change: 0 additions & 1 deletion test/parallel/test-smalloc.js
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,6 @@ assert.equal(b[0], 0xff);
assert.equal(b[1], 0xff);



// verify checking external if has external memory

// check objects
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-stream-unshift-empty-chunk.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
var common = require('../common');
var assert = require('assert');

// This test verifies that stream.unshift(Buffer(0)) or
// This test verifies that stream.unshift(Buffer(0)) or
// stream.unshift('') does not set state.reading=false.
var Readable = require('stream').Readable;

Expand Down
1 change: 0 additions & 1 deletion test/parallel/test-stream2-readable-from-list.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ process.on('exit', function() {
process.nextTick(run);



test('buffers', function(t) {
// have a length
var len = 16;
Expand Down
1 change: 0 additions & 1 deletion test/parallel/test-stringbytes-external.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ assert.equal(c_bin.toString('binary'), ucs2_control);
assert.equal(c_ucs.toString('binary'), ucs2_control);



// now let's test BASE64 and HEX ecoding/decoding
var RADIOS = 2;
var PRE_HALF_APEX = Math.ceil(EXTERN_APEX / 2) - RADIOS;
Expand Down
1 change: 0 additions & 1 deletion test/parallel/test-url.js
Original file line number Diff line number Diff line change
Expand Up @@ -1562,7 +1562,6 @@ relativeTests2.forEach(function(relativeTest) {
});



// https://github.com/nodejs/io.js/pull/1036
var throws = [
undefined,
Expand Down
3 changes: 0 additions & 3 deletions test/parallel/test-vm-new-script-new-context.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ assert.throws(function() {
}, /test/);



console.error('undefined reference');
var error;
script = new Script('foo.bar = 5;');
Expand Down Expand Up @@ -67,5 +66,3 @@ console.error('invalid this');
assert.throws(function() {
script.runInNewContext.call('\'hello\';');
}, TypeError);


Loading