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

Assign number trivia to enum cases. #1008

Merged
merged 2 commits into from
Aug 19, 2020
Merged

Assign number trivia to enum cases. #1008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da8feea
Assign number trivia to enum cases. Fixes #1006.
nojaf Aug 14, 2020
95ed648
Merge branch 'master' into fix-1006-2
nojaf Aug 19, 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
14 changes: 14 additions & 0 deletions src/Fantomas.Tests/UnionTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,3 +381,17 @@ type MyEnum =
| ``test-one`` of int
| ``test-two`` of string
"""

[<Test>]
let ``hexadecimal numbers in enums, 1006`` () =
formatSourceString false """
type Foo =
| One = 0x00000001
| Two = 0x00000002
""" config
|> prepend newline
|> should equal """
type Foo =
| One = 0x00000001
| Two = 0x00000002
"""
9 changes: 8 additions & 1 deletion src/Fantomas/TokenParser.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,13 @@ let private getRangeBetween name startToken endToken =
let endR = FSharp.Compiler.Range.mkPos endToken.LineNumber (if l=r then r+1 else r)
FSharp.Compiler.Range.mkRange name start endR

let private getRangeForSingleToken name token =
let l = token.TokenInfo.LeftColumn
let r = l + token.TokenInfo.FullMatchedLength
let start = FSharp.Compiler.Range.mkPos token.LineNumber l
let endR = FSharp.Compiler.Range.mkPos token.LineNumber r
FSharp.Compiler.Range.mkRange name start endR

let private hasOnlySpacesAndLineCommentsOnLine lineNumber tokens =
if List.isEmpty tokens then
false
Expand Down Expand Up @@ -423,7 +430,7 @@ let rec private getTriviaFromTokensThemSelves (allTokens: Token list) (tokens: T
getTriviaFromTokensThemSelves allTokens rest info

| head::rest when (isNumber head) ->
let range = getRangeBetween "number" head head
let range = getRangeForSingleToken "number" head
let info =
Trivia.Create (Number(head.Content)) range
|> List.prependItem foundTrivia
Expand Down
15 changes: 10 additions & 5 deletions src/Fantomas/Trivia.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,12 +124,17 @@ let private findNodeAfterLineAndColumn (nodes: TriviaNodeAssigner list) line col
(range.StartLine > line) || (range.StartLine = line && range.StartColumn > column)
)

let private findConstNodeOnLineAndColumn (nodes: TriviaNodeAssigner list) line column =
let private findConstNodeOnLineAndColumn (nodes: TriviaNodeAssigner list) (numberRange:range) =
nodes
|> List.tryFind (fun tn ->
match tn.Type, line = tn.Range.StartLine, column = tn.Range.StartColumn with
| MainNode("SynExpr.Const"), true, true -> true
| MainNode("SynPat.Const"), true, true -> true
match tn.Type with
| MainNode("SynExpr.Const")
| MainNode("SynPat.Const") ->
numberRange.StartLine = tn.Range.StartLine
&& numberRange.StartColumn = tn.Range.StartColumn
| MainNode("EnumCase") ->
tn.Range.EndLine = numberRange.EndLine
&& tn.Range.EndColumn = numberRange.EndColumn
| _ -> false
)

Expand Down Expand Up @@ -344,7 +349,7 @@ let private addTriviaToTriviaNode
|> updateTriviaNode (fun tn -> tn.ContentItself <- Some siNode) triviaNodes

| { Item = Number(_) as number; Range = range } ->
findConstNodeOnLineAndColumn triviaNodes range.StartLine range.StartColumn
findConstNodeOnLineAndColumn triviaNodes range
|> updateTriviaNode (fun tn -> tn.ContentItself <- Some number) triviaNodes

| { Item = CharContent(_) as chNode; Range = range } ->
Expand Down