Skip to content

Fix formatting of empty type parameters #14073

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fisker merged 9 commits into from
Dec 29, 2022
Merged

Fix formatting of empty type parameters #14073

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
660a46f
Add test
fisker Dec 28, 2022
e88aef3
Fix
fisker Dec 28, 2022
51019a8
More tests
fisker Dec 28, 2022
4b5db9f
Add changelog
fisker Dec 28, 2022
b1d96cd
Simplify example
fisker Dec 28, 2022
07d8883
Try another solution
fisker Dec 28, 2022
1ebe00e
Apply change
fisker Dec 28, 2022
1801524
Revert "Apply change"
fisker Dec 28, 2022
cf3a165
Revert "Try another solution"
fisker Dec 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Try another solution
  • Loading branch information
@fisker
fisker committed Dec 28, 2022
commit 07d8883b87837eeceb55c10ae8b550a1bfec680d
14 changes: 7 additions & 7 deletions src/language-js/print/type-parameters.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,17 @@ function printTypeParameters(path, options, print, paramsKey) {
!(node[paramsKey].length === 1 && isObjectType(node[paramsKey][0])),
undefined,
(node, name) => name === "typeAnnotation",
(node) => node.type === "Identifier",
(node, name) => node.type === "Identifier" && name === "id",
isArrowFunctionVariableDeclarator
);

const shouldInline =
node[paramsKey].length === 0 ||
(!isArrowFunctionVariable &&
(isParameterInTestCall ||
(node[paramsKey].length === 1 &&
(node[paramsKey][0].type === "NullableTypeAnnotation" ||
shouldHugType(node[paramsKey][0])))));
!isArrowFunctionVariable &&
(isParameterInTestCall ||
node[paramsKey].length === 0 ||
(node[paramsKey].length === 1 &&
(node[paramsKey][0].type === "NullableTypeAnnotation" ||
shouldHugType(node[paramsKey][0]))));

if (shouldInline) {
return [
Expand Down