From ed7fa672cf09b73b9ddbc15b49f419c82465c9c2 Mon Sep 17 00:00:00 2001 From: Andrey Starovoyt Date: Fri, 29 May 2020 15:28:24 +0300 Subject: [PATCH] html: disable intention for all places except xml/html files WEB-34199 GitOrigin-RevId: e8cf53e0caa9fbeeca4c58b2277ae70699e6bf22 --- .../daemon/impl/analysis/RearrangeAttributesIntention.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/RearrangeAttributesIntention.java b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/RearrangeAttributesIntention.java index 736780cca956..6ffb0ef13e65 100644 --- a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/RearrangeAttributesIntention.java +++ b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/RearrangeAttributesIntention.java @@ -13,11 +13,13 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.xml.XmlChildRole; +import com.intellij.psi.xml.XmlFile; import com.intellij.psi.xml.XmlTag; import com.intellij.util.IncorrectOperationException; import com.intellij.xml.XmlBundle; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import java.util.Collection; import java.util.Collections; @@ -75,7 +77,9 @@ public class RearrangeAttributesIntention implements IntentionAction { return true; } - private static XmlTag getTag(Editor editor, PsiFile file) { + private static XmlTag getTag(@Nullable Editor editor, PsiFile file) { + if (!(file instanceof XmlFile)) return null; + int offset = editor.getCaretModel().getOffset(); PsiElement element = file.findElementAt(offset); XmlTag parent = PsiTreeUtil.getParentOfType(element, XmlTag.class);