fix: tweak generatorHack reprinting

Author: jedwards1211

src/babel/reprint.ts

@@ -3,7 +3,6 @@ import { Comment, Node } from '../types'
 import { original, rangeWithWhitespace, source } from '../util/symbols'
 
 const excludedNodeTypes = new Set([
-  'File',
   // @babel/generator prints ` ${ and } around TemplateElement
   // even though their range doesn't include those characters
   'TemplateElement',
@@ -43,8 +42,7 @@ export default function reprint(
           const src = (node as any)[source]
 
           if (orig && src) {
-            const { start: _start, end } =
-              (node as any)[rangeWithWhitespace] || orig
+            const { start: _start, end } = orig
             let start = _start
             if (
               start < lastPrintedRange.end &&

src/util/cloneAstWithOriginals.ts

@@ -13,7 +13,10 @@ export function cloneAstWithOriginals<T extends Node>(ast: T, src: string): T {
     const result: any = { [original]: node, [source]: src }
     const { start, end } = node as any
     if (typeof start === 'number' && typeof end === 'number') {
-      result[rangeWithWhitespace] = { start: starts[start], end: ends[end] }
+      result[rangeWithWhitespace] = {
+        start: starts[start],
+        end: ends[end] ?? end,
+      }
     }
 
     for (const field in node) {

test/Astx.test.ts

@@ -197,7 +197,7 @@ describe(`Astx`, function () {
         const astx = createAstx(`foo + bar; baz + qux, qlomb`).find`$a + $b`()
         expect(astx.match).to.equal(astx.matches[0])
       })
-      it.only(`.matched`, function () {
+      it(`.matched`, function () {
         expect(
           createAstx(`foo + bar; baz + qux, qlomb`).find`$a + $b`().matched?.$a
         ).to.exist

test/astx/insertComment.ts

@@ -0,0 +1,23 @@
+import dedent from 'dedent-js'
+import { TransformOptions } from '../../src'
+import { astxTestcase } from '../astxTestcase'
+
+astxTestcase({
+  file: __filename,
+  parsers: ['babel', 'babel/tsx'],
+  input: dedent`
+    const foo = 1
+  `,
+  astx: ({ astx }: TransformOptions): void => {
+    ;(astx.node as any).program.body[0].leadingComments = [
+      {
+        type: 'CommentLine',
+        value: ' @flow',
+      },
+    ]
+  },
+  expected: dedent`
+    // @flow
+    const foo = 1;
+  `,
+})

test/astx/noChanges.ts

@@ -0,0 +1,18 @@
+import { astxTestcase } from '../astxTestcase'
+
+astxTestcase({
+  file: __filename,
+  input: `
+    
+    // foo
+     const   bar = 1
+  `,
+  astx: (): void => {
+    // no-op
+  },
+  expected: `
+    
+    // foo
+     const   bar = 1
+  `,
+})

test/astxTestcase.ts

@@ -93,6 +93,7 @@ export function astxTestcase(testcase: Fixture): void {
           : jsParser.bindParserOpts(parserOpts)
       const babelBackend = new BabelBackend({
         parserOptions: babelParser.parserOpts,
+        preserveFormat: 'generatorHack',
       })
       const backend: Backend =
         backendName === 'recast'

test/findReplace/bugs_9_duplicateCode.ts

@@ -1,6 +1,4 @@
 export const input = `
-/* eslint-disable no-console */
-
 const testLib = require('test-lib')
 
 const funcOne = (foo) => {
@@ -50,12 +48,10 @@ module.exports = func({
 `
 
 export const expectedReplace = `
-/* eslint-disable no-console */
 const {
   func
 } = require("some-module");
 
-/* eslint-disable no-console */
 const testLib = require("test-lib");
 
 const funcOne = foo => {

test/findReplace/bugs_commentDuplication.ts

@@ -0,0 +1,92 @@
+export const input = `
+/* eslint-disable no-console */
+const testLib = require('test-lib')
+
+const funcOne = (foo) => {
+  console.log('foo', foo)
+  return testLib(foo)
+}
+
+const funcTwo = (bar) => {
+  console.log('bar', bar)
+  return testLib(bar)
+}
+
+module.exports = (on, config) => {
+  on('event', () => {
+    funcOne(config.foo)
+    funcTwo(config.bar)
+  })
+}
+
+const json = {
+  "foo": 123,
+  "bar": true
+}
+`
+
+export const find = `
+$$header
+module.exports = (on, config) => {
+  $$functionBody
+}
+const json = { $$json }
+`
+
+export const replace = `
+const { func } = require('some-module')
+
+$$header
+
+module.exports = func({
+  $$json,
+  events: {
+    setupEvents(on, config) {
+      $$functionBody
+    }
+  }
+})
+`
+
+export const expectedReplace = `
+const {
+  func
+} = require("some-module");
+
+/* eslint-disable no-console */
+const testLib = require("test-lib");
+
+const funcOne = foo => {
+  console.log("foo", foo);
+  return testLib(foo);
+};
+
+const funcTwo = bar => {
+  console.log("bar", bar);
+  return testLib(bar);
+};
+
+module.exports = func({
+  "foo": 123,
+  "bar": true,
+
+  events: {
+    setupEvents(on, config) {
+      on("event", () => {
+        funcOne(config.foo);
+        funcTwo(config.bar);
+      });
+    }
+  }
+});
+`
+import { findReplaceTestcase } from '../findReplaceTestcase'
+
+findReplaceTestcase({
+  file: __filename,
+  input,
+  find,
+  replace,
+  expectedReplace,
+  skip: true,
+})