This is an automated email from the ASF dual-hosted git repository. junichi11 pushed a change to branch php-nb22-features in repository https://gitbox.apache.org/repos/asf/netbeans.git
from 2100f39631 Update issue report template for NB21 release candidates add 452a636fe8 Fix incorrect formatting after use statements #6980 new 35a83e09a5 Merge pull request #6981 from junichi11/php-gh-6980-incorrect-formatting 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/TokenFormatter.java | 8 +++++ .../formatting/blankLines/issueGH6980_01.php | 22 +++++++++++++ .../issueGH6980_01.php.testGH6980_01.formatted | 24 +++++++++++++++ .../formatting/blankLines/issueGH6980_02.php | 24 +++++++++++++++ .../issueGH6980_02.php.testGH6980_02.formatted | 26 ++++++++++++++++ .../formatting/blankLines/issueGH6980_03.php | 25 +++++++++++++++ .../issueGH6980_03.php.testGH6980_03.formatted | 27 ++++++++++++++++ .../blankLines/issueGH6980_NSWithBlock01.php | 24 +++++++++++++++ ...hBlock01.php.testGH6980_NSWithBlock01.formatted | 27 ++++++++++++++++ .../blankLines/issueGH6980_NSWithBlock02.php | 26 ++++++++++++++++ ...hBlock02.php.testGH6980_NSWithBlock02.formatted | 30 ++++++++++++++++++ .../blankLines/issueGH6980_NSWithBlock03.php | 27 ++++++++++++++++ ...hBlock03.php.testGH6980_NSWithBlock03.formatted | 30 ++++++++++++++++++ .../editor/indent/PHPFormatterBlankLinesTest.java | 36 ++++++++++++++++++++++ 14 files changed, 356 insertions(+) create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_01.php create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_01.php.testGH6980_01.formatted create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_02.php create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_02.php.testGH6980_02.formatted create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_03.php create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_03.php.testGH6980_03.formatted create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_NSWithBlock01.php create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_NSWithBlock01.php.testGH6980_NSWithBlock01.formatted create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_NSWithBlock02.php create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_NSWithBlock02.php.testGH6980_NSWithBlock02.formatted create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_NSWithBlock03.php create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_NSWithBlock03.php.testGH6980_NSWithBlock03.formatted --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists