From 71b71fa2acd3b3de55a09969675c3f354d73380b Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Wed, 25 Apr 2012 16:54:04 +0200
Subject: [PATCH] recent files fixes

---
 .../intellij/ide/actions/ShowRecentFilesAction.java    |  2 +-
 .../src/com/intellij/ide/actions/Switcher.java         | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/ide/actions/ShowRecentFilesAction.java b/platform/platform-impl/src/com/intellij/ide/actions/ShowRecentFilesAction.java
index c4ecf96177de..2849ed3f3dd2 100644
--- a/platform/platform-impl/src/com/intellij/ide/actions/ShowRecentFilesAction.java
+++ b/platform/platform-impl/src/com/intellij/ide/actions/ShowRecentFilesAction.java
@@ -35,7 +35,7 @@ public class ShowRecentFilesAction extends DumbAwareAction {
     final Project project = e.getData(PlatformDataKeys.PROJECT);
     if (project != null) {
       FeatureUsageTracker.getInstance().triggerFeatureUsed("navigation.recent.files");
-      Switcher.createAndShowSwitcher(project, IdeBundle.message("title.popup.recent.files"), true);
+      Switcher.createAndShowSwitcher(project, IdeBundle.message("title.popup.recent.files"), true).goForward();
     }
   }
 }
diff --git a/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java b/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java
index 4e33454d2eb2..daca8165ed14 100644
--- a/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java
+++ b/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java
@@ -191,7 +191,7 @@ public class Switcher extends AnAction implements DumbAware {
     SwitcherPanel(Project project, String title, boolean pinned) {
       super(new BorderLayout(0, 0));
       this.project = project;
-      MAX_FILES_IN_SWITCHER = pinned ? UISettings.getInstance().RECENT_FILES_LIMIT + UISettings.getInstance().EDITOR_TAB_LIMIT : 30;
+      MAX_FILES_IN_SWITCHER = pinned ? UISettings.getInstance().RECENT_FILES_LIMIT : 30;
       myPinned = pinned;
       mySpeedSearch =  pinned ? new SwitcherSpeedSearch() : null;
 
@@ -297,8 +297,10 @@ public class Switcher extends AnAction implements DumbAware {
       final FileEditorManagerImpl editorManager = (FileEditorManagerImpl)FileEditorManager.getInstance(project);
       final ArrayList<FileInfo> filesData = new ArrayList<FileInfo>();
       final ArrayList<FileInfo> editors = new ArrayList<FileInfo>();
-      for (Pair<VirtualFile, EditorWindow> pair : editorManager.getSelectionHistory()) {
-        editors.add(new FileInfo(pair.first, pair.second));
+      if (!pinned) {
+        for (Pair<VirtualFile, EditorWindow> pair : editorManager.getSelectionHistory()) {
+          editors.add(new FileInfo(pair.first, pair.second));
+        }
       }
       if (editors.size() < 2 || isPinnedMode()) {
         if (isPinnedMode() && editors.size() > 1) {
@@ -306,7 +308,7 @@ public class Switcher extends AnAction implements DumbAware {
         }
         final VirtualFile[] recentFiles = ArrayUtil.reverseArray(EditorHistoryManager.getInstance(project).getFiles());
         final int maxFiles = Math.max(editors.size(), recentFiles.length);
-        final int len = isPinnedMode() ? maxFiles : Math.min(toolWindows.getModel().getSize(), maxFiles);
+        final int len = isPinnedMode() ? recentFiles.length : Math.min(toolWindows.getModel().getSize(), maxFiles);
         boolean firstRecentMarked = false;
         for (int i = 0; i < len; i++) {
           final FileInfo info = new FileInfo(recentFiles[i], null);