eslint 2.13.0 → 2.13.1

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+v2.13.1 - June 20, 2016
+
+* 434de7f Fix: wrong baseDir (fixes #6450) (#6457) (Toru Nagashima)
+* 3c9ce09 Fix: Keep indentation when fixing `padded-blocks` "never" (fixes #6454) (#6456) (Ed Lee)
+* a9d4cb2 Docs: Fix typo in max-params examples (#6471) (J. William Ashton)
+* 1e185b9 Fix: no-multiple-empty-lines errors when no line breaks (fixes #6449) (#6451) (strawbrary)
+
 v2.13.0 - June 17, 2016
 
 * cf223dd Fix: add test for a syntax error (fixes #6013) (#6378) (Toru Nagashima)

package/lib/config/config-file.js

@@ -495,7 +495,6 @@ function resolve(filePath, relativeTo) {
 function load(filePath, applyEnvironments, relativeTo) {
     var resolvedPath = resolve(filePath, relativeTo),
         dirname = path.dirname(resolvedPath.filePath),
-        basedir = getBaseDir(dirname),
         lookupPath = getLookupPath(dirname),
         config = loadConfigFile(resolvedPath);
 
@@ -514,7 +513,7 @@ function load(filePath, applyEnvironments, relativeTo) {
         // include full path of parser if present
         if (config.parser) {
             if (isFilePath(config.parser)) {
-                config.parser = path.resolve(basedir || "", config.parser);
+                config.parser = path.resolve(dirname || "", config.parser);
             } else {
                 config.parser = resolver.resolve(config.parser, lookupPath);
             }
@@ -528,7 +527,7 @@ function load(filePath, applyEnvironments, relativeTo) {
          * a "parent". Load the referenced file and merge the configuration recursively.
          */
         if (config.extends) {
-            config = applyExtends(config, filePath, basedir);
+            config = applyExtends(config, filePath, dirname);
         }
 
         if (config.env && applyEnvironments) {

package/lib/rules/no-multiple-empty-lines.js

@@ -78,7 +78,7 @@ module.exports = {
 
             "Program:exit": function checkBlankLines(node) {
                 var lines = sourceCode.lines,
-                    fullLines = sourceCode.text.match(/.*(\r\n|\r|\n|\u2028|\u2029)/g),
+                    fullLines = sourceCode.text.match(/.*(\r\n|\r|\n|\u2028|\u2029)/g) || [],
                     firstNonBlankLine = -1,
                     trimmedLines = [],
                     linesRangeStart = [],

package/lib/rules/padded-blocks.js

@@ -190,7 +190,7 @@ module.exports = {
                         node: node,
                         loc: { line: openBrace.loc.start.line, column: openBrace.loc.start.column },
                         fix: function(fixer) {
-                            return fixer.replaceTextRange([openBrace.end, nextToken.start], "\n");
+                            return fixer.replaceTextRange([openBrace.end, nextToken.start - nextToken.loc.start.column], "\n");
                         },
                         message: NEVER_MESSAGE
                     });
@@ -204,7 +204,7 @@ module.exports = {
                         loc: {line: closeBrace.loc.end.line, column: closeBrace.loc.end.column - 1 },
                         message: NEVER_MESSAGE,
                         fix: function(fixer) {
-                            return fixer.replaceTextRange([previousToken.end, closeBrace.start], "\n");
+                            return fixer.replaceTextRange([previousToken.end, closeBrace.start - closeBrace.loc.start.column], "\n");
                         }
                     });
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint",
-  "version": "2.13.0",
+  "version": "2.13.1",
   "author": "Nicholas C. Zakas <nicholas+npm@nczconsulting.com>",
   "description": "An AST-based pattern checker for JavaScript.",
   "bin": {