diff --git a/xml/impl/src/com/intellij/codeInsight/editorActions/XmlAutoPopupHandler.java b/xml/impl/src/com/intellij/codeInsight/editorActions/XmlAutoPopupHandler.java index a0f5406fc740..139ea62d72b4 100644 --- a/xml/impl/src/com/intellij/codeInsight/editorActions/XmlAutoPopupHandler.java +++ b/xml/impl/src/com/intellij/codeInsight/editorActions/XmlAutoPopupHandler.java @@ -65,7 +65,7 @@ public class XmlAutoPopupHandler extends TypedHandlerDelegate { if (lastElement instanceof PsiFile) { //the very end of an injected file lastElement = file.findElementAt(offset - 1); } - if (lastElement == null) return false; + if (lastElement == null || !lastElement.isValid()) return false; if (doCompleteIfNeeded(offset, file, lastElement)) { return true; @@ -78,7 +78,7 @@ public class XmlAutoPopupHandler extends TypedHandlerDelegate { if (fileViewProvider instanceof TemplateLanguageFileViewProvider && (templateDataLanguage = ((TemplateLanguageFileViewProvider)fileViewProvider).getTemplateDataLanguage()) != parent.getLanguage()) { lastElement = fileViewProvider.findElementAt(offset - 1, templateDataLanguage); - if (lastElement == null) return false; + if (lastElement == null || !lastElement.isValid()) return false; return doCompleteIfNeeded(offset, file, lastElement); } return false;