[netbeans] branch master updated (81fae58229 -> 9445a566c5)

[tm...@apache.org]

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 81fae58229 Merge pull request #4816 from neilcsmith-net/nb16-issues
     new 065225aaae Support `{@inheritdoc}` for fields and constants #4686
     new 13ee697b21 Replace `{@inheritdoc}` with whole parent sentences #4686
     new 9445a566c5 Merge pull request #4846 from junichi11/gh-4686-inheritdoc

The 7626 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/completion/DocRenderer.java |  80 +++++++++++++-
 .../completion/documentation/inheritdoc.php        | 119 +++++++++++++++++++++
 ...hp.testInheritdocChildMethodSingleSentence.html |  10 ++
 ...itdoc.php.testInheritdocClassWithInlineTag.html |   2 +-
 ...eritdocClassWithInlineTagForPhpDocumentor.html} |   0
 ...nheritdoc.php.testInheritdocConstInlineTag.html |  10 ++
 ...stInheritdocConstInlineTagForPhpDocumentor.html |  10 ++
 .../inheritdoc.php.testInheritdocConstOnlyTag.html |   9 ++
 ....php.testInheritdocConstWithSingleSentence.html |   9 ++
 ...itdoc.php.testInheritdocConstWithoutPhpDoc.html |   9 ++
 ...nheritdoc.php.testInheritdocFieldInlineTag.html |  10 ++
 ...stInheritdocFieldInlineTagForPhpDocumentor.html |  10 ++
 .../inheritdoc.php.testInheritdocFieldOnlyTag.html |  10 ++
 ....php.testInheritdocFieldWithSingleSentence.html |   9 ++
 ...itdoc.php.testInheritdocFieldWithoutPhpDoc.html |  10 ++
 ...c.php.testInheritdocInterfaceWithInlineTag.html |   2 +-
 ...docInterfaceWithInlineTagForPhpDocumentor.html} |   0
 ...tdoc.php.testInheritdocMethodWithInlineTag.html |   2 +-
 ...ritdocMethodWithInlineTagForPhpDocumentor.html} |   0
 .../editor/completion/PHPCCDocumentationTest.java  |  66 ++++++++++++
 20 files changed, 372 insertions(+), 5 deletions(-)
 create mode 100644 php/php.editor/test/unit/data/testfiles/completion/documentation/inheritdoc.php.testInheritdocChildMethodSingleSentence.html
 copy php/php.editor/test/unit/data/testfiles/completion/documentation/{inheritdoc.php.testInheritdocClassWithInlineTag.html => inheritdoc.php.testInheritdocClassWithInlineTagForPhpDocumentor.html} (100%)
 create mode 100644 php/php.editor/test/unit/data/testfiles/completion/documentation/inheritdoc.php.testInheritdocConstInlineTag.html
 create mode 100644 php/php.editor/test/unit/data/testfiles/completion/documentation/inheritdoc.php.testInheritdocConstInlineTagForPhpDocumentor.html
 create mode 100644 php/php.editor/test/unit/data/testfiles/completion/documentation/inheritdoc.php.testInheritdocConstOnlyTag.html
 create mode 100644 php/php.editor/test/unit/data/testfiles/completion/documentation/inheritdoc.php.testInheritdocConstWithSingleSentence.html
 create mode 100644 php/php.editor/test/unit/data/testfiles/completion/documentation/inheritdoc.php.testInheritdocConstWithoutPhpDoc.html
 create mode 100644 php/php.editor/test/unit/data/testfiles/completion/documentation/inheritdoc.php.testInheritdocFieldInlineTag.html
 create mode 100644 php/php.editor/test/unit/data/testfiles/completion/documentation/inheritdoc.php.testInheritdocFieldInlineTagForPhpDocumentor.html
 create mode 100644 php/php.editor/test/unit/data/testfiles/completion/documentation/inheritdoc.php.testInheritdocFieldOnlyTag.html
 create mode 100644 php/php.editor/test/unit/data/testfiles/completion/documentation/inheritdoc.php.testInheritdocFieldWithSingleSentence.html
 create mode 100644 php/php.editor/test/unit/data/testfiles/completion/documentation/inheritdoc.php.testInheritdocFieldWithoutPhpDoc.html
 copy php/php.editor/test/unit/data/testfiles/completion/documentation/{inheritdoc.php.testInheritdocInterfaceWithInlineTag.html => inheritdoc.php.testInheritdocInterfaceWithInlineTagForPhpDocumentor.html} (100%)
 copy php/php.editor/test/unit/data/testfiles/completion/documentation/{inheritdoc.php.testInheritdocMethodWithInlineTag.html => inheritdoc.php.testInheritdocMethodWithInlineTagForPhpDocumentor.html} (100%)


---------------------------------------------------------------------
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