Skip to content

Remove the use of the now deprecated WriteCommandAction.Simple usages #8316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 11, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 34 additions & 40 deletions flutter-idea/src/io/flutter/editor/FlutterSaveActionsManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -131,25 +131,22 @@ private void performOrganizeThenFormat(@NotNull Document document, @NotNull Virt
return;
}

new WriteCommandAction.Simple(myProject) {
@Override
protected void run() {
if (myProject.isDisposed()) {
return;
}

AssistUtils.applySourceEdits(myProject, file, document, fileEdit.getEdits(), Collections.emptySet());

// Committing a document here is required in order to guarantee that DartPostFormatProcessor.processText() is called afterwards.
PsiDocumentManager.getInstance(myProject).commitDocument(document);

// Run this in an invoke later so that we don't exeucte the initial part of performFormat in a write action.
//noinspection CodeBlock2Expr
OpenApiUtils.safeInvokeLater(() -> {
performFormat(document, file, true, psiFile);
});
WriteCommandAction.writeCommandAction(myProject).run(() -> {
if (myProject.isDisposed()) {
return;
}
}.execute();

AssistUtils.applySourceEdits(myProject, file, document, fileEdit.getEdits(), Collections.emptySet());

// Committing a document here is required in order to guarantee that DartPostFormatProcessor.processText() is called afterwards.
PsiDocumentManager.getInstance(myProject).commitDocument(document);

// Run this in an invoke later so that we don't exeucte the initial part of performFormat in a write action.
//noinspection CodeBlock2Expr
OpenApiUtils.safeInvokeLater(() -> {
performFormat(document, file, true, psiFile);
});
});
});
}
}
Expand All @@ -174,33 +171,30 @@ private void performFormat(@NotNull Document document, @NotNull VirtualFile file
return;
}

new WriteCommandAction.Simple(myProject) {
@Override
protected void run() {
if (myProject.isDisposed()) {
return;
}
WriteCommandAction.writeCommandAction(myProject).run(() -> {
if (myProject.isDisposed()) {
return;
}

boolean didFormat = false;
boolean didFormat = false;

final List<SourceEdit> edits = formatResult.getEdits();
if (edits != null && edits.size() == 1) {
final String replacement = StringUtil.convertLineSeparators(edits.get(0).getReplacement());
document.replaceString(0, document.getTextLength(), replacement);
PsiDocumentManager.getInstance(myProject).commitDocument(document);
final List<SourceEdit> edits = formatResult.getEdits();
if (edits != null && edits.size() == 1) {
final String replacement = StringUtil.convertLineSeparators(edits.get(0).getReplacement());
document.replaceString(0, document.getTextLength(), replacement);
PsiDocumentManager.getInstance(myProject).commitDocument(document);

didFormat = true;
}
didFormat = true;
}

// Don't perform the save in a write action - it could invoke EDT work.
if (reSave || didFormat) {
//noinspection CodeBlock2Expr
OpenApiUtils.safeInvokeLater(() -> {
FileDocumentManager.getInstance().saveDocument(document);
});
}
// Don't perform the save in a write action - it could invoke EDT work.
if (reSave || didFormat) {
//noinspection CodeBlock2Expr
OpenApiUtils.safeInvokeLater(() -> {
FileDocumentManager.getInstance().saveDocument(document);
});
}
}.execute();
});
});
}

Expand Down