Skip to content

Change semicolon indentation #318

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Change semicolon indentation #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 2 additions & 4 deletions src/Nixfmt/Pretty.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,7 @@ instance Pretty Binder where
pretty (Assignment selectors assign expr semicolon) =
group $
hcat selectors
<> nest (hardspace <> pretty assign <> rhs)
<> pretty semicolon
<> nest (hardspace <> pretty assign <> rhs <> nest (pretty semicolon))
where
rhs =
-- In most cases, the LHS of a binding is fairly short. This means that when the RHS
Expand Down Expand Up @@ -264,8 +263,7 @@ instance Pretty ParamAttr where
group $
pretty name
<> hardspace
<> nest (pretty qmark <> absorbRHS def)
<> pretty maybeComma
<> nest (pretty qmark <> absorbRHS def <> nest (pretty maybeComma))
-- `...`
pretty (ParamEllipsis ellipsis) =
pretty ellipsis
Expand Down
12 changes: 6 additions & 6 deletions test/diff/key_value/out-pure.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ rec {

b = {
a = 1 # d
;
;
};

c = {
Expand All @@ -19,7 +19,7 @@ rec {
d = {
a = # c
1 # d
;
;
};
e = {
a # b
Expand All @@ -28,7 +28,7 @@ rec {
f = {
a # b
= 1 # d
;
;
};
h = {
a # b
Expand All @@ -39,7 +39,7 @@ rec {
a # b
= # c
1 # d
;
;
};
j = a: { b = 1; };
k = a: {
Expand All @@ -63,8 +63,8 @@ rec {
=
# c
1
# d
;
# d
;

p = aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa { } a;

Expand Down
12 changes: 6 additions & 6 deletions test/diff/key_value/out.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ rec {

b = {
a = 1 # d
;
;
};

c = {
Expand All @@ -19,7 +19,7 @@ rec {
d = {
a = # c
1 # d
;
;
};
e = {
a # b
Expand All @@ -28,7 +28,7 @@ rec {
f = {
a # b
= 1 # d
;
;
};
h = {
a # b
Expand All @@ -39,7 +39,7 @@ rec {
a # b
= # c
1 # d
;
;
};
j = a: { b = 1; };
k = a: {
Expand Down Expand Up @@ -68,8 +68,8 @@ rec {
=
# c
1
# d
;
# d
;

p = aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa { } a;

Expand Down
4 changes: 2 additions & 2 deletions test/diff/pattern/out-pure.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,11 +646,11 @@
b # a
? # a
null # c
, # d
, # d
e # a
? # a
null # f
, # g
, # g
... # h
}:
_
Expand Down
4 changes: 2 additions & 2 deletions test/diff/pattern/out.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,11 +646,11 @@
b # a
? # a
null # c
, # d
, # d
e # a
? # a
null # f
, # g
, # g
... # h
}:
_
Expand Down