Merge branch 'master' into windows-path

CHANGELOG.md

@@ -4,9 +4,13 @@ Please add your own contribution below inside the Master section
 Bug-fixes within the same version aren't needed
 
 ## Master
-* fix debug problem for windows users (#694) - @connectdotz
+
 -->
 
+### 4.0.2
+* fix debug problem for windows users (#694) - @connectdotz
+* change *Run Related Tests* default keybinding to Ctrl-Alt/Option-T to avoid overriding default shortcuts. (#704) - @Agalin
+
 ### 4.0.1
 * fix test files not found in testFile list on windows after v4 migration - @connectdotz (#696)
 * do not report error if no test file found - @connectdotz (#696)

README.md

@@ -373,7 +373,7 @@ One can assign keyboard shortcut to any of these commands, see [vscode Key Bindi
 In interactive mode, user can trigger the following action from the text editor context-menu
 |menu|description|keyboard shortcut
 |---|---|---|
-|Jest: Run Related Tests| if in test file, run all tests in the file; if in source file, run all tests with dependency to the file|Cmd-t or Ctrl-t|
+|Jest: Run Related Tests| if in test file, run all tests in the file; if in source file, run all tests with dependency to the file|Ctrl-Option-t (Mac) or Ctrl-Alt-t|
 
 Please see [vscode Key Bindings](https://code.visualstudio.com/docs/getstarted/keybindings) if you want to change the keyboard shortcut. 
 

package.json

@@ -292,8 +292,8 @@
     "keybindings": [
       {
         "command": "io.orta.jest.editor.run-all-tests",
-        "key": "ctrl+t",
-        "mac": "cmd+t",
+        "key": "ctrl+alt+t",
+        "mac": "ctrl+alt+t",
         "when": "jest:run.interactive && editorLangId =~ /(javascript|javascriptreact|typescript|typescriptreact)/ "
       }
     ],