Extract another convenience method

Author: travkin79

org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/preferences/CustomCodeTemplatePreferencePage.java

@@ -11,8 +11,6 @@
  *******************************************************************************/
 package org.eclipse.tm4e.ui.internal.preferences;
 
-import java.util.Arrays;
-
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.jface.text.Document;
 import org.eclipse.jface.text.IDocument;
@@ -28,7 +26,6 @@
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.text.templates.TemplatePersistenceData;
 import org.eclipse.tm4e.core.grammar.IGrammar;
-import org.eclipse.tm4e.registry.IGrammarDefinition;
 import org.eclipse.tm4e.registry.ITMScope;
 import org.eclipse.tm4e.registry.TMEclipseRegistryPlugin;
 import org.eclipse.tm4e.ui.TMUIPlugin;
@@ -108,12 +105,7 @@ private void selectedCodeTemplateChanged() {
 		if (selectedTemplate != null) {
 
 			final String id = selectedTemplate.getContextTypeId();
-
-			final IGrammarDefinition[] grammarDefinitions = TMEclipseRegistryPlugin.getGrammarRegistryManager().getDefinitions();
-			final ITMScope scope = Arrays.stream(grammarDefinitions)
-					.map(IGrammarDefinition::getScope)
-					.filter(s -> id.equals(CodeTemplateContextTypeUtils.toContextTypeId(s)))
-					.findFirst().orElse(null);
+			final ITMScope scope = CodeTemplateContextTypeUtils.findScopeFor(id);
 
 			if (scope != null) {
 				final IGrammar languageGrammar = TMEclipseRegistryPlugin.getGrammarRegistryManager().getGrammarForScope(scope);

org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/utils/CodeTemplateContextTypeUtils.java

@@ -11,7 +11,12 @@
  *******************************************************************************/
 package org.eclipse.tm4e.ui.internal.utils;
 
+import java.util.Arrays;
+
+import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.tm4e.registry.IGrammarDefinition;
 import org.eclipse.tm4e.registry.ITMScope;
+import org.eclipse.tm4e.registry.TMEclipseRegistryPlugin;
 import org.eclipse.tm4e.ui.TMUIPlugin;
 
 public class CodeTemplateContextTypeUtils {
@@ -28,4 +33,13 @@ public static String toContextTypeId(final ITMScope languageScope) {
 		return CONTEXT_TYPE_ID_PREFIX + contextTypeIdSuffix;
 	}
 
+	public static @Nullable ITMScope findScopeFor(final String contextTypeId) {
+		final IGrammarDefinition[] grammarDefinitions = TMEclipseRegistryPlugin.getGrammarRegistryManager().getDefinitions();
+
+		return Arrays.stream(grammarDefinitions)
+				.map(IGrammarDefinition::getScope)
+				.filter(scope -> contextTypeId.equals(CodeTemplateContextTypeUtils.toContextTypeId(scope)))
+				.findFirst().orElse(null);
+	}
+
 }