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-159262 Incorrect treating of the <link> element in the jsp page

Browse Source 
fix collapse HTML tag in JSP
This commit is contained in:
Dmitry Avdeev
2016-08-23 15:55:21 +03:00
parent 0a84fda821
commit d3b2bd2adb
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xml/xml-analysis-impl/src/com/intellij/xml/util/CollapseTagIntention.java
+12 -3
View File
@@ -20,6 +20,7 @@ import com.intellij.codeInsight.intention.IntentionAction;
import com.intellij.codeInspection.LocalQuickFix;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.lang.ASTNode;
import com.intellij.lang.Language;
import com.intellij.openapi.application.Result;
import com.intellij.openapi.command.WriteCommandAction;
import com.intellij.openapi.editor.Document;
@@ -82,9 +83,17 @@ public class CollapseTagIntention implements LocalQuickFix, IntentionAction {
}
private static XmlTag getTag(Editor editor, PsiFile file) {
int offset = editor.getCaretModel().getOffset();
FileViewProvider provider = file.getViewProvider();
PsiElement element = provider.findElementAt(editor.getCaretModel().getOffset(), provider.getBaseLanguage());
return PsiTreeUtil.getParentOfType(element, XmlTag.class, false);
for (Language language : provider.getLanguages()) {
PsiElement element = provider.findElementAt(offset, language);
XmlTag tag = PsiTreeUtil.getParentOfType(element, XmlTag.class);
if (tag != null && XmlChildRole.START_TAG_END_FINDER.findChild(tag.getNode()) != null) {
return tag;
}
}
return null;
}
@Override
@@ -92,7 +101,7 @@ public class CollapseTagIntention implements LocalQuickFix, IntentionAction {
return false;
}
private static void applyFix(@NotNull final Project project, final PsiElement tag) {
private static void applyFix(@NotNull final Project project, @NotNull final PsiElement tag) {
if (!FileModificationService.getInstance().prepareFileForWrite(tag.getContainingFile())) {
return;
}