From fde8abfa47e4e2763ba1d47616f28dfdaedb79bc Mon Sep 17 00:00:00 2001 From: Alexey Borokhvostov Date: Mon, 7 Aug 2023 21:45:49 +0700 Subject: [PATCH] PHP: In the navigator, inherited members are displayed in a different color, similar to how it is done in java. --- .../php/editor/csl/NavigatorScanner.java | 71 ++++++++++---- .../deprecatedInheritedDeclarations.pass | 54 +++++++++++ .../structure/nb3362/traitedClass_01.pass | 46 ++++----- .../structure/nb3362/traitedClass_02.pass | 32 +++--- .../structure/nb3362/traitedTrait_01.pass | 24 ++--- .../structure/nb3362/traitedTrait_02.pass | 20 ++-- .../structure/php82/constantsInTraits.pass | 28 +++--- .../deprecatedInheritedDeclarations.php | 97 +++++++++++++++++++ .../editor/csl/NavigatorDeprecatedTest.java | 4 + 9 files changed, 284 insertions(+), 92 deletions(-) create mode 100644 php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/csl/NavigatorDeprecatedTest/structure/deprecatedInheritedDeclarations.pass create mode 100644 php/php.editor/test/unit/data/testfiles/structure/deprecatedInheritedDeclarations.php diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/csl/NavigatorScanner.java b/php/php.editor/src/org/netbeans/modules/php/editor/csl/NavigatorScanner.java index 563c3c89212b..2d36ab435793 100644 --- a/php/php.editor/src/org/netbeans/modules/php/editor/csl/NavigatorScanner.java +++ b/php/php.editor/src/org/netbeans/modules/php/editor/csl/NavigatorScanner.java @@ -72,6 +72,7 @@ public final class NavigatorScanner { private static final Logger LOGGER = Logger.getLogger(NavigatorScanner.class.getName()); private static final String FONT_GRAY_COLOR = ""; //NOI18N + private static final String FONT_INHERITED_COLOR = ""; //NOI18N private static final String CLOSE_FONT = ""; //NOI18N private static ImageIcon interfaceIcon = null; private static ImageIcon traitIcon = null; @@ -362,11 +363,45 @@ protected void appendUsedTraits(Collection usedTraits, Htm } } + protected void appendConstantDescription(ConstantElement constant, HtmlFormatter formatter) { + appendConstantDescription(constant, formatter, false); + } + + protected void appendConstantDescription(ConstantElement constant, HtmlFormatter formatter, boolean isInherited) { + if (constant.isDeprecated()) { + formatter.deprecated(true); + } + if (isInherited) { + formatter.appendHtml(FONT_INHERITED_COLOR); + } + formatter.appendText(getName()); + if (isInherited) { + formatter.appendHtml(CLOSE_FONT); + } + if (constant.isDeprecated()) { + formatter.deprecated(false); + } + String value = constant.getValue(); + if (value != null) { + formatter.appendText(" "); //NOI18N + formatter.appendHtml(FONT_GRAY_COLOR); + formatter.appendText(value); + formatter.appendHtml(CLOSE_FONT); + } + } + protected void appendFunctionDescription(FunctionScope function, HtmlFormatter formatter) { + appendFunctionDescription(function, formatter, false); + } + + protected void appendFunctionDescription(FunctionScope function, HtmlFormatter formatter, boolean isInherited) { formatter.reset(); if (function == null) { return; } + if (isInherited) { + formatter.appendHtml(FONT_INHERITED_COLOR); + } if (function.isDeprecated()) { formatter.deprecated(true); } @@ -380,6 +415,9 @@ protected void appendFunctionDescription(FunctionScope function, HtmlFormatter f processParameters(function, formatter, parameters); } formatter.appendText(")"); //NOI18N + if (isInherited) { + formatter.appendHtml(CLOSE_FONT); + } Collection returnTypes = function.getReturnTypeNames(); if (!returnTypes.isEmpty()) { processReturnTypes(function, formatter, returnTypes); @@ -518,7 +556,13 @@ public String getHtml(HtmlFormatter formatter) { if (field.isDeprecated()) { formatter.deprecated(true); } + if (isInherited()) { + formatter.appendHtml(FONT_INHERITED_COLOR); + } formatter.appendText(field.getName()); + if (isInherited()) { + formatter.appendHtml(CLOSE_FONT); + } if (field.isDeprecated()) { formatter.deprecated(false); } @@ -682,21 +726,7 @@ public ConstantElement getConstant() { @Override public String getHtml(HtmlFormatter formatter) { formatter.reset(); - if (getConstant().isDeprecated()) { - formatter.deprecated(true); - } - formatter.appendText(getName()); - if (getConstant().isDeprecated()) { - formatter.deprecated(false); - } - final ConstantElement constant = getConstant(); - String value = constant.getValue(); - if (value != null) { - formatter.appendText(" "); //NOI18N - formatter.appendHtml(FONT_GRAY_COLOR); //NOI18N - formatter.appendText(value); - formatter.appendHtml(CLOSE_FONT); - } + appendConstantDescription(getConstant(), formatter); return formatter.getText(); } @@ -725,6 +755,13 @@ public ElementHandle getDeclaringElement() { return getConstant().getInScope(); } + @Override + public String getHtml(HtmlFormatter formatter) { + formatter.reset(); + appendConstantDescription(getConstant(), formatter, isInherited()); + return formatter.getText(); + } + } private class PHPFunctionStructureItem extends PHPStructureItem { @@ -763,7 +800,7 @@ public MethodScope getMethodScope() { @Override public String getHtml(HtmlFormatter formatter) { formatter.reset(); - appendFunctionDescription(getMethodScope(), formatter); + appendFunctionDescription(getMethodScope(), formatter, isInherited()); return formatter.getText(); } @@ -947,7 +984,7 @@ public MethodScope getMethodScope() { @Override public String getHtml(HtmlFormatter formatter) { formatter.reset(); - appendFunctionDescription(getMethodScope(), formatter); + appendFunctionDescription(getMethodScope(), formatter, isInherited()); return formatter.getText(); } diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/csl/NavigatorDeprecatedTest/structure/deprecatedInheritedDeclarations.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/csl/NavigatorDeprecatedTest/structure/deprecatedInheritedDeclarations.pass new file mode 100644 index 000000000000..be72ab1dce8c --- /dev/null +++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/csl/NavigatorDeprecatedTest/structure/deprecatedInheritedDeclarations.pass @@ -0,0 +1,54 @@ +|-DeprecatedFooTrait [13, 1121] : ESCAPED{DeprecatedFooTrait} +|--$publicFooTraitField [74, 93] : DEPRECATED{ESCAPED{$publicFooTraitField}}:ESCAPED{int} +|--$privateFooTraitField [135, 155] : DEPRECATED{ESCAPED{$privateFooTraitField}}:ESCAPED{int} +|--$protectedFooTraitField [199, 221] : DEPRECATED{ESCAPED{$protectedFooTraitField}}:ESCAPED{int} +|--$publicStaticFooTraitField [270, 295] : DEPRECATED{ESCAPED{$publicStaticFooTraitField}}:ESCAPED{int} +|--$privateStaticFooTraitField [344, 370] : DEPRECATED{ESCAPED{$privateStaticFooTraitField}}:ESCAPED{int} +|--$protectedStaticFooTraitField [421, 449] : DEPRECATED{ESCAPED{$protectedStaticFooTraitField}}:ESCAPED{int} +|--publicFooTraitMethod [495, 541] : DEPRECATED{ESCAPED{publicFooTraitMethod}}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param}ESCAPED{)}:ESCAPED{void} +|--privateFooTraitMethod [587, 651] : DEPRECATED{ESCAPED{privateFooTraitMethod}}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} +|--protectedFooTraitMethod [699, 765] : DEPRECATED{ESCAPED{protectedFooTraitMethod}}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} +|--publicStaticFooTraitMethod [817, 869] : DEPRECATED{ESCAPED{publicStaticFooTraitMethod}}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param}ESCAPED{)}:ESCAPED{void} +|--privateStaticFooTraitMethod [922, 992] : DEPRECATED{ESCAPED{privateStaticFooTraitMethod}}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} +|--protectedStaticFooTraitMethod [1047, 1119] : DEPRECATED{ESCAPED{protectedStaticFooTraitMethod}}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} +|-DeprecatedParentClass [1129, 2574] : ESCAPED{DeprecatedParentClass} +|--IMPLICIT_PUBLIC_PARENT_CONST [1186, 1214] : DEPRECATED{ESCAPED{IMPLICIT_PUBLIC_PARENT_CONST}}ESCAPED{ }ESCAPED{"parent"} +|--PUBLIC_PARENT_CONST [1267, 1286] : DEPRECATED{ESCAPED{PUBLIC_PARENT_CONST}}ESCAPED{ }ESCAPED{"parent"} +|--PRIVATE_PARENT_CONST [1340, 1360] : DEPRECATED{ESCAPED{PRIVATE_PARENT_CONST}}ESCAPED{ }ESCAPED{"parent"} +|--PROTECTED_PARENT_CONST [1416, 1438] : DEPRECATED{ESCAPED{PROTECTED_PARENT_CONST}}ESCAPED{ }ESCAPED{"parent"} +|--$publicParentClassField [1491, 1513] : DEPRECATED{ESCAPED{$publicParentClassField}}:ESCAPED{int} +|--$privateParentClassField [1555, 1578] : DEPRECATED{ESCAPED{$privateParentClassField}}:ESCAPED{int} +|--$protectedParentClassField [1622, 1647] : DEPRECATED{ESCAPED{$protectedParentClassField}}:ESCAPED{int} +|--$publicStaticParentClassField [1696, 1724] : DEPRECATED{ESCAPED{$publicStaticParentClassField}}:ESCAPED{int} +|--$privateStaticParentClassField [1773, 1802] : DEPRECATED{ESCAPED{$privateStaticParentClassField}}:ESCAPED{int} +|--$protectedStaticParentClassField [1853, 1884] : DEPRECATED{ESCAPED{$protectedStaticParentClassField}}:ESCAPED{int} +|--publicParentClassMethod [1930, 1979] : DEPRECATED{ESCAPED{publicParentClassMethod}}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param}ESCAPED{)}:ESCAPED{void} +|--privateParentClassMethod [2025, 2092] : DEPRECATED{ESCAPED{privateParentClassMethod}}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} +|--protectedParentClassMethod [2140, 2209] : DEPRECATED{ESCAPED{protectedParentClassMethod}}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} +|--publicStaticParentClassMethod [2261, 2316] : DEPRECATED{ESCAPED{publicStaticParentClassMethod}}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param}ESCAPED{)}:ESCAPED{void} +|--privateStaticParentClassMethod [2369, 2442] : DEPRECATED{ESCAPED{privateStaticParentClassMethod}}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} +|--protectedStaticParentClassMethod [2497, 2572] : DEPRECATED{ESCAPED{protectedStaticParentClassMethod}}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} +|-ChildClass [2583, 2655] : ESCAPED{ChildClass}::ESCAPED{DeprecatedParentClass}#ESCAPED{DeprecatedFooTrait} +|--(Inherited) $publicFooTraitField [74, 94] : DEPRECATED{ESCAPED{$publicFooTraitField}}:ESCAPED{int} +|--(Inherited) $privateFooTraitField [135, 156] : DEPRECATED{ESCAPED{$privateFooTraitField}}:ESCAPED{int} +|--(Inherited) $protectedFooTraitField [199, 222] : DEPRECATED{ESCAPED{$protectedFooTraitField}}:ESCAPED{int} +|--(Inherited) $publicStaticFooTraitField [270, 296] : DEPRECATED{ESCAPED{$publicStaticFooTraitField}}:ESCAPED{int} +|--(Inherited) $privateStaticFooTraitField [344, 371] : DEPRECATED{ESCAPED{$privateStaticFooTraitField}}:ESCAPED{int} +|--(Inherited) $protectedStaticFooTraitField [421, 450] : DEPRECATED{ESCAPED{$protectedStaticFooTraitField}}:ESCAPED{int} +|--(Inherited) publicFooTraitMethod [495, 515] : DEPRECATED{ESCAPED{publicFooTraitMethod}}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param}ESCAPED{)}:ESCAPED{void} +|--(Inherited) privateFooTraitMethod [587, 608] : DEPRECATED{ESCAPED{privateFooTraitMethod}}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} +|--(Inherited) protectedFooTraitMethod [699, 722] : DEPRECATED{ESCAPED{protectedFooTraitMethod}}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} +|--(Inherited) publicStaticFooTraitMethod [817, 843] : DEPRECATED{ESCAPED{publicStaticFooTraitMethod}}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param}ESCAPED{)}:ESCAPED{void} +|--(Inherited) privateStaticFooTraitMethod [922, 949] : DEPRECATED{ESCAPED{privateStaticFooTraitMethod}}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} +|--(Inherited) protectedStaticFooTraitMethod [1047, 1076] : DEPRECATED{ESCAPED{protectedStaticFooTraitMethod}}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} +|--(Inherited) IMPLICIT_PUBLIC_PARENT_CONST [1186, 1214] : DEPRECATED{ESCAPED{IMPLICIT_PUBLIC_PARENT_CONST}}ESCAPED{ }ESCAPED{"parent"} +|--(Inherited) PUBLIC_PARENT_CONST [1267, 1286] : DEPRECATED{ESCAPED{PUBLIC_PARENT_CONST}}ESCAPED{ }ESCAPED{"parent"} +|--(Inherited) PROTECTED_PARENT_CONST [1416, 1438] : DEPRECATED{ESCAPED{PROTECTED_PARENT_CONST}}ESCAPED{ }ESCAPED{"parent"} +|--(Inherited) $publicParentClassField [1491, 1514] : DEPRECATED{ESCAPED{$publicParentClassField}}:ESCAPED{int} +|--(Inherited) $protectedParentClassField [1622, 1648] : DEPRECATED{ESCAPED{$protectedParentClassField}}:ESCAPED{int} +|--(Inherited) $publicStaticParentClassField [1696, 1725] : DEPRECATED{ESCAPED{$publicStaticParentClassField}}:ESCAPED{int} +|--(Inherited) $protectedStaticParentClassField [1853, 1885] : DEPRECATED{ESCAPED{$protectedStaticParentClassField}}:ESCAPED{int} +|--(Inherited) publicParentClassMethod [1930, 1953] : DEPRECATED{ESCAPED{publicParentClassMethod}}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param}ESCAPED{)}:ESCAPED{void} +|--(Inherited) protectedParentClassMethod [2140, 2166] : DEPRECATED{ESCAPED{protectedParentClassMethod}}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} +|--(Inherited) publicStaticParentClassMethod [2261, 2290] : DEPRECATED{ESCAPED{publicStaticParentClassMethod}}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param}ESCAPED{)}:ESCAPED{void} +|--(Inherited) protectedStaticParentClassMethod [2497, 2529] : DEPRECATED{ESCAPED{protectedStaticParentClassMethod}}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/csl/NavigatorNb3362Test/structure/nb3362/traitedClass_01.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/csl/NavigatorNb3362Test/structure/nb3362/traitedClass_01.pass index b6cf8b9d8c0f..24264e07a999 100644 --- a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/csl/NavigatorNb3362Test/structure/nb3362/traitedClass_01.pass +++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/csl/NavigatorNb3362Test/structure/nb3362/traitedClass_01.pass @@ -1,28 +1,28 @@ |-Test [17, 1116] : ESCAPED{Test} |--ChildClass [30, 1116] : ESCAPED{ChildClass}::ESCAPED{ParentClass}#ESCAPED{FooTrait} -|---(Inherited) $publicFooTraitField [58, 78] : ESCAPED{$publicFooTraitField}:ESCAPED{int} -|---(Inherited) $privateFooTraitField [96, 117] : ESCAPED{$privateFooTraitField}:ESCAPED{int} -|---(Inherited) $protectedFooTraitField [137, 160] : ESCAPED{$protectedFooTraitField}:ESCAPED{int} -|---(Inherited) $publicStaticFooTraitField [185, 211] : ESCAPED{$publicStaticFooTraitField}:ESCAPED{int} -|---(Inherited) $privateStaticFooTraitField [236, 263] : ESCAPED{$privateStaticFooTraitField}:ESCAPED{int} -|---(Inherited) $protectedStaticFooTraitField [290, 319] : ESCAPED{$protectedStaticFooTraitField}:ESCAPED{int} -|---(Inherited) publicFooTraitMethod [341, 361] : ESCAPED{publicFooTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param}ESCAPED{)}:ESCAPED{void} -|---(Inherited) privateFooTraitMethod [410, 431] : ESCAPED{privateFooTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} -|---(Inherited) protectedFooTraitMethod [499, 522] : ESCAPED{protectedFooTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} -|---(Inherited) publicStaticFooTraitMethod [594, 620] : ESCAPED{publicStaticFooTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param}ESCAPED{)}:ESCAPED{void} -|---(Inherited) privateStaticFooTraitMethod [676, 703] : ESCAPED{privateStaticFooTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} -|---(Inherited) protectedStaticFooTraitMethod [778, 807] : ESCAPED{protectedStaticFooTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} -|---(Inherited) IMPLICIT_PUBLIC_PARENT_CONST [55, 83] : ESCAPED{IMPLICIT_PUBLIC_PARENT_CONST}ESCAPED{ }ESCAPED{"parent"} -|---(Inherited) PUBLIC_PARENT_CONST [113, 132] : ESCAPED{PUBLIC_PARENT_CONST}ESCAPED{ }ESCAPED{"parent"} -|---(Inherited) PROTECTED_PARENT_CONST [216, 238] : ESCAPED{PROTECTED_PARENT_CONST}ESCAPED{ }ESCAPED{"parent"} -|---(Inherited) $publicParentClassField [268, 291] : ESCAPED{$publicParentClassField}:ESCAPED{int} -|---(Inherited) $protectedParentClassField [353, 379] : ESCAPED{$protectedParentClassField}:ESCAPED{int} -|---(Inherited) $publicStaticParentClassField [404, 433] : ESCAPED{$publicStaticParentClassField}:ESCAPED{int} -|---(Inherited) $protectedStaticParentClassField [515, 547] : ESCAPED{$protectedStaticParentClassField}:ESCAPED{int} -|---(Inherited) publicParentClassMethod [569, 592] : ESCAPED{publicParentClassMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param}ESCAPED{)}:ESCAPED{void} -|---(Inherited) protectedParentClassMethod [733, 759] : ESCAPED{protectedParentClassMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} -|---(Inherited) publicStaticParentClassMethod [831, 860] : ESCAPED{publicStaticParentClassMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param}ESCAPED{)}:ESCAPED{void} -|---(Inherited) protectedStaticParentClassMethod [1021, 1053] : ESCAPED{protectedStaticParentClassMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} +|---(Inherited) $publicFooTraitField [58, 78] : ESCAPED{$publicFooTraitField}:ESCAPED{int} +|---(Inherited) $privateFooTraitField [96, 117] : ESCAPED{$privateFooTraitField}:ESCAPED{int} +|---(Inherited) $protectedFooTraitField [137, 160] : ESCAPED{$protectedFooTraitField}:ESCAPED{int} +|---(Inherited) $publicStaticFooTraitField [185, 211] : ESCAPED{$publicStaticFooTraitField}:ESCAPED{int} +|---(Inherited) $privateStaticFooTraitField [236, 263] : ESCAPED{$privateStaticFooTraitField}:ESCAPED{int} +|---(Inherited) $protectedStaticFooTraitField [290, 319] : ESCAPED{$protectedStaticFooTraitField}:ESCAPED{int} +|---(Inherited) publicFooTraitMethod [341, 361] : ESCAPED{publicFooTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param}ESCAPED{)}:ESCAPED{void} +|---(Inherited) privateFooTraitMethod [410, 431] : ESCAPED{privateFooTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} +|---(Inherited) protectedFooTraitMethod [499, 522] : ESCAPED{protectedFooTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} +|---(Inherited) publicStaticFooTraitMethod [594, 620] : ESCAPED{publicStaticFooTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param}ESCAPED{)}:ESCAPED{void} +|---(Inherited) privateStaticFooTraitMethod [676, 703] : ESCAPED{privateStaticFooTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} +|---(Inherited) protectedStaticFooTraitMethod [778, 807] : ESCAPED{protectedStaticFooTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} +|---(Inherited) IMPLICIT_PUBLIC_PARENT_CONST [55, 83] : ESCAPED{IMPLICIT_PUBLIC_PARENT_CONST}ESCAPED{ }ESCAPED{"parent"} +|---(Inherited) PUBLIC_PARENT_CONST [113, 132] : ESCAPED{PUBLIC_PARENT_CONST}ESCAPED{ }ESCAPED{"parent"} +|---(Inherited) PROTECTED_PARENT_CONST [216, 238] : ESCAPED{PROTECTED_PARENT_CONST}ESCAPED{ }ESCAPED{"parent"} +|---(Inherited) $publicParentClassField [268, 291] : ESCAPED{$publicParentClassField}:ESCAPED{int} +|---(Inherited) $protectedParentClassField [353, 379] : ESCAPED{$protectedParentClassField}:ESCAPED{int} +|---(Inherited) $publicStaticParentClassField [404, 433] : ESCAPED{$publicStaticParentClassField}:ESCAPED{int} +|---(Inherited) $protectedStaticParentClassField [515, 547] : ESCAPED{$protectedStaticParentClassField}:ESCAPED{int} +|---(Inherited) publicParentClassMethod [569, 592] : ESCAPED{publicParentClassMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param}ESCAPED{)}:ESCAPED{void} +|---(Inherited) protectedParentClassMethod [733, 759] : ESCAPED{protectedParentClassMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} +|---(Inherited) publicStaticParentClassMethod [831, 860] : ESCAPED{publicStaticParentClassMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param}ESCAPED{)}:ESCAPED{void} +|---(Inherited) protectedStaticParentClassMethod [1021, 1053] : ESCAPED{protectedStaticParentClassMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} |---IMPLICIT_PUBLIC_CHILD_CONST [93, 120] : ESCAPED{IMPLICIT_PUBLIC_CHILD_CONST}ESCAPED{ }ESCAPED{"child"} |---PUBLIC_CHILD_CONST [149, 167] : ESCAPED{PUBLIC_CHILD_CONST}ESCAPED{ }ESCAPED{"child"} |---PRIVATE_CHILD_CONST [197, 216] : ESCAPED{PRIVATE_CHILD_CONST}ESCAPED{ }ESCAPED{"child"} diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/csl/NavigatorNb3362Test/structure/nb3362/traitedClass_02.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/csl/NavigatorNb3362Test/structure/nb3362/traitedClass_02.pass index 75dadc1ae748..f4a63a73fe43 100644 --- a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/csl/NavigatorNb3362Test/structure/nb3362/traitedClass_02.pass +++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/csl/NavigatorNb3362Test/structure/nb3362/traitedClass_02.pass @@ -1,21 +1,21 @@ |-Test [17, 1673] : ESCAPED{Test} |--ChildClass [30, 1673] : ESCAPED{ChildClass}::ESCAPED{ParentClass}#ESCAPED{FooTrait} -|---(Inherited) $publicFooTraitField [58, 78] : ESCAPED{$publicFooTraitField}:ESCAPED{int} -|---(Inherited) $privateFooTraitField [96, 117] : ESCAPED{$privateFooTraitField}:ESCAPED{int} -|---(Inherited) $protectedFooTraitField [137, 160] : ESCAPED{$protectedFooTraitField}:ESCAPED{int} -|---(Inherited) $publicStaticFooTraitField [185, 211] : ESCAPED{$publicStaticFooTraitField}:ESCAPED{int} -|---(Inherited) $privateStaticFooTraitField [236, 263] : ESCAPED{$privateStaticFooTraitField}:ESCAPED{int} -|---(Inherited) $protectedStaticFooTraitField [290, 319] : ESCAPED{$protectedStaticFooTraitField}:ESCAPED{int} -|---(Inherited) publicFooTraitMethod [341, 361] : ESCAPED{publicFooTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param}ESCAPED{)}:ESCAPED{void} -|---(Inherited) protectedFooTraitMethod [499, 522] : ESCAPED{protectedFooTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} -|---(Inherited) privateStaticFooTraitMethod [676, 703] : ESCAPED{privateStaticFooTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} -|---(Inherited) protectedStaticFooTraitMethod [778, 807] : ESCAPED{protectedStaticFooTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} -|---(Inherited) IMPLICIT_PUBLIC_PARENT_CONST [55, 83] : ESCAPED{IMPLICIT_PUBLIC_PARENT_CONST}ESCAPED{ }ESCAPED{"parent"} -|---(Inherited) PROTECTED_PARENT_CONST [216, 238] : ESCAPED{PROTECTED_PARENT_CONST}ESCAPED{ }ESCAPED{"parent"} -|---(Inherited) $publicParentClassField [268, 291] : ESCAPED{$publicParentClassField}:ESCAPED{int} -|---(Inherited) $protectedStaticParentClassField [515, 547] : ESCAPED{$protectedStaticParentClassField}:ESCAPED{int} -|---(Inherited) publicParentClassMethod [569, 592] : ESCAPED{publicParentClassMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param}ESCAPED{)}:ESCAPED{void} -|---(Inherited) protectedStaticParentClassMethod [1021, 1053] : ESCAPED{protectedStaticParentClassMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} +|---(Inherited) $publicFooTraitField [58, 78] : ESCAPED{$publicFooTraitField}:ESCAPED{int} +|---(Inherited) $privateFooTraitField [96, 117] : ESCAPED{$privateFooTraitField}:ESCAPED{int} +|---(Inherited) $protectedFooTraitField [137, 160] : ESCAPED{$protectedFooTraitField}:ESCAPED{int} +|---(Inherited) $publicStaticFooTraitField [185, 211] : ESCAPED{$publicStaticFooTraitField}:ESCAPED{int} +|---(Inherited) $privateStaticFooTraitField [236, 263] : ESCAPED{$privateStaticFooTraitField}:ESCAPED{int} +|---(Inherited) $protectedStaticFooTraitField [290, 319] : ESCAPED{$protectedStaticFooTraitField}:ESCAPED{int} +|---(Inherited) publicFooTraitMethod [341, 361] : ESCAPED{publicFooTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param}ESCAPED{)}:ESCAPED{void} +|---(Inherited) protectedFooTraitMethod [499, 522] : ESCAPED{protectedFooTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} +|---(Inherited) privateStaticFooTraitMethod [676, 703] : ESCAPED{privateStaticFooTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} +|---(Inherited) protectedStaticFooTraitMethod [778, 807] : ESCAPED{protectedStaticFooTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} +|---(Inherited) IMPLICIT_PUBLIC_PARENT_CONST [55, 83] : ESCAPED{IMPLICIT_PUBLIC_PARENT_CONST}ESCAPED{ }ESCAPED{"parent"} +|---(Inherited) PROTECTED_PARENT_CONST [216, 238] : ESCAPED{PROTECTED_PARENT_CONST}ESCAPED{ }ESCAPED{"parent"} +|---(Inherited) $publicParentClassField [268, 291] : ESCAPED{$publicParentClassField}:ESCAPED{int} +|---(Inherited) $protectedStaticParentClassField [515, 547] : ESCAPED{$protectedStaticParentClassField}:ESCAPED{int} +|---(Inherited) publicParentClassMethod [569, 592] : ESCAPED{publicParentClassMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param}ESCAPED{)}:ESCAPED{void} +|---(Inherited) protectedStaticParentClassMethod [1021, 1053] : ESCAPED{protectedStaticParentClassMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} |---IMPLICIT_PUBLIC_CHILD_CONST [93, 120] : ESCAPED{IMPLICIT_PUBLIC_CHILD_CONST}ESCAPED{ }ESCAPED{"child"} |---PUBLIC_CHILD_CONST [149, 167] : ESCAPED{PUBLIC_CHILD_CONST}ESCAPED{ }ESCAPED{"child"} |---PRIVATE_CHILD_CONST [197, 216] : ESCAPED{PRIVATE_CHILD_CONST}ESCAPED{ }ESCAPED{"child"} diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/csl/NavigatorNb3362Test/structure/nb3362/traitedTrait_01.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/csl/NavigatorNb3362Test/structure/nb3362/traitedTrait_01.pass index e6af267113f1..6bc4ae73f657 100644 --- a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/csl/NavigatorNb3362Test/structure/nb3362/traitedTrait_01.pass +++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/csl/NavigatorNb3362Test/structure/nb3362/traitedTrait_01.pass @@ -1,17 +1,17 @@ |-Test [17, 920] : ESCAPED{Test} |--FooBarTrait [30, 920] : ESCAPED{FooBarTrait}#ESCAPED{BarTrait}ESCAPED{, }ESCAPED{FooTrait} -|---(Inherited) publicBarTraitMethod [341, 361] : ESCAPED{publicBarTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param}ESCAPED{)}:ESCAPED{void} -|---(Inherited) privateBarTraitMethod [410, 431] : ESCAPED{privateBarTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} -|---(Inherited) protectedBarTraitMethod [499, 522] : ESCAPED{protectedBarTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} -|---(Inherited) publicStaticBarTraitMethod [594, 620] : ESCAPED{publicStaticBarTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param}ESCAPED{)}:ESCAPED{void} -|---(Inherited) privateStaticBarTraitMethod [676, 703] : ESCAPED{privateStaticBarTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} -|---(Inherited) protectedStaticBarTraitMethod [778, 807] : ESCAPED{protectedStaticBarTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} -|---(Inherited) publicFooTraitMethod [341, 361] : ESCAPED{publicFooTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param}ESCAPED{)}:ESCAPED{void} -|---(Inherited) privateFooTraitMethod [410, 431] : ESCAPED{privateFooTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} -|---(Inherited) protectedFooTraitMethod [499, 522] : ESCAPED{protectedFooTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} -|---(Inherited) publicStaticFooTraitMethod [594, 620] : ESCAPED{publicStaticFooTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param}ESCAPED{)}:ESCAPED{void} -|---(Inherited) privateStaticFooTraitMethod [676, 703] : ESCAPED{privateStaticFooTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} -|---(Inherited) protectedStaticFooTraitMethod [778, 807] : ESCAPED{protectedStaticFooTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} +|---(Inherited) publicBarTraitMethod [341, 361] : ESCAPED{publicBarTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param}ESCAPED{)}:ESCAPED{void} +|---(Inherited) privateBarTraitMethod [410, 431] : ESCAPED{privateBarTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} +|---(Inherited) protectedBarTraitMethod [499, 522] : ESCAPED{protectedBarTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} +|---(Inherited) publicStaticBarTraitMethod [594, 620] : ESCAPED{publicStaticBarTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param}ESCAPED{)}:ESCAPED{void} +|---(Inherited) privateStaticBarTraitMethod [676, 703] : ESCAPED{privateStaticBarTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} +|---(Inherited) protectedStaticBarTraitMethod [778, 807] : ESCAPED{protectedStaticBarTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} +|---(Inherited) publicFooTraitMethod [341, 361] : ESCAPED{publicFooTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param}ESCAPED{)}:ESCAPED{void} +|---(Inherited) privateFooTraitMethod [410, 431] : ESCAPED{privateFooTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} +|---(Inherited) protectedFooTraitMethod [499, 522] : ESCAPED{protectedFooTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} +|---(Inherited) publicStaticFooTraitMethod [594, 620] : ESCAPED{publicStaticFooTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param}ESCAPED{)}:ESCAPED{void} +|---(Inherited) privateStaticFooTraitMethod [676, 703] : ESCAPED{privateStaticFooTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} +|---(Inherited) protectedStaticFooTraitMethod [778, 807] : ESCAPED{protectedStaticFooTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} |---$publicFooBarTraitField [90, 112] : ESCAPED{$publicFooBarTraitField}:ESCAPED{int} |---$privateFooBarTraitField [131, 154] : ESCAPED{$privateFooBarTraitField}:ESCAPED{int} |---$protectedFooBarTraitField [175, 200] : ESCAPED{$protectedFooBarTraitField}:ESCAPED{int} diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/csl/NavigatorNb3362Test/structure/nb3362/traitedTrait_02.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/csl/NavigatorNb3362Test/structure/nb3362/traitedTrait_02.pass index 9e7ad38dfeb3..4727cc28e818 100644 --- a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/csl/NavigatorNb3362Test/structure/nb3362/traitedTrait_02.pass +++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/csl/NavigatorNb3362Test/structure/nb3362/traitedTrait_02.pass @@ -1,15 +1,15 @@ |-Test [17, 1107] : ESCAPED{Test} |--FooBarTrait [30, 1107] : ESCAPED{FooBarTrait}#ESCAPED{BarTrait}ESCAPED{, }ESCAPED{FooTrait} -|---(Inherited) publicBarTraitMethod [341, 361] : ESCAPED{publicBarTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param}ESCAPED{)}:ESCAPED{void} -|---(Inherited) privateBarTraitMethod [410, 431] : ESCAPED{privateBarTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} -|---(Inherited) protectedBarTraitMethod [499, 522] : ESCAPED{protectedBarTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} -|---(Inherited) publicStaticBarTraitMethod [594, 620] : ESCAPED{publicStaticBarTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param}ESCAPED{)}:ESCAPED{void} -|---(Inherited) protectedStaticBarTraitMethod [778, 807] : ESCAPED{protectedStaticBarTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} -|---(Inherited) privateFooTraitMethod [410, 431] : ESCAPED{privateFooTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} -|---(Inherited) protectedFooTraitMethod [499, 522] : ESCAPED{protectedFooTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} -|---(Inherited) publicStaticFooTraitMethod [594, 620] : ESCAPED{publicStaticFooTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param}ESCAPED{)}:ESCAPED{void} -|---(Inherited) privateStaticFooTraitMethod [676, 703] : ESCAPED{privateStaticFooTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} -|---(Inherited) protectedStaticFooTraitMethod [778, 807] : ESCAPED{protectedStaticFooTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} +|---(Inherited) publicBarTraitMethod [341, 361] : ESCAPED{publicBarTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param}ESCAPED{)}:ESCAPED{void} +|---(Inherited) privateBarTraitMethod [410, 431] : ESCAPED{privateBarTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} +|---(Inherited) protectedBarTraitMethod [499, 522] : ESCAPED{protectedBarTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} +|---(Inherited) publicStaticBarTraitMethod [594, 620] : ESCAPED{publicStaticBarTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param}ESCAPED{)}:ESCAPED{void} +|---(Inherited) protectedStaticBarTraitMethod [778, 807] : ESCAPED{protectedStaticBarTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} +|---(Inherited) privateFooTraitMethod [410, 431] : ESCAPED{privateFooTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} +|---(Inherited) protectedFooTraitMethod [499, 522] : ESCAPED{protectedFooTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} +|---(Inherited) publicStaticFooTraitMethod [594, 620] : ESCAPED{publicStaticFooTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param}ESCAPED{)}:ESCAPED{void} +|---(Inherited) privateStaticFooTraitMethod [676, 703] : ESCAPED{privateStaticFooTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} +|---(Inherited) protectedStaticFooTraitMethod [778, 807] : ESCAPED{protectedStaticFooTraitMethod}ESCAPED{(}ESCAPED{int}ESCAPED{ }ESCAPED{$param1}ESCAPED{, }ESCAPED{string}ESCAPED{ }ESCAPED{$param2}ESCAPED{)}:ESCAPED{void} |---$publicFooBarTraitField [90, 112] : ESCAPED{$publicFooBarTraitField}:ESCAPED{int} |---$privateFooBarTraitField [131, 154] : ESCAPED{$privateFooBarTraitField}:ESCAPED{int} |---$protectedFooBarTraitField [175, 200] : ESCAPED{$protectedFooBarTraitField}:ESCAPED{int} diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/csl/NavigatorPHP82Test/structure/php82/constantsInTraits.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/csl/NavigatorPHP82Test/structure/php82/constantsInTraits.pass index eab583c7c69f..a77287b31b23 100644 --- a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/csl/NavigatorPHP82Test/structure/php82/constantsInTraits.pass +++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/csl/NavigatorPHP82Test/structure/php82/constantsInTraits.pass @@ -5,26 +5,26 @@ |--PRIVATE [982, 989] : ESCAPED{PRIVATE}ESCAPED{ }ESCAPED{'private'} |--method [1024, 1235] : ESCAPED{method}ESCAPED{(}ESCAPED{)}:ESCAPED{void} |-ExampleTrait2 [1245, 1608] : ESCAPED{ExampleTrait2}#ESCAPED{ExampleTrait} -|--(Inherited) IMPLICIT_PUBLIC [846, 861] : ESCAPED{IMPLICIT_PUBLIC}ESCAPED{ }ESCAPED{'implicit public'} -|--(Inherited) PUBLIC [900, 906] : ESCAPED{PUBLIC}ESCAPED{ }ESCAPED{'public'} -|--(Inherited) PROTECTED [939, 948] : ESCAPED{PROTECTED}ESCAPED{ }ESCAPED{'protected'} -|--(Inherited) PRIVATE [982, 989] : ESCAPED{PRIVATE}ESCAPED{ }ESCAPED{'private'} -|--(Inherited) method [1024, 1030] : ESCAPED{method}ESCAPED{(}ESCAPED{)}:ESCAPED{void} +|--(Inherited) IMPLICIT_PUBLIC [846, 861] : ESCAPED{IMPLICIT_PUBLIC}ESCAPED{ }ESCAPED{'implicit public'} +|--(Inherited) PUBLIC [900, 906] : ESCAPED{PUBLIC}ESCAPED{ }ESCAPED{'public'} +|--(Inherited) PROTECTED [939, 948] : ESCAPED{PROTECTED}ESCAPED{ }ESCAPED{'protected'} +|--(Inherited) PRIVATE [982, 989] : ESCAPED{PRIVATE}ESCAPED{ }ESCAPED{'private'} +|--(Inherited) method [1024, 1030] : ESCAPED{method}ESCAPED{(}ESCAPED{)}:ESCAPED{void} |--IMPLICIT_PUBLIC2 [1330, 1346] : ESCAPED{IMPLICIT_PUBLIC2}ESCAPED{ }ESCAPED{'implicit public'} |--PUBLIC2 [1385, 1392] : ESCAPED{PUBLIC2}ESCAPED{ }ESCAPED{'public'} |--PROTECTED2 [1425, 1435] : ESCAPED{PROTECTED2}ESCAPED{ }ESCAPED{'protected'} |--PRIVATE2 [1498, 1506] : ESCAPED{PRIVATE2}ESCAPED{ }ESCAPED{'private'} |--test [1540, 1606] : ESCAPED{test}ESCAPED{(}ESCAPED{)}:ESCAPED{void} |-ExampleClass [1616, 1812] : ESCAPED{ExampleClass}#ESCAPED{ExampleTrait} -|--(Inherited) IMPLICIT_PUBLIC [846, 861] : ESCAPED{IMPLICIT_PUBLIC}ESCAPED{ }ESCAPED{'implicit public'} -|--(Inherited) PUBLIC [900, 906] : ESCAPED{PUBLIC}ESCAPED{ }ESCAPED{'public'} -|--(Inherited) PROTECTED [939, 948] : ESCAPED{PROTECTED}ESCAPED{ }ESCAPED{'protected'} -|--(Inherited) PRIVATE [982, 989] : ESCAPED{PRIVATE}ESCAPED{ }ESCAPED{'private'} -|--(Inherited) method [1024, 1030] : ESCAPED{method}ESCAPED{(}ESCAPED{)}:ESCAPED{void} +|--(Inherited) IMPLICIT_PUBLIC [846, 861] : ESCAPED{IMPLICIT_PUBLIC}ESCAPED{ }ESCAPED{'implicit public'} +|--(Inherited) PUBLIC [900, 906] : ESCAPED{PUBLIC}ESCAPED{ }ESCAPED{'public'} +|--(Inherited) PROTECTED [939, 948] : ESCAPED{PROTECTED}ESCAPED{ }ESCAPED{'protected'} +|--(Inherited) PRIVATE [982, 989] : ESCAPED{PRIVATE}ESCAPED{ }ESCAPED{'private'} +|--(Inherited) method [1024, 1030] : ESCAPED{method}ESCAPED{(}ESCAPED{)}:ESCAPED{void} |--test [1675, 1810] : ESCAPED{test}ESCAPED{(}ESCAPED{)}:ESCAPED{void} |-Child [1820, 2030] : ESCAPED{Child}::ESCAPED{ExampleClass} -|--(Inherited) IMPLICIT_PUBLIC [846, 861] : ESCAPED{IMPLICIT_PUBLIC}ESCAPED{ }ESCAPED{'implicit public'} -|--(Inherited) PUBLIC [900, 906] : ESCAPED{PUBLIC}ESCAPED{ }ESCAPED{'public'} -|--(Inherited) PROTECTED [939, 948] : ESCAPED{PROTECTED}ESCAPED{ }ESCAPED{'protected'} -|--(Inherited) method [1024, 1030] : ESCAPED{method}ESCAPED{(}ESCAPED{)}:ESCAPED{void} +|--(Inherited) IMPLICIT_PUBLIC [846, 861] : ESCAPED{IMPLICIT_PUBLIC}ESCAPED{ }ESCAPED{'implicit public'} +|--(Inherited) PUBLIC [900, 906] : ESCAPED{PUBLIC}ESCAPED{ }ESCAPED{'public'} +|--(Inherited) PROTECTED [939, 948] : ESCAPED{PROTECTED}ESCAPED{ }ESCAPED{'protected'} +|--(Inherited) method [1024, 1030] : ESCAPED{method}ESCAPED{(}ESCAPED{)}:ESCAPED{void} |--test [1870, 2028] : ESCAPED{test}ESCAPED{(}ESCAPED{)}:ESCAPED{void} diff --git a/php/php.editor/test/unit/data/testfiles/structure/deprecatedInheritedDeclarations.php b/php/php.editor/test/unit/data/testfiles/structure/deprecatedInheritedDeclarations.php new file mode 100644 index 000000000000..b717d0190180 --- /dev/null +++ b/php/php.editor/test/unit/data/testfiles/structure/deprecatedInheritedDeclarations.php @@ -0,0 +1,97 @@ + createClassPathsForTest() { return Collections.singletonMap(