From f68008237d27d104417ef9cadecc48959a177237 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Mon, 18 Jun 2018 20:15:37 +0300 Subject: [PATCH] removed WriteAction for IDEA-CR-33774 --- .../editor/impl/EditorTextFieldRendererDocument.java | 8 ++++---- .../src/com/intellij/ui/EditorTextFieldCellRenderer.java | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/platform/core-impl/src/com/intellij/openapi/editor/impl/EditorTextFieldRendererDocument.java b/platform/core-impl/src/com/intellij/openapi/editor/impl/EditorTextFieldRendererDocument.java index 6f06cefd3c11..278ed7853ef8 100644 --- a/platform/core-impl/src/com/intellij/openapi/editor/impl/EditorTextFieldRendererDocument.java +++ b/platform/core-impl/src/com/intellij/openapi/editor/impl/EditorTextFieldRendererDocument.java @@ -16,11 +16,11 @@ import org.jetbrains.annotations.NotNull; * The only mutating method is setText() which is extremely cheap. */ public class EditorTextFieldRendererDocument extends UserDataHolderBase implements DocumentEx { - RangeMarkerTree myRangeMarkers = new RangeMarkerTree(this) { + private final RangeMarkerTree myRangeMarkers = new RangeMarkerTree(this) { }; - char[] myChars = ArrayUtil.EMPTY_CHAR_ARRAY; - String myString = ""; - LineSet myLineSet = LineSet.createLineSet(myString); + private char[] myChars = ArrayUtil.EMPTY_CHAR_ARRAY; + private String myString = ""; + private LineSet myLineSet = LineSet.createLineSet(myString); @Override public void setModificationStamp(long modificationStamp) { diff --git a/platform/platform-impl/src/com/intellij/ui/EditorTextFieldCellRenderer.java b/platform/platform-impl/src/com/intellij/ui/EditorTextFieldCellRenderer.java index 2930ec2688d9..536be03308f9 100644 --- a/platform/platform-impl/src/com/intellij/ui/EditorTextFieldCellRenderer.java +++ b/platform/platform-impl/src/com/intellij/ui/EditorTextFieldCellRenderer.java @@ -16,7 +16,6 @@ package com.intellij.ui; import com.intellij.openapi.Disposable; -import com.intellij.openapi.application.WriteAction; import com.intellij.openapi.editor.SelectionModel; import com.intellij.openapi.editor.colors.EditorColors; import com.intellij.openapi.editor.colors.EditorColorsScheme; @@ -188,7 +187,7 @@ public abstract class EditorTextFieldCellRenderer implements TableCellRenderer, void setTextToEditor(String text) { myEditor.getMarkupModel().removeAllHighlighters(); - WriteAction.run(() -> myEditor.getDocument().setText(text)); + myEditor.getDocument().setText(text); ((EditorImpl)myEditor).resetSizes(); myEditor.getHighlighter().setText(text); if (myTextAttributes != null) {