Skip to content
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

Jump to bottom

Preserve return attribute #839

Merged
merged 10 commits into from
May 22, 2020
Merged

Preserve return attribute #839

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6f1a109
Preserve return type attributes
kontomondo May 16, 2020
b665bbd
PR feedback
kontomondo May 17, 2020
c662b77
Merge remote-tracking branch 'upstream/master' into fix-800
kontomondo May 17, 2020
c4ce1ab
Merge branch 'master' into fix-800
kontomondo May 17, 2020
8334b94
another test
kontomondo May 17, 2020
99ee3f5
Merge remote-tracking branch 'origin/fix-800' into fix-800
kontomondo May 17, 2020
86f6b31
unnecessary sepNone
kontomondo May 17, 2020
9314686
rename
kontomondo May 19, 2020
682f190
remove ctx
kontomondo May 22, 2020
7701f90
Merge branch 'master' into fix-800
kontomondo May 22, 2020
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
2 changes: 1 addition & 1 deletion src/Fantomas/CodePrinter.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ and genExprSepEqPrependType astContext (pat:SynPat) (e: SynExpr) (valInfo:SynVal
let genMetadataAttributes ctx =
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could leave the ctx parameter all together and return partially applied from both clauses.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kontomondo could you change this to:

let genMetadataAttributes =
            match valInfo with
            | Some(SynValInfo(_, SynArgInfo(attributes, _, _))) -> genOnelinerAttributes astContext attributes
            | None -> sepNone

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

absolutely, done

match valInfo with
| Some(SynValInfo(_, SynArgInfo(attributes, _, _))) -> genOnelinerAttributes astContext attributes ctx
| None -> sepNone ctx
| None -> ctx

(addExtraSpaceBeforeGenericType
+> genCommentBeforeColon
Expand Down