Merge branch 'main' into next

# Conflicts:
#	package.json
#	scripts/vendors/bundle-vendors.mjs
#	scripts/vendors/vendor-meta.json
#	scripts/vendors/vendors.mjs
#	src/language-handlebars/utils.js
#	src/language-html/utils/html-elements-attributes.js
#	vendors/tempy.js
This commit is contained in:
fisker Cheung committed 2022-04-01 10:37:35 +08:00
commit 65ce63b4dc
25 files changed
+608 -455

No files matched your search

+9 -8
View File
@@ -933,15 +933,16 @@ function genericPrint(path, options, print) {
if (
!isLast &&
child.type === "value-comma_group" &&
child.groups &&
child.groups[0].type !== "value-paren_group" &&
isNextLineEmpty(
options.originalText,
getLast(child.groups),
locEnd
)
isNonEmptyArray(child.groups)
) {
printed.push(hardline);
const last = getLast(child.groups);
if (
// `value-paren_group` missing location info
last.source &&
isNextLineEmpty(options.originalText, last, locEnd)
) {
printed.push(hardline);
}
}
return printed;