Skip to content

Fix doctring indentation issue in #241 - #289

Merged
bbatsov merged 1 commit into
clojure-emacs:masterfrom
sandhu:master
Jun 14, 2015
Merged

bbatsov merged 1 commit into
clojure-emacs:masterfrom
sandhu:master

Conversation

@sandhu

@sandhu sandhu commented Apr 27, 2015

Copy link
Copy Markdown
Contributor

Added code to only apply the prefix if the current indent level is <=
the default prefix spacing.

@bbatsov

bbatsov commented Apr 29, 2015

Copy link
Copy Markdown
Member

We need to implement some indentation tests first. See my comments here #283

If you get the ball rolling on the tests, I'll gladly accept the patch. As it stands, with no indentation tests every change is a potential problem and I'd rather avoid those.

@sandhu

sandhu commented Apr 30, 2015

Copy link
Copy Markdown
Contributor Author

Fair point. I'll look into creating the tests.

@bbatsov

bbatsov commented May 17, 2015

Copy link
Copy Markdown
Member

@sandhu Ping :-)

@bbatsov

bbatsov commented May 17, 2015

Copy link
Copy Markdown
Member

Btw, I just added some basic indentation tests to get you started.

@expez

expez commented Jun 11, 2015

Copy link
Copy Markdown
Member

@sandhu Did you get around to looking at the tests for this fix?

@sandhu

sandhu commented Jun 11, 2015

Copy link
Copy Markdown
Contributor Author

Sorry. Seem to have missed the ping from @bbatsov as well.

Will take a look at them this weekend and update the PR.

@sandhu

sandhu commented Jun 13, 2015

Copy link
Copy Markdown
Contributor Author

Added the doc string indentation tests

@expez

expez commented Jun 13, 2015

Copy link
Copy Markdown
Member

Cool. Could you squash the commits?

@sandhu

sandhu commented Jun 13, 2015

Copy link
Copy Markdown
Contributor Author

Done.

@expez

expez commented Jun 13, 2015

Copy link
Copy Markdown
Member

There's still an empty merge commit.

@sandhu

sandhu commented Jun 13, 2015

Copy link
Copy Markdown
Contributor Author

I've removed the merge commit, but I now have merge conflicts. Will add it back in.

@sandhu

sandhu commented Jun 13, 2015

Copy link
Copy Markdown
Contributor Author

I've added the merge commit back in since it shows conflicts without it there.

@expez

expez commented Jun 13, 2015

Copy link
Copy Markdown
Member

We don't want merge commits polluting our history. In the contribution guidelines there's this link about how to rebase to avoid creating merge commits.

git rebase is a very powerful tool so even if this is pissing you off, your future self will benefit from having learned about it :)

@bbatsov

bbatsov commented Jun 13, 2015

Copy link
Copy Markdown
Member

You should rebase on top of the current master.

On Saturday, June 13, 2015, Achint Sandhu notifications@github.com wrote:

I've added the merge commit back in since it shows conflicts without it
there.

—
Reply to this email directly or view it on GitHub
#289 (comment)
.

Best Regards,
Bozhidar Batsov

http://www.batsov.com

Added code to only apply the prefix if the current indent level is <=
the default prefix spacing.
@sandhu

sandhu commented Jun 13, 2015

Copy link
Copy Markdown
Contributor Author

I don't generally rebase since it's not an accurate reflection of the history, but since it's your repo, I'm happy to play along. :-)

Just pushed a rebased version.

bbatsov added a commit that referenced this pull request Jun 14, 2015
Fix doctring indentation issue in #241
@bbatsov
bbatsov merged commit 4815653 into clojure-emacs:master Jun 14, 2015
@bbatsov

bbatsov commented Jun 14, 2015

Copy link
Copy Markdown
Member

Thanks!

@sandhu

sandhu commented Jun 14, 2015

Copy link
Copy Markdown
Contributor Author

No worries. Thanks for the merge.

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants