Merge pull request #33 from Arcanemagus/simplify-regex

Simplify the regex used
steelbrain · Dec 3, 2015 · 1add0e6 · 1add0e6
2 parents c322a5c + 0f1b3d4
commit 1add0e6
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/lib/helpers.js b/lib/helpers.js
@@ -3,25 +3,25 @@
 import {BufferedProcess} from 'atom'
 const extractionRegex = /Installing (.*?) to .* (.*)/
 const nameRegexes = [
-  /(\\|\/)packages(\\|\/)(.*?)(\\|\/)/,
-  /(\\|\/)([\w-_]+)(\\|\/)(lib|src)(\\|\/)/i,
-  /(\\|\/)([\w-_]+)(\\|\/)[\w-_]+\..+$/
+  /[\\\/]packages[\\\/](.*?)[\\\/]/,
+  /[\\\/]([\w-_]+)[\\\/](?:lib|src)[\\\/]/i,
+  /[\\\/]([\w-_]+)[\\\/][\w-_]+\..+$/
 ]
 
 export function guessName(filePath) {
   let matches
 
   matches = nameRegexes[0].exec(filePath)
   if (matches) {
-    return matches[3]
+    return matches[1]
   }
   matches = nameRegexes[1].exec(filePath)
   if (matches) {
-    return matches[2]
+    return matches[1]
   }
   matches = nameRegexes[2].exec(filePath)
   if (matches) {
-    return matches[2]
+    return matches[1]
   }
   return null
 }