From 08f6504bb42f8d5a1c502d06e1438f2a44f43c3b Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Fri, 22 Jun 2018 14:11:58 +0200 Subject: [PATCH] EditorTextField.setText: take command and write action in correct order --- .../platform-impl/src/com/intellij/ui/EditorTextField.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ui/EditorTextField.java b/platform/platform-impl/src/com/intellij/ui/EditorTextField.java index ecc71a463008..e11fba55c8ae 100644 --- a/platform/platform-impl/src/com/intellij/ui/EditorTextField.java +++ b/platform/platform-impl/src/com/intellij/ui/EditorTextField.java @@ -1,4 +1,4 @@ -// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.ui; import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer; @@ -236,7 +236,8 @@ public class EditorTextField extends NonOpaquePanel implements DocumentListener, @Override public void setText(@Nullable final String text) { - ApplicationManager.getApplication().runWriteAction(() -> CommandProcessor.getInstance().executeCommand(getProject(), () -> { + CommandProcessor.getInstance().executeCommand(getProject(), () -> + ApplicationManager.getApplication().runWriteAction(() -> { myDocument.replaceString(0, myDocument.getTextLength(), StringUtil.notNullize(text)); if (myEditor != null) { final CaretModel caretModel = myEditor.getCaretModel(); @@ -244,7 +245,7 @@ public class EditorTextField extends NonOpaquePanel implements DocumentListener, caretModel.moveToOffset(myDocument.getTextLength()); } } - }, null, null, UndoConfirmationPolicy.DEFAULT, getDocument())); + }), null, null, UndoConfirmationPolicy.DEFAULT, getDocument()); } /**