From 84ce72fdeba082b7b132e4ac6b714fb1a93831b7 Mon Sep 17 00:00:00 2001
From: st-sloth <st-sloth@users.noreply.github.com>
Date: Fri, 8 Feb 2019 19:54:21 +0500
Subject: [PATCH] Fix: Remove extraneous linefeeds in `one-var` fixer (fixes
 #10741) (#10955)

---
 lib/rules/one-var.js       | 8 ++++++--
 tests/lib/rules/one-var.js | 8 ++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/lib/rules/one-var.js b/lib/rules/one-var.js
index 0e9dff41658..4c54d8bfe68 100644
--- a/lib/rules/one-var.js
+++ b/lib/rules/one-var.js
@@ -340,7 +340,11 @@ module.exports = {
                  *      y`
                  *      ^ afterComma
                  */
-                if (afterComma.loc.start.line > tokenAfterDeclarator.loc.end.line || afterComma.type === "Line" || afterComma.type === "Block") {
+                if (
+                    afterComma.loc.start.line > tokenAfterDeclarator.loc.end.line ||
+                    afterComma.type === "Line" ||
+                    afterComma.type === "Block"
+                ) {
                     let lastComment = afterComma;
 
                     while (lastComment.type === "Line" || lastComment.type === "Block") {
@@ -349,7 +353,7 @@ module.exports = {
 
                     return fixer.replaceTextRange(
                         [tokenAfterDeclarator.range[0], lastComment.range[0]],
-                        `;\n${sourceCode.text.slice(tokenAfterDeclarator.range[1], lastComment.range[0])}\n${declaration.kind} `
+                        `;${sourceCode.text.slice(tokenAfterDeclarator.range[1], lastComment.range[0])}${declaration.kind} `
                     );
                 }
 
diff --git a/tests/lib/rules/one-var.js b/tests/lib/rules/one-var.js
index e5470d2e9ca..3ab9d7473c8 100644
--- a/tests/lib/rules/one-var.js
+++ b/tests/lib/rules/one-var.js
@@ -884,7 +884,7 @@ ruleTester.run("one-var", rule, {
         },
         {
             code: "const foo = 1,\n    bar = 2;",
-            output: "const foo = 1;\n\n    \nconst bar = 2;",
+            output: "const foo = 1;\n    const bar = 2;",
             options: [{ initialized: "never" }],
             parserOptions: { ecmaVersion: 6 },
             errors: [{
@@ -896,7 +896,7 @@ ruleTester.run("one-var", rule, {
         },
         {
             code: "var foo = 1,\n    bar = 2;",
-            output: "var foo = 1;\n\n    \nvar bar = 2;",
+            output: "var foo = 1;\n    var bar = 2;",
             options: [{ initialized: "never" }],
             errors: [{
                 message: "Split initialized 'var' declarations into multiple statements.",
@@ -907,7 +907,7 @@ ruleTester.run("one-var", rule, {
         },
         {
             code: "var foo = 1, // comment\n    bar = 2;",
-            output: "var foo = 1;\n // comment\n    \nvar bar = 2;",
+            output: "var foo = 1; // comment\n    var bar = 2;",
             options: [{ initialized: "never" }],
             errors: [{
                 message: "Split initialized 'var' declarations into multiple statements.",
@@ -929,7 +929,7 @@ ruleTester.run("one-var", rule, {
         },
         {
             code: "var f,          /* test */ l;",
-            output: "var f;\n          /* test */ \nvar l;",
+            output: "var f;          /* test */ var l;",
             options: ["never"],
             errors: [{
                 message: "Split 'var' declarations into multiple statements.",