From 6df7f2d2e6793f9c0cde6145dabc9fc6225133ca Mon Sep 17 00:00:00 2001 From: peter Date: Fri, 25 Nov 2016 09:18:12 +0100 Subject: [PATCH] javafx intentions: make files writable outside write action --- .../inspections/JavaFxUnusedImportsInspection.java | 13 +------------ .../fxml/codeInsight/inspections/UnwrapTagFix.java | 2 -- .../JavaFxCollapseSubTagToAttributeIntention.java | 2 -- .../intentions/JavaFxExpandAttributeIntention.java | 2 -- .../intentions/JavaFxWrapWithDefineIntention.java | 2 -- 5 files changed, 1 insertion(+), 20 deletions(-) diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/JavaFxUnusedImportsInspection.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/JavaFxUnusedImportsInspection.java index 7c1f91b3d678..3b2a188e2f3e 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/JavaFxUnusedImportsInspection.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/JavaFxUnusedImportsInspection.java @@ -15,11 +15,8 @@ */ package org.jetbrains.plugins.javaFX.fxml.codeInsight.inspections; -import com.intellij.codeInsight.FileModificationService; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.codeInspection.*; -import com.intellij.lang.ImportOptimizer; -import com.intellij.openapi.command.WriteCommandAction; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.PsiElement; @@ -106,15 +103,7 @@ public class JavaFxUnusedImportsInspection extends XmlSuppressableInspectionTool if (psiElement == null) return; final PsiFile file = psiElement.getContainingFile(); if (file == null || !JavaFxFileTypeFactory.isFxml(file)) return; - if (!FileModificationService.getInstance().prepareFileForWrite(file)) return; - ImportOptimizer optimizer = new JavaFxImportsOptimizer(); - final Runnable runnable = optimizer.processFile(file); - new WriteCommandAction.Simple(project, getFamilyName(), file) { - @Override - protected void run() throws Throwable { - runnable.run(); - } - }.execute(); + new JavaFxImportsOptimizer().processFile(file).run(); } } } diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/UnwrapTagFix.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/UnwrapTagFix.java index e22f6f11e1a6..2cf0c903a50e 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/UnwrapTagFix.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/UnwrapTagFix.java @@ -15,7 +15,6 @@ */ package org.jetbrains.plugins.javaFX.fxml.codeInsight.inspections; -import com.intellij.codeInsight.FileModificationService; import com.intellij.codeInspection.LocalQuickFix; import com.intellij.codeInspection.ProblemDescriptor; import com.intellij.openapi.diagnostic.Logger; @@ -63,7 +62,6 @@ public class UnwrapTagFix implements LocalQuickFix { if (xmlTag != null) { final XmlTag parentTag = xmlTag.getParentTag(); final PsiElement[] children = PsiTreeUtil.getChildrenOfType(xmlTag, XmlTagChild.class); - if (!FileModificationService.getInstance().preparePsiElementsForWrite(element)) return; if (children != null && children.length > 0 && parentTag != null) { parentTag.addRange(children[0], children[children.length - 1]); } diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/intentions/JavaFxCollapseSubTagToAttributeIntention.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/intentions/JavaFxCollapseSubTagToAttributeIntention.java index b993a03e134f..b8e337ee6341 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/intentions/JavaFxCollapseSubTagToAttributeIntention.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/intentions/JavaFxCollapseSubTagToAttributeIntention.java @@ -15,7 +15,6 @@ */ package org.jetbrains.plugins.javaFX.fxml.codeInsight.intentions; -import com.intellij.codeInsight.FileModificationService; import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; @@ -39,7 +38,6 @@ import org.jetbrains.plugins.javaFX.fxml.descriptors.JavaFxPropertyTagDescriptor public class JavaFxCollapseSubTagToAttributeIntention extends PsiElementBaseIntentionAction{ @Override public void invoke(@NotNull Project project, Editor editor, @NotNull PsiElement element) throws IncorrectOperationException { - if (!FileModificationService.getInstance().preparePsiElementsForWrite(element)) return; final XmlTag tag = (XmlTag)element.getParent(); final String value; if (tag.getSubTags().length == 0) { diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/intentions/JavaFxExpandAttributeIntention.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/intentions/JavaFxExpandAttributeIntention.java index 69bde6e043e4..01eca0ce4d33 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/intentions/JavaFxExpandAttributeIntention.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/intentions/JavaFxExpandAttributeIntention.java @@ -15,7 +15,6 @@ */ package org.jetbrains.plugins.javaFX.fxml.codeInsight.intentions; -import com.intellij.codeInsight.FileModificationService; import com.intellij.codeInsight.daemon.impl.analysis.JavaGenericsUtil; import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction; import com.intellij.openapi.diagnostic.Logger; @@ -45,7 +44,6 @@ public class JavaFxExpandAttributeIntention extends PsiElementBaseIntentionActio @Override public void invoke(@NotNull Project project, Editor editor, @NotNull PsiElement element) throws IncorrectOperationException { - if (!FileModificationService.getInstance().preparePsiElementsForWrite(element)) return; final XmlAttribute attr = (XmlAttribute)element.getParent(); final String name = attr.getName(); final XmlAttributeDescriptor descriptor = attr.getDescriptor(); diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/intentions/JavaFxWrapWithDefineIntention.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/intentions/JavaFxWrapWithDefineIntention.java index 8a3dbcdb8749..fe2c6821d885 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/intentions/JavaFxWrapWithDefineIntention.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/intentions/JavaFxWrapWithDefineIntention.java @@ -15,7 +15,6 @@ */ package org.jetbrains.plugins.javaFX.fxml.codeInsight.intentions; -import com.intellij.codeInsight.FileModificationService; import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; @@ -53,7 +52,6 @@ public class JavaFxWrapWithDefineIntention extends PsiElementBaseIntentionAction @Override public void invoke(@NotNull Project project, Editor editor, @NotNull PsiElement element) throws IncorrectOperationException { - if (!FileModificationService.getInstance().preparePsiElementsForWrite(element)) return; final XmlTag tagFromText = XmlElementFactory.getInstance(project).createTagFromText("<" + FxmlConstants.FX_DEFINE + "/>"); tagFromText.addSubTag(myTag, true); myTag.replace(tagFromText);