You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by tm...@apache.org on 2018/11/05 11:16:01 UTC
[incubator-netbeans] 01/01: Merge pull request #1009 from
junichi11/php.editor-minor-changes
This is an automated email from the ASF dual-hosted git repository.
tmysik pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
commit 487d18b56d0e7c9458dc67f44b08a5aca83319ac
Merge: 6dc3462 85e1a52
Author: Tomáš Myšík <to...@gmail.com>
AuthorDate: Mon Nov 5 12:15:55 2018 +0100
Merge pull request #1009 from junichi11/php.editor-minor-changes
Minor changes for the php.editor
.../modules/php/editor/csl/PHPTypeSearcher.java | 1 -
.../php/editor/elements/VariableElementImpl.java | 1 -
.../modules/php/editor/indent/ui/FmtWrapping.java | 1 -
.../modules/php/editor/parser/ASTPHP5Parser.java | 2276 +++++++++---------
.../modules/php/editor/parser/ASTPHP5Scanner.java | 511 ++---
.../modules/php/editor/parser/ASTPHP5Symbols.java | 2 +-
.../org/netbeans/test/php/brackets/brackets.java | 3 -
.../src/org/netbeans/test/php/cc/testCC.java | 1 -
.../org/netbeans/test/php/cc/testCCInDetail.java | 3 -
.../test/php/cc/testCCReturnAnotation.java | 10 -
.../src/org/netbeans/test/php/cc/testCCSmarty.java | 1 -
.../src/org/netbeans/test/php/folds/folds.java | 3 -
.../netbeans/test/php/formatting/formatting.java | 5 -
.../testNewPHPProjectNameLocationStepOperator.java | 3 -
.../editor/completion/PHP53CodeCompletionTest.java | 1 -
.../completion/PHPCodeCompletion194836Test.java | 2 -
.../modules/php/editor/csl/TestUtilities.java | 11 -
.../modules/php/editor/lexer/PHPLexerUtils.java | 1 -
.../editor/model/impl/ModelPerformanceTest.java | 8 -
.../modules/php/editor/parser/api/UtilsTest.java | 1 -
.../typinghooks/PhpTypedBreakInterceptorTest.java | 2 -
.../typinghooks/PhpTypedTextInterceptorTest.java | 3 -
php/php.editor/tools/ASTPHP5Parser.cup | 2424 ++++++++++----------
php/php.editor/tools/ASTPHP5Scanner.flex | 483 ++--
24 files changed, 2847 insertions(+), 2910 deletions(-)
---------------------------------------------------------------------
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