This is an automated email from the ASF dual-hosted git repository.
tmysik pushed a change to branch php81-support
in repository https://gitbox.apache.org/repos/asf/netbeans.git.
from 6dd2ade Merge pull request #3448 from
junichi11/php81-new-in-initializers
new 47566cb [NETBEANS-5599] PHP 8.1 Support: Pure intersection types
(Part 1)
new 04d43f9 [NETBEANS-5599] PHP 8.1 Support: Pure intersection types
(Part 2)
new 20e1de0 Merge pull request #3461 from
junichi11/php81-pure-intersection-types
The 6207 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/api/QualifiedName.java | 12 +
.../php/editor/api/elements/AliasedFunction.java | 6 +
.../editor/api/elements/BaseFunctionElement.java | 7 +
.../php/editor/api/elements/ParameterElement.java | 1 +
.../php/editor/completion/PHPCompletionItem.java | 3 +-
.../modules/php/editor/csl/NavigatorScanner.java | 7 +-
.../elements/BaseFunctionElementSupport.java | 28 +-
.../php/editor/elements/FunctionElementImpl.java | 24 +-
.../php/editor/elements/MethodElementImpl.java | 23 +-
.../php/editor/elements/ParameterElementImpl.java | 25 +-
.../modules/php/editor/indent/CodeStyle.java | 4 +
.../modules/php/editor/indent/FmtOptions.java | 2 +
.../modules/php/editor/indent/FormatToken.java | 1 +
.../modules/php/editor/indent/FormatVisitor.java | 33 +-
.../modules/php/editor/indent/TokenFormatter.java | 5 +
.../modules/php/editor/indent/ui/Bundle.properties | 1 +
.../modules/php/editor/indent/ui/FmtSpaces.java | 4 +-
.../modules/php/editor/indent/ui/Spaces.php | 8 +
.../modules/php/editor/index/PHPIndexer.java | 2 +-
.../modules/php/editor/model/FieldElement.java | 1 +
.../modules/php/editor/model/FunctionScope.java | 1 +
.../modules/php/editor/model/Parameter.java | 2 +
.../php/editor/model/impl/FieldElementImpl.java | 10 +-
.../php/editor/model/impl/FunctionScopeImpl.java | 40 +-
.../php/editor/model/impl/MethodScopeImpl.java | 7 +
.../php/editor/model/impl/ModelVisitor.java | 7 +-
.../php/editor/model/impl/ParameterImpl.java | 32 +-
.../modules/php/editor/model/impl/Type.java | 21 +
.../php/editor/model/impl/VariousUtils.java | 52 +-
.../model/nodes/ArrowFunctionDeclarationInfo.java | 3 +
.../editor/model/nodes/FormalParameterInfo.java | 7 +-
.../model/nodes/LambdaFunctionDeclarationInfo.java | 3 +
.../model/nodes/MagicMethodDeclarationInfo.java | 2 +-
.../model/nodes/SingleFieldDeclarationInfo.java | 4 +
.../modules/php/editor/parser/ASTPHP5Parser.java | 5369 +++++++-------
.../modules/php/editor/parser/ASTPHP5Scanner.java | 2264 +++---
.../modules/php/editor/parser/ASTPHP5Symbols.java | 3 +-
.../php/editor/parser/EncodedActionTable1.java | 7612 ++++++++++----------
.../php/editor/parser/EncodedActionTable10.java | 5332 +++++++-------
.../php/editor/parser/EncodedActionTable11.java | 5548 +++++++-------
.../php/editor/parser/EncodedActionTable12.java | 6606 ++++++++---------
.../php/editor/parser/EncodedActionTable13.java | 5502 +++++++-------
.../php/editor/parser/EncodedActionTable14.java | 6854 +++++++++---------
.../php/editor/parser/EncodedActionTable15.java | 4954 ++++++-------
.../php/editor/parser/EncodedActionTable16.java | 5398 +++++++-------
.../php/editor/parser/EncodedActionTable17.java | 3194 +++++++-
.../php/editor/parser/EncodedActionTable2.java | 5682 +++++++--------
.../php/editor/parser/EncodedActionTable3.java | 6826 +++++++++---------
.../php/editor/parser/EncodedActionTable4.java | 6086 ++++++++--------
.../php/editor/parser/EncodedActionTable5.java | 6672 ++++++++---------
.../php/editor/parser/EncodedActionTable6.java | 6036 ++++++++--------
.../php/editor/parser/EncodedActionTable7.java | 6624 ++++++++---------
.../php/editor/parser/EncodedActionTable8.java | 7510 +++++++++----------
.../php/editor/parser/EncodedActionTable9.java | 6700 ++++++++---------
.../netbeans/modules/php/editor/parser/Utils.java | 3 +
.../editor/parser/astnodes/FormalParameter.java | 4 +
.../editor/parser/astnodes/IntersectionType.java | 69 +
.../php/editor/parser/astnodes/Visitor.java | 2 +
.../astnodes/visitors/DefaultTreePathVisitor.java | 8 +
.../parser/astnodes/visitors/DefaultVisitor.java | 6 +
.../editor/verification/PHP81UnhandledError.java | 7 +
.../php80ConstructorPropertyPromotion.pass | 8 +-
.../structure/pureIntersectionTypes.pass | 16 +
.../ASTPHP5ParserTest/parser/TextSearchQuery.pass | 16 +-
.../parser/php74/arrowFunctions_01.pass | 4 +-
...pureIntersectionTypesWithUnionTypeError_01.pass | 128 +
...pureIntersectionTypesWithUnionTypeError_02.pass | 165 +
...pureIntersectionTypesWithUnionTypeError_03.pass | 165 +
.../parser/php81/pureIntersectionTypes_01.pass | 1215 ++++
...daFunctionWithParamsWithVarsWithStatements.pass | 2 +-
...paceAroundPureIntersectionTypeSeparator_01a.php | 85 +
...PureIntersectionTypeSeparator_01a.php.formatted | 85 +
...paceAroundPureIntersectionTypeSeparator_01b.php | 85 +
...PureIntersectionTypeSeparator_01b.php.formatted | 85 +
...paceAroundPureIntersectionTypeSeparator_02a.php | 85 +
...PureIntersectionTypeSeparator_02a.php.formatted | 85 +
...paceAroundPureIntersectionTypeSeparator_02b.php | 85 +
...PureIntersectionTypeSeparator_02b.php.formatted | 85 +
.../testPureIntersectionType.php | 66 +
.../testGetFunctions/testGetFunctions.php.indexed | 6 +-
.../testGetMethods/testGetMethods.php.indexed | 2 +-
.../testIssue240824/testIssue240824.php.indexed | 2 +-
.../testNullableTypesForFunctions.php.indexed | 4 +-
.../testNullableTypesForMethods.php.indexed | 8 +-
...stPHP80ConstructorPropertyPromotion.php.indexed | 20 +-
.../testPHP80MixedReturnType.php.indexed | 4 +-
.../testPHP80UnionTypesFunctions.php.indexed | 12 +-
.../testPHP80UnionTypesTypes.php.indexed | 16 +-
.../testPHP81PureIntersectionTypes.php | 67 +
.../testPHP81PureIntersectionTypes.php.indexed | 170 +
.../testPureIntersectionType.php | 66 +
...pureIntersectionTypesWithUnionTypeError_01.php} | 18 +-
...tersectionTypesWithUnionTypeError_01.php.errors | 11 +
...pureIntersectionTypesWithUnionTypeError_02.php} | 19 +-
...tersectionTypesWithUnionTypeError_02.php.errors | 17 +
...pureIntersectionTypesWithUnionTypeError_03.php} | 20 +-
...tersectionTypesWithUnionTypeError_03.php.errors | 11 +
.../parser/php81/pureIntersectionTypes_01.php | 67 +
.../php81/pureIntersectionTypes_01.php.errors} | 0
.../testfiles/structure/pureIntersectionTypes.php | 67 +
...pe.php.testPureIntersectionType_01a.occurrences | 15 +
...pe.php.testPureIntersectionType_01b.occurrences | 15 +
...pe.php.testPureIntersectionType_02a.occurrences | 15 +
...pe.php.testPureIntersectionType_02b.occurrences | 15 +
...pe.php.testPureIntersectionType_03a.occurrences | 15 +
...pe.php.testPureIntersectionType_03b.occurrences | 15 +
...pe.php.testPureIntersectionType_04a.occurrences | 15 +
...pe.php.testPureIntersectionType_04b.occurrences | 15 +
...pe.php.testPureIntersectionType_05a.occurrences | 15 +
...pe.php.testPureIntersectionType_05b.occurrences | 15 +
...pe.php.testPureIntersectionType_06a.occurrences | 15 +
...pe.php.testPureIntersectionType_06b.occurrences | 15 +
...pe.php.testPureIntersectionType_07a.occurrences | 15 +
...pe.php.testPureIntersectionType_07b.occurrences | 15 +
...pe.php.testPureIntersectionType_08a.occurrences | 15 +
...pe.php.testPureIntersectionType_08b.occurrences | 15 +
...pe.php.testPureIntersectionType_09a.occurrences | 15 +
...pe.php.testPureIntersectionType_09b.occurrences | 15 +
...pe.php.testPureIntersectionType_10a.occurrences | 15 +
...pe.php.testPureIntersectionType_10b.occurrences | 15 +
...pe.php.testPureIntersectionType_11a.occurrences | 15 +
...pe.php.testPureIntersectionType_11b.occurrences | 15 +
...pe.php.testPureIntersectionType_12a.occurrences | 15 +
...pe.php.testPureIntersectionType_12b.occurrences | 15 +
...pe.php.testPureIntersectionType_13a.occurrences | 15 +
...pe.php.testPureIntersectionType_13b.occurrences | 15 +
...pe.php.testPureIntersectionType_14a.occurrences | 15 +
...pe.php.testPureIntersectionType_14b.occurrences | 15 +
...pe.php.testPureIntersectionType_15a.occurrences | 15 +
...pe.php.testPureIntersectionType_15b.occurrences | 15 +
...pe.php.testPureIntersectionType_16a.occurrences | 15 +
...pe.php.testPureIntersectionType_16b.occurrences | 15 +
...pe.php.testPureIntersectionType_17a.occurrences | 15 +
...pe.php.testPureIntersectionType_17b.occurrences | 15 +
.../php/editor/csl/GotoDeclarationPHP81Test.java | 128 +
.../modules/php/editor/csl/NavigatorTest.java | 4 +
.../editor/csl/OccurrencesFinderImplPHP81Test.java | 136 +
.../php/editor/indent/PHPFormatterSpacesTest.java | 26 +
.../modules/php/editor/index/PHPIndexTest.java | 4 +
.../php/editor/parser/ASTPHP5ParserTest.java | 16 +
.../php/editor/parser/PhpParserErrorTest.java | 16 +
.../modules/php/editor/parser/PrintASTVisitor.java | 7 +
php/php.editor/tools/ASTPHP5Parser.cup | 80 +-
php/php.editor/tools/ASTPHP5Scanner.flex | 7 +-
144 files changed, 61284 insertions(+), 53981 deletions(-)
create mode 100644
php/php.editor/src/org/netbeans/modules/php/editor/parser/astnodes/IntersectionType.java
create mode 100644
php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/csl/NavigatorTest/structure/pureIntersectionTypes.pass
create mode 100644
php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php81/pureIntersectionTypesWithUnionTypeError_01.pass
create mode 100644
php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php81/pureIntersectionTypesWithUnionTypeError_02.pass
create mode 100644
php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php81/pureIntersectionTypesWithUnionTypeError_03.pass
create mode 100644
php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php81/pureIntersectionTypes_01.pass
create mode 100644
php/php.editor/test/unit/data/testfiles/formatting/spaces/php81/spaceAroundPureIntersectionTypeSeparator_01a.php
create mode 100644
php/php.editor/test/unit/data/testfiles/formatting/spaces/php81/spaceAroundPureIntersectionTypeSeparator_01a.php.formatted
create mode 100644
php/php.editor/test/unit/data/testfiles/formatting/spaces/php81/spaceAroundPureIntersectionTypeSeparator_01b.php
create mode 100644
php/php.editor/test/unit/data/testfiles/formatting/spaces/php81/spaceAroundPureIntersectionTypeSeparator_01b.php.formatted
create mode 100644
php/php.editor/test/unit/data/testfiles/formatting/spaces/php81/spaceAroundPureIntersectionTypeSeparator_02a.php
create mode 100644
php/php.editor/test/unit/data/testfiles/formatting/spaces/php81/spaceAroundPureIntersectionTypeSeparator_02a.php.formatted
create mode 100644
php/php.editor/test/unit/data/testfiles/formatting/spaces/php81/spaceAroundPureIntersectionTypeSeparator_02b.php
create mode 100644
php/php.editor/test/unit/data/testfiles/formatting/spaces/php81/spaceAroundPureIntersectionTypeSeparator_02b.php.formatted
create mode 100644
php/php.editor/test/unit/data/testfiles/gotodeclaration/php81/testPureIntersectionType/testPureIntersectionType.php
create mode 100644
php/php.editor/test/unit/data/testfiles/index/testPHP81PureIntersectionTypes/testPHP81PureIntersectionTypes.php
create mode 100644
php/php.editor/test/unit/data/testfiles/index/testPHP81PureIntersectionTypes/testPHP81PureIntersectionTypes.php.indexed
create mode 100644
php/php.editor/test/unit/data/testfiles/markoccurences/php81/testPureIntersectionType/testPureIntersectionType.php
copy
php/php.editor/{src/org/netbeans/modules/php/editor/model/FieldElement.java =>
test/unit/data/testfiles/parser/php81/pureIntersectionTypesWithUnionTypeError_01.php}
(74%)
create mode 100644
php/php.editor/test/unit/data/testfiles/parser/php81/pureIntersectionTypesWithUnionTypeError_01.php.errors
copy
php/php.editor/{src/org/netbeans/modules/php/editor/model/FieldElement.java =>
test/unit/data/testfiles/parser/php81/pureIntersectionTypesWithUnionTypeError_02.php}
(74%)
create mode 100644
php/php.editor/test/unit/data/testfiles/parser/php81/pureIntersectionTypesWithUnionTypeError_02.php.errors
copy
php/php.editor/{src/org/netbeans/modules/php/editor/model/FieldElement.java =>
test/unit/data/testfiles/parser/php81/pureIntersectionTypesWithUnionTypeError_03.php}
(74%)
create mode 100644
php/php.editor/test/unit/data/testfiles/parser/php81/pureIntersectionTypesWithUnionTypeError_03.php.errors
create mode 100644
php/php.editor/test/unit/data/testfiles/parser/php81/pureIntersectionTypes_01.php
copy
php/{php.smarty/src/org/netbeans/modules/php/smarty/resources/TplTemplate.tpl
=>
php.editor/test/unit/data/testfiles/parser/php81/pureIntersectionTypes_01.php.errors}
(100%)
create mode 100644
php/php.editor/test/unit/data/testfiles/structure/pureIntersectionTypes.php
create mode 100644
php/php.editor/test/unit/data/testfiles/testPureIntersectionType.php.testPureIntersectionType_01a.occurrences
create mode 100644
php/php.editor/test/unit/data/testfiles/testPureIntersectionType.php.testPureIntersectionType_01b.occurrences
create mode 100644
php/php.editor/test/unit/data/testfiles/testPureIntersectionType.php.testPureIntersectionType_02a.occurrences
create mode 100644
php/php.editor/test/unit/data/testfiles/testPureIntersectionType.php.testPureIntersectionType_02b.occurrences
create mode 100644
php/php.editor/test/unit/data/testfiles/testPureIntersectionType.php.testPureIntersectionType_03a.occurrences
create mode 100644
php/php.editor/test/unit/data/testfiles/testPureIntersectionType.php.testPureIntersectionType_03b.occurrences
create mode 100644
php/php.editor/test/unit/data/testfiles/testPureIntersectionType.php.testPureIntersectionType_04a.occurrences
create mode 100644
php/php.editor/test/unit/data/testfiles/testPureIntersectionType.php.testPureIntersectionType_04b.occurrences
create mode 100644
php/php.editor/test/unit/data/testfiles/testPureIntersectionType.php.testPureIntersectionType_05a.occurrences
create mode 100644
php/php.editor/test/unit/data/testfiles/testPureIntersectionType.php.testPureIntersectionType_05b.occurrences
create mode 100644
php/php.editor/test/unit/data/testfiles/testPureIntersectionType.php.testPureIntersectionType_06a.occurrences
create mode 100644
php/php.editor/test/unit/data/testfiles/testPureIntersectionType.php.testPureIntersectionType_06b.occurrences
create mode 100644
php/php.editor/test/unit/data/testfiles/testPureIntersectionType.php.testPureIntersectionType_07a.occurrences
create mode 100644
php/php.editor/test/unit/data/testfiles/testPureIntersectionType.php.testPureIntersectionType_07b.occurrences
create mode 100644
php/php.editor/test/unit/data/testfiles/testPureIntersectionType.php.testPureIntersectionType_08a.occurrences
create mode 100644
php/php.editor/test/unit/data/testfiles/testPureIntersectionType.php.testPureIntersectionType_08b.occurrences
create mode 100644
php/php.editor/test/unit/data/testfiles/testPureIntersectionType.php.testPureIntersectionType_09a.occurrences
create mode 100644
php/php.editor/test/unit/data/testfiles/testPureIntersectionType.php.testPureIntersectionType_09b.occurrences
create mode 100644
php/php.editor/test/unit/data/testfiles/testPureIntersectionType.php.testPureIntersectionType_10a.occurrences
create mode 100644
php/php.editor/test/unit/data/testfiles/testPureIntersectionType.php.testPureIntersectionType_10b.occurrences
create mode 100644
php/php.editor/test/unit/data/testfiles/testPureIntersectionType.php.testPureIntersectionType_11a.occurrences
create mode 100644
php/php.editor/test/unit/data/testfiles/testPureIntersectionType.php.testPureIntersectionType_11b.occurrences
create mode 100644
php/php.editor/test/unit/data/testfiles/testPureIntersectionType.php.testPureIntersectionType_12a.occurrences
create mode 100644
php/php.editor/test/unit/data/testfiles/testPureIntersectionType.php.testPureIntersectionType_12b.occurrences
create mode 100644
php/php.editor/test/unit/data/testfiles/testPureIntersectionType.php.testPureIntersectionType_13a.occurrences
create mode 100644
php/php.editor/test/unit/data/testfiles/testPureIntersectionType.php.testPureIntersectionType_13b.occurrences
create mode 100644
php/php.editor/test/unit/data/testfiles/testPureIntersectionType.php.testPureIntersectionType_14a.occurrences
create mode 100644
php/php.editor/test/unit/data/testfiles/testPureIntersectionType.php.testPureIntersectionType_14b.occurrences
create mode 100644
php/php.editor/test/unit/data/testfiles/testPureIntersectionType.php.testPureIntersectionType_15a.occurrences
create mode 100644
php/php.editor/test/unit/data/testfiles/testPureIntersectionType.php.testPureIntersectionType_15b.occurrences
create mode 100644
php/php.editor/test/unit/data/testfiles/testPureIntersectionType.php.testPureIntersectionType_16a.occurrences
create mode 100644
php/php.editor/test/unit/data/testfiles/testPureIntersectionType.php.testPureIntersectionType_16b.occurrences
create mode 100644
php/php.editor/test/unit/data/testfiles/testPureIntersectionType.php.testPureIntersectionType_17a.occurrences
create mode 100644
php/php.editor/test/unit/data/testfiles/testPureIntersectionType.php.testPureIntersectionType_17b.occurrences
---------------------------------------------------------------------
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
