feat: add IGrammarRegistryManager#getInjections(ITMScope)

Author: sebthom

org.eclipse.tm4e.registry/src/main/java/org/eclipse/tm4e/registry/IGrammarRegistryManager.java

@@ -98,8 +98,16 @@ default IGrammarRegistryManager.EditSession newEditSession() {
 	Collection<IContentType> getContentTypesForScope(ITMScope scope);
 
 	/**
+	 * @param scopeName an unqualified (sources.batchfile) or qualified (sources.batchfile@plugin) scope name
+	 *
 	 * @return list of scope names to inject for the given <code>scopeName</code> and null otherwise.
 	 */
 	@Nullable
 	Collection<String> getInjections(String scopeName);
+
+	/**
+	 * @return list of scope names to inject for the given scope name and null otherwise.
+	 */
+	@Nullable
+	Collection<String> getInjections(ITMScope scope);
 }

org.eclipse.tm4e.registry/src/main/java/org/eclipse/tm4e/registry/internal/AbstractGrammarRegistryManager.java

@@ -156,7 +156,8 @@ public long getLastModified() {
 	@Override
 	public @Nullable IGrammar getGrammarFor(final IContentType... contentTypes) {
 		// -> used by TMPresentationReconciler
-		for (@Nullable IContentType contentType : contentTypes) {
+		for (@Nullable
+		IContentType contentType : contentTypes) {
 			while (contentType != null) {
 				final ContentTypeToScopeBinding binding = contentTypeToScopeBindings.get(contentType);
 				if (binding == null) {
@@ -249,13 +250,15 @@ public IGrammarDefinition[] getDefinitions() {
 				.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) {
 		// -> indirectly used by org.eclipse.tm4e.core.registry.Registry._doLoadSingleGrammar(String)
-		return injections.get(TMScope.parse(scopeName).getName());
+		return getInjections(TMScope.parse(scopeName));
+	}
+
+	@Override
+	public @Nullable Collection<String> getInjections(final ITMScope scope) {
+		return injections.get(scope.getName());
 	}
 
 	/**

org.eclipse.tm4e.registry/src/main/java/org/eclipse/tm4e/registry/internal/WorkingCopyGrammarRegistryManager.java

@@ -64,6 +64,11 @@ public void reset() {
 		return manager.getInjections(scopeName);
 	}
 
+	@Override
+	public @Nullable Collection<String> getInjections(final ITMScope scope) {
+		return manager.getInjections(scope);
+	}
+
 	@Override
 	public void registerGrammarDefinition(final IGrammarDefinition definition) {
 		super.registerGrammarDefinition(definition);