Merge pull request #99 from AtomLinter/steelbrain/do-not-force-g-flag

Do not force g flag
steelbrain · Jan 22, 2016 · d78b20c · d78b20c
2 parents e79ac34 + 778b226
commit d78b20c
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 4.3.4
+
+* Do not add `g` flag to regex if it already exists
+
 ### 4.3.3
 
 * Switch to `named-js-regexp` instead of `xregexp` for `parse` method

diff --git a/lib/helpers.js b/lib/helpers.js
@@ -388,7 +388,9 @@ function parse(data, regex) {
   }
 
   const options = assign({ flags: '' }, opts);
-  options.flags += 'g';
+  if (options.flags.indexOf('g') === -1) {
+    options.flags += 'g';
+  }
 
   const messages = [];
   const compiledRegexp = NamedRegexp(regex, options.flags);

diff --git a/spec/helper-spec.coffee b/spec/helper-spec.coffee
@@ -152,6 +152,17 @@ describe 'linter helpers', ->
       results = helpers.parse(input, regex, {flags: "i"})
       expect(results).toEqual(output)
 
+      regex = 'type:(?<type>.+) message:(?<message>.+)'
+      input = 'TYPE:type message:message'
+      output = [(
+        type: 'type'
+        text: 'message'
+        filePath: null
+        range: [[0, 0], [0, 0]]
+      )]
+      results = helpers.parse(input, regex, {flags: "gi"})
+      expect(results).toEqual(output)
+
   describe '::find', ->
     it 'cries when no argument is passed', ->
       expect ->

diff --git a/src/helpers.js b/src/helpers.js
@@ -332,7 +332,9 @@ export function parse(data, regex, opts = {}) {
   }
 
   const options = assign({flags: ''}, opts)
-  options.flags += 'g'
+  if (options.flags.indexOf('g') === -1) {
+    options.flags += 'g'
+  }
 
   const messages = []
   const compiledRegexp = NamedRegexp(regex, options.flags)