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

IDEA-199851 Double "<" when editing a JSP

Browse Source
This commit is contained in:
Dmitry Avdeev
2018-10-04 12:37:19 +03:00
parent 6f0915996a
commit 44f553daed
2 changed files with 5 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xml/impl/resources/liveTemplates/zen_html.xml
-205
View File
File diff suppressed because it is too large Load Diff
xml/impl/src/com/intellij/codeInsight/template/HtmlTextContextType.java
+5 -2
View File
@@ -16,10 +16,12 @@
package com.intellij.codeInsight.template;
import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.lang.Language;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiErrorElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtilCore;
import com.intellij.psi.xml.XmlComment;
import com.intellij.psi.xml.XmlDocument;
import com.intellij.psi.xml.XmlText;
@@ -36,10 +38,11 @@ public class HtmlTextContextType extends TemplateContextType {
@Override
public boolean isInContext(@NotNull PsiFile file, int offset) {
if (!HtmlContextType.isMyLanguage(file.getLanguage())) {
Language language = PsiUtilCore.getLanguageAtOffset(file, offset);
if (!HtmlContextType.isMyLanguage(language)) {
return false;
}
PsiElement element = file.findElementAt(offset);
PsiElement element = file.getViewProvider().findElementAt(offset, language);
return element == null || isInContext(element);
}