fix: register injections with fully qualified scope names

Author: sebthom

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

@@ -100,13 +100,13 @@ default IGrammarRegistryManager.EditSession newEditSession() {
 	/**
 	 * @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.
+	 * @return list of registered 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.
+	 * @return list of registered 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

@@ -264,14 +264,14 @@ public IGrammarDefinition[] getDefinitions() {
 	/**
 	 * Register the given <code>scopeName</code> to inject to the given scope name <code>injectTo</code>.
 	 */
-	protected void registerInjection(final String scopeName, final String injectTo) {
+	void registerInjection(final TMScope scopeName, final String injectTo) {
 		// -> used by GrammarRegistryManager.loadGrammarsFromExtensionPoints()
 		Collection<String> injectionsOfScope = getInjections(injectTo);
 		if (injectionsOfScope == null) {
 			injectionsOfScope = new ArrayList<>();
 			injections.put(injectTo, injectionsOfScope);
 		}
-		injectionsOfScope.add(scopeName);
+		injectionsOfScope.add(scopeName.toString());
 	}
 
 	@Override

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

@@ -61,9 +61,9 @@ private void loadGrammarsFromExtensionPoints() {
 					registerGrammarDefinition(new GrammarDefinition(ce));
 					break;
 				case XMLConstants.INJECTION_ELT: {
-					final String scopeName = ce.getAttribute(XMLConstants.SCOPE_NAME_ATTR);
+					final var scope = new TMScope(ce.getAttribute(XMLConstants.SCOPE_NAME_ATTR), ce.getNamespaceIdentifier());
 					final String injectTo = ce.getAttribute(XMLConstants.INJECT_TO_ATTR);
-					registerInjection(scopeName, injectTo);
+					registerInjection(scope, injectTo);
 					break;
 				}
 				case XMLConstants.SCOPE_NAME_CONTENT_TYPE_BINDING_ELT: {