Skip to content

Commit 4c8db88

Browse files
committed
Also read initially visible marker fields from extensions #2193
1 parent 9732719 commit 4c8db88

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/markers/internal/ContentGeneratorDescriptor.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,12 @@ public String getId() {
174174
* @return {@link MarkerField}[]
175175
*/
176176
public MarkerField[] getInitialVisible() {
177-
return initialVisibleWithoutExtensions;
177+
List<MarkerField> allVisibleFieldsList = new ArrayList<>(Arrays.asList(initialVisibleWithoutExtensions));
178+
179+
getExtensionsDescriptorsStream().flatMap(descriptor -> Arrays.stream(descriptor.getInitialVisible()))
180+
.forEach(field -> allVisibleFieldsList.add(field));
181+
182+
return allVisibleFieldsList.toArray(new MarkerField[allVisibleFieldsList.size()]);
178183
}
179184

180185
/**

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/markers/MarkerSupportViewTest.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,6 @@ public void markerContentGeneratorExtensionLoaded() throws Exception {
141141
assertNotNull(descriptor);
142142

143143
MarkerField[] allFields = descriptor.getAllFields();
144-
145144
boolean foundAdditionalField1 = false;
146145
boolean foundRecursivelyAddedField2 = false;
147146
for (MarkerField field : allFields) {
@@ -160,6 +159,16 @@ public void markerContentGeneratorExtensionLoaded() throws Exception {
160159
assertTrue("MarkerField not loaded from recursive marker content generator extension.",
161160
foundRecursivelyAddedField2);
162161

162+
MarkerField[] initiallyVisibleFields = descriptor.getInitialVisible();
163+
boolean foundAdditionalVisbileField = false;
164+
for (MarkerField field : initiallyVisibleFields) {
165+
if ("Problem Key".equals(field.getName())) {
166+
foundAdditionalVisbileField = true;
167+
}
168+
}
169+
assertTrue("Visible attribute from marker fields from marker content generator extensions not loaded.",
170+
foundAdditionalVisbileField);
171+
163172
MarkerType markerTypeFromExtension = descriptor.getType("org.eclipse.ui.tests.markers.artificial.problem");
164173
assertNotNull("Marker type from marker content generator extensions not loaded.", markerTypeFromExtension);
165174
assertTrue(descriptor.getMarkerTypes().contains(markerTypeFromExtension));

0 commit comments

Comments
 (0)