You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by tm...@apache.org on 2023/04/01 04:55:30 UTC
[netbeans] branch master updated (8f943c27e6 -> e1b594034b)
This is an automated email from the ASF dual-hosted git repository.
tmysik pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
from 8f943c27e6 Merge pull request #5749 from pepness/glassfish-7.0.3
new 88483e73ea Separate between class-based, function-based, and const-based use statements by a single blank line #4609
new 8d13bc2a05 Separate between class-based, function-based, and const-based use statements by a single blank line #4609
new 11f3e9de73 Don't add a space before `{`
new 99ecf610ea Don't generate full class names
new e1b594034b Merge pull request #5758 from junichi11/php-gh-4609-psr12-between-use-types
The 8379 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/actions/Bundle.properties | 8 +-
.../editor/actions/FixDuplicateImportStmts.form | 3 +-
.../editor/actions/FixDuplicateImportStmts.java | 166 ++++++------------
.../php/editor/actions/FixImportsBottomPanel.form | 114 +++++++++++++
.../php/editor/actions/FixImportsBottomPanel.java | 159 ++++++++++++++++++
.../modules/php/editor/actions/FixUsesAction.java | 24 ++-
.../php/editor/actions/FixUsesPerformer.java | 71 +++++++-
.../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 | 13 ++
.../modules/php/editor/indent/TokenFormatter.java | 6 +
.../modules/php/editor/indent/ui/BlankLines.php | 6 +
.../modules/php/editor/indent/ui/Bundle.properties | 3 +
.../php/editor/indent/ui/FmtBlankLines.form | 64 +++++--
.../php/editor/indent/ui/FmtBlankLines.java | 57 ++++---
.../GroupUses/testGH4609PSR12_GroupUses.php | 71 ++++++++
.../testGH4609PSR12_GroupUses.php.fixUses | 81 +++++++++
.../testGH4609PSR12_GroupUsesWithPSR12a.php | 69 ++++++++
...testGH4609PSR12_GroupUsesWithPSR12a.php.fixUses | 83 +++++++++
.../testGH4609PSR12_GroupUsesWithPSR12b.php | 68 ++++++++
...testGH4609PSR12_GroupUsesWithPSR12b.php.fixUses | 80 +++++++++
.../testGH4609PSR12_GroupUsesWithPSR12c.php | 65 +++++++
...testGH4609PSR12_GroupUsesWithPSR12c.php.fixUses | 70 ++++++++
.../testGH4609PSR12_GroupUsesWithPSR12d.php | 67 ++++++++
...testGH4609PSR12_GroupUsesWithPSR12d.php.fixUses | 76 +++++++++
.../testGH4609PSR12_GroupUsesWithPSR12e.php | 66 ++++++++
...testGH4609PSR12_GroupUsesWithPSR12e.php.fixUses | 73 ++++++++
.../testGH4609PSR12_GroupUsesWithPSR12f.php | 66 ++++++++
...testGH4609PSR12_GroupUsesWithPSR12f.php.fixUses | 73 ++++++++
.../testGH4609PSR12_GroupUsesWithPSR12g.php | 64 +++++++
...testGH4609PSR12_GroupUsesWithPSR12g.php.fixUses | 66 ++++++++
.../testGH4609PSR12_SingleLineUses.php | 71 ++++++++
.../testGH4609PSR12_SingleLineUses.php.fixUses | 77 +++++++++
.../testGH4609PSR12_SingleLineUsesWithPSR12a.php | 69 ++++++++
...H4609PSR12_SingleLineUsesWithPSR12a.php.fixUses | 79 +++++++++
.../testGH4609PSR12_SingleLineUsesWithPSR12b.php | 68 ++++++++
...H4609PSR12_SingleLineUsesWithPSR12b.php.fixUses | 76 +++++++++
.../testGH4609PSR12_SingleLineUsesWithPSR12c.php | 65 +++++++
...H4609PSR12_SingleLineUsesWithPSR12c.php.fixUses | 68 ++++++++
.../testGH4609PSR12_SingleLineUsesWithPSR12d.php | 67 ++++++++
...H4609PSR12_SingleLineUsesWithPSR12d.php.fixUses | 74 ++++++++
.../testGH4609PSR12_SingleLineUsesWithPSR12e.php | 66 ++++++++
...H4609PSR12_SingleLineUsesWithPSR12e.php.fixUses | 71 ++++++++
.../testGH4609PSR12_SingleLineUsesWithPSR12f.php | 66 ++++++++
...H4609PSR12_SingleLineUsesWithPSR12f.php.fixUses | 71 ++++++++
.../testGH4609PSR12_SingleLineUsesWithPSR12g.php | 64 +++++++
...H4609PSR12_SingleLineUsesWithPSR12g.php.fixUses | 66 ++++++++
.../testGroupUse/06/testGroupUse_06.php.fixUses | 2 +-
.../testGroupUse/07/testGroupUse_07.php.fixUses | 2 +-
.../testGroupUse/08/testGroupUse_08.php.fixUses | 2 +-
.../testGroupUse/09/testGroupUse_09.php.fixUses | 2 +-
.../testGroupUse/10/testGroupUse_10.php.fixUses | 2 +-
.../testGroupUse/11/testGroupUse_11.php.fixUses | 2 +-
.../testGroupUse/12/testGroupUse_12.php.fixUses | 6 +-
.../testGroupUse/14/testGroupUse_14.php.fixUses | 6 +-
.../01/testGroupUseComplex_01.php.fixUses | 6 +-
.../blankLines/issueGH4609BetweenUseTypes_01.php | 26 +++
...hp.testIssueGH4609BetweenUseTypes_01a.formatted | 41 +++++
...hp.testIssueGH4609BetweenUseTypes_01b.formatted | 43 +++++
.../blankLines/issueGH4609BetweenUseTypes_02.php | 32 ++++
...hp.testIssueGH4609BetweenUseTypes_02a.formatted | 35 ++++
...hp.testIssueGH4609BetweenUseTypes_02b.formatted | 37 ++++
.../blankLines/issueGH4609BetweenUseTypes_03.php | 32 ++++
...hp.testIssueGH4609BetweenUseTypes_03a.formatted | 35 ++++
...hp.testIssueGH4609BetweenUseTypes_03b.formatted | 41 +++++
.../php/editor/actions/FixUsesPerformerTest.java | 186 ++++++++++++++++++++-
.../editor/indent/PHPFormatterBlankLinesTest.java | 36 ++++
68 files changed, 3350 insertions(+), 181 deletions(-)
create mode 100644 php/php.editor/src/org/netbeans/modules/php/editor/actions/FixImportsBottomPanel.form
create mode 100644 php/php.editor/src/org/netbeans/modules/php/editor/actions/FixImportsBottomPanel.java
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/GroupUses/testGH4609PSR12_GroupUses.php
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/GroupUses/testGH4609PSR12_GroupUses.php.fixUses
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/GroupUsesWithPSR12a/testGH4609PSR12_GroupUsesWithPSR12a.php
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/GroupUsesWithPSR12a/testGH4609PSR12_GroupUsesWithPSR12a.php.fixUses
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/GroupUsesWithPSR12b/testGH4609PSR12_GroupUsesWithPSR12b.php
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/GroupUsesWithPSR12b/testGH4609PSR12_GroupUsesWithPSR12b.php.fixUses
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/GroupUsesWithPSR12c/testGH4609PSR12_GroupUsesWithPSR12c.php
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/GroupUsesWithPSR12c/testGH4609PSR12_GroupUsesWithPSR12c.php.fixUses
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/GroupUsesWithPSR12d/testGH4609PSR12_GroupUsesWithPSR12d.php
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/GroupUsesWithPSR12d/testGH4609PSR12_GroupUsesWithPSR12d.php.fixUses
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/GroupUsesWithPSR12e/testGH4609PSR12_GroupUsesWithPSR12e.php
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/GroupUsesWithPSR12e/testGH4609PSR12_GroupUsesWithPSR12e.php.fixUses
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/GroupUsesWithPSR12f/testGH4609PSR12_GroupUsesWithPSR12f.php
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/GroupUsesWithPSR12f/testGH4609PSR12_GroupUsesWithPSR12f.php.fixUses
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/GroupUsesWithPSR12g/testGH4609PSR12_GroupUsesWithPSR12g.php
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/GroupUsesWithPSR12g/testGH4609PSR12_GroupUsesWithPSR12g.php.fixUses
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/SingleLineUses/testGH4609PSR12_SingleLineUses.php
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/SingleLineUses/testGH4609PSR12_SingleLineUses.php.fixUses
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/SingleLineUsesWithPSR12a/testGH4609PSR12_SingleLineUsesWithPSR12a.php
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/SingleLineUsesWithPSR12a/testGH4609PSR12_SingleLineUsesWithPSR12a.php.fixUses
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/SingleLineUsesWithPSR12b/testGH4609PSR12_SingleLineUsesWithPSR12b.php
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/SingleLineUsesWithPSR12b/testGH4609PSR12_SingleLineUsesWithPSR12b.php.fixUses
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/SingleLineUsesWithPSR12c/testGH4609PSR12_SingleLineUsesWithPSR12c.php
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/SingleLineUsesWithPSR12c/testGH4609PSR12_SingleLineUsesWithPSR12c.php.fixUses
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/SingleLineUsesWithPSR12d/testGH4609PSR12_SingleLineUsesWithPSR12d.php
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/SingleLineUsesWithPSR12d/testGH4609PSR12_SingleLineUsesWithPSR12d.php.fixUses
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/SingleLineUsesWithPSR12e/testGH4609PSR12_SingleLineUsesWithPSR12e.php
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/SingleLineUsesWithPSR12e/testGH4609PSR12_SingleLineUsesWithPSR12e.php.fixUses
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/SingleLineUsesWithPSR12f/testGH4609PSR12_SingleLineUsesWithPSR12f.php
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/SingleLineUsesWithPSR12f/testGH4609PSR12_SingleLineUsesWithPSR12f.php.fixUses
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/SingleLineUsesWithPSR12g/testGH4609PSR12_SingleLineUsesWithPSR12g.php
create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/SingleLineUsesWithPSR12g/testGH4609PSR12_SingleLineUsesWithPSR12g.php.fixUses
create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH4609BetweenUseTypes_01.php
create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH4609BetweenUseTypes_01.php.testIssueGH4609BetweenUseTypes_01a.formatted
create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH4609BetweenUseTypes_01.php.testIssueGH4609BetweenUseTypes_01b.formatted
create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH4609BetweenUseTypes_02.php
create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH4609BetweenUseTypes_02.php.testIssueGH4609BetweenUseTypes_02a.formatted
create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH4609BetweenUseTypes_02.php.testIssueGH4609BetweenUseTypes_02b.formatted
create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH4609BetweenUseTypes_03.php
create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH4609BetweenUseTypes_03.php.testIssueGH4609BetweenUseTypes_03a.formatted
create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH4609BetweenUseTypes_03.php.testIssueGH4609BetweenUseTypes_03b.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