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

Fix compiler directive on first line & compound directives #286

Merged
merged 18 commits into from
Sep 10, 2018
Merged

Fix compiler directive on first line & compound directives #286

merged 18 commits into from
Sep 10, 2018

Conversation

vasily-kirichenko
Copy link
Contributor

@vasily-kirichenko vasily-kirichenko commented Jul 21, 2018 •
edited
Loading

The bug was in that

#if FOO
let x = 1
#endif

was formatted as

#if FOOlet x = 1
#endif

This also fixes #280

vasily-kirichenko
vasily-kirichenko commented Jul 21, 2018
View reviewed changes
src/Fantomas.Tests/FormattingPropertyTests.fs Outdated
@@ -450,7 +450,8 @@ let rec shrinkSynExpr = function
| SynExpr.MatchLambda(_, _, clauses, _, _) ->
seq { yield! Seq.collect collectSynMatchClause clauses }
| SynExpr.TryWith(expr, _, clauses, _, _, _, _)
| SynExpr.Match(_, expr, clauses, _, _) ->
| SynExpr.Match(_, expr, clauses, _, _)
| SynExpr.MatchBang(_, expr, clauses, _, _) ->
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I also fix incomplete pattern match by adding a branch for match!.

Copy link
Contributor

@nojaf nojaf Jul 31, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

Perhaps add this in another PR? Adding the pattern match does not mean that match! is supported right?

@vasily-kirichenko vasily-kirichenko changed the title Fix compiler directive on first line Fix compiler directive on first line & compound directives Jul 21, 2018
@vasily-kirichenko vasily-kirichenko mentioned this pull request Jul 21, 2018
Closed
vasily-kirichenko and others added 15 commits July 21, 2018 22:00
@vasily-kirichenko
Merge branch 'master' of https://github.com/fsprojects/fantomas into …
27d5f94 
…fix-if-dicective-on-first-line
@vasily-kirichenko
Merge branch 'master' into fix-if-dicective-on-first-line
62a3192
@vasily-kirichenko
fix missing end line after #if on the fist line
ee615da
@vasily-kirichenko
fix double line ends after #if
83930a3
@vasily-kirichenko
fix formatting for compound compiler directives
e3a1daf
@vasily-kirichenko
fix missing end line after #if on the fist line
4260cfe
@vasily-kirichenko
fix formatting for compound compiler directives
1820f25
Merge branch 'fix-if-dicective-on-first-line' of https://github.com/v…
1dac734 
…asily-kirichenko/fantomas into fix-if-dicective-on-first-line
@vasily-kirichenko
fix tests
6268519
@nojaf
Merge branch 'master' into fix-if-dicective-on-first-line
d1e7b4c
removed MatchBang
14b8715
@nojaf
Merge branch 'master' into fix-if-dicective-on-first-line
6e482ea
@nojaf
Merge branch 'master' into fix-if-dicective-on-first-line
13741b4
@vasily-kirichenko
Merge pull request #2 from nojaf/remove-match-bang
39e5869 
removed MatchBang
@nojaf
Merge branch 'master' into fix-if-dicective-on-first-line
ad7715e
@nojaf nojaf merged commit bc75bf0 into fsprojects:master Sep 10, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nojaf nojaf nojaf approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

#if FOO || BAR => #if FOO
2 participants
@vasily-kirichenko @nojaf