diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 16d875f..0000000 Binary files a/.DS_Store and /dev/null differ diff --git a/.gitignore b/.gitignore index 3f21372..83fedc9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,7 @@ *.iws out/* -build/* \ No newline at end of file +build/* +.DS_Store +*.ipr +.idea +*.iml diff --git a/META-INF/plugin.xml b/META-INF/plugin.xml index 7b1f516..3eaf06c 100644 --- a/META-INF/plugin.xml +++ b/META-INF/plugin.xml @@ -2,8 +2,8 @@ TabSwitch - 3.0.9 - + 3.1.0 + 3.0.7: Bug-fix: reverse recent files array _before_ checking their validity do be added to list.
3.0.6: Remove TabSwitch settings. Is not used anymore.
3.0.5: Project is upgraded to use java 7.
diff --git a/TabSwitch.iml b/TabSwitch.iml deleted file mode 100644 index 1c9ba9e..0000000 --- a/TabSwitch.iml +++ /dev/null @@ -1,208 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/TabSwitch.ipr b/TabSwitch.ipr deleted file mode 100644 index 8d0f3f7..0000000 --- a/TabSwitch.ipr +++ /dev/null @@ -1,454 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - http://www.w3.org/1999/xhtml - - - - - - - - - - - - - - - - - - diff --git a/build.xml b/build.xml index 2cd6892..f04cd33 100644 --- a/build.xml +++ b/build.xml @@ -27,6 +27,7 @@ + diff --git a/src/org/intellij/ideaplugins/tabswitch/action/SwitchTabAction.java b/src/org/intellij/ideaplugins/tabswitch/action/SwitchTabAction.java index 5a614d0..725e102 100644 --- a/src/org/intellij/ideaplugins/tabswitch/action/SwitchTabAction.java +++ b/src/org/intellij/ideaplugins/tabswitch/action/SwitchTabAction.java @@ -15,6 +15,7 @@ */ package org.intellij.ideaplugins.tabswitch.action; +import org.intellij.ideaplugins.tabswitch.filefetcher.OpenTabFilesFileFetcher; import org.jetbrains.annotations.Nullable; import com.intellij.ide.ui.UISettings; @@ -45,7 +46,8 @@ private VirtualFile getFile(Project project, FileEditorManager fileEditorManager VirtualFile[] recentFiles = EditorHistoryManager.getInstance(project).getFiles(); for (int i = recentFiles.length - 2; i >= 0; i--) { VirtualFile file = recentFiles[i]; - if (showRecentFiles || fileEditorManager.isFileOpen(file)) { + if ((showRecentFiles || fileEditorManager.isFileOpen(file)) + && !OpenTabFilesFileFetcher.ignoredExtensions.contains(file.getExtension())) { return file; } } diff --git a/src/org/intellij/ideaplugins/tabswitch/filefetcher/OpenTabFilesFileFetcher.java b/src/org/intellij/ideaplugins/tabswitch/filefetcher/OpenTabFilesFileFetcher.java index df0be8a..817bb9a 100644 --- a/src/org/intellij/ideaplugins/tabswitch/filefetcher/OpenTabFilesFileFetcher.java +++ b/src/org/intellij/ideaplugins/tabswitch/filefetcher/OpenTabFilesFileFetcher.java @@ -1,8 +1,5 @@ package org.intellij.ideaplugins.tabswitch.filefetcher; -import java.util.LinkedList; -import java.util.List; - import com.intellij.ide.ui.UISettings; import com.intellij.openapi.fileEditor.FileEditorManager; import com.intellij.openapi.fileEditor.impl.EditorHistoryManager; @@ -10,10 +7,19 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.ArrayUtil; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Set; + /** * Creates a list of {@link VirtualFile} by fetching all the files that are open in tabs in current project. */ public class OpenTabFilesFileFetcher implements FileFetcher { + public static Set ignoredExtensions = new HashSet<>(); + static { + ignoredExtensions.add("class"); + } @Override public List getFiles(Project project) { @@ -25,7 +31,8 @@ private List getOpenFiles(FileEditorManager fileEditorManager, Virt List openFiles = new LinkedList<>(); int editorTabLimit = UISettings.getInstance().EDITOR_TAB_LIMIT; for (VirtualFile file : recentFiles) { - if (openFiles.size() <= editorTabLimit && fileEditorManager.isFileOpen(file) && !openFiles.contains(file)) { + if (openFiles.size() <= editorTabLimit && fileEditorManager.isFileOpen(file) && !openFiles.contains(file) + && !ignoredExtensions.contains(file.getExtension())) { openFiles.add(file); } }