Fix collecting marker content generators from extensions eclipse-plat…

…form#2193
travkin79 · Aug 19, 2024 · 4cca5c0 · 4cca5c0
1 parent db4e3ca
commit 4cca5c0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/....eclipse.ui.ide/src/org/eclipse/ui/views/markers/internal/ContentGeneratorDescriptor.java b/....eclipse.ui.ide/src/org/eclipse/ui/views/markers/internal/ContentGeneratorDescriptor.java
@@ -107,7 +107,7 @@ public boolean allTypesSelected(Collection<MarkerType> selectedTypes) {
 	 * @return {@link MarkerField}[]
 	 */
 	public MarkerField[] getAllFields() {
-		List<MarkerField> allFieldsList = Arrays.asList(allFields);
+		List<MarkerField> allFieldsList = new ArrayList<>(Arrays.asList(allFields));
 
 		Iterator<IConfigurationElement> extensions = generatorExtensions.iterator();
 		while (extensions.hasNext()) {

diff --git a/...eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/markers/MarkerSupportViewTest.java b/...eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/markers/MarkerSupportViewTest.java
@@ -136,6 +136,8 @@ public void markerContentGeneratorExtensionLoaded() throws Exception {
 		MarkerContentGenerator generator = getMarkerContentGenerator(view);
 		ContentGeneratorDescriptor descriptor = MarkerSupportRegistry.getInstance()
 				.getContentGenDescriptor(generator.getId());
+		assertNotNull(descriptor);
+
 		MarkerField[] allFields = descriptor.getAllFields();
 
 		boolean foundAdditionalFieldRegisteredViaExtension = false;