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

Fix an array formatting in a match arm #5186 #5685

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,7 @@ public void visit(ArrayCreation node) {
if (formatTokens.get(formatTokens.size() - 1).getId() == FormatToken.Kind.WHITESPACE_INDENT
|| path.get(1) instanceof ArrayElement
|| path.get(1) instanceof FormalParameter
|| path.get(1) instanceof MatchArm
|| path.get(1) instanceof CastExpression) {
// when the array is on the beginning of the line, indent items in normal way
delta = options.indentArrayItems;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<?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.
*/

// GH-5186
match(true){
'test' => [
'key' => 'value',
],
};

match (true) {
'test1' => ['key' => 'value'],
'test2' => [
'key1' => 'value1',
'nested' => [
'key2' => 'value2',
],
],
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<?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.
*/

// GH-5186
match (true) {
'test' => [
'key' => 'value',
],
};

match (true) {
'test1' => ['key' => 'value'],
'test2' => [
'key1' => 'value1',
'nested' => [
'key2' => 'value2',
],
],
};
Original file line number Diff line number Diff line change
Expand Up @@ -943,6 +943,12 @@ public void testMatchExpressionSameLineBracePlacement_02() throws Exception {
reformatFileContents("testfiles/formatting/php80/matchExpression_SameLine_02.php", options);
}

// GH-5186
public void testMatchExpressionWithArray_01() throws Exception {
HashMap<String, Object> options = new HashMap<>(FmtOptions.getDefaults());
reformatFileContents("testfiles/formatting/php80/matchExpressionWithArray_01.php", options);
}

public void testAttributeSyntax_01() throws Exception {
HashMap<String, Object> options = new HashMap<>(FmtOptions.getDefaults());
reformatFileContents("testfiles/formatting/php80/attributeSyntax_01.php", options);
Expand Down