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 ae0b68e Merge pull request #3316 from ppisl/NETBEANS-6196 new 94a092b [NETBEANS-2472] Mark overriding/overridden constants and properties as annotations new 898ebb0 Fix the message of TP_Overrides new 1e86a06 Merge pull request #3327 from junichi11/netbeans-2472-overriding-properties The 6190 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: .../csl/editor/overridden/Bundle.properties | 2 +- .../php/editor/csl/OverridingMethodsImpl.java | 196 ++++++++++++++++++++- .../php/editor/elements/IndexQueryImpl.java | 16 +- .../overriding/overridden/overridden_01.pass | 18 ++ .../overriding/overriding/overriding_01.pass | 16 ++ .../overriding/overridden/ChildClass1.php | 63 +++++++ .../overriding/overridden/ChildClass2.php | 83 +++++++++ .../overriding/overridden/overridden_01.php | 55 ++++++ .../overriding/overriding/ParentClass.php | 55 ++++++ .../overriding/overriding/overriding_01.php | 83 +++++++++ .../editor/csl/OverridingMethodsImplTestBase.java | 179 +++++++++++++++++++ .../csl/OverridingMethodsOverriddenTest.java | 49 ++++++ .../csl/OverridingMethodsOverridingTest.java | 49 ++++++ 13 files changed, 847 insertions(+), 17 deletions(-) create mode 100644 php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/csl/OverridingMethodsOverriddenTest/overriding/overridden/overridden_01.pass create mode 100644 php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/csl/OverridingMethodsOverridingTest/overriding/overriding/overriding_01.pass create mode 100644 php/php.editor/test/unit/data/testfiles/overriding/overridden/ChildClass1.php create mode 100644 php/php.editor/test/unit/data/testfiles/overriding/overridden/ChildClass2.php create mode 100644 php/php.editor/test/unit/data/testfiles/overriding/overridden/overridden_01.php create mode 100644 php/php.editor/test/unit/data/testfiles/overriding/overriding/ParentClass.php create mode 100644 php/php.editor/test/unit/data/testfiles/overriding/overriding/overriding_01.php create mode 100644 php/php.editor/test/unit/src/org/netbeans/modules/php/editor/csl/OverridingMethodsImplTestBase.java create mode 100644 php/php.editor/test/unit/src/org/netbeans/modules/php/editor/csl/OverridingMethodsOverriddenTest.java create mode 100644 php/php.editor/test/unit/src/org/netbeans/modules/php/editor/csl/OverridingMethodsOverridingTest.java --------------------------------------------------------------------- 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