fix(runner): comments between fixture destructures (#8127)

Author: AriPerkkio

packages/browser/src/node/plugin.ts

@@ -241,6 +241,7 @@ export default (parentServer: ParentBrowserProject, base = '/'): Plugin[] => {
           'vitest > @vitest/snapshot > magic-string',
           'vitest > chai',
           'vitest > chai > loupe',
+          'vitest > strip-literal',
           'vitest > @vitest/utils > loupe',
           '@vitest/browser > @testing-library/user-event',
           '@vitest/browser > @testing-library/dom',

packages/runner/package.json

@@ -43,6 +43,7 @@
   },
   "dependencies": {
     "@vitest/utils": "workspace:*",
-    "pathe": "catalog:"
+    "pathe": "catalog:",
+    "strip-literal": "catalog:"
   }
 }

packages/runner/src/fixture.ts

@@ -1,6 +1,7 @@
 import type { VitestRunner } from './types'
 import type { FixtureOptions, TestContext } from './types/tasks'
 import { createDefer, isObject } from '@vitest/utils'
+import { stripLiteral } from 'strip-literal'
 import { getFileContext } from './context'
 import { getTestFixture } from './map'
 
@@ -338,9 +339,9 @@ function resolveDeps(
 }
 
 function getUsedProps(fn: Function) {
-  let fnString = fn.toString()
+  let fnString = stripLiteral(fn.toString())
   // match lowered async function and strip it off
-  // example code on esbuild-try https://esbuild.github.io/try/#YgAwLjI0LjAALS1zdXBwb3J0ZWQ6YXN5bmMtYXdhaXQ9ZmFsc2UAZQBlbnRyeS50cwBjb25zdCBvID0gewogIGYxOiBhc3luYyAoKSA9PiB7fSwKICBmMjogYXN5bmMgKGEpID0+IHt9LAogIGYzOiBhc3luYyAoYSwgYikgPT4ge30sCiAgZjQ6IGFzeW5jIGZ1bmN0aW9uKGEpIHt9LAogIGY1OiBhc3luYyBmdW5jdGlvbiBmZihhKSB7fSwKICBhc3luYyBmNihhKSB7fSwKCiAgZzE6IGFzeW5jICgpID0+IHt9LAogIGcyOiBhc3luYyAoeyBhIH0pID0+IHt9LAogIGczOiBhc3luYyAoeyBhIH0sIGIpID0+IHt9LAogIGc0OiBhc3luYyBmdW5jdGlvbiAoeyBhIH0pIHt9LAogIGc1OiBhc3luYyBmdW5jdGlvbiBnZyh7IGEgfSkge30sCiAgYXN5bmMgZzYoeyBhIH0pIHt9Cn0
+  // example code on esbuild-try https://esbuild.github.io/try/#YgAwLjI0LjAALS1zdXBwb3J0ZWQ6YXN5bmMtYXdhaXQ9ZmFsc2UAZQBlbnRyeS50cwBjb25zdCBvID0gewogIGYxOiBhc3luYyAoKSA9PiB7fSwKICBmMjogYXN5bmMgKGEpID0+IHt9LAogIGYzOiBhc3luYyAoYSwgYikgPT4ge30sCiAgZjQ6IGFzeW5jIGZ1bmN0aW9uKGEpIHt9LAogIGY1OiBhc3luYyBmdW5jdGlvbiBmZihhKSB7fSwKICBhc3luYyBmNihhKSB7fSwKCiAgZzE6IGFzeW5jICgpID0+IHt9LAogIGcyOiBhc3luYyAoeyBhIH0pID0+IHt9LAogIGczOiBhc3luYyAoeyBhIH0sIGIpID0+IHt9LAogIGc0OiBhc3luYyBmdW5jdGlvbiAoeyBhIH0pIHt9LAogIGc1OiBhc3luYyBmdW5jdGlvbiBnZyh7IGEgfSkge30sCiAgYXN5bmMgZzYoeyBhIH0pIHt9LAoKICBoMTogYXN5bmMgKCkgPT4ge30sCiAgLy8gY29tbWVudCBiZXR3ZWVuCiAgaDI6IGFzeW5jIChhKSA9PiB7fSwKfQ
   //   __async(this, null, function*
   //   __async(this, arguments, function*
   //   __async(this, [_0, _1], function*

packages/vitest/package.json

@@ -201,7 +201,7 @@
     "mime": "^4.0.7",
     "pretty-format": "^29.7.0",
     "prompts": "^2.4.2",
-    "strip-literal": "^3.0.0",
+    "strip-literal": "catalog:",
     "ws": "catalog:"
   }
 }

pnpm-lock.yaml

@@ -37,6 +37,7 @@ catalog:
   pathe: ^2.0.3
   sirv: ^3.0.1
   std-env: ^3.9.0
+  strip-literal: ^3.0.0
   test-exclude: ^7.0.1
   tinyglobby: ^0.2.14
   tinyrainbow: ^2.0.0

pnpm-workspace.yaml

@@ -0,0 +1,53 @@
+/* eslint-disable style/spaced-comment */
+import { test as base, expect } from 'vitest'
+
+const test = base.extend<{
+  one: 1
+  two: 2
+}>({
+  one: 1,
+  two: 2,
+})
+
+test('no comments', ({ one, two }) => {
+  expect(one).toBe(1)
+  expect(two).toBe(2)
+})
+
+test('inline comment', ({
+  one,
+  // comment
+  two,
+}) => {
+  expect(one).toBe(1)
+  expect(two).toBe(2)
+})
+
+test('multiline comment', ({
+  one,
+  /**
+   * comment
+   */
+  two,
+}) => {
+  expect(one).toBe(1)
+  expect(two).toBe(2)
+})
+
+test('inline legal comment', ({
+  one,
+  //! comment
+  two,
+}) => {
+  expect(one).toBe(1)
+  expect(two).toBe(2)
+})
+
+test('multiline legal comment', ({
+  one,
+  /*! comment */
+  two,
+}) => {
+  expect(one).toBe(1)
+  expect(two).toBe(2)
+})