Skip to content

Commit 1f64b17

Browse files
authored
Merge pull request #385 from kasecato/#383/improve_terminal_change_tab
Fixed #383 that [alt+left] in terminal is bound to change tab
2 parents a0128c0 + f4c75c7 commit 1f64b17

File tree

3 files changed

+38
-8
lines changed

3 files changed

+38
-8
lines changed

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,8 +288,10 @@ shift+ctrl+enter | shift+cmd+enter | Start new line | ✅
288288
alt+f12 | alt+f12 | Opens and focuses corresponding tool window (Terminal) | ✅
289289
alt+f12 | alt+f12 | Close corresponding tool window (Terminal) | ✅
290290
ctrl+shift+alt+j | ctrl+cmd+g | Sublime Text style multiple selections | ✅
291-
alt+left | shift+cmd+[ | Select previous tab (Terminal) | ✅
292-
alt+right | shift+cmd+] | Select next tab (Terminal) | ✅
291+
alt+left | N/A | Select previous tab (Terminal) | ✅
292+
alt+right | N/A | Select next tab (Terminal) | ✅
293+
N/A | shift+cmd+[ | Select previous tab (Terminal) | ✅
294+
N/A | shift+cmd+] | Select next tab (Terminal) | ✅
293295
alt+tab | alt+tab | Goto next splitter | ✅
294296
shift+alt+tab | shift+alt+tab | Goto previous splitter | ✅
295297
enter | enter | Open Highlighted File (Explorer) | ✅

package.json

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -862,24 +862,28 @@
862862
"key": "alt+left",
863863
"mac": "ctrl+left",
864864
"command": "workbench.action.previousEditor",
865+
"when": "!terminalFocus",
865866
"intellij": "Go to previous editor tab"
866867
},
867868
{
868869
"key": "",
869870
"mac": "shift+cmd+[",
870871
"command": "workbench.action.previousEditor",
872+
"when": "!terminalFocus",
871873
"intellij": "Go to previous editor tab"
872874
},
873875
{
874876
"key": "alt+right",
875877
"mac": "ctrl+right",
876878
"command": "workbench.action.nextEditor",
879+
"when": "!terminalFocus",
877880
"intellij": "Go to next editor tab"
878881
},
879882
{
880883
"key": "",
881884
"mac": "shift+cmd+]",
882885
"command": "workbench.action.nextEditor",
886+
"when": "!terminalFocus",
883887
"intellij": "Go to next editor tab"
884888
},
885889

@@ -1621,16 +1625,26 @@
16211625
},
16221626
{
16231627
"key": "alt+left",
1624-
"mac": "shift+cmd+[",
16251628
"command": "workbench.action.terminal.focusPrevious",
1626-
"when": "terminalFocus",
1629+
"when": "terminalTabsFocus",
16271630
"intellij": "Select previous tab (Terminal)"
16281631
},
16291632
{
16301633
"key": "alt+right",
1634+
"command": "workbench.action.terminal.focusNext",
1635+
"when": "terminalTabsFocus",
1636+
"intellij": "Select next tab (Terminal)"
1637+
},
1638+
{
1639+
"key": "",
1640+
"mac": "shift+cmd+[",
1641+
"command": "workbench.action.terminal.focusPrevious",
1642+
"intellij": "Select previous tab (Terminal)"
1643+
},
1644+
{
1645+
"key": "",
16311646
"mac": "shift+cmd+]",
16321647
"command": "workbench.action.terminal.focusNext",
1633-
"when": "terminalFocus",
16341648
"intellij": "Select next tab (Terminal)"
16351649
},
16361650
{

src/package-with-comment.json

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1087,24 +1087,28 @@
10871087
"key": "alt+left",
10881088
"mac": "ctrl+left",
10891089
"command": "workbench.action.previousEditor",
1090+
"when": "!terminalFocus",
10901091
"intellij": "Go to previous editor tab"
10911092
},
10921093
{
10931094
"key": "",
10941095
"mac": "shift+cmd+[",
10951096
"command": "workbench.action.previousEditor",
1097+
"when": "!terminalFocus",
10961098
"intellij": "Go to previous editor tab"
10971099
},
10981100
{
10991101
"key": "alt+right",
11001102
"mac": "ctrl+right",
11011103
"command": "workbench.action.nextEditor",
1104+
"when": "!terminalFocus",
11021105
"intellij": "Go to next editor tab"
11031106
},
11041107
{
11051108
"key": "",
11061109
"mac": "shift+cmd+]",
11071110
"command": "workbench.action.nextEditor",
1111+
"when": "!terminalFocus",
11081112
"intellij": "Go to next editor tab"
11091113
},
11101114
/*
@@ -2058,16 +2062,26 @@
20582062
},
20592063
{
20602064
"key": "alt+left",
2061-
"mac": "shift+cmd+[",
20622065
"command": "workbench.action.terminal.focusPrevious",
2063-
"when": "terminalFocus",
2066+
"when": "terminalTabsFocus",
20642067
"intellij": "Select previous tab (Terminal)"
20652068
},
20662069
{
20672070
"key": "alt+right",
2071+
"command": "workbench.action.terminal.focusNext",
2072+
"when": "terminalTabsFocus",
2073+
"intellij": "Select next tab (Terminal)"
2074+
},
2075+
{
2076+
"key": "",
2077+
"mac": "shift+cmd+[",
2078+
"command": "workbench.action.terminal.focusPrevious",
2079+
"intellij": "Select previous tab (Terminal)"
2080+
},
2081+
{
2082+
"key": "",
20682083
"mac": "shift+cmd+]",
20692084
"command": "workbench.action.terminal.focusNext",
2070-
"when": "terminalFocus",
20712085
"intellij": "Select next tab (Terminal)"
20722086
},
20732087
{

0 commit comments

Comments
 (0)