Fix alignment of the hash in one line

[saks]

This fixes incorrect behavior in the case, when hash is written in one line with different length of keys.

[jonas054]

Good catch @saks! I was just thinking that if any two keys are on the same line, that we should just return from on_hash and leave the hash as it is (with the exception of key alignment, where it makes sense to align even if there are multiple key-value pairs per line). @bbatsov @yujinakayama @saks What do you think?

[bbatsov]

@jonas054 I think your suggestion is a good one.

[saks]

Completely agree 👍

[bbatsov]

@saks You should also mention the bugfix in the changelog.

[bbatsov]

@saks Ping :-)

[saks]

Sorry for the delay, was really hard week.

[bbatsov]

@saks Looks good, but you'll need to rebase on top of the current master.

[saks]

I did a rebase from current master. Is it ok now?

[yujinakayama]

I guess something is wrong. :)

I suggest the following steps to construct proper commit graph in the current state:

$ git checkout master
$ git branch -m fix_for_one_line_hash fix_for_one_line_hash.bak
$ git checkout -b fix_for_one_line_hash
$ git cherry-pick 4a8ee1b
error: could not apply 4a8ee1b... Fix alignment of the hashe containing different key lengths
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
# Fix the conflict...
# ...
$ git add .
$ git commit
$ git push -f your-remote-name fix_for_one_line_hash

[saks]

You're right. Thanks. How about this? :)

[bbatsov]

Yep, it's OK now.

[saks]

Thanks