chylex/IntelliJ-IdeaVim
1
0
Fork 0
mirror of https://github.com/chylex/IntelliJ-IdeaVim.git synced 2025-03-04 21:32:52 +01:00
Code

VIM-868 Allow count on 'gt' and 'gT'

Browse Source 
'{count}gt' can now be used to switch to a specific tab.
'{count}gT' can now be used to switch to a n:th previous tab.
This commit is contained in:
Tuomas Tynkkynen 2015-01-17 22:24:17 +02:00
parent 458e0fc76d
commit 79fd32088b
3 changed files with 26 additions and 10 deletions
src/com/maddyhome/idea/vim
action/motion/tabs
MotionNextTabAction.javaMotionPreviousTabAction.java
group
MotionGroup.java

2
src/com/maddyhome/idea/vim/action/motion/tabs/MotionNextTabAction.java
View File

@ -36,7 +36,7 @@ public class MotionNextTabAction extends MotionEditorAction {
private static class Handler extends MotionEditorActionHandler {
public int getOffset(@NotNull final Editor editor, @NotNull final DataContext context, final int count, final int rawCount, final Argument argument) {
return VimPlugin.getMotion().moveCaretGotoNextTab(editor, context);
return VimPlugin.getMotion().moveCaretGotoNextTab(editor, context, rawCount);
}
}
}

2
src/com/maddyhome/idea/vim/action/motion/tabs/MotionPreviousTabAction.java
View File

@ -36,7 +36,7 @@ public class MotionPreviousTabAction extends MotionEditorAction {
private static class Handler extends MotionEditorActionHandler {
public int getOffset(@NotNull final Editor editor, @NotNull final DataContext context, final int count, final int rawCount, final Argument argument) {
return VimPlugin.getMotion().moveCaretGotoPreviousTab(editor, context);
return VimPlugin.getMotion().moveCaretGotoPreviousTab(editor, context, rawCount);
}
}
}

32
src/com/maddyhome/idea/vim/group/MotionGroup.java
View File

@ -25,6 +25,8 @@ import com.intellij.openapi.fileEditor.FileEditor;
import com.intellij.openapi.fileEditor.FileEditorManagerAdapter;
import com.intellij.openapi.fileEditor.FileEditorManagerEvent;
import com.intellij.openapi.fileEditor.TextEditor;
import com.intellij.openapi.fileEditor.impl.EditorTabbedContainer;
import com.intellij.openapi.fileEditor.impl.EditorWindow;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import com.maddyhome.idea.vim.EventFacade;
@ -1234,17 +1236,31 @@ public class MotionGroup {
return false;
}
public int moveCaretGotoPreviousTab(@NotNull Editor editor, @NotNull DataContext context) {
final AnAction previousTab = ActionManager.getInstance().getAction("PreviousTab");
final AnActionEvent e = new AnActionEvent(null, context, "", new Presentation(), ActionManager.getInstance(), 0);
previousTab.actionPerformed(e);
/* If 'absolute' is true, then set tab index to 'value', otherwise add 'value' to tab index with wraparound. */
private void switchEditorTab(EditorWindow editorWindow, int value, boolean absolute) {
if (editorWindow != null && editorWindow.getTabbedPane() != null) {
EditorTabbedContainer tabbedPane = editorWindow.getTabbedPane();
if (absolute) {
tabbedPane.setSelectedIndex(value);
}
else {
int tabIndex = (value + tabbedPane.getSelectedIndex()) % tabbedPane.getTabCount();
tabbedPane.setSelectedIndex(tabIndex < 0 ? tabIndex + tabbedPane.getTabCount() : tabIndex);
}
}
}
public int moveCaretGotoPreviousTab(@NotNull Editor editor, @NotNull DataContext context, int rawCount) {
switchEditorTab(EditorWindow.DATA_KEY.getData(context), rawCount >= 1 ? -rawCount : -1, false);
return editor.getCaretModel().getOffset();
}
public int moveCaretGotoNextTab(@NotNull Editor editor, @NotNull DataContext context) {
final AnAction nextTab = ActionManager.getInstance().getAction("NextTab");
final AnActionEvent e = new AnActionEvent(null, context, "", new Presentation(), ActionManager.getInstance(), 0);
nextTab.actionPerformed(e);
public int moveCaretGotoNextTab(@NotNull Editor editor, @NotNull DataContext context, int rawCount) {
if (rawCount >= 1) {
switchEditorTab(EditorWindow.DATA_KEY.getData(context), rawCount - 1, true);
} else {
switchEditorTab(EditorWindow.DATA_KEY.getData(context), 1, false);
}
return editor.getCaretModel().getOffset();
}