From 4e2d96ec1eb5425c0578ff204f47aa29f3ecd971 Mon Sep 17 00:00:00 2001 From: louyl Date: Mon, 19 Oct 2015 17:27:25 +0800 Subject: [PATCH 1/2] Ignore class file in Open Files list --- .DS_Store | Bin 6148 -> 0 bytes .gitignore | 4 +- META-INF/plugin.xml | 5 +- TabSwitch.ipr | 454 ------------------ .../filefetcher/OpenTabFilesFileFetcher.java | 15 +- 5 files changed, 17 insertions(+), 461 deletions(-) delete mode 100644 .DS_Store delete mode 100644 TabSwitch.ipr diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 16d875f048b003f89438f610b00ecfc05d69253a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeH~J&pn~427Thk&tL8DbsL(y+MTF1YBUnPJ=WO#fm;h=h<(?J6KYLuU74ZjM<6h0 J5P^Rs@C1L66M6su diff --git a/.gitignore b/.gitignore index 3f21372..6a26239 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ *.iws out/* -build/* \ No newline at end of file +build/* +.DS_Store +*.ipr \ No newline at end of file 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.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/src/org/intellij/ideaplugins/tabswitch/filefetcher/OpenTabFilesFileFetcher.java b/src/org/intellij/ideaplugins/tabswitch/filefetcher/OpenTabFilesFileFetcher.java index df0be8a..74091ee 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 { + private 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); } } From c0509a999d15980422236c245b8771d79dbf0898 Mon Sep 17 00:00:00 2001 From: louyl Date: Mon, 19 Oct 2015 18:58:01 +0800 Subject: [PATCH 2/2] Ignore class file when tab switch; Fix cannot be found classvistor problem --- .gitignore | 4 +- TabSwitch.iml | 208 ------------------ build.xml | 1 + .../tabswitch/action/SwitchTabAction.java | 4 +- .../filefetcher/OpenTabFilesFileFetcher.java | 2 +- 5 files changed, 8 insertions(+), 211 deletions(-) delete mode 100644 TabSwitch.iml diff --git a/.gitignore b/.gitignore index 6a26239..83fedc9 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,6 @@ out/* build/* .DS_Store -*.ipr \ No newline at end of file +*.ipr +.idea +*.iml 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/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 74091ee..817bb9a 100644 --- a/src/org/intellij/ideaplugins/tabswitch/filefetcher/OpenTabFilesFileFetcher.java +++ b/src/org/intellij/ideaplugins/tabswitch/filefetcher/OpenTabFilesFileFetcher.java @@ -16,7 +16,7 @@ * Creates a list of {@link VirtualFile} by fetching all the files that are open in tabs in current project. */ public class OpenTabFilesFileFetcher implements FileFetcher { - private static Set ignoredExtensions = new HashSet<>(); + public static Set ignoredExtensions = new HashSet<>(); static { ignoredExtensions.add("class"); }