You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ju...@apache.org on 2024/06/21 21:40:11 UTC
(netbeans) branch master updated (f66ae511b4d -> 09ce82b57f2)
This is an automated email from the ASF dual-hosted git repository.
junichi11 pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
from f66ae511b4d Merge pull request #7494 from dbalek/dbalek/micronaut-symbols-from-libraries
add 9a89c227585 Add a formatting option for an empty function/method body [GH-6716]
new 09ce82b57f2 Merge pull request #7498 from junichi11/php-gh-6716-formatting-for-empty-method-body
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../modules/php/editor/indent/CodeStyle.java | 4 +
.../modules/php/editor/indent/FmtOptions.java | 2 +
.../modules/php/editor/indent/FormatToken.java | 1 +
.../modules/php/editor/indent/FormatVisitor.java | 8 +-
.../modules/php/editor/indent/TokenFormatter.java | 99 ++++++---
.../modules/php/editor/indent/ui/Bundle.properties | 1 +
.../php/editor/indent/ui/FmtBlankLines.form | 12 +-
.../php/editor/indent/ui/FmtBlankLines.java | 10 +-
.../blankLines/PER/EmptyFunctionBody.php | 171 +++++++++++++++
...tionBody.php.testEmptyFunctionBody_01.formatted | 149 +++++++++++++
...tionBody.php.testEmptyFunctionBody_02.formatted | 205 ++++++++++++++++++
...tionBody.php.testEmptyFunctionBody_03.formatted | 149 +++++++++++++
...tionBody.php.testEmptyFunctionBody_04.formatted | 233 +++++++++++++++++++++
...tionBody.php.testEmptyFunctionBody_05.formatted | 149 +++++++++++++
...tionBody.php.testEmptyFunctionBody_06.formatted | 149 +++++++++++++
.../formatting/templates/issueGH6716_01.php | 24 +++
.../templates/issueGH6716_01.php.formatted | 25 +++
.../editor/indent/PHPFormatterBlankLinesTest.java | 42 ++++
.../editor/indent/PHPFormatterTemplateTest.java | 6 +
19 files changed, 1408 insertions(+), 31 deletions(-)
create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/PER/EmptyFunctionBody.php
create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/PER/EmptyFunctionBody.php.testEmptyFunctionBody_01.formatted
create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/PER/EmptyFunctionBody.php.testEmptyFunctionBody_02.formatted
create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/PER/EmptyFunctionBody.php.testEmptyFunctionBody_03.formatted
create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/PER/EmptyFunctionBody.php.testEmptyFunctionBody_04.formatted
create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/PER/EmptyFunctionBody.php.testEmptyFunctionBody_05.formatted
create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/PER/EmptyFunctionBody.php.testEmptyFunctionBody_06.formatted
create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/templates/issueGH6716_01.php
create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/templates/issueGH6716_01.php.formatted
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
(netbeans) 01/01: Merge pull request #7498 from junichi11/php-gh-6716-formatting-for-empty-method-body
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
junichi11 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 09ce82b57f26b087c1870923aa9e5ef89e7d5798
Merge: f66ae511b4d 9a89c227585
Author: Junichi Yamamoto <ju...@apache.org>
AuthorDate: Sat Jun 22 06:40:05 2024 +0900
Merge pull request #7498 from junichi11/php-gh-6716-formatting-for-empty-method-body
Add a formatting option for an empty function/method body [GH-6716]
.../modules/php/editor/indent/CodeStyle.java | 4 +
.../modules/php/editor/indent/FmtOptions.java | 2 +
.../modules/php/editor/indent/FormatToken.java | 1 +
.../modules/php/editor/indent/FormatVisitor.java | 8 +-
.../modules/php/editor/indent/TokenFormatter.java | 99 ++++++---
.../modules/php/editor/indent/ui/Bundle.properties | 1 +
.../php/editor/indent/ui/FmtBlankLines.form | 12 +-
.../php/editor/indent/ui/FmtBlankLines.java | 10 +-
.../blankLines/PER/EmptyFunctionBody.php | 171 +++++++++++++++
...tionBody.php.testEmptyFunctionBody_01.formatted | 149 +++++++++++++
...tionBody.php.testEmptyFunctionBody_02.formatted | 205 ++++++++++++++++++
...tionBody.php.testEmptyFunctionBody_03.formatted | 149 +++++++++++++
...tionBody.php.testEmptyFunctionBody_04.formatted | 233 +++++++++++++++++++++
...tionBody.php.testEmptyFunctionBody_05.formatted | 149 +++++++++++++
...tionBody.php.testEmptyFunctionBody_06.formatted | 149 +++++++++++++
.../formatting/templates/issueGH6716_01.php | 24 +++
.../templates/issueGH6716_01.php.formatted | 25 +++
.../editor/indent/PHPFormatterBlankLinesTest.java | 42 ++++
.../editor/indent/PHPFormatterTemplateTest.java | 6 +
19 files changed, 1408 insertions(+), 31 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists