Merge pull request jest-community#270 from stephtr/master

Fix regex for detecting jest.js
legend1202 · Feb 22, 2018 · fbcbde5 · fbcbde5
2 parents 0d9e1f4 + b91451d
commit fbcbde5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,8 @@ Bug-fixes within the same version aren't needed
 
 ## Master
 
+* Fixes debugging of tasks on Windows (bug introduced in 2.6.2) - stephtr
+
 ### 2.6.3
 
 * Even better detection logic for projects created by `create-react-app` - stephtr

diff --git a/src/JestExt.ts b/src/JestExt.ts
@@ -501,7 +501,7 @@ export class JestExt {
 
           case '#!/bin/sh': {
             const line = lines[8]
-            const match = /^\s*"[^"]+"\s+"$basedir\/([^"]+)"/.exec(line)
+            const match = /^\s*"[^"]+"\s+"\$basedir\/([^"]+)"/.exec(line)
             if (match) {
               return path.join(path.dirname(jest), match[1])
             }
@@ -512,6 +512,12 @@ export class JestExt {
 
         break
       }
+
+      case 'npm test --':
+      case 'npm.cmd test --': {
+        vscode.window.showErrorMessage('Debugging of tasks is currently only available when directly running jest!')
+        return undefined
+      }
     }
 
     vscode.window.showErrorMessage('Cannot find jest.js file!')