diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/TemporaryPlacesInjector.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/TemporaryPlacesInjector.java index 49b9d25de8d7..8157712e55b1 100644 --- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/TemporaryPlacesInjector.java +++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/TemporaryPlacesInjector.java @@ -44,11 +44,11 @@ public class TemporaryPlacesInjector implements MultiHostInjector { public void getLanguagesToInject(@NotNull final MultiHostRegistrar registrar, @NotNull final PsiElement context) { final PsiLanguageInjectionHost host = (PsiLanguageInjectionHost)context; - final ElementManipulator manipulator = ElementManipulators.getManipulator(host); - if (manipulator == null) return; // TODO: [gregory] there is no need to stop the world ! - //LOG.assertTrue(manipulator != null, "No manipulator for " + host); final PsiLanguageInjectionHost originalHost = PsiUtilBase.getOriginalElement(host, host.getClass()); final List list = TemporaryPlacesRegistry.getInstance(context.getProject()).getTempInjectionsSafe(originalHost); + if (list.isEmpty()) return; + final ElementManipulator manipulator = ElementManipulators.getManipulator(host); + if (manipulator == null) return; for (final TemporaryPlacesRegistry.TemporaryPlace place : list) { LOG.assertTrue(place.language != null, "Language should not be NULL"); InjectorUtils.registerInjection(