fix extra whitespce

datadotworld · May 24, 2019 · 8858f92 · 8858f92
1 parent 3e48f1c
commit 8858f92
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 21 deletions.
diff --git a/dist/cli.js b/dist/cli.js
diff --git a/dist/cli.js.map b/dist/cli.js.map
diff --git a/dist/converter.js b/dist/converter.js
diff --git a/dist/converter.js.map b/dist/converter.js.map
diff --git a/dist/stripComments.d.ts b/dist/stripComments.d.ts
@@ -1 +1 @@
-export declare function stripComments(code: string, comments: string[]): string;
+export declare function stripComments(code: string, comments: string[]): [string, number];
diff --git a/dist/stripComments.js b/dist/stripComments.js
diff --git a/dist/stripComments.js.map b/dist/stripComments.js.map
diff --git a/dist/stripCommentsRunner.d.ts b/dist/stripCommentsRunner.d.ts
@@ -1,2 +1,2 @@
 import { FilePaths } from "./cli";
-export default function run(paths: FilePaths, shouldComit: boolean): Promise<void>;
+export default function run(paths: FilePaths, comments: string[] | undefined, shouldComit: boolean): Promise<void>;
diff --git a/dist/stripCommentsRunner.js b/dist/stripCommentsRunner.js
diff --git a/dist/stripCommentsRunner.js.map b/dist/stripCommentsRunner.js.map
diff --git a/src/stripComments.ts b/src/stripComments.ts
@@ -11,8 +11,11 @@ export function stripComments(
         const matchedComment = comments.find(c => line.includes(c))!;
         const matchedIndex = line.indexOf(matchedComment);
         if (matchedIndex > 0) {
-          acc.push(line.slice(0, matchedIndex));
-          count = count + 1;
+          const firstPartOfLine = line.slice(0, matchedIndex);
+          if (firstPartOfLine.match(/\S/)) {
+            acc.push(firstPartOfLine);
+            count = count + 1;
+          }
         }
       } else {
         acc.push(line);

diff --git a/test/stripComments.test.ts b/test/stripComments.test.ts
@@ -13,6 +13,7 @@ const bar = undefined;
 
 return {
     audioId: getAudioIdFromTerm(term, termSide),
+    // $FlowFixMeImmutable
     url:
       termSide === TermSide.WORD
         ? // $FlowFixMeImmutable
@@ -24,26 +25,30 @@ return {
 
 describe("stripComments", () => {
   it("should strip // @flow", () => {
-    expect(stripComments(testCode, ["// @flow"])).not.toContain("// @flow");
+    expect(stripComments(testCode, ["// @flow"])[0]).not.toContain("// @flow");
   });
   it("should strip // $FlowFixMe", () => {
-    expect(stripComments(testCode, ["// $FlowFixMe"])).not.toContain(
+    expect(stripComments(testCode, ["// $FlowFixMe"])[0]).not.toContain(
       "// $FlowFixMe"
     );
   });
   it("should retain any code before the comment", () => {
-    expect(stripComments(testCode, ["// $FlowFixMeImmutable"])).toContain("?");
+    expect(stripComments(testCode, ["// $FlowFixMeImmutable"])[0]).toContain(
+      "?"
+    );
   });
   it("should preserve 'undefined'", () => {
-    expect(stripComments(testCode, ["// $FlowFixMeImmutable"])).toContain("?");
+    expect(stripComments(testCode, ["// $FlowFixMeImmutable"])[0]).toContain(
+      "?"
+    );
   });
   it("should strip all at once", () => {
     expect(
       stripComments(testCode, [
         "// @flow",
         "// $FlowFixMeImmutable",
         "// $FlowFixMe"
-      ])
+      ])[0]
     ).toMatchSnapshot();
   });
 });
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export declare function stripComments(code: string, comments: string[]): string;
		export declare function stripComments(code: string, comments: string[]): [string, number];