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 5f9b451bd8 Merge pull request #6090 from
mbien/update-return-encapsulation-hint
new 910fd0fd70 Revert "Merge pull request #5801 from
junichi11/php-gh-5330-fix-imports"
new 2c6ea841fc Revert "Don't generate full class names"
new e345d0ea6c Revert "Don't add a space before `{`"
new 5aed58eb99 Revert "Separate between class-based, function-based, and
const-based use statements by a single blank line #4609"
new 7893aaae14 Revert "FixUsesPerformer,ImportDataCreator and
UsedNamespaceCollector logic update to fix imports in whole file, fix
ModelUtils multiple default namespace detection"
new c01cbbd6b7 Revert "Merge pull request #5579 from
rossluk/php/fix-uses-performer-fix"
new b6be0f8b57 Add unit tests for `FixUsesPerformer` #6056 #6082
new 251f448632 Fix unit tests
new d29bbb336a Merge pull request #6152 from
junichi11/revert-fix-import-changes
The 8757 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 | 26 +-
.../php/editor/actions/FixUsesPerformer.java | 389 +++++++--------------
.../php/editor/actions/ImportDataCreator.java | 38 +-
.../php/editor/actions/UsedNamesCollector.java | 83 +++--
.../php/editor/actions/UsedNamespaceName.java | 12 +-
.../modules/php/editor/model/ModelUtils.java | 83 ++++-
.../php/editor/model/impl/ModelBuilder.java | 2 +-
..._multiple_namespaces_with_multiple_default.pass | 2 +-
...iple_namespaces_with_elements_from_default.pass | 7 +
.../data/testfiles/actions/nb4978_08.php.usedNames | 5 +-
.../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 | 12 -
.../actions/testGH5578/01/testGH5578_01.php | 36 --
.../testGH5578/01/testGH5578_01.php.fixUses | 38 --
.../actions/testGH5578/02/testGH5578_02.php | 35 --
.../testGH5578/02/testGH5578_02.php.fixUses | 37 --
.../actions/testGH5578/03/testGH5578_03.php | 42 ---
.../testGH5578/03/testGH5578_03.php.fixUses | 46 ---
.../actions/testGH5578/04/testGH5578_04.php | 43 ---
.../testGH5578/04/testGH5578_04.php.fixUses | 46 ---
.../actions/testGH5578/05/testGH5578_05.php | 44 ---
.../testGH5578/05/testGH5578_05.php.fixUses | 46 ---
.../actions/testGH5578/06/testGH5578_06.php | 49 ---
.../testGH5578/06/testGH5578_06.php.fixUses | 51 ---
.../actions/testGH5578/07/testGH5578_07.php | 49 ---
.../testGH5578/07/testGH5578_07.php.fixUses | 51 ---
.../data/testfiles/actions/testGH5578/08/B.php | 23 --
.../actions/testGH5578/08/testGH5578_08.php | 41 ---
.../testGH5578/08/testGH5578_08.php.fixUses | 43 ---
.../Foo.php => testGH6056/01/Test/TestClass1.php} | 8 +-
.../02/B.php => testGH6056/01/Test/TestClass2.php} | 10 +-
.../01/B.php => testGH6056/01/Test/TestClass3.php} | 10 +-
.../Foo.php => testGH6056/01/Test/TestClass4.php} | 8 +-
.../actions/testGH6056/01/testGH6056_01.php | 13 +
.../testGH6056/01/testGH6056_01.php.fixUses | 16 +
.../02/Foo.php => testGH6082/01/Vendor/Test.php} | 4 +-
.../actions/testGH6082/01/testGH6082_01.php | 12 +
.../testGH6082/01/testGH6082_01.php.fixUses | 14 +
.../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 +-
.../01/testMultipleDefaultNSUse_01.php | 52 ---
.../01/testMultipleDefaultNSUse_01.php.fixUses | 54 ---
.../02/testMultipleDefaultNSUse_02.php | 52 ---
.../02/testMultipleDefaultNSUse_02.php.fixUses | 54 ---
.../testWholeFileUse/01/testWholeFileUse_01.php | 52 ---
.../01/testWholeFileUse_01.php.fixUses | 55 ---
.../testWholeFileUse/02/testWholeFileUse_02.php | 52 ---
.../02/testWholeFileUse_02.php.fixUses | 55 ---
...d_multiple_namespaces_with_multiple_default.php | 2 +-
.../php/editor/actions/FixUsesPerformerTest.java | 274 +--------------
.../php/editor/actions/ImportDataCreatorTest.java | 4 -
97 files changed, 497 insertions(+), 4525 deletions(-)
delete mode 100644
php/php.editor/src/org/netbeans/modules/php/editor/actions/FixImportsBottomPanel.form
delete mode 100644
php/php.editor/src/org/netbeans/modules/php/editor/actions/FixImportsBottomPanel.java
create mode 100644
php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/csl/NavigatorTest/structure/php53/multiple_namespaces_with_elements_from_default.pass
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/GroupUses/testGH4609PSR12_GroupUses.php
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/GroupUses/testGH4609PSR12_GroupUses.php.fixUses
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/GroupUsesWithPSR12a/testGH4609PSR12_GroupUsesWithPSR12a.php
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/GroupUsesWithPSR12a/testGH4609PSR12_GroupUsesWithPSR12a.php.fixUses
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/GroupUsesWithPSR12b/testGH4609PSR12_GroupUsesWithPSR12b.php
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/GroupUsesWithPSR12b/testGH4609PSR12_GroupUsesWithPSR12b.php.fixUses
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/GroupUsesWithPSR12c/testGH4609PSR12_GroupUsesWithPSR12c.php
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/GroupUsesWithPSR12c/testGH4609PSR12_GroupUsesWithPSR12c.php.fixUses
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/GroupUsesWithPSR12d/testGH4609PSR12_GroupUsesWithPSR12d.php
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/GroupUsesWithPSR12d/testGH4609PSR12_GroupUsesWithPSR12d.php.fixUses
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/GroupUsesWithPSR12e/testGH4609PSR12_GroupUsesWithPSR12e.php
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/GroupUsesWithPSR12e/testGH4609PSR12_GroupUsesWithPSR12e.php.fixUses
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/GroupUsesWithPSR12f/testGH4609PSR12_GroupUsesWithPSR12f.php
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/GroupUsesWithPSR12f/testGH4609PSR12_GroupUsesWithPSR12f.php.fixUses
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/GroupUsesWithPSR12g/testGH4609PSR12_GroupUsesWithPSR12g.php
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/GroupUsesWithPSR12g/testGH4609PSR12_GroupUsesWithPSR12g.php.fixUses
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/SingleLineUses/testGH4609PSR12_SingleLineUses.php
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/SingleLineUses/testGH4609PSR12_SingleLineUses.php.fixUses
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/SingleLineUsesWithPSR12a/testGH4609PSR12_SingleLineUsesWithPSR12a.php
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/SingleLineUsesWithPSR12a/testGH4609PSR12_SingleLineUsesWithPSR12a.php.fixUses
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/SingleLineUsesWithPSR12b/testGH4609PSR12_SingleLineUsesWithPSR12b.php
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/SingleLineUsesWithPSR12b/testGH4609PSR12_SingleLineUsesWithPSR12b.php.fixUses
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/SingleLineUsesWithPSR12c/testGH4609PSR12_SingleLineUsesWithPSR12c.php
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/SingleLineUsesWithPSR12c/testGH4609PSR12_SingleLineUsesWithPSR12c.php.fixUses
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/SingleLineUsesWithPSR12d/testGH4609PSR12_SingleLineUsesWithPSR12d.php
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/SingleLineUsesWithPSR12d/testGH4609PSR12_SingleLineUsesWithPSR12d.php.fixUses
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/SingleLineUsesWithPSR12e/testGH4609PSR12_SingleLineUsesWithPSR12e.php
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/SingleLineUsesWithPSR12e/testGH4609PSR12_SingleLineUsesWithPSR12e.php.fixUses
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/SingleLineUsesWithPSR12f/testGH4609PSR12_SingleLineUsesWithPSR12f.php
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/SingleLineUsesWithPSR12f/testGH4609PSR12_SingleLineUsesWithPSR12f.php.fixUses
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/SingleLineUsesWithPSR12g/testGH4609PSR12_SingleLineUsesWithPSR12g.php
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH4609PSR12/SingleLineUsesWithPSR12g/testGH4609PSR12_SingleLineUsesWithPSR12g.php.fixUses
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH5330/01/testGH5330_01.php
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH5330/01/testGH5330_01.php.fixUses
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH5330/testGH5330_01.php
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH5330/testGH5330_01.php.importData
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH5578/01/testGH5578_01.php
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH5578/01/testGH5578_01.php.fixUses
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH5578/02/testGH5578_02.php
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH5578/02/testGH5578_02.php.fixUses
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH5578/03/testGH5578_03.php
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH5578/03/testGH5578_03.php.fixUses
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH5578/04/testGH5578_04.php
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH5578/04/testGH5578_04.php.fixUses
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH5578/05/testGH5578_05.php
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH5578/05/testGH5578_05.php.fixUses
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH5578/06/testGH5578_06.php
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH5578/06/testGH5578_06.php.fixUses
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH5578/07/testGH5578_07.php
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH5578/07/testGH5578_07.php.fixUses
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH5578/08/B.php
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH5578/08/testGH5578_08.php
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH5578/08/testGH5578_08.php.fixUses
rename php/php.editor/test/unit/data/testfiles/actions/{testNB4978/01/Foo.php
=> testGH6056/01/Test/TestClass1.php} (88%)
rename php/php.editor/test/unit/data/testfiles/actions/{testGH5578/02/B.php =>
testGH6056/01/Test/TestClass2.php} (88%)
rename php/php.editor/test/unit/data/testfiles/actions/{testGH5578/01/B.php =>
testGH6056/01/Test/TestClass3.php} (88%)
copy php/php.editor/test/unit/data/testfiles/actions/{testNB4978/02/Foo.php =>
testGH6056/01/Test/TestClass4.php} (88%)
create mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH6056/01/testGH6056_01.php
create mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH6056/01/testGH6056_01.php.fixUses
rename php/php.editor/test/unit/data/testfiles/actions/{testNB4978/02/Foo.php
=> testGH6082/01/Vendor/Test.php} (96%)
create mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH6082/01/testGH6082_01.php
create mode 100644
php/php.editor/test/unit/data/testfiles/actions/testGH6082/01/testGH6082_01.php.fixUses
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testMultipleDefaultNSUse/01/testMultipleDefaultNSUse_01.php
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testMultipleDefaultNSUse/01/testMultipleDefaultNSUse_01.php.fixUses
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testMultipleDefaultNSUse/02/testMultipleDefaultNSUse_02.php
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testMultipleDefaultNSUse/02/testMultipleDefaultNSUse_02.php.fixUses
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testWholeFileUse/01/testWholeFileUse_01.php
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testWholeFileUse/01/testWholeFileUse_01.php.fixUses
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testWholeFileUse/02/testWholeFileUse_02.php
delete mode 100644
php/php.editor/test/unit/data/testfiles/actions/testWholeFileUse/02/testWholeFileUse_02.php.fixUses
---------------------------------------------------------------------
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
