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

Javafx: "Wrap field with JavaFx property" intention - don't use TransactionGuard, because it delays the write action which may cause inconsistencies when performing refactoring (IDEA-102430)

Browse Source
This commit is contained in:
Pavel Dolgov
2016-10-27 13:22:35 +03:00
parent 1556430784
commit 270ab5e85f
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/javaFX/src/org/jetbrains/plugins/javaFX/codeInsight/JavaFxFieldToPropertyIntention.java
+4 -9
View File
@@ -1,11 +1,9 @@
package org.jetbrains.plugins.javaFX.codeInsight;
import com.intellij.codeInsight.FileModificationService;
import com.intellij.codeInsight.intention.LowPriorityAction;
import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.openapi.application.ReadAction;
import com.intellij.openapi.application.TransactionGuard;
import com.intellij.openapi.command.WriteCommandAction;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Editor;
@@ -109,17 +107,14 @@ public class JavaFxFieldToPropertyIntention extends PsiElementBaseIntentionActio
final PsiFile file = element.getContainingFile();
return file != null && file.isPhysical() ? file : null;
});
TransactionGuard.submitTransaction(myProject, () ->
WriteCommandAction
.runWriteCommandAction(myProject, "Convert '" + myProperty.myFieldName + "' to JavaFX property", null,
this::replaceUsages, myFiles.toArray(PsiFile.EMPTY_ARRAY)));
});
WriteCommandAction
.runWriteCommandAction(myProject, "Convert '" + myProperty.myFieldName + "' to JavaFX property", null,
this::replaceOccurrences, myFiles.toArray(PsiFile.EMPTY_ARRAY));
}
private void replaceUsages() {
private void replaceOccurrences() {
final PsiField field = myProperty.myField;
if (!FileModificationService.getInstance().preparePsiElementsForWrite(myFiles)) return;
field.normalizeDeclaration();
final PsiElementFactory elementFactory = JavaPsiFacade.getInstance(myProject).getElementFactory();