Extract method works properly with code indented more than one level #41
Conversation
| @@ -53,7 +53,10 @@ public function replaceRangeWithMethodCall(LineRange $range, MethodSignature $ne | |||
| $call = 'list(' . $this->implodeVariables($newMethod->returnVariables()) . ') = ' . $call; | |||
| } | |||
|
|
|||
| $this->buffer->replace($range, array($this->whitespace(8) . $call)); | |||
| $lines = $this->buffer->getLines($range); | |||
| $indent = $this->leftWhitespacesOf(reset($lines)); | |||
There was a problem hiding this comment.
Is the reset necessary? It leaks technical data into the domain.
There was a problem hiding this comment.
I can replace it with $line[0] if you prefer? I suppose under these circumstances the first index isn't going to be anything other than 0
|
@beberlei I have replaced the reset with In reality I think all the whitespace detection should be refactored into a |
|
Rebased, fixed to work with new patch generation and squashed :) |
Extract method works properly with code indented more than one level
Extract method was messing up the extracted method if the code being extracted was indented more than 4 spaces.
Also the method call to the extracted method was not indented correctly.
This PR fixes both these issues.
Unit tests & acceptance tests are included.
PS: For some reason 2 scenarios are failing the the Fix Class Names feature but there were failing before I started working so I'm assuming that they either are currently broken in the repo or something in my environment?