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

Fix for #284 #285

Merged
merged 3 commits into from
Jul 21, 2018
Merged

Fix for #284 #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
56fa498
Merge pull request #1 from fsprojects/master
7sharp9 Jul 20, 2018
c8bad18
Add failing test for access modifies in signatures
Jul 20, 2018
b8f7934
Fix for #284
Jul 20, 2018
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
15 changes: 15 additions & 0 deletions src/Fantomas.Tests/SignatureTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,3 +136,18 @@ module Tainted

val GetHashCodeTainted : Tainted<'T> -> int when 'T : equality
"""

[<Test>]
let ``should keep access modifiers in signatures seperated``() =
formatSourceString true """
module Test
type Test =
static member internal FormatAroundCursorAsync : fileName:string -> unit
""" config
|> prepend newline
|> should equal """
module Test

type Test =
static member internal FormatAroundCursorAsync : fileName:string -> unit
"""
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 @@ -838,7 +838,7 @@ and genMemberSig astContext = function
| MSMember(Val(ats, px, ao, s, t, vi, _), mf) ->
let (FunType namedArgs) = (t, vi)
genPreXmlDoc px +> genAttributes astContext ats
+> atCurrentColumn (indent +> genMemberFlags { astContext with IsInterface = false } mf +> opt sepNone ao genAccess
+> atCurrentColumn (indent +> genMemberFlags { astContext with IsInterface = false } mf +> opt sepSpace ao genAccess
+> ifElse (s = "``new``") (!- "new") (!- s)
+> sepColon +> genTypeList astContext namedArgs +> unindent)

Expand Down