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 296dc8c4d4 Merge pull request #5686 from junichi11/php-gh-5100-cc-enum-this new 6928b96d3b fix navigator view for multiple default namespaces new 1bda109d68 FixUsesPerformer,ImportDataCreator and UsedNamespaceCollector logic update to fix imports in whole file, fix ModelUtils multiple default namespace detection new eba3855928 Merge pull request #5681 from rossluk/multiple_default_namespace_fixes The 8295 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/FixUsesAction.java | 2 +- .../php/editor/actions/FixUsesPerformer.java | 307 ++++++++++++--------- .../php/editor/actions/ImportDataCreator.java | 38 ++- .../php/editor/actions/UsedNamesCollector.java | 76 ++--- .../php/editor/actions/UsedNamespaceName.java | 12 +- .../modules/php/editor/model/ModelUtils.java | 83 ++---- .../php/editor/model/impl/ModelBuilder.java | 2 +- ...keted_multiple_namespaces_with_default_one.pass | 5 +- ..._multiple_namespaces_with_multiple_default.pass | 9 + .../data/testfiles/actions/nb4978_08.php.usedNames | 5 +- .../01/testMultipleDefaultNSUse_01.php | 52 ++++ .../01/testMultipleDefaultNSUse_01.php.fixUses | 54 ++++ .../02/testMultipleDefaultNSUse_02.php | 52 ++++ .../02/testMultipleDefaultNSUse_02.php.fixUses | 54 ++++ .../data/testfiles/actions/testNB4978/01/Foo.php | 23 ++ .../data/testfiles/actions/testNB4978/02/Foo.php | 23 ++ .../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 | 33 +++ .../php/editor/actions/FixUsesPerformerTest.java | 47 +++- .../modules/php/editor/csl/NavigatorTest.java | 4 + 23 files changed, 823 insertions(+), 272 deletions(-) create mode 100644 php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/csl/NavigatorTest/structure/php53/bracketed_multiple_namespaces_with_multiple_default.pass create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testMultipleDefaultNSUse/01/testMultipleDefaultNSUse_01.php create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testMultipleDefaultNSUse/01/testMultipleDefaultNSUse_01.php.fixUses create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testMultipleDefaultNSUse/02/testMultipleDefaultNSUse_02.php create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testMultipleDefaultNSUse/02/testMultipleDefaultNSUse_02.php.fixUses create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testNB4978/01/Foo.php create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testNB4978/02/Foo.php create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testWholeFileUse/01/testWholeFileUse_01.php create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testWholeFileUse/01/testWholeFileUse_01.php.fixUses create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testWholeFileUse/02/testWholeFileUse_02.php create mode 100644 php/php.editor/test/unit/data/testfiles/actions/testWholeFileUse/02/testWholeFileUse_02.php.fixUses create mode 100644 php/php.editor/test/unit/data/testfiles/structure/php53/bracketed_multiple_namespaces_with_multiple_default.php --------------------------------------------------------------------- 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