From 45d564eb0bfd19635ea86a230f88bd7c7878d006 Mon Sep 17 00:00:00 2001
From: Dmitry Batrak <Dmitry.Batrak@jetbrains.com>
Date: Fri, 20 Nov 2015 15:05:37 +0300
Subject: [PATCH] revert fix for IDEA-147626

---
 .../openapi/fileEditor/impl/text/TextEditorComponent.java       | 1 -
 .../openapi/fileEditor/impl/text/TextEditorProvider.java        | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorComponent.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorComponent.java
index b869b293dd66..02423006fdc6 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorComponent.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorComponent.java
@@ -98,7 +98,6 @@ class TextEditorComponent extends JBLoadingPanel implements DataProvider {
     myDocument.addDocumentListener(myDocumentListener);
 
     myEditor = createEditor();
-    myEditor.getContentComponent().setFocusTraversalKeysEnabled(false);
     add(myEditor.getComponent(), BorderLayout.CENTER);
     myModified = isModifiedImpl();
     myValid = isEditorValidImpl();
diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorProvider.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorProvider.java
index d14bd13505ca..6f8b58fa0bff 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorProvider.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorProvider.java
@@ -295,10 +295,12 @@ public class TextEditorProvider implements FileEditorProvider, DumbAware {
     UiNotifyConnector.doWhenFirstShown(editor.getContentComponent(), new Runnable() {
       public void run() {
         if (!editor.isDisposed()) {
+          editor.getScrollingModel().disableAnimation();
           if (verticalScrollProportion != -1) {
             EditorUtil.setVerticalScrollProportion(editor, verticalScrollProportion);
           }
           editor.getScrollingModel().scrollToCaret(ScrollType.RELATIVE);
+          editor.getScrollingModel().enableAnimation();
         }
       }
     });