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.

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

PR: Do not overwrite unmatched braces #5604

Merged
merged 2 commits into from
Nov 1, 2017

Conversation

timhoffm
Copy link
Contributor

@timhoffm timhoffm commented Oct 29, 2017

Fixes #5588

Sorry for the two char indentation, but the strict 80 char line limit give me really a hard time here. I don't see how one could format this reasonably otherwise without changing functionality (i.e. pre-evaluating cursor.block().text() and/or __unmatched_braces_in_line() even when that is not necessary because of not key_matches_next_char).

@pep8speaks
Copy link

Hello @timhoffm! Thanks for submitting the PR.

Line 2900:15: E128 continuation line under-indented for visual indent

@ccordoba12 ccordoba12 changed the title [#5588] do not overwrite unmatched braces PR: Do not overwrite unmatched braces Oct 30, 2017
@ccordoba12 ccordoba12 added this to the v3.2.5 milestone Oct 30, 2017
Copy link
Member

@rlaverde rlaverde left a comment

Choose a reason for hiding this comment

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

It looks good to me, and works as expected

Thanks @timhoffm for working in this, could you add a test for it?

@rlaverde
Copy link
Member

LGTM, I think that the travis error is unrelated to this PR

@ccordoba12
Copy link
Member

Yep, that's right.

Thanks @timhoffm for your contribution!

@ccordoba12 ccordoba12 merged commit 7dd3a70 into spyder-ide:3.x Nov 1, 2017
ccordoba12 added a commit that referenced this pull request Nov 1, 2017
@timhoffm timhoffm deleted the no-unmatched-brace-overwrite branch November 1, 2017 16:10
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.

4 participants