Skip to content

Commit 34c6eb9

Browse files
committed
Update gulp-eslint and minor style fixes to adapt to new eslint version
1 parent 1d8ecb7 commit 34c6eb9

File tree

14 files changed

+16
-10
lines changed

14 files changed

+16
-10
lines changed

.eslintrc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
"no-caller": 2,
4949
"no-div-regex": 2,
5050
"no-else-return": 0,
51-
"no-empty-label": 2,
5251
"no-eq-null": 2,
5352
"no-eval": 2,
5453
"no-extra-bind": 2,
@@ -156,12 +155,11 @@
156155
"semi": [2, "always"],
157156
"semi-spacing": 2,
158157
"sort-vars": 0,
159-
"space-after-keywords": [2, "always"],
158+
"keyword-spacing": 2,
160159
"space-before-blocks": [2, "always"],
161160
"space-in-brackets": 0, // TODO: enable?
162161
"space-in-parens": 0, // TODO: enable?
163162
"space-infix-ops": 2,
164-
"space-return-throw-case": 2,
165163
"space-unary-ops": 2,
166164
"spaced-comment": [2, "always"],
167165
"wrap-regex": 0,

gulpfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ gulp.task('coverage', function(cb) {
4848
});
4949

5050
gulp.task('lint', function() {
51-
var pipeline = gulp.src(options.lintPaths)
51+
return gulp.src(options.lintPaths)
5252
.pipe(eslint())
5353
.pipe(eslint.formatEach())
5454
.pipe(eslint.failOnError());

lib/jsdoc/opts/args.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,4 +86,5 @@ exports.get = function(name) {
8686
else if ( hasOwnProp.call(ourOptions, name) ) {
8787
return ourOptions[name];
8888
}
89+
return undefined;
8990
};

lib/jsdoc/src/astnode.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,7 @@ var getInfo = exports.getInfo = function(node) {
363363
info.paramnames = getParamNames(definition.value);
364364
return true;
365365
}
366+
return false;
366367
});
367368

368369
break;

lib/jsdoc/src/handlers.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,8 @@ function newSymbolDoclet(parser, docletSrc, e) {
299299

300300
addDoclet(parser, newDoclet);
301301
e.doclet = newDoclet;
302+
303+
return true;
302304
}
303305

304306
/**

lib/jsdoc/src/parser.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,7 @@ Parser.prototype.getBasename = function(name) {
319319
if (name !== undefined) {
320320
return name.replace(/^([$a-z_][$a-z_0-9]*).*?$/i, '$1');
321321
}
322+
return undefined;
322323
};
323324

324325
// TODO: docs

lib/jsdoc/src/visitor.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ function findRestParam(params) {
132132
restParam = param;
133133
return true;
134134
}
135+
return false;
135136
});
136137

137138
return restParam;

lib/jsdoc/tag/dictionary/definitions.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ function parseBorrows(doclet, tag) {
175175
else if (m[1]) {
176176
return { target: m[1] };
177177
}
178+
return {};
178179
} else {
179180
return {};
180181
}

lib/jsdoc/util/markdown.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ function getParseFunction(parserName, conf) {
153153
else {
154154
logger.error('Unrecognized Markdown parser "%s". Markdown support is disabled.',
155155
parserName);
156+
return undefined;
156157
}
157158
}
158159

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
"js2xmlparser": "~1.0.0",
2222
"marked": "~0.3.5",
2323
"requizzle": "~0.2.1",
24-
"strip-json-comments": "~1.0.4",
24+
"strip-json-comments": "~2.0.1",
2525
"taffydb": "https://github.com/hegemonic/taffydb/tarball/7d100bcee0e997ee4977e273cdce60bd8933050e",
2626
"underscore": "~1.8.3",
2727
"wrench": "~1.5.9"
2828
},
2929
"devDependencies": {
3030
"gulp": "~3.9.1",
31-
"gulp-eslint": "~1.1.1",
31+
"gulp-eslint": "~2.0.0",
3232
"gulp-json-editor": "~2.2.1",
3333
"istanbul": "~0.4.2",
3434
"tv4": "https://github.com/hegemonic/tv4/tarball/own-properties"

0 commit comments

Comments
 (0)