Skip to content

Require single-method instance declarations to be indented#2965

Merged
paf31 merged 2 commits intopurescript:masterfrom
quesebifurcan:2947/indentation
Jul 4, 2017
Merged

Require single-method instance declarations to be indented#2965
paf31 merged 2 commits intopurescript:masterfrom
quesebifurcan:2947/indentation

Conversation

@quesebifurcan
Copy link
Copy Markdown
Contributor

Resolves #2947

Copy link
Copy Markdown
Member

@LiamGoodacre LiamGoodacre left a comment

Choose a reason for hiding this comment

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

Looks good. I believe purescript.cabal also wants updating to refer to the new example files. I think it updates automatically when you run the tests.

@quesebifurcan
Copy link
Copy Markdown
Contributor Author

Thanks for the swift review. Looks like purescript.cabal was added to .gitignore recently: 947c950

@LiamGoodacre
Copy link
Copy Markdown
Member

Oh interesting, thanks!

@hdgarrood
Copy link
Copy Markdown
Contributor

I don't think this previously would have required a cabal file change anyway, it used to be only when you added a directory that you would need to change it, since the globbing in cabal files doesn't allow any kind of recursive includes like **/*.purs. Now that we generate the cabal file using hpack it should be even more rare that adding test files needs a corresponding change in package.yaml. Anyway yeah this looks good to me 👍

@paf31
Copy link
Copy Markdown
Contributor

paf31 commented Jul 4, 2017

Thanks! Please update CONTRIBUTORS.md as well and I'll get this merged in.

@paf31 paf31 merged commit b3e470d into purescript:master Jul 4, 2017
@paf31
Copy link
Copy Markdown
Contributor

paf31 commented Jul 4, 2017

Thanks!

@paf31
Copy link
Copy Markdown
Contributor

paf31 commented Jul 10, 2017

Unfortunately, this is a breaking change, since the compiler no longer allows code like this, which occurs quite frequently:

instance foo :: Foo String where

instance bar :: Bar String where
  member = ...

Note how foo has no members but still uses where.

I'll revert this, but we can try to include it in the next breaking release or find a way to make it non-breaking.

paf31 added a commit that referenced this pull request Jul 10, 2017
paf31 added a commit that referenced this pull request Jul 10, 2017
…2985)

* Revert "Fix child decl ordering (#2984)"

This reverts commit 7fdd39d.

* Revert "Only build master and semver tags in Travis (#2982)"

This reverts commit c41a7a4.

* Revert "Include comments in child declarations in HTML docs (#2981)"

This reverts commit ad6166f.

* Revert "Solve RowToList (#2945)"

This reverts commit 0e2d820.

* Revert "Fix links to type operators in HTML docs (#2979)"

This reverts commit 5fe26f2.

* Revert "Re-evaluate REPL globs during :reload (#2978)"

This reverts commit 50e1c68.

* Revert "[purs ide] Collect data constructors (#2976)"

This reverts commit c965f35.

* Revert "Replace synonyms in instance constraints (#2973)"

This reverts commit ee66e0d.

* Revert "Require single-method instance declarations to be indented (#2965)"

This reverts commit b3e470d.
@paf31
Copy link
Copy Markdown
Contributor

paf31 commented Sep 15, 2017

@quesebifurcan Would you like to reopen this now that we're putting 0.12.0 together? Thanks!

@quesebifurcan
Copy link
Copy Markdown
Contributor Author

@paf31 Sure, I'll see if I can come up with something (preferably non-breaking) over the weekend. If not, I'm happy to let someone else take over.

@paf31
Copy link
Copy Markdown
Contributor

paf31 commented Sep 15, 2017

Oh it's fine to break now, we're at a major release. You could just reopen the PR if you like.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants