MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

WEB-8569 EJS: HTML tag is not closed inside quotes

Browse Source
This commit is contained in:
Fedor Korotkov
2013-08-16 14:11:52 +04:00
parent 8ad9c40d1e
commit a8992f523d
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xml/impl/src/com/intellij/codeInsight/editorActions/XmlGtTypedHandler.java
+6 -8
View File
@@ -47,7 +47,12 @@ import org.jetbrains.annotations.NonNls;
public class XmlGtTypedHandler extends TypedHandlerDelegate {
private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.editorActions.TypedHandler");
public Result beforeCharTyped(final char c, final Project project, final Editor editor, final PsiFile editedFile, final FileType fileType) {
public Result beforeCharTyped(final char c, final Project project, Editor editor, PsiFile editedFile, final FileType fileType) {
final Editor injectedEditor = InjectedLanguageUtil.getEditorForInjectedLanguageNoCommit(editor, editedFile);
if (editor != injectedEditor) {
editor = injectedEditor;
editedFile = PsiDocumentManager.getInstance(project).getPsiFile(injectedEditor.getDocument());
}
final WebEditorOptions webEditorOptions = WebEditorOptions.getInstance();
if (c == '>' && webEditorOptions != null && webEditorOptions.isAutomaticallyInsertClosingTag() && fileContainsXmlLanguage(editedFile)) {
PsiDocumentManager.getInstance(project).commitAllDocuments();
@@ -66,13 +71,6 @@ public class XmlGtTypedHandler extends TypedHandlerDelegate {
// <xml_code><caret><outer_element>
elementAtCaret = element = provider.findElementAt(offset - 1, XMLLanguage.class);
}
if (element == null && offset > 0) {
// seems like an injection in a template file
final PsiElement injectedElement = InjectedLanguageUtil.findInjectedElementNoCommit(file, offset);
if (injectedElement != null && injectedElement.getContainingFile() instanceof XmlFile) {
elementAtCaret = element = injectedElement;
}
}
if (!(element instanceof PsiWhiteSpace)) {
boolean nonAcceptableDelimiter = true;