Merge remote-tracking branch 'origin/master'

platform/platform-api/src/com/intellij/openapi/fileEditor/FileEditorProvider.java

@@ -36,7 +36,6 @@ public interface FileEditorProvider {
   Key<FileEditorProvider> KEY = Key.create("com.intellij.fileEditorProvider");
 
   /**
-   * If provider is not dumb-aware, and it is the only
    * @param file file to be tested for acceptance. This
    * parameter is never <code>null</code>.
    *

platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorComposite.java

@@ -463,8 +463,11 @@ public abstract class EditorComposite implements Disposable {
       myComponent.setComponent(myTabbedPaneWrapper.getComponent());
     }
     else {
-      myTabbedPaneWrapper.addTab(editor.getName(), editor.getComponent());
+      JComponent component = createEditorComponent(editor);
+      myTabbedPaneWrapper.addTab(editor.getName(), component);
     }
+    myFocusWatcher.deinstall(myFocusWatcher.getTopComponent());
+    myFocusWatcher.install(myComponent);
     myEditors = editors;
   }