fix: registering local grammar injection in plugin.xml broken #733

eclipse · Mar 13, 2024 · 96a28c2 · 96a28c2
1 parent 997ca82
commit 96a28c2
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/...stry/src/main/java/org/eclipse/tm4e/registry/internal/AbstractGrammarRegistryManager.java b/...stry/src/main/java/org/eclipse/tm4e/registry/internal/AbstractGrammarRegistryManager.java
@@ -255,10 +255,14 @@ public Reader getReader() throws IOException {
 				.toArray(IGrammarDefinition[]::new);
 	}
 
+
+	/**
+	 * @param scopeName an unqualified (sources.batchfile) or qualified (sources.batchfile@plugin) scope name
+	 */
 	@Override
 	public @Nullable Collection<String> getInjections(final String scopeName) {
-		// -> is effectively unused at the moment
-		return injections.get(scopeName);
+		// -> indirectly used by org.eclipse.tm4e.core.registry.Registry._doLoadSingleGrammar(String)
+		return injections.get(TMScope.parse(scopeName).getName());
 	}
 
 	/**
@@ -283,7 +287,7 @@ void registerInjection(final String scopeName, final String injectTo) {
 				.map(binding -> binding.contentType).toList();
 	}
 
-	void registerContentTypeToScopeBinding(String pluginId, IContentType contentType, String scopeName) {
+	void registerContentTypeToScopeBinding(final String pluginId, final IContentType contentType, final String scopeName) {
 		// -> used by GrammarRegistryManager.loadGrammarsFromExtensionPoints()
 		contentTypeToScopeBindings.put(contentType, new ContentTypeToScopeBinding(pluginId, contentType, scopeName));
 	}