diff --git a/changelog_unreleased/javascript/13054.md b/changelog_unreleased/javascript/13054.md new file mode 100644 index 000000000..6fddc71be --- /dev/null +++ b/changelog_unreleased/javascript/13054.md @@ -0,0 +1,28 @@ +#### Fix docblock parsing (#13054 by @fisker) + + +```jsx +// With `--insert-pragma` flag + +// Input +/* comment */ +foo() + +// Prettier stable +/** + * /* comment + * + * @format + */ + +foo(); + +// Prettier main +/** + * comment + * + * @format + */ + +foo(); +``` diff --git a/package.json b/package.json index 1903ef8a3..d0b8c8ccb 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "html-tag-names": "2.0.1", "html-void-elements": "2.0.1", "ignore": "5.2.0", - "jest-docblock": "27.5.1", + "jest-docblock": "28.1.1", "json5": "2.2.1", "leven": "4.0.0", "lines-and-columns": "2.0.3", diff --git a/tests/format/misc/insert-pragma/js/__snapshots__/jsfmt.spec.js.snap b/tests/format/misc/insert-pragma/js/__snapshots__/jsfmt.spec.js.snap index 8ec5cc9b2..93eafd4a8 100644 --- a/tests/format/misc/insert-pragma/js/__snapshots__/jsfmt.spec.js.snap +++ b/tests/format/misc/insert-pragma/js/__snapshots__/jsfmt.spec.js.snap @@ -262,3 +262,25 @@ printWidth: 80 ================================================================================ `; + +exports[`with-comment.js - {"insertPragma":true} format 1`] = ` +====================================options===================================== +insertPragma: true +parsers: ["flow", "babel", "typescript"] +printWidth: 80 + | printWidth +=====================================input====================================== +/* comment */ +foo() + +=====================================output===================================== +/** + * comment + * + * @format + */ + +foo(); + +================================================================================ +`; diff --git a/tests/format/misc/insert-pragma/js/with-comment.js b/tests/format/misc/insert-pragma/js/with-comment.js new file mode 100644 index 000000000..23f24e53c --- /dev/null +++ b/tests/format/misc/insert-pragma/js/with-comment.js @@ -0,0 +1,2 @@ +/* comment */ +foo() diff --git a/yarn.lock b/yarn.lock index 56830743f..e3c427e3d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4175,7 +4175,14 @@ jest-diff@^27.5.1: jest-get-type "^27.5.1" pretty-format "^27.5.1" -jest-docblock@27.5.1, jest-docblock@^27.5.1: +jest-docblock@28.1.1: + version "28.1.1" + resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-28.1.1.tgz#6f515c3bf841516d82ecd57a62eed9204c2f42a8" + integrity sha512-3wayBVNiOYx0cwAbl9rwm5kKFP8yHH3d/fkEaL02NPTkDojPtheGB7HZSFY4wzX+DxyrvhXz0KSCVksmCknCuA== + dependencies: + detect-newline "^3.0.0" + +jest-docblock@^27.5.1: version "27.5.1" resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-27.5.1.tgz#14092f364a42c6108d42c33c8cf30e058e25f6c0" integrity sha512-rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ==