From e2c3c29372e7ff77435a977fad9bb56169beffcb Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Wed, 29 Jun 2016 18:31:51 +0300
Subject: [PATCH] cleanup

---
 .../src/com/intellij/util/ui/EditorAdapter.java   | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/platform/platform-api/src/com/intellij/util/ui/EditorAdapter.java b/platform/platform-api/src/com/intellij/util/ui/EditorAdapter.java
index a65f45ec43d9..7f0631018076 100644
--- a/platform/platform-api/src/com/intellij/util/ui/EditorAdapter.java
+++ b/platform/platform-api/src/com/intellij/util/ui/EditorAdapter.java
@@ -57,22 +57,19 @@ public class EditorAdapter {
   private final Editor myEditor;
 
   private final Alarm myFlushAlarm = new Alarm();
-  private final Collection<Line> myLines = new ArrayList<Line>();
+  private final Collection<Line> myLines = new ArrayList<>();
   private final Project myProject;
   private final boolean myScrollToTheEndOnAppend;
 
-  private final Runnable myFlushDeferredRunnable = () -> flushStoredLines();
-
   private synchronized void flushStoredLines() {
     Collection<Line> lines;
     synchronized (myLines) {
-      lines = new ArrayList<Line>(myLines);
+      lines = new ArrayList<>(myLines);
       myLines.clear();
     }
     ApplicationManager.getApplication().runWriteAction(writingCommand(lines));
   }
 
-
   public EditorAdapter(@NotNull Editor editor, Project project, boolean scrollToTheEndOnAppend) {
     myEditor = editor;
     myProject = project;
@@ -90,13 +87,13 @@ public class EditorAdapter {
     }
 
     if (myFlushAlarm.isEmpty()) {
-      myFlushAlarm.addRequest(myFlushDeferredRunnable, 200, ModalityState.NON_MODAL);
+      myFlushAlarm.addRequest(this::flushStoredLines, 200, ModalityState.NON_MODAL);
     }
   }
 
-  private Runnable writingCommand(final Collection<Line> lines) {
+  @NotNull
+  private Runnable writingCommand(@NotNull Collection<Line> lines) {
     final Runnable command = () -> {
-
       Document document = myEditor.getDocument();
 
       StringBuilder buffer = new StringBuilder();
@@ -104,8 +101,8 @@ public class EditorAdapter {
         buffer.append(line.getValue());
       }
       int endBefore = document.getTextLength();
-      int endBeforeLine = endBefore;
       document.insertString(endBefore, buffer.toString());
+      int endBeforeLine = endBefore;
       for (Line line : lines) {
         myEditor.getMarkupModel()
             .addRangeHighlighter(endBeforeLine, Math.min(document.getTextLength(), endBeforeLine + line.getValue().length()), HighlighterLayer.ADDITIONAL_SYNTAX,