This is an automated email from the ASF dual-hosted git repository.
junichi11 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new fde8abfa47 PHP: In the navigator, inherited members are displayed in a
different color, similar to how it is done in java.
new 0322fce7c3 Merge pull request #6393 from
troizet/navigator_php_color_inherited_members
fde8abfa47 is described below
commit fde8abfa47e4e2763ba1d47616f28dfdaedb79bc
Author: Alexey Borokhvostov <troi...@gmail.com>
AuthorDate: Mon Aug 7 21:45:49 2023 +0700
PHP: In the navigator, inherited members are displayed in a different
color, similar to how it is done in java.
---
.../modules/php/editor/csl/NavigatorScanner.java | 71 ++++++++++++----
.../structure/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 +++----
.../structure/deprecatedInheritedDeclarations.php | 97 ++++++++++++++++++++++
.../php/editor/csl/NavigatorDeprecatedTest.java | 4 +
9 files changed, 284 insertions(+), 92 deletions(-)
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 563c3c8921..2d36ab4357 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 = "<font color=\"#999999\">";
//NOI18N
+ private static final String FONT_INHERITED_COLOR = "<font
color=\"#7D694A\">"; //NOI18N
private static final String CLOSE_FONT = "</font>"; //NOI18N
private static ImageIcon interfaceIcon = null;
private static ImageIcon traitIcon = null;
@@ -362,11 +363,45 @@ public final class NavigatorScanner {
}
}
+ 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 @@ public final class NavigatorScanner {
processParameters(function, formatter, parameters);
}
formatter.appendText(")"); //NOI18N
+ if (isInherited) {
+ formatter.appendHtml(CLOSE_FONT);
+ }
Collection<? extends String> returnTypes =
function.getReturnTypeNames();
if (!returnTypes.isEmpty()) {
processReturnTypes(function, formatter, returnTypes);
@@ -518,7 +556,13 @@ public final class NavigatorScanner {
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 final class NavigatorScanner {
@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 final class NavigatorScanner {
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 final class NavigatorScanner {
@Override
public String getHtml(HtmlFormatter formatter) {
formatter.reset();
- appendFunctionDescription(getMethodScope(), formatter);
+ appendFunctionDescription(getMethodScope(), formatter,
isInherited());
return formatter.getText();
}
@@ -947,7 +984,7 @@ public final class NavigatorScanner {
@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 0000000000..be72ab1dce
--- /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}}<font
color="#999999">:ESCAPED{int}</font>
+|--$privateFooTraitField [135, 155] :
DEPRECATED{ESCAPED{$privateFooTraitField}}<font
color="#999999">:ESCAPED{int}</font>
+|--$protectedFooTraitField [199, 221] :
DEPRECATED{ESCAPED{$protectedFooTraitField}}<font
color="#999999">:ESCAPED{int}</font>
+|--$publicStaticFooTraitField [270, 295] :
DEPRECATED{ESCAPED{$publicStaticFooTraitField}}<font
color="#999999">:ESCAPED{int}</font>
+|--$privateStaticFooTraitField [344, 370] :
DEPRECATED{ESCAPED{$privateStaticFooTraitField}}<font
color="#999999">:ESCAPED{int}</font>
+|--$protectedStaticFooTraitField [421, 449] :
DEPRECATED{ESCAPED{$protectedStaticFooTraitField}}<font
color="#999999">:ESCAPED{int}</font>
+|--publicFooTraitMethod [495, 541] :
DEPRECATED{ESCAPED{publicFooTraitMethod}}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
+|--privateFooTraitMethod [587, 651] :
DEPRECATED{ESCAPED{privateFooTraitMethod}}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{ }</font>ESCAPED{$param2}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
+|--protectedFooTraitMethod [699, 765] :
DEPRECATED{ESCAPED{protectedFooTraitMethod}}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{ }</font>ESCAPED{$param2}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
+|--publicStaticFooTraitMethod [817, 869] :
DEPRECATED{ESCAPED{publicStaticFooTraitMethod}}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
+|--privateStaticFooTraitMethod [922, 992] :
DEPRECATED{ESCAPED{privateStaticFooTraitMethod}}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{ }</font>ESCAPED{$param2}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
+|--protectedStaticFooTraitMethod [1047, 1119] :
DEPRECATED{ESCAPED{protectedStaticFooTraitMethod}}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{ }</font>ESCAPED{$param2}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
+|-DeprecatedParentClass [1129, 2574] : ESCAPED{DeprecatedParentClass}
+|--IMPLICIT_PUBLIC_PARENT_CONST [1186, 1214] :
DEPRECATED{ESCAPED{IMPLICIT_PUBLIC_PARENT_CONST}}ESCAPED{ }<font
color="#999999">ESCAPED{"parent"}</font>
+|--PUBLIC_PARENT_CONST [1267, 1286] :
DEPRECATED{ESCAPED{PUBLIC_PARENT_CONST}}ESCAPED{ }<font
color="#999999">ESCAPED{"parent"}</font>
+|--PRIVATE_PARENT_CONST [1340, 1360] :
DEPRECATED{ESCAPED{PRIVATE_PARENT_CONST}}ESCAPED{ }<font
color="#999999">ESCAPED{"parent"}</font>
+|--PROTECTED_PARENT_CONST [1416, 1438] :
DEPRECATED{ESCAPED{PROTECTED_PARENT_CONST}}ESCAPED{ }<font
color="#999999">ESCAPED{"parent"}</font>
+|--$publicParentClassField [1491, 1513] :
DEPRECATED{ESCAPED{$publicParentClassField}}<font
color="#999999">:ESCAPED{int}</font>
+|--$privateParentClassField [1555, 1578] :
DEPRECATED{ESCAPED{$privateParentClassField}}<font
color="#999999">:ESCAPED{int}</font>
+|--$protectedParentClassField [1622, 1647] :
DEPRECATED{ESCAPED{$protectedParentClassField}}<font
color="#999999">:ESCAPED{int}</font>
+|--$publicStaticParentClassField [1696, 1724] :
DEPRECATED{ESCAPED{$publicStaticParentClassField}}<font
color="#999999">:ESCAPED{int}</font>
+|--$privateStaticParentClassField [1773, 1802] :
DEPRECATED{ESCAPED{$privateStaticParentClassField}}<font
color="#999999">:ESCAPED{int}</font>
+|--$protectedStaticParentClassField [1853, 1884] :
DEPRECATED{ESCAPED{$protectedStaticParentClassField}}<font
color="#999999">:ESCAPED{int}</font>
+|--publicParentClassMethod [1930, 1979] :
DEPRECATED{ESCAPED{publicParentClassMethod}}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
+|--privateParentClassMethod [2025, 2092] :
DEPRECATED{ESCAPED{privateParentClassMethod}}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{ }</font>ESCAPED{$param2}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
+|--protectedParentClassMethod [2140, 2209] :
DEPRECATED{ESCAPED{protectedParentClassMethod}}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{ }</font>ESCAPED{$param2}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
+|--publicStaticParentClassMethod [2261, 2316] :
DEPRECATED{ESCAPED{publicStaticParentClassMethod}}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
+|--privateStaticParentClassMethod [2369, 2442] :
DEPRECATED{ESCAPED{privateStaticParentClassMethod}}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{ }</font>ESCAPED{$param2}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
+|--protectedStaticParentClassMethod [2497, 2572] :
DEPRECATED{ESCAPED{protectedStaticParentClassMethod}}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{ }</font>ESCAPED{$param2}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
+|-ChildClass [2583, 2655] : ESCAPED{ChildClass}<font
color="#999999">::ESCAPED{DeprecatedParentClass}</font><font
color="#999999">#ESCAPED{DeprecatedFooTrait}</font>
+|--(Inherited) $publicFooTraitField [74, 94] : DEPRECATED{<font
color="#7D694A">ESCAPED{$publicFooTraitField}</font>}<font
color="#999999">:ESCAPED{int}</font>
+|--(Inherited) $privateFooTraitField [135, 156] : DEPRECATED{<font
color="#7D694A">ESCAPED{$privateFooTraitField}</font>}<font
color="#999999">:ESCAPED{int}</font>
+|--(Inherited) $protectedFooTraitField [199, 222] : DEPRECATED{<font
color="#7D694A">ESCAPED{$protectedFooTraitField}</font>}<font
color="#999999">:ESCAPED{int}</font>
+|--(Inherited) $publicStaticFooTraitField [270, 296] : DEPRECATED{<font
color="#7D694A">ESCAPED{$publicStaticFooTraitField}</font>}<font
color="#999999">:ESCAPED{int}</font>
+|--(Inherited) $privateStaticFooTraitField [344, 371] : DEPRECATED{<font
color="#7D694A">ESCAPED{$privateStaticFooTraitField}</font>}<font
color="#999999">:ESCAPED{int}</font>
+|--(Inherited) $protectedStaticFooTraitField [421, 450] : DEPRECATED{<font
color="#7D694A">ESCAPED{$protectedStaticFooTraitField}</font>}<font
color="#999999">:ESCAPED{int}</font>
+|--(Inherited) publicFooTraitMethod [495, 515] : <font
color="#7D694A">DEPRECATED{ESCAPED{publicFooTraitMethod}}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{
}</font>ESCAPED{$param}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
+|--(Inherited) privateFooTraitMethod [587, 608] : <font
color="#7D694A">DEPRECATED{ESCAPED{privateFooTraitMethod}}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{
}</font>ESCAPED{$param2}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
+|--(Inherited) protectedFooTraitMethod [699, 722] : <font
color="#7D694A">DEPRECATED{ESCAPED{protectedFooTraitMethod}}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{
}</font>ESCAPED{$param2}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
+|--(Inherited) publicStaticFooTraitMethod [817, 843] : <font
color="#7D694A">DEPRECATED{ESCAPED{publicStaticFooTraitMethod}}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{
}</font>ESCAPED{$param}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
+|--(Inherited) privateStaticFooTraitMethod [922, 949] : <font
color="#7D694A">DEPRECATED{ESCAPED{privateStaticFooTraitMethod}}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{
}</font>ESCAPED{$param2}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
+|--(Inherited) protectedStaticFooTraitMethod [1047, 1076] : <font
color="#7D694A">DEPRECATED{ESCAPED{protectedStaticFooTraitMethod}}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{
}</font>ESCAPED{$param2}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
+|--(Inherited) IMPLICIT_PUBLIC_PARENT_CONST [1186, 1214] : DEPRECATED{<font
color="#7D694A">ESCAPED{IMPLICIT_PUBLIC_PARENT_CONST}</font>}ESCAPED{ }<font
color="#999999">ESCAPED{"parent"}</font>
+|--(Inherited) PUBLIC_PARENT_CONST [1267, 1286] : DEPRECATED{<font
color="#7D694A">ESCAPED{PUBLIC_PARENT_CONST}</font>}ESCAPED{ }<font
color="#999999">ESCAPED{"parent"}</font>
+|--(Inherited) PROTECTED_PARENT_CONST [1416, 1438] : DEPRECATED{<font
color="#7D694A">ESCAPED{PROTECTED_PARENT_CONST}</font>}ESCAPED{ }<font
color="#999999">ESCAPED{"parent"}</font>
+|--(Inherited) $publicParentClassField [1491, 1514] : DEPRECATED{<font
color="#7D694A">ESCAPED{$publicParentClassField}</font>}<font
color="#999999">:ESCAPED{int}</font>
+|--(Inherited) $protectedParentClassField [1622, 1648] : DEPRECATED{<font
color="#7D694A">ESCAPED{$protectedParentClassField}</font>}<font
color="#999999">:ESCAPED{int}</font>
+|--(Inherited) $publicStaticParentClassField [1696, 1725] : DEPRECATED{<font
color="#7D694A">ESCAPED{$publicStaticParentClassField}</font>}<font
color="#999999">:ESCAPED{int}</font>
+|--(Inherited) $protectedStaticParentClassField [1853, 1885] :
DEPRECATED{<font
color="#7D694A">ESCAPED{$protectedStaticParentClassField}</font>}<font
color="#999999">:ESCAPED{int}</font>
+|--(Inherited) publicParentClassMethod [1930, 1953] : <font
color="#7D694A">DEPRECATED{ESCAPED{publicParentClassMethod}}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{
}</font>ESCAPED{$param}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
+|--(Inherited) protectedParentClassMethod [2140, 2166] : <font
color="#7D694A">DEPRECATED{ESCAPED{protectedParentClassMethod}}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{
}</font>ESCAPED{$param2}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
+|--(Inherited) publicStaticParentClassMethod [2261, 2290] : <font
color="#7D694A">DEPRECATED{ESCAPED{publicStaticParentClassMethod}}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{
}</font>ESCAPED{$param}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
+|--(Inherited) protectedStaticParentClassMethod [2497, 2529] : <font
color="#7D694A">DEPRECATED{ESCAPED{protectedStaticParentClassMethod}}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{
}</font>ESCAPED{$param2}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
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 b6cf8b9d8c..24264e07a9 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}<font
color="#999999">::ESCAPED{ParentClass}</font><font
color="#999999">#ESCAPED{FooTrait}</font>
-|---(Inherited) $publicFooTraitField [58, 78] :
ESCAPED{$publicFooTraitField}<font color="#999999">:ESCAPED{int}</font>
-|---(Inherited) $privateFooTraitField [96, 117] :
ESCAPED{$privateFooTraitField}<font color="#999999">:ESCAPED{int}</font>
-|---(Inherited) $protectedFooTraitField [137, 160] :
ESCAPED{$protectedFooTraitField}<font color="#999999">:ESCAPED{int}</font>
-|---(Inherited) $publicStaticFooTraitField [185, 211] :
ESCAPED{$publicStaticFooTraitField}<font color="#999999">:ESCAPED{int}</font>
-|---(Inherited) $privateStaticFooTraitField [236, 263] :
ESCAPED{$privateStaticFooTraitField}<font color="#999999">:ESCAPED{int}</font>
-|---(Inherited) $protectedStaticFooTraitField [290, 319] :
ESCAPED{$protectedStaticFooTraitField}<font color="#999999">:ESCAPED{int}</font>
-|---(Inherited) publicFooTraitMethod [341, 361] :
ESCAPED{publicFooTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
-|---(Inherited) privateFooTraitMethod [410, 431] :
ESCAPED{privateFooTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{ }</font>ESCAPED{$param2}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
-|---(Inherited) protectedFooTraitMethod [499, 522] :
ESCAPED{protectedFooTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{ }</font>ESCAPED{$param2}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
-|---(Inherited) publicStaticFooTraitMethod [594, 620] :
ESCAPED{publicStaticFooTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
-|---(Inherited) privateStaticFooTraitMethod [676, 703] :
ESCAPED{privateStaticFooTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{ }</font>ESCAPED{$param2}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
-|---(Inherited) protectedStaticFooTraitMethod [778, 807] :
ESCAPED{protectedStaticFooTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{ }</font>ESCAPED{$param2}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
-|---(Inherited) IMPLICIT_PUBLIC_PARENT_CONST [55, 83] :
ESCAPED{IMPLICIT_PUBLIC_PARENT_CONST}ESCAPED{ }<font
color="#999999">ESCAPED{"parent"}</font>
-|---(Inherited) PUBLIC_PARENT_CONST [113, 132] :
ESCAPED{PUBLIC_PARENT_CONST}ESCAPED{ }<font
color="#999999">ESCAPED{"parent"}</font>
-|---(Inherited) PROTECTED_PARENT_CONST [216, 238] :
ESCAPED{PROTECTED_PARENT_CONST}ESCAPED{ }<font
color="#999999">ESCAPED{"parent"}</font>
-|---(Inherited) $publicParentClassField [268, 291] :
ESCAPED{$publicParentClassField}<font color="#999999">:ESCAPED{int}</font>
-|---(Inherited) $protectedParentClassField [353, 379] :
ESCAPED{$protectedParentClassField}<font color="#999999">:ESCAPED{int}</font>
-|---(Inherited) $publicStaticParentClassField [404, 433] :
ESCAPED{$publicStaticParentClassField}<font color="#999999">:ESCAPED{int}</font>
-|---(Inherited) $protectedStaticParentClassField [515, 547] :
ESCAPED{$protectedStaticParentClassField}<font
color="#999999">:ESCAPED{int}</font>
-|---(Inherited) publicParentClassMethod [569, 592] :
ESCAPED{publicParentClassMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
-|---(Inherited) protectedParentClassMethod [733, 759] :
ESCAPED{protectedParentClassMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{ }</font>ESCAPED{$param2}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
-|---(Inherited) publicStaticParentClassMethod [831, 860] :
ESCAPED{publicStaticParentClassMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
-|---(Inherited) protectedStaticParentClassMethod [1021, 1053] :
ESCAPED{protectedStaticParentClassMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{ }</font>ESCAPED{$param2}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
+|---(Inherited) $publicFooTraitField [58, 78] : <font
color="#7D694A">ESCAPED{$publicFooTraitField}</font><font
color="#999999">:ESCAPED{int}</font>
+|---(Inherited) $privateFooTraitField [96, 117] : <font
color="#7D694A">ESCAPED{$privateFooTraitField}</font><font
color="#999999">:ESCAPED{int}</font>
+|---(Inherited) $protectedFooTraitField [137, 160] : <font
color="#7D694A">ESCAPED{$protectedFooTraitField}</font><font
color="#999999">:ESCAPED{int}</font>
+|---(Inherited) $publicStaticFooTraitField [185, 211] : <font
color="#7D694A">ESCAPED{$publicStaticFooTraitField}</font><font
color="#999999">:ESCAPED{int}</font>
+|---(Inherited) $privateStaticFooTraitField [236, 263] : <font
color="#7D694A">ESCAPED{$privateStaticFooTraitField}</font><font
color="#999999">:ESCAPED{int}</font>
+|---(Inherited) $protectedStaticFooTraitField [290, 319] : <font
color="#7D694A">ESCAPED{$protectedStaticFooTraitField}</font><font
color="#999999">:ESCAPED{int}</font>
+|---(Inherited) publicFooTraitMethod [341, 361] : <font
color="#7D694A">ESCAPED{publicFooTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{
}</font>ESCAPED{$param}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
+|---(Inherited) privateFooTraitMethod [410, 431] : <font
color="#7D694A">ESCAPED{privateFooTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{
}</font>ESCAPED{$param2}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
+|---(Inherited) protectedFooTraitMethod [499, 522] : <font
color="#7D694A">ESCAPED{protectedFooTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{
}</font>ESCAPED{$param2}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
+|---(Inherited) publicStaticFooTraitMethod [594, 620] : <font
color="#7D694A">ESCAPED{publicStaticFooTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{
}</font>ESCAPED{$param}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
+|---(Inherited) privateStaticFooTraitMethod [676, 703] : <font
color="#7D694A">ESCAPED{privateStaticFooTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{
}</font>ESCAPED{$param2}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
+|---(Inherited) protectedStaticFooTraitMethod [778, 807] : <font
color="#7D694A">ESCAPED{protectedStaticFooTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{
}</font>ESCAPED{$param2}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
+|---(Inherited) IMPLICIT_PUBLIC_PARENT_CONST [55, 83] : <font
color="#7D694A">ESCAPED{IMPLICIT_PUBLIC_PARENT_CONST}</font>ESCAPED{ }<font
color="#999999">ESCAPED{"parent"}</font>
+|---(Inherited) PUBLIC_PARENT_CONST [113, 132] : <font
color="#7D694A">ESCAPED{PUBLIC_PARENT_CONST}</font>ESCAPED{ }<font
color="#999999">ESCAPED{"parent"}</font>
+|---(Inherited) PROTECTED_PARENT_CONST [216, 238] : <font
color="#7D694A">ESCAPED{PROTECTED_PARENT_CONST}</font>ESCAPED{ }<font
color="#999999">ESCAPED{"parent"}</font>
+|---(Inherited) $publicParentClassField [268, 291] : <font
color="#7D694A">ESCAPED{$publicParentClassField}</font><font
color="#999999">:ESCAPED{int}</font>
+|---(Inherited) $protectedParentClassField [353, 379] : <font
color="#7D694A">ESCAPED{$protectedParentClassField}</font><font
color="#999999">:ESCAPED{int}</font>
+|---(Inherited) $publicStaticParentClassField [404, 433] : <font
color="#7D694A">ESCAPED{$publicStaticParentClassField}</font><font
color="#999999">:ESCAPED{int}</font>
+|---(Inherited) $protectedStaticParentClassField [515, 547] : <font
color="#7D694A">ESCAPED{$protectedStaticParentClassField}</font><font
color="#999999">:ESCAPED{int}</font>
+|---(Inherited) publicParentClassMethod [569, 592] : <font
color="#7D694A">ESCAPED{publicParentClassMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{
}</font>ESCAPED{$param}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
+|---(Inherited) protectedParentClassMethod [733, 759] : <font
color="#7D694A">ESCAPED{protectedParentClassMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{
}</font>ESCAPED{$param2}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
+|---(Inherited) publicStaticParentClassMethod [831, 860] : <font
color="#7D694A">ESCAPED{publicStaticParentClassMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{
}</font>ESCAPED{$param}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
+|---(Inherited) protectedStaticParentClassMethod [1021, 1053] : <font
color="#7D694A">ESCAPED{protectedStaticParentClassMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{
}</font>ESCAPED{$param2}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
|---IMPLICIT_PUBLIC_CHILD_CONST [93, 120] :
ESCAPED{IMPLICIT_PUBLIC_CHILD_CONST}ESCAPED{ }<font
color="#999999">ESCAPED{"child"}</font>
|---PUBLIC_CHILD_CONST [149, 167] : ESCAPED{PUBLIC_CHILD_CONST}ESCAPED{ }<font
color="#999999">ESCAPED{"child"}</font>
|---PRIVATE_CHILD_CONST [197, 216] : ESCAPED{PRIVATE_CHILD_CONST}ESCAPED{
}<font color="#999999">ESCAPED{"child"}</font>
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 75dadc1ae7..f4a63a73fe 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}<font
color="#999999">::ESCAPED{ParentClass}</font><font
color="#999999">#ESCAPED{FooTrait}</font>
-|---(Inherited) $publicFooTraitField [58, 78] :
ESCAPED{$publicFooTraitField}<font color="#999999">:ESCAPED{int}</font>
-|---(Inherited) $privateFooTraitField [96, 117] :
ESCAPED{$privateFooTraitField}<font color="#999999">:ESCAPED{int}</font>
-|---(Inherited) $protectedFooTraitField [137, 160] :
ESCAPED{$protectedFooTraitField}<font color="#999999">:ESCAPED{int}</font>
-|---(Inherited) $publicStaticFooTraitField [185, 211] :
ESCAPED{$publicStaticFooTraitField}<font color="#999999">:ESCAPED{int}</font>
-|---(Inherited) $privateStaticFooTraitField [236, 263] :
ESCAPED{$privateStaticFooTraitField}<font color="#999999">:ESCAPED{int}</font>
-|---(Inherited) $protectedStaticFooTraitField [290, 319] :
ESCAPED{$protectedStaticFooTraitField}<font color="#999999">:ESCAPED{int}</font>
-|---(Inherited) publicFooTraitMethod [341, 361] :
ESCAPED{publicFooTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
-|---(Inherited) protectedFooTraitMethod [499, 522] :
ESCAPED{protectedFooTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{ }</font>ESCAPED{$param2}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
-|---(Inherited) privateStaticFooTraitMethod [676, 703] :
ESCAPED{privateStaticFooTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{ }</font>ESCAPED{$param2}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
-|---(Inherited) protectedStaticFooTraitMethod [778, 807] :
ESCAPED{protectedStaticFooTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{ }</font>ESCAPED{$param2}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
-|---(Inherited) IMPLICIT_PUBLIC_PARENT_CONST [55, 83] :
ESCAPED{IMPLICIT_PUBLIC_PARENT_CONST}ESCAPED{ }<font
color="#999999">ESCAPED{"parent"}</font>
-|---(Inherited) PROTECTED_PARENT_CONST [216, 238] :
ESCAPED{PROTECTED_PARENT_CONST}ESCAPED{ }<font
color="#999999">ESCAPED{"parent"}</font>
-|---(Inherited) $publicParentClassField [268, 291] :
ESCAPED{$publicParentClassField}<font color="#999999">:ESCAPED{int}</font>
-|---(Inherited) $protectedStaticParentClassField [515, 547] :
ESCAPED{$protectedStaticParentClassField}<font
color="#999999">:ESCAPED{int}</font>
-|---(Inherited) publicParentClassMethod [569, 592] :
ESCAPED{publicParentClassMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
-|---(Inherited) protectedStaticParentClassMethod [1021, 1053] :
ESCAPED{protectedStaticParentClassMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{ }</font>ESCAPED{$param2}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
+|---(Inherited) $publicFooTraitField [58, 78] : <font
color="#7D694A">ESCAPED{$publicFooTraitField}</font><font
color="#999999">:ESCAPED{int}</font>
+|---(Inherited) $privateFooTraitField [96, 117] : <font
color="#7D694A">ESCAPED{$privateFooTraitField}</font><font
color="#999999">:ESCAPED{int}</font>
+|---(Inherited) $protectedFooTraitField [137, 160] : <font
color="#7D694A">ESCAPED{$protectedFooTraitField}</font><font
color="#999999">:ESCAPED{int}</font>
+|---(Inherited) $publicStaticFooTraitField [185, 211] : <font
color="#7D694A">ESCAPED{$publicStaticFooTraitField}</font><font
color="#999999">:ESCAPED{int}</font>
+|---(Inherited) $privateStaticFooTraitField [236, 263] : <font
color="#7D694A">ESCAPED{$privateStaticFooTraitField}</font><font
color="#999999">:ESCAPED{int}</font>
+|---(Inherited) $protectedStaticFooTraitField [290, 319] : <font
color="#7D694A">ESCAPED{$protectedStaticFooTraitField}</font><font
color="#999999">:ESCAPED{int}</font>
+|---(Inherited) publicFooTraitMethod [341, 361] : <font
color="#7D694A">ESCAPED{publicFooTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{
}</font>ESCAPED{$param}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
+|---(Inherited) protectedFooTraitMethod [499, 522] : <font
color="#7D694A">ESCAPED{protectedFooTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{
}</font>ESCAPED{$param2}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
+|---(Inherited) privateStaticFooTraitMethod [676, 703] : <font
color="#7D694A">ESCAPED{privateStaticFooTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{
}</font>ESCAPED{$param2}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
+|---(Inherited) protectedStaticFooTraitMethod [778, 807] : <font
color="#7D694A">ESCAPED{protectedStaticFooTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{
}</font>ESCAPED{$param2}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
+|---(Inherited) IMPLICIT_PUBLIC_PARENT_CONST [55, 83] : <font
color="#7D694A">ESCAPED{IMPLICIT_PUBLIC_PARENT_CONST}</font>ESCAPED{ }<font
color="#999999">ESCAPED{"parent"}</font>
+|---(Inherited) PROTECTED_PARENT_CONST [216, 238] : <font
color="#7D694A">ESCAPED{PROTECTED_PARENT_CONST}</font>ESCAPED{ }<font
color="#999999">ESCAPED{"parent"}</font>
+|---(Inherited) $publicParentClassField [268, 291] : <font
color="#7D694A">ESCAPED{$publicParentClassField}</font><font
color="#999999">:ESCAPED{int}</font>
+|---(Inherited) $protectedStaticParentClassField [515, 547] : <font
color="#7D694A">ESCAPED{$protectedStaticParentClassField}</font><font
color="#999999">:ESCAPED{int}</font>
+|---(Inherited) publicParentClassMethod [569, 592] : <font
color="#7D694A">ESCAPED{publicParentClassMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{
}</font>ESCAPED{$param}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
+|---(Inherited) protectedStaticParentClassMethod [1021, 1053] : <font
color="#7D694A">ESCAPED{protectedStaticParentClassMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{
}</font>ESCAPED{$param2}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
|---IMPLICIT_PUBLIC_CHILD_CONST [93, 120] :
ESCAPED{IMPLICIT_PUBLIC_CHILD_CONST}ESCAPED{ }<font
color="#999999">ESCAPED{"child"}</font>
|---PUBLIC_CHILD_CONST [149, 167] : ESCAPED{PUBLIC_CHILD_CONST}ESCAPED{ }<font
color="#999999">ESCAPED{"child"}</font>
|---PRIVATE_CHILD_CONST [197, 216] : ESCAPED{PRIVATE_CHILD_CONST}ESCAPED{
}<font color="#999999">ESCAPED{"child"}</font>
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 e6af267113..6bc4ae73f6 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}<font
color="#999999">#ESCAPED{BarTrait}ESCAPED{, }ESCAPED{FooTrait}</font>
-|---(Inherited) publicBarTraitMethod [341, 361] :
ESCAPED{publicBarTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
-|---(Inherited) privateBarTraitMethod [410, 431] :
ESCAPED{privateBarTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{ }</font>ESCAPED{$param2}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
-|---(Inherited) protectedBarTraitMethod [499, 522] :
ESCAPED{protectedBarTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{ }</font>ESCAPED{$param2}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
-|---(Inherited) publicStaticBarTraitMethod [594, 620] :
ESCAPED{publicStaticBarTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
-|---(Inherited) privateStaticBarTraitMethod [676, 703] :
ESCAPED{privateStaticBarTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{ }</font>ESCAPED{$param2}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
-|---(Inherited) protectedStaticBarTraitMethod [778, 807] :
ESCAPED{protectedStaticBarTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{ }</font>ESCAPED{$param2}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
-|---(Inherited) publicFooTraitMethod [341, 361] :
ESCAPED{publicFooTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
-|---(Inherited) privateFooTraitMethod [410, 431] :
ESCAPED{privateFooTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{ }</font>ESCAPED{$param2}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
-|---(Inherited) protectedFooTraitMethod [499, 522] :
ESCAPED{protectedFooTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{ }</font>ESCAPED{$param2}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
-|---(Inherited) publicStaticFooTraitMethod [594, 620] :
ESCAPED{publicStaticFooTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
-|---(Inherited) privateStaticFooTraitMethod [676, 703] :
ESCAPED{privateStaticFooTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{ }</font>ESCAPED{$param2}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
-|---(Inherited) protectedStaticFooTraitMethod [778, 807] :
ESCAPED{protectedStaticFooTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{ }</font>ESCAPED{$param2}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
+|---(Inherited) publicBarTraitMethod [341, 361] : <font
color="#7D694A">ESCAPED{publicBarTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{
}</font>ESCAPED{$param}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
+|---(Inherited) privateBarTraitMethod [410, 431] : <font
color="#7D694A">ESCAPED{privateBarTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{
}</font>ESCAPED{$param2}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
+|---(Inherited) protectedBarTraitMethod [499, 522] : <font
color="#7D694A">ESCAPED{protectedBarTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{
}</font>ESCAPED{$param2}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
+|---(Inherited) publicStaticBarTraitMethod [594, 620] : <font
color="#7D694A">ESCAPED{publicStaticBarTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{
}</font>ESCAPED{$param}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
+|---(Inherited) privateStaticBarTraitMethod [676, 703] : <font
color="#7D694A">ESCAPED{privateStaticBarTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{
}</font>ESCAPED{$param2}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
+|---(Inherited) protectedStaticBarTraitMethod [778, 807] : <font
color="#7D694A">ESCAPED{protectedStaticBarTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{
}</font>ESCAPED{$param2}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
+|---(Inherited) publicFooTraitMethod [341, 361] : <font
color="#7D694A">ESCAPED{publicFooTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{
}</font>ESCAPED{$param}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
+|---(Inherited) privateFooTraitMethod [410, 431] : <font
color="#7D694A">ESCAPED{privateFooTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{
}</font>ESCAPED{$param2}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
+|---(Inherited) protectedFooTraitMethod [499, 522] : <font
color="#7D694A">ESCAPED{protectedFooTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{
}</font>ESCAPED{$param2}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
+|---(Inherited) publicStaticFooTraitMethod [594, 620] : <font
color="#7D694A">ESCAPED{publicStaticFooTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{
}</font>ESCAPED{$param}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
+|---(Inherited) privateStaticFooTraitMethod [676, 703] : <font
color="#7D694A">ESCAPED{privateStaticFooTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{
}</font>ESCAPED{$param2}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
+|---(Inherited) protectedStaticFooTraitMethod [778, 807] : <font
color="#7D694A">ESCAPED{protectedStaticFooTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{
}</font>ESCAPED{$param2}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
|---$publicFooBarTraitField [90, 112] : ESCAPED{$publicFooBarTraitField}<font
color="#999999">:ESCAPED{int}</font>
|---$privateFooBarTraitField [131, 154] :
ESCAPED{$privateFooBarTraitField}<font color="#999999">:ESCAPED{int}</font>
|---$protectedFooBarTraitField [175, 200] :
ESCAPED{$protectedFooBarTraitField}<font color="#999999">:ESCAPED{int}</font>
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 9e7ad38dfe..4727cc28e8 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}<font
color="#999999">#ESCAPED{BarTrait}ESCAPED{, }ESCAPED{FooTrait}</font>
-|---(Inherited) publicBarTraitMethod [341, 361] :
ESCAPED{publicBarTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
-|---(Inherited) privateBarTraitMethod [410, 431] :
ESCAPED{privateBarTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{ }</font>ESCAPED{$param2}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
-|---(Inherited) protectedBarTraitMethod [499, 522] :
ESCAPED{protectedBarTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{ }</font>ESCAPED{$param2}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
-|---(Inherited) publicStaticBarTraitMethod [594, 620] :
ESCAPED{publicStaticBarTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
-|---(Inherited) protectedStaticBarTraitMethod [778, 807] :
ESCAPED{protectedStaticBarTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{ }</font>ESCAPED{$param2}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
-|---(Inherited) privateFooTraitMethod [410, 431] :
ESCAPED{privateFooTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{ }</font>ESCAPED{$param2}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
-|---(Inherited) protectedFooTraitMethod [499, 522] :
ESCAPED{protectedFooTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{ }</font>ESCAPED{$param2}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
-|---(Inherited) publicStaticFooTraitMethod [594, 620] :
ESCAPED{publicStaticFooTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
-|---(Inherited) privateStaticFooTraitMethod [676, 703] :
ESCAPED{privateStaticFooTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{ }</font>ESCAPED{$param2}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
-|---(Inherited) protectedStaticFooTraitMethod [778, 807] :
ESCAPED{protectedStaticFooTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{ }</font>ESCAPED{$param2}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
+|---(Inherited) publicBarTraitMethod [341, 361] : <font
color="#7D694A">ESCAPED{publicBarTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{
}</font>ESCAPED{$param}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
+|---(Inherited) privateBarTraitMethod [410, 431] : <font
color="#7D694A">ESCAPED{privateBarTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{
}</font>ESCAPED{$param2}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
+|---(Inherited) protectedBarTraitMethod [499, 522] : <font
color="#7D694A">ESCAPED{protectedBarTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{
}</font>ESCAPED{$param2}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
+|---(Inherited) publicStaticBarTraitMethod [594, 620] : <font
color="#7D694A">ESCAPED{publicStaticBarTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{
}</font>ESCAPED{$param}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
+|---(Inherited) protectedStaticBarTraitMethod [778, 807] : <font
color="#7D694A">ESCAPED{protectedStaticBarTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{
}</font>ESCAPED{$param2}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
+|---(Inherited) privateFooTraitMethod [410, 431] : <font
color="#7D694A">ESCAPED{privateFooTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{
}</font>ESCAPED{$param2}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
+|---(Inherited) protectedFooTraitMethod [499, 522] : <font
color="#7D694A">ESCAPED{protectedFooTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{
}</font>ESCAPED{$param2}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
+|---(Inherited) publicStaticFooTraitMethod [594, 620] : <font
color="#7D694A">ESCAPED{publicStaticFooTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{
}</font>ESCAPED{$param}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
+|---(Inherited) privateStaticFooTraitMethod [676, 703] : <font
color="#7D694A">ESCAPED{privateStaticFooTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{
}</font>ESCAPED{$param2}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
+|---(Inherited) protectedStaticFooTraitMethod [778, 807] : <font
color="#7D694A">ESCAPED{protectedStaticFooTraitMethod}ESCAPED{(}<font
color="#999999">ESCAPED{int}ESCAPED{ }</font>ESCAPED{$param1}ESCAPED{, }<font
color="#999999">ESCAPED{string}ESCAPED{
}</font>ESCAPED{$param2}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
|---$publicFooBarTraitField [90, 112] : ESCAPED{$publicFooBarTraitField}<font
color="#999999">:ESCAPED{int}</font>
|---$privateFooBarTraitField [131, 154] :
ESCAPED{$privateFooBarTraitField}<font color="#999999">:ESCAPED{int}</font>
|---$protectedFooBarTraitField [175, 200] :
ESCAPED{$protectedFooBarTraitField}<font color="#999999">:ESCAPED{int}</font>
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 eab583c7c6..a77287b31b 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{ }<font
color="#999999">ESCAPED{'private'}</font>
|--method [1024, 1235] : ESCAPED{method}ESCAPED{(}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
|-ExampleTrait2 [1245, 1608] : ESCAPED{ExampleTrait2}<font
color="#999999">#ESCAPED{ExampleTrait}</font>
-|--(Inherited) IMPLICIT_PUBLIC [846, 861] : ESCAPED{IMPLICIT_PUBLIC}ESCAPED{
}<font color="#999999">ESCAPED{'implicit public'}</font>
-|--(Inherited) PUBLIC [900, 906] : ESCAPED{PUBLIC}ESCAPED{ }<font
color="#999999">ESCAPED{'public'}</font>
-|--(Inherited) PROTECTED [939, 948] : ESCAPED{PROTECTED}ESCAPED{ }<font
color="#999999">ESCAPED{'protected'}</font>
-|--(Inherited) PRIVATE [982, 989] : ESCAPED{PRIVATE}ESCAPED{ }<font
color="#999999">ESCAPED{'private'}</font>
-|--(Inherited) method [1024, 1030] : ESCAPED{method}ESCAPED{(}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
+|--(Inherited) IMPLICIT_PUBLIC [846, 861] : <font
color="#7D694A">ESCAPED{IMPLICIT_PUBLIC}</font>ESCAPED{ }<font
color="#999999">ESCAPED{'implicit public'}</font>
+|--(Inherited) PUBLIC [900, 906] : <font
color="#7D694A">ESCAPED{PUBLIC}</font>ESCAPED{ }<font
color="#999999">ESCAPED{'public'}</font>
+|--(Inherited) PROTECTED [939, 948] : <font
color="#7D694A">ESCAPED{PROTECTED}</font>ESCAPED{ }<font
color="#999999">ESCAPED{'protected'}</font>
+|--(Inherited) PRIVATE [982, 989] : <font
color="#7D694A">ESCAPED{PRIVATE}</font>ESCAPED{ }<font
color="#999999">ESCAPED{'private'}</font>
+|--(Inherited) method [1024, 1030] : <font
color="#7D694A">ESCAPED{method}ESCAPED{(}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
|--IMPLICIT_PUBLIC2 [1330, 1346] : ESCAPED{IMPLICIT_PUBLIC2}ESCAPED{ }<font
color="#999999">ESCAPED{'implicit public'}</font>
|--PUBLIC2 [1385, 1392] : ESCAPED{PUBLIC2}ESCAPED{ }<font
color="#999999">ESCAPED{'public'}</font>
|--PROTECTED2 [1425, 1435] : ESCAPED{PROTECTED2}ESCAPED{ }<font
color="#999999">ESCAPED{'protected'}</font>
|--PRIVATE2 [1498, 1506] : ESCAPED{PRIVATE2}ESCAPED{ }<font
color="#999999">ESCAPED{'private'}</font>
|--test [1540, 1606] : ESCAPED{test}ESCAPED{(}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
|-ExampleClass [1616, 1812] : ESCAPED{ExampleClass}<font
color="#999999">#ESCAPED{ExampleTrait}</font>
-|--(Inherited) IMPLICIT_PUBLIC [846, 861] : ESCAPED{IMPLICIT_PUBLIC}ESCAPED{
}<font color="#999999">ESCAPED{'implicit public'}</font>
-|--(Inherited) PUBLIC [900, 906] : ESCAPED{PUBLIC}ESCAPED{ }<font
color="#999999">ESCAPED{'public'}</font>
-|--(Inherited) PROTECTED [939, 948] : ESCAPED{PROTECTED}ESCAPED{ }<font
color="#999999">ESCAPED{'protected'}</font>
-|--(Inherited) PRIVATE [982, 989] : ESCAPED{PRIVATE}ESCAPED{ }<font
color="#999999">ESCAPED{'private'}</font>
-|--(Inherited) method [1024, 1030] : ESCAPED{method}ESCAPED{(}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
+|--(Inherited) IMPLICIT_PUBLIC [846, 861] : <font
color="#7D694A">ESCAPED{IMPLICIT_PUBLIC}</font>ESCAPED{ }<font
color="#999999">ESCAPED{'implicit public'}</font>
+|--(Inherited) PUBLIC [900, 906] : <font
color="#7D694A">ESCAPED{PUBLIC}</font>ESCAPED{ }<font
color="#999999">ESCAPED{'public'}</font>
+|--(Inherited) PROTECTED [939, 948] : <font
color="#7D694A">ESCAPED{PROTECTED}</font>ESCAPED{ }<font
color="#999999">ESCAPED{'protected'}</font>
+|--(Inherited) PRIVATE [982, 989] : <font
color="#7D694A">ESCAPED{PRIVATE}</font>ESCAPED{ }<font
color="#999999">ESCAPED{'private'}</font>
+|--(Inherited) method [1024, 1030] : <font
color="#7D694A">ESCAPED{method}ESCAPED{(}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
|--test [1675, 1810] : ESCAPED{test}ESCAPED{(}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
|-Child [1820, 2030] : ESCAPED{Child}<font
color="#999999">::ESCAPED{ExampleClass}</font>
-|--(Inherited) IMPLICIT_PUBLIC [846, 861] : ESCAPED{IMPLICIT_PUBLIC}ESCAPED{
}<font color="#999999">ESCAPED{'implicit public'}</font>
-|--(Inherited) PUBLIC [900, 906] : ESCAPED{PUBLIC}ESCAPED{ }<font
color="#999999">ESCAPED{'public'}</font>
-|--(Inherited) PROTECTED [939, 948] : ESCAPED{PROTECTED}ESCAPED{ }<font
color="#999999">ESCAPED{'protected'}</font>
-|--(Inherited) method [1024, 1030] : ESCAPED{method}ESCAPED{(}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
+|--(Inherited) IMPLICIT_PUBLIC [846, 861] : <font
color="#7D694A">ESCAPED{IMPLICIT_PUBLIC}</font>ESCAPED{ }<font
color="#999999">ESCAPED{'implicit public'}</font>
+|--(Inherited) PUBLIC [900, 906] : <font
color="#7D694A">ESCAPED{PUBLIC}</font>ESCAPED{ }<font
color="#999999">ESCAPED{'public'}</font>
+|--(Inherited) PROTECTED [939, 948] : <font
color="#7D694A">ESCAPED{PROTECTED}</font>ESCAPED{ }<font
color="#999999">ESCAPED{'protected'}</font>
+|--(Inherited) method [1024, 1030] : <font
color="#7D694A">ESCAPED{method}ESCAPED{(}ESCAPED{)}</font><font
color="#999999">:ESCAPED{void}</font>
|--test [1870, 2028] : ESCAPED{test}ESCAPED{(}ESCAPED{)}<font
color="#999999">:ESCAPED{void}</font>
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 0000000000..b717d01901
--- /dev/null
+++
b/php/php.editor/test/unit/data/testfiles/structure/deprecatedInheritedDeclarations.php
@@ -0,0 +1,97 @@
+<?php
+
+trait DeprecatedFooTrait {
+
+ /** @deprecated */
+ public int $publicFooTraitField;
+ /** @deprecated */
+ private int $privateFooTraitField;
+ /** @deprecated */
+ protected int $protectedFooTraitField;
+
+ /** @deprecated */
+ public static int $publicStaticFooTraitField;
+ /** @deprecated */
+ private static int $privateStaticFooTraitField;
+ /** @deprecated */
+ protected static int $protectedStaticFooTraitField;
+
+ /** @deprecated */
+ public function publicFooTraitMethod(int $param): void {
+ }
+
+ /** @deprecated */
+ private function privateFooTraitMethod(int $param1, string $param2): void {
+ }
+
+ /** @deprecated */
+ protected function protectedFooTraitMethod(int $param1, string $param2):
void {
+ }
+
+ /** @deprecated */
+ public static function publicStaticFooTraitMethod(int $param): void {
+ }
+
+ /** @deprecated */
+ private static function privateStaticFooTraitMethod(int $param1, string
$param2): void {
+ }
+
+ /** @deprecated */
+ protected static function protectedStaticFooTraitMethod(int $param1,
string $param2): void {
+ }
+}
+
+class DeprecatedParentClass {
+ /** @deprecated */
+ const IMPLICIT_PUBLIC_PARENT_CONST = "parent";
+ /** @deprecated */
+ public const PUBLIC_PARENT_CONST = "parent";
+ /** @deprecated */
+ private const PRIVATE_PARENT_CONST = "parent";
+ /** @deprecated */
+ protected const PROTECTED_PARENT_CONST = "parent";
+
+ /** @deprecated */
+ public int $publicParentClassField;
+ /** @deprecated */
+ private int $privateParentClassField;
+ /** @deprecated */
+ protected int $protectedParentClassField;
+
+ /** @deprecated */
+ public static int $publicStaticParentClassField;
+ /** @deprecated */
+ private static int $privateStaticParentClassField;
+ /** @deprecated */
+ protected static int $protectedStaticParentClassField;
+
+ /** @deprecated */
+ public function publicParentClassMethod(int $param): void {
+ }
+
+ /** @deprecated */
+ private function privateParentClassMethod(int $param1, string $param2):
void {
+ }
+
+ /** @deprecated */
+ protected function protectedParentClassMethod(int $param1, string
$param2): void {
+ }
+
+ /** @deprecated */
+ public static function publicStaticParentClassMethod(int $param): void {
+ }
+
+ /** @deprecated */
+ private static function privateStaticParentClassMethod(int $param1, string
$param2): void {
+ }
+
+ /** @deprecated */
+ protected static function protectedStaticParentClassMethod(int $param1,
string $param2): void {
+ }
+}
+
+
+class ChildClass extends DeprecatedParentClass
+{
+ use DeprecatedFooTrait;
+}
diff --git
a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/csl/NavigatorDeprecatedTest.java
b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/csl/NavigatorDeprecatedTest.java
index 8b48d1d5a7..9046fd0a67 100644
---
a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/csl/NavigatorDeprecatedTest.java
+++
b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/csl/NavigatorDeprecatedTest.java
@@ -58,6 +58,10 @@ public class NavigatorDeprecatedTest extends
PhpNavigatorTestBase {
performTest("structure/deprecatedTypedFields");
}
+ public void testDeprecatedInheritedDeclarations() throws Exception {
+ performTest("structure/deprecatedInheritedDeclarations");
+ }
+
@Override
protected Map<String, ClassPath> createClassPathsForTest() {
return Collections.singletonMap(
---------------------------------------------------------------------
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
