From 7433a70ff5d475fc3ae8b5b218d33376378ccfae Mon Sep 17 00:00:00 2001 From: peter Date: Mon, 2 Jul 2018 13:21:11 +0200 Subject: [PATCH] disable invoking "remove attribute" intention invocation from outer language --- .../analysis/RemoveAttributeIntentionFix.java | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/RemoveAttributeIntentionFix.java b/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/RemoveAttributeIntentionFix.java index bc925c40eb2b..d504d1c31927 100644 --- a/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/RemoveAttributeIntentionFix.java +++ b/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/RemoveAttributeIntentionFix.java @@ -6,10 +6,8 @@ import com.intellij.codeInsight.daemon.XmlErrorMessages; import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.codeInspection.LocalQuickFix; import com.intellij.codeInspection.ProblemDescriptor; -import com.intellij.lang.Language; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; -import com.intellij.psi.FileViewProvider; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.util.PsiTreeUtil; @@ -106,19 +104,10 @@ public class RemoveAttributeIntentionFix implements LocalQuickFix, IntentionActi private static XmlAttribute getAttribute(Editor editor, PsiFile file) { int offset = editor.getCaretModel().getOffset(); - FileViewProvider provider = file.getViewProvider(); - for (Language language : provider.getLanguages()) { - PsiElement element = provider.findElementAt(offset, language); - XmlAttribute attribute = PsiTreeUtil.getParentOfType(element, XmlAttribute.class); - if (attribute != null) { - return attribute; - } - element = provider.findElementAt(offset - 1, language); - attribute = PsiTreeUtil.getParentOfType(element, XmlAttribute.class); - if (attribute != null) { - return attribute; - } + XmlAttribute attribute = PsiTreeUtil.getParentOfType(file.findElementAt(offset), XmlAttribute.class); + if (attribute == null) { + attribute = PsiTreeUtil.getParentOfType(file.findElementAt(offset - 1), XmlAttribute.class); } - return null; + return attribute; } }