-
Notifications
You must be signed in to change notification settings - Fork 874
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix the formatting for the method call arguments alignment option #6714
- #6714 - Consider the TAB size when a column size is got Example: ```php array_merge( $x, $y, ); ``` Before: ```php array_merge( $x, $y, ); ``` After: ```php array_merge( $x, $y, ); ``` - Keep the last anchor to a stack when a method calls are nested Example: ```php nestedCall( something( $arg1, $arg2, C::something( $x, $y, $z, ) ), $y, $z, ); ``` Before: ```php nestedCall( something( $arg1, $arg2, C::something( $x, $y, $z, ) ), $y, $z, ); ``` After: ```php nestedCall( something( $arg1, $arg2, C::something( $x, $y, $z, ) ), $y, $z, ); ``` - Add unit tests
- Loading branch information
Showing
12 changed files
with
965 additions
and
6 deletions.
There are no files selected for viewing
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
84 changes: 84 additions & 0 deletions
84
php/php.editor/test/unit/data/testfiles/formatting/alignment/gh6714_01.php
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| <?php | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| namespace NS\GH6714; | ||
|
|
||
| use Vendor\Package\TestClass1; | ||
| use function Vendor\Package\ { | ||
| function1, | ||
| function2, | ||
| }; | ||
| use function Vendor\Package\ { | ||
| function3, | ||
| function4, | ||
| }; | ||
| use const Vendor\Package\CONSTANT1; | ||
|
|
||
| class GH6714 implements Interface1, | ||
| Interface2, | ||
| Interface3 | ||
| { | ||
| public array $x = []; | ||
| public array $y = []; | ||
|
|
||
| public function test1() | ||
| { | ||
| return something1( | ||
| $this->x, | ||
| $this->y, | ||
| ); | ||
| } | ||
|
|
||
| public function test2( | ||
| $param1, | ||
| $param2, | ||
| $param3, | ||
| ) | ||
| { | ||
| nestedCall( | ||
| $this->testMethod($arg1), | ||
| $this->x, | ||
| $this->y, | ||
| ); | ||
| return nestedCall( | ||
| $this->testMethod($arg1), | ||
| $this->x, | ||
| $this->y, | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| array_merge( | ||
| $x, | ||
| $y, | ||
| ); | ||
|
|
||
| nestedCall( | ||
| something( | ||
| $arg1, | ||
| $arg2, | ||
| C::something( | ||
| $x, | ||
| $y, | ||
| $z, | ||
| ) | ||
| ), | ||
| $y, | ||
| $z, | ||
| ); |
84 changes: 84 additions & 0 deletions
84
...unit/data/testfiles/formatting/alignment/gh6714_01.php.testGH6714WithSpaces_01a.formatted
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| <?php | ||
|
|
||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| namespace NS\GH6714; | ||
|
|
||
| use Vendor\Package\TestClass1; | ||
| use function Vendor\Package\{ | ||
| function1, | ||
| function2, | ||
| }; | ||
| use function Vendor\Package\{ | ||
| function3, | ||
| function4, | ||
| }; | ||
| use const Vendor\Package\CONSTANT1; | ||
|
|
||
| class GH6714 implements Interface1, | ||
| Interface2, | ||
| Interface3 { | ||
|
|
||
| public array $x = []; | ||
| public array $y = []; | ||
|
|
||
| public function test1() { | ||
| return something1( | ||
| $this->x, | ||
| $this->y, | ||
| ); | ||
| } | ||
|
|
||
| public function test2( | ||
| $param1, | ||
| $param2, | ||
| $param3, | ||
| ) { | ||
| nestedCall( | ||
| $this->testMethod($arg1), | ||
| $this->x, | ||
| $this->y, | ||
| ); | ||
| return nestedCall( | ||
| $this->testMethod($arg1), | ||
| $this->x, | ||
| $this->y, | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| array_merge( | ||
| $x, | ||
| $y, | ||
| ); | ||
|
|
||
| nestedCall( | ||
| something( | ||
| $arg1, | ||
| $arg2, | ||
| C::something( | ||
| $x, | ||
| $y, | ||
| $z, | ||
| ) | ||
| ), | ||
| $y, | ||
| $z, | ||
| ); |
84 changes: 84 additions & 0 deletions
84
...unit/data/testfiles/formatting/alignment/gh6714_01.php.testGH6714WithSpaces_01b.formatted
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| <?php | ||
|
|
||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| namespace NS\GH6714; | ||
|
|
||
| use Vendor\Package\TestClass1; | ||
| use function Vendor\Package\{ | ||
| function1, | ||
| function2, | ||
| }; | ||
| use function Vendor\Package\{ | ||
| function3, | ||
| function4, | ||
| }; | ||
| use const Vendor\Package\CONSTANT1; | ||
|
|
||
| class GH6714 implements Interface1, | ||
| Interface2, | ||
| Interface3 { | ||
|
|
||
| public array $x = []; | ||
| public array $y = []; | ||
|
|
||
| public function test1() { | ||
| return something1( | ||
| $this->x, | ||
| $this->y, | ||
| ); | ||
| } | ||
|
|
||
| public function test2( | ||
| $param1, | ||
| $param2, | ||
| $param3, | ||
| ) { | ||
| nestedCall( | ||
| $this->testMethod($arg1), | ||
| $this->x, | ||
| $this->y, | ||
| ); | ||
| return nestedCall( | ||
| $this->testMethod($arg1), | ||
| $this->x, | ||
| $this->y, | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| array_merge( | ||
| $x, | ||
| $y, | ||
| ); | ||
|
|
||
| nestedCall( | ||
| something( | ||
| $arg1, | ||
| $arg2, | ||
| C::something( | ||
| $x, | ||
| $y, | ||
| $z, | ||
| ) | ||
| ), | ||
| $y, | ||
| $z, | ||
| ); |
Oops, something went wrong.