This is an automated email from the ASF dual-hosted git repository.
junichi11 pushed a commit to branch 2ndDonation
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
commit b474ad046f0f833e8348c25b274c61c1205589c7
Merge: a7db1ad f6c9977
Author: Junichi Yamamoto <junichi0...@gmail.com>
AuthorDate: Sat Jun 30 04:33:13 2018 +0900
Merge pull request #615 from junichi11/existing-patches
Integrate existing patches
php.api.phpmodule/manifest.mf | 2 +-
.../org/netbeans/modules/php/api/PhpVersion.java | 8 +-
php.dbgp/nbproject/project.xml | 9 +
.../php/dbgp/breakpoints/BreakpointsReader.java | 37 +-
.../dbgp/breakpoints/BrkptsViewActionProvider.java | 96 +-
.../dbgp/breakpoints/DbgpLineBreakpointType.java | 115 +
.../php/dbgp/breakpoints/LineBreakpoint.java | 43 +
.../dbgp/breakpoints/LineBreakpointBeanInfo.java | 42 +-
.../breakpoints/UpdatePropertiesOnSaveTask.java | 71 +-
.../modules/php/dbgp/breakpoints/Utils.java | 45 +
.../php/dbgp/packets/BrkpntCommandBuilder.java | 8 +-
.../modules/php/dbgp/packets/BrkpntSetCommand.java | 2 +-
.../netbeans/modules/php/dbgp/ui/Bundle.properties | 7 +
.../modules/php/dbgp/ui/ControllerProvider.java | 25 +-
.../php/dbgp/ui/DbgpLineBreakpointCustomizer.java | 73 +-
.../dbgp/ui/DbgpLineBreakpointCustomizerPanel.form | 170 ++
.../dbgp/ui/DbgpLineBreakpointCustomizerPanel.java | 466 ++++
php.editor/nbproject/project.properties | 2 +-
php.editor/nbproject/project.xml | 2 +-
.../modules/php/editor/api/ElementQuery.java | 2 +
.../php/editor/api/elements/AliasedClass.java | 5 +
.../php/editor/api/elements/ClassElement.java | 1 +
.../editor/completion/CompletionContextFinder.java | 3 +-
.../php/editor/completion/PHPCodeCompletion.java | 13 +-
.../php/editor/csl/DeclarationFinderImpl.java | 66 +-
.../modules/php/editor/csl/FoldingScanner.java | 110 +
.../modules/php/editor/csl/PHPFoldingProvider.java | 7 +-
.../php/editor/elements/ClassElementImpl.java | 42 +-
.../php/editor/elements/IndexQueryImpl.java | 120 +-
.../modules/php/editor/indent/FormatVisitor.java | 4 +-
.../modules/php/editor/indent/TokenFormatter.java | 6 +-
.../modules/php/editor/index/PHPIndexer.java | 2 +-
.../php/editor/lexer/PHP5ColoringLexer.java | 2387 ++++++++++----------
.../modules/php/editor/lexer/PHPTokenId.java | 1 +
.../php/editor/model/impl/ClassScopeImpl.java | 30 +
.../php/editor/model/impl/ModelVisitor.java | 19 +
.../modules/php/editor/model/impl/Type.java | 4 +-
.../modules/php/editor/options/Bundle.properties | 2 +
.../php/editor/options/CodeCompletionPanel.form | 26 +
.../php/editor/options/CodeCompletionPanel.java | 30 +-
.../modules/php/editor/options/OptionsUtils.java | 18 +
.../modules/php/editor/parser/ASTPHP5Parser.java | 94 +-
.../modules/php/editor/parser/ASTPHP5Scanner.java | 1328 +++++------
.../modules/php/editor/parser/ASTPHP5Symbols.java | 2 +-
.../php/editor/parser/EncodedActionTable1.java | 12 +-
.../php/editor/parser/EncodedActionTable13.java | 50 +-
.../php/editor/parser/PHPDocCommentParser.java | 2 +-
.../php/editor/parser/PHPVarCommentParser.java | 33 +-
.../parser/astnodes/GroupUseStatementPart.java | 1 +
.../php/editor/parser/astnodes/PHPDocTag.java | 1 +
.../php/editor/parser/astnodes/PHPVarComment.java | 6 +
.../php/editor/resources/code-templates.xml | 7 +-
.../modules/php/editor/resources/layer.xml | 1 +
.../typinghooks/PhpTypedBreakInterceptor.java | 37 +-
.../editor/verification/PHP72UnhandledError.java | 197 ++
.../php/editor/verification/VarDocSuggestion.java | 4 +-
.../PHP72FeaturesTest/lexer/object_type_01.pass | 73 +
.../parser/groupUseTrailingCommas_01.pass | 99 +
.../parser/groupUseTrailingCommas_02.pass | 95 +
.../parser/groupUseTrailingCommas_03.pass | 95 +
.../parser/groupUseTrailingCommas_04.pass | 134 ++
.../byReferences.php.testByReferences01.completion | 1 +
.../byReferences.php.testByReferences03.completion | 1 +
.../byReferences.php.testByReferences05.completion | 1 +
.../byReferences.php.testByReferences07.completion | 1 +
.../byReferences.php.testByReferences08.completion | 1 +
.../byReferences.php.testByReferences10.completion | 1 +
.../byReferences.php.testByReferences12.completion | 1 +
.../byReferences.php.testByReferences14.completion | 1 +
.../byReferences.php.testByReferences16.completion | 1 +
.../byReferences.php.testByReferences18.completion | 1 +
.../byReferences.php.testByReferences20.completion | 1 +
.../byReferences.php.testByReferences22.completion | 1 +
.../byReferences.php.testByReferences24.completion | 1 +
.../byReferences.php.testByReferences26.completion | 1 +
.../byReferences.php.testByReferences28.completion | 1 +
.../byReferences.php.testByReferences30.completion | 1 +
.../byReferences.php.testByReferences32.completion | 1 +
.../byReferences.php.testByReferences34.completion | 1 +
.../byReferences.php.testByReferences36.completion | 1 +
.../data/testfiles/completion/lib/mixin/mixin.php | 226 ++
.../lib/mixin/mixin.php.testMixin.completion | 20 +
.../mixin/mixin.php.testMixinEnclosing.completion | 35 +
...p.testMixinEnclosingWithStaticAccess.completion | 34 +
.../mixin/mixin.php.testMixinTagType.completion | 31 +
.../mixin.php.testMixinWithStaticAccess.completion | 19 +
.../completion/lib/mixin/mixinFieldAccess.php | 21 +
...ldAccess.php.testMixinFieldAccess_01.completion | 10 +
...ldAccess.php.testMixinFieldAccess_02.completion | 21 +
...ss.php.testMixinFieldStaticAccess_01.completion | 11 +
...ss.php.testMixinFieldStaticAccess_02.completion | 20 +
...amdecltypes.php.testParamDeclTypes11.completion | 1 +
...amdecltypes.php.testParamDeclTypes14.completion | 1 +
...ramdecltypes.php.testParamDeclTypes5.completion | 1 +
...ramdecltypes.php.testParamDeclTypes8.completion | 1 +
...TypeHint.php.testCallableTypeHint_01.completion | 1 +
...TypeHint.php.testCallableTypeHint_03.completion | 1 +
.../returnTypes.php.testReturnType01.completion | 1 +
.../returnTypes.php.testReturnType03.completion | 1 +
.../returnTypes.php.testReturnType05.completion | 1 +
.../returnTypes.php.testReturnType07.completion | 1 +
.../returnTypes.php.testReturnType12.completion | 1 +
.../returnTypes.php.testReturnType13.completion | 1 +
.../returnTypes.php.testReturnType14.completion | 1 +
...Typing01.php.testReturnTypesTyping01.completion | 1 +
...Typing02.php.testReturnTypesTyping02.completion | 1 +
...Typing03.php.testReturnTypesTyping03.completion | 1 +
...yping04.php.testReturnTypesTyping04a.completion | 1 +
...yping04.php.testReturnTypesTyping04b.completion | 1 +
...Typing05.php.testReturnTypesTyping05.completion | 1 +
...Typing06.php.testReturnTypesTyping06.completion | 1 +
...Typing07.php.testReturnTypesTyping07.completion | 1 +
...yping08.php.testReturnTypesTyping08a.completion | 1 +
...yping08.php.testReturnTypesTyping08b.completion | 1 +
...Typing09.php.testReturnTypesTyping09.completion | 1 +
...Typing10.php.testReturnTypesTyping10.completion | 1 +
...Typing11.php.testReturnTypesTyping11.completion | 1 +
...yping12.php.testReturnTypesTyping12a.completion | 1 +
...yping12.php.testReturnTypesTyping12b.completion | 1 +
...alarTypeHints.php.testBoolTypeHint01.completion | 1 +
...alarTypeHints.php.testBoolTypeHint03.completion | 1 +
...larTypeHints.php.testFloatTypeHint01.completion | 1 +
...larTypeHints.php.testFloatTypeHint03.completion | 1 +
...calarTypeHints.php.testIntTypeHint01.completion | 1 +
...calarTypeHints.php.testIntTypeHint03.completion | 1 +
...arTypeHints.php.testStringTypeHint01.completion | 1 +
...arTypeHints.php.testStringTypeHint03.completion | 1 +
...hp.testNullableTypes_ParameterType01.completion | 1 +
...hp.testNullableTypes_ParameterType03.completion | 1 +
...hp.testNullableTypes_ParameterType07.completion | 1 +
...hp.testNullableTypes_ParameterType09.completion | 1 +
...hp.testNullableTypes_ParameterType11.completion | 1 +
...hp.testNullableTypes_ParameterType13.completion | 1 +
...s.php.testNullableTypes_ReturnType01.completion | 1 +
...s.php.testNullableTypes_ReturnType03.completion | 1 +
...s.php.testNullableTypes_ReturnType05.completion | 1 +
...s.php.testNullableTypes_ReturnType09.completion | 1 +
...s.php.testNullableTypes_ReturnType11.completion | 1 +
...s.php.testNullableTypes_ReturnType13.completion | 1 +
...s.php.testNullableTypes_ReturnType15.completion | 1 +
...tNullableTypes_TypingParameterType01.completion | 1 +
...tNullableTypes_TypingParameterType02.completion | 1 +
...tNullableTypes_TypingParameterType03.completion | 1 +
...tNullableTypes_TypingParameterType04.completion | 1 +
...tNullableTypes_TypingParameterType05.completion | 1 +
...tNullableTypes_TypingParameterType06.completion | 1 +
...tNullableTypes_TypingParameterType07.completion | 1 +
...tNullableTypes_TypingParameterType08.completion | 1 +
...tNullableTypes_TypingParameterType09.completion | 1 +
...tNullableTypes_TypingParameterType10.completion | 1 +
...tNullableTypes_TypingParameterType11.completion | 1 +
...tNullableTypes_TypingParameterType12.completion | 1 +
...testNullableTypes_TypingReturnType01.completion | 1 +
...testNullableTypes_TypingReturnType02.completion | 1 +
...testNullableTypes_TypingReturnType03.completion | 1 +
...testNullableTypes_TypingReturnType04.completion | 1 +
...testNullableTypes_TypingReturnType05.completion | 1 +
...testNullableTypes_TypingReturnType06.completion | 1 +
...testNullableTypes_TypingReturnType07.completion | 1 +
...testNullableTypes_TypingReturnType08.completion | 1 +
...testNullableTypes_TypingReturnType09.completion | 1 +
...testNullableTypes_TypingReturnType10.completion | 1 +
...testNullableTypes_TypingReturnType11.completion | 1 +
...testNullableTypes_TypingReturnType12.completion | 1 +
...NullableTypesInPHPDoc_NullableType04.completion | 1 +
...NullableTypesInPHPDoc_NullableType06.completion | 1 +
...nType.php.testVoidReturnType_Class01.completion | 1 +
...pe.php.testVoidReturnType_Function01.completion | 1 +
...e.php.testVoidReturnType_Interface01.completion | 1 +
.../php72/testObjectTypeHint/objectTypeHint.php | 18 +
....testObjectTypeHint_ParameterType01.completion} | 5 +-
...p.testObjectTypeHint_ParameterType02.completion | 6 +
...p.testObjectTypeHint_ParameterType03.completion | 6 +
....php.testObjectTypeHint_ReturnType01.completion | 6 +
...php.testObjectTypeHint_ReturnType02.completion} | 6 +-
.../issue204958.php.testUseCase1.completion | 1 +
.../tests225089.php.testUseCase1.completion | 1 +
.../tests225089.php.testUseCase2.completion | 1 +
.../tests225089.php.testUseCase3.completion | 1 +
.../tests225089.php.testUseCase4.completion | 1 +
.../issue242398_01.php.testUseCase1.completion | 1 +
.../issue242398_02.php.testUseCase2.completion | 1 +
.../testfiles/completion/lib/vardoc/vardoc.php | 20 +
.../vardoc/vardoc.php.testVarTagType_01.completion | 24 +
.../vardoc/vardoc.php.testVariable_01.completion | 5 +
.../vardoc/vardoc.php.testVariable_02.completion | 5 +
.../test/unit/data/testfiles/finally_01.php.folds | 8 +-
.../test/unit/data/testfiles/finally_02.php.folds | 8 +-
.../foldingConditionalStatements.php.folds | 1 -
.../foldingConditionalStatements_1.php.folds | 1 -
.../unit/data/testfiles/foldingCycles.php.folds | 1 -
.../unit/data/testfiles/foldingCycles_1.php.folds | 1 -
.../unit/data/testfiles/foldingMethod.php.folds | 1 -
.../unit/data/testfiles/foldingMethod_1.php.folds | 1 -
.../unit/data/testfiles/foldingPHPTags.php.folds | 19 +
.../test/unit/data/testfiles/foldingUses.php.folds | 36 +
.../testGroupUseTrailingCommas.php | 29 +
.../gotodeclaration/testMixin/testMixin.php | 30 +
.../gotodeclaration/testVardoc/testVardoc.php | 24 +
.../testClassConstantVisibility.php.indexed | 2 +-
.../testGetClasses/testGetClasses.php.indexed | 6 +-
.../testGetClassesWithNsInterfaces.php.indexed | 2 +-
.../testGetFunctions/testGetFunctions.php.indexed | 2 +-
.../testGetMethods/testGetMethods.php.indexed | 2 +-
.../testIssue240824/testIssue240824.php.indexed | 2 +-
.../data/testfiles/index/testMixin/testMixin.php | 34 +
.../index/testMixin/testMixin.php.indexed | 73 +
.../testNullableTypesForMethods.php.indexed | 2 +-
.../test/unit/data/testfiles/issue213616.php.folds | 1 -
.../test/unit/data/testfiles/issue216088.php.folds | 1 -
.../test/unit/data/testfiles/issue232884.php.folds | 1 -
.../unit/data/testfiles/lexer/object_type_01.php | 11 +
.../testGroupUseTrailingCommas.php | 29 +
.../markoccurences/testMixin/testMixin.php | 30 +
.../markoccurences/testVardoc/testVardoc.php | 24 +
.../parser/foldingConditionalStatements.php | 2 -
.../parser/foldingConditionalStatements_1.php | 2 -
.../unit/data/testfiles/parser/foldingCycles.php | 2 -
.../unit/data/testfiles/parser/foldingCycles_1.php | 2 -
.../unit/data/testfiles/parser/foldingMethod.php | 2 -
.../unit/data/testfiles/parser/foldingMethod_1.php | 2 -
.../unit/data/testfiles/parser/foldingPHPTags.php | 19 +
.../unit/data/testfiles/parser/foldingUses.php | 35 +
.../testfiles/parser/groupUseTrailingCommas_01.php | 3 +
.../parser/groupUseTrailingCommas_01.php.errors | 0
.../testfiles/parser/groupUseTrailingCommas_02.php | 3 +
.../parser/groupUseTrailingCommas_02.php.errors | 0
.../testfiles/parser/groupUseTrailingCommas_03.php | 3 +
.../parser/groupUseTrailingCommas_03.php.errors | 0
.../testfiles/parser/groupUseTrailingCommas_04.php | 3 +
.../parser/groupUseTrailingCommas_04.php.errors | 0
.../unit/data/testfiles/parser/issue213616.php | 2 -
.../unit/data/testfiles/parser/issue216088.php | 1 -
.../unit/data/testfiles/parser/issue232884.php | 1 -
...s.php.testGroupUseTrailingCommas_01.occurrences | 3 +
...s.php.testGroupUseTrailingCommas_02.occurrences | 3 +
...s.php.testGroupUseTrailingCommas_03.occurrences | 3 +
...s.php.testGroupUseTrailingCommas_04.occurrences | 3 +
...s.php.testGroupUseTrailingCommas_05.occurrences | 3 +
...s.php.testGroupUseTrailingCommas_06.occurrences | 3 +
...s.php.testGroupUseTrailingCommas_07.occurrences | 3 +
...s.php.testGroupUseTrailingCommas_08.occurrences | 3 +
...s.php.testGroupUseTrailingCommas_09.occurrences | 3 +
.../testMixin.php.testMixin_01.occurrences | 2 +
.../testMixin.php.testMixin_02.occurrences | 2 +
.../testMixin.php.testMixin_03.occurrences | 3 +
.../testMixin.php.testMixin_04.occurrences | 3 +
.../testMixin.php.testMixin_05.occurrences | 3 +
.../testMixin.php.testMixin_06.occurrences | 2 +
.../testMixin.php.testMixin_07.occurrences | 2 +
.../testVardoc.php.testVardoc_01.occurrences | 4 +
.../testVardoc.php.testVardoc_02.occurrences | 4 +
.../testVardoc.php.testVardoc_03.occurrences | 4 +
.../testVardoc.php.testVardoc_04.occurrences | 4 +
.../testVardoc.php.testVardoc_05.occurrences | 4 +
.../testVardoc.php.testVardoc_06.occurrences | 4 +
.../testVardoc.php.testVardoc_07.occurrences | 4 +
.../testVardoc.php.testVardoc_08.occurrences | 4 +
.../testVardoc.php.testVardoc_09.occurrences | 3 +
.../testVardoc.php.testVardoc_10.occurrences | 3 +
.../testVardoc.php.testVardoc_11.occurrences | 3 +
.../testVardoc.php.testVardoc_12.occurrences | 3 +
.../testVardoc.php.testVardoc_13.occurrences | 3 +
.../testVardoc.php.testVardoc_14.occurrences | 3 +
.../testVardoc.php.testVardoc_15.occurrences | 3 +
.../testVardoc.php.testVardoc_16.occurrences | 3 +
.../testVardoc.php.testVardoc_17.occurrences | 3 +
...VarDocSuggestion.php.testVarDocSuggestion.hints | 2 +-
.../editor/completion/PHP72CodeCompletionTest.java | 101 +
.../completion/PHPCodeCompletionMixinTest.java | 105 +
.../completion/PHPCodeCompletionVardocTest.java} | 62 +-
.../modules/php/editor/csl/FoldingTest.java | 10 +
.../php/editor/csl/GotoDeclarationMixinTest.java} | 36 +-
.../php/editor/csl/GotoDeclarationPHP72Test.java} | 53 +-
...ingTest.java => GotoDeclarationVardocTest.java} | 67 +-
.../csl/OccurrencesFinderImplMixinTest.java} | 57 +-
.../csl/OccurrencesFinderImplPHP72Test.java} | 65 +-
.../csl/OccurrencesFinderImplVardocTest.java | 117 +
.../modules/php/editor/index/PHPIndexTest.java | 5 +
.../php/editor/lexer/PHP72FeaturesTest.java} | 29 +-
.../php/editor/parser/ASTPHP5ParserTest.java | 17 +
.../php/editor/parser/PHPVarCommentParserTest.java | 54 +
.../php/editor/parser/PhpParserErrorTest.java | 16 +
.../typinghooks/PhpTypedBreakInterceptorTest.java | 308 +++
php.editor/tools/ASTPHP5Parser.cup | 2 +-
php.editor/tools/ASTPHP5Scanner.flex | 5 +
php.editor/tools/Php5ColoringScanner.flex | 6 +
.../php/project/ui/options/Bundle.properties | 2 +-
php.twig/nbproject/project.xml | 17 +
.../twig/editor/palette/TwigPaletteFactory.java | 165 ++
.../netbeans/modules/php/twig/resources/layer.xml | 13 +
291 files changed, 6539 insertions(+), 2387 deletions(-)
---------------------------------------------------------------------
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
