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 61a114ac6d Merge pull request #6092 from
junichi11/php-gh-5933-instanceof-with-cast
new 9e3bc8a8ad Fix the problem that "Fix Imports" don't work when there
are types that have the same suffix #5330
new c990ed293e Separate between class-based, function-based, and
const-based use statements by a single blank line #4609
new 921e42fc6e Don't add a space before `{`
new ce548fe871 Don't generate full class names
new 0f4aafed70 Merge pull request #6161 from
junichi11/php-reimplement-fix-imports
The 8780 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 | 4 +
.../editor/actions/FixDuplicateImportStmts.form | 3 +-
.../editor/actions/FixDuplicateImportStmts.java | 155 +++++----------
.../php/editor/actions/FixImportsBottomPanel.form | 95 +++++++++
.../php/editor/actions/FixImportsBottomPanel.java | 144 ++++++++++++++
.../modules/php/editor/actions/FixUsesAction.java | 82 +++++++-
.../php/editor/actions/FixUsesPerformer.java | 99 +++++++++-
.../php/editor/actions/UsedNamesCollector.java | 7 +-
.../modules/php/editor/indent/CodeStyle.java | 4 +
.../modules/php/editor/indent/FmtOptions.java | 4 +-
.../modules/php/editor/indent/ui/Bundle.properties | 1 +
.../modules/php/editor/indent/ui/FmtUses.form | 14 +-
.../modules/php/editor/indent/ui/FmtUses.java | 79 ++++----
.../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 +++++++
.../actions/testGH5330/01/testGH5330_01.php | 35 ++++
.../testGH5330/01/testGH5330_01.php.fixUses | 36 ++++
.../testfiles/actions/testGH5330/testGH5330_01.php | 35 ++++
.../testGH5330/testGH5330_01.php.importData | 11 ++
.../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 +-
.../php/editor/actions/FixUsesPerformerTest.java | 219 +++++++++++++++++++++
.../php/editor/actions/ImportDataCreatorTest.java | 4 +
60 files changed, 3144 insertions(+), 173 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/actions/testGH5330/01/testGH5330_01.php
create mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH5330/01/testGH5330_01.php.fixUses
create mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH5330/testGH5330_01.php
create mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH5330/testGH5330_01.php.importData
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
