Skip to content

Require single-method instance declarations to be indented #2965

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

Merged
paf31 merged 2 commits into from
Jul 4, 2017
Merged

Require single-method instance declarations to be indented #2965

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
6395631
Require single-method instance declarations to be indented
quesebifurcan Jul 1, 2017
24427f0
Add name and licensing notice
quesebifurcan Jul 4, 2017
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
1 change: 1 addition & 0 deletions CONTRIBUTORS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ If you would prefer to use different terms, please use the section below instead
| [@phiggins](https://github.com/phiggins) | Pete Higgins | [MIT license](http://opensource.org/licenses/MIT) |
| [@philopon](https://github.com/philopon) | Hirotomo Moriwaki | [MIT license](http://opensource.org/licenses/MIT) |
| [@pseudonom](https://github.com/pseudonom) | Eric Easley | [MIT license](http://opensource.org/licenses/MIT) |
| [@quesebifurcan](https://github.com/quesebifurcan) | Fredrik Wallberg | [MIT license](http://opensource.org/licenses/MIT) |
| [@rightfold](https://github.com/rightfold) | rightfold | [MIT license](https://opensource.org/licenses/MIT) |
| [@robdaemon](https://github.com/robdaemon) | Robert Roland | [MIT license](http://opensource.org/licenses/MIT) |
| [@RossMeikleham](https://github.com/RossMeikleham) | Ross Meikleham | [MIT license](http://opensource.org/licenses/MIT) |
Expand Down
10 changes: 10 additions & 0 deletions examples/failing/2947.purs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
-- @shouldFailWith ErrorParsingModule

module Main where

import Prelude

data Foo = Foo

instance eqFoo :: Eq Foo where
eq _ _ = true
11 changes: 11 additions & 0 deletions examples/passing/2947.purs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
module Main where

import Prelude
import Control.Monad.Eff.Console (log)

data Foo = Foo

instance eqFoo :: Eq Foo where
eq _ _ = true

main = log "Done"
2 changes: 1 addition & 1 deletion src/Language/PureScript/Parser/Declarations.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ parseTypeInstanceDeclaration = do
instanceDecl <- parseInstanceDeclaration
members <- P.option [] $ do
indented *> reserved "where"
mark (P.many (same *> declsInInstance))
indented *> mark (P.many (same *> declsInInstance))
return $ instanceDecl (ExplicitInstance members)
where
declsInInstance :: TokenParser Declaration
Expand Down