PR: Some indentation fixes #4486
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ccordoba12
reviewed
May 17, 2017
| @@ -1925,6 +1925,11 @@ def fix_indent(self, forward=True, comment_or_string=False): | |||
| cursor.movePosition(QTextCursor.PreviousBlock) | |||
| prevtext = to_text_string(cursor.block().text()).rstrip() | |||
|
|
|||
| # Remove inline comment | |||
| inline_comment = prevtext.find('#') | |||
There was a problem hiding this comment.
Is this enough to detect an inline comment? What if you have a line like
# foo
?
There was a problem hiding this comment.
prevtext = "" and the indentation will be calculated to 0 as expected.
I was testing and It fails in expressions with # that isn't a comment, and the crop cause to drop a bracket, although it is pretty rare (e. g. a list assignment to a dict element that contains a "#"):
a_dict["#"] = (
a_dict["#"] = (
|
|
Ok, let's merge it then. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #4475
no xfail tests in auto_indentation 😄🙈